Merge branch 'main' into ci/add-venom-tests

pcaversaccio · Aug 27, 2024 · 83e9139 · 83e9139
2 parents f0579d0 + dc2c12b
commit 83e9139
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 78 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/.gitmodules b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "lib/erc4626-tests"]
 	path = lib/erc4626-tests
 	url = https://github.com/a16z/erc4626-tests.git
-[submodule "lib/FreshCryptoLib"]
-	path = lib/FreshCryptoLib
-	url = https://github.com/rdubois-crypto/FreshCryptoLib.git
 [submodule "lib/halmos-cheatcodes"]
 	path = lib/halmos-cheatcodes
 	url = https://github.com/a16z/halmos-cheatcodes.git

diff --git a/.prettierignore b/.prettierignore
@@ -8,7 +8,6 @@ lib/forge-std
 lib/properties
 lib/create-util
 lib/erc4626-tests
-lib/FreshCryptoLib
 lib/halmos-cheatcodes
 lib/solidity-bytes-utils
 lib/openzeppelin-contracts

diff --git a/.solhintignore b/.solhintignore
@@ -8,7 +8,6 @@ lib/forge-std
 lib/properties
 lib/create-util
 lib/erc4626-tests
-lib/FreshCryptoLib
 lib/halmos-cheatcodes
 lib/solidity-bytes-utils
 lib/openzeppelin-contracts

diff --git a/eslint.config.js b/eslint.config.js
@@ -23,7 +23,6 @@ module.exports = [
       "lib/properties/**",
       "lib/create-util/**",
       "lib/erc4626-tests/**",
-      "lib/FreshCryptoLib/**",
       "lib/halmos-cheatcodes/**",
       "lib/solidity-bytes-utils/**",
       "lib/openzeppelin-contracts/**",

diff --git a/lib/FreshCryptoLib b/lib/FreshCryptoLib
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/halmos-cheatcodes b/lib/halmos-cheatcodes
diff --git a/lib/solady b/lib/solady
diff --git a/remappings.txt b/remappings.txt
@@ -8,6 +8,5 @@ erc4626-tests/=lib/erc4626-tests/
 properties/=lib/properties/contracts/
 create-util/=lib/create-util/contracts/
 halmos-cheatcodes/=lib/halmos-cheatcodes/src/
-fresh-crypto-lib=lib/FreshCryptoLib/solidity/src/
 openzeppelin/=lib/openzeppelin-contracts/contracts/
 solidity-bytes-utils/=lib/solidity-bytes-utils/contracts/
diff --git a/test/utils/P256.t.sol b/test/utils/P256.t.sol
@@ -6,7 +6,6 @@ import {stdJson} from "forge-std/StdJson.sol";
 import {VyperDeployer} from "utils/VyperDeployer.sol";
 
 import {BytesLib} from "solidity-bytes-utils/BytesLib.sol";
-import {FCL_ecdsa_utils} from "fresh-crypto-lib/FCL_ecdsa_utils.sol";
 
 import {IP256} from "./interfaces/IP256.sol";
 
@@ -147,7 +146,7 @@ contract P256Test is Test {
         key = bound(key, 1, _N - 1);
         bytes32 hash = keccak256(abi.encode(message));
         (bytes32 r, bytes32 s) = vm.signP256(key, hash);
-        (uint256 qx, uint256 qy) = FCL_ecdsa_utils.ecdsa_derivKpub(key);
+        (uint256 qx, uint256 qy) = vm.publicKeyP256(key);
         if (uint256(s) <= _MALLEABILITY_THRESHOLD) {
             assertTrue(P256.verify_sig(hash, uint256(r), uint256(s), qx, qy));
         } else {
+9 −7		.gas-snapshot
+83 −0		src/utils/EfficientHashLib.sol
+35 −0		test/EfficientHashLib.t.sol