Merge branch 'hardfork/target-osaka' into update/use-0.8.31-clz

Author: Amxx

.github/workflows/checks.yml

@@ -86,6 +86,8 @@ jobs:
           submodules: recursive
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Check foundry version
+        run: forge --version
       - name: Run tests
         run: forge test -vvv
 

hardhat.config.js

@@ -103,7 +103,6 @@ module.exports = {
       // we rely on the `code-size` compiler warning, that will cause a compilation error.
       allowUnlimitedContractSize: true,
       initialBaseFeePerGas: argv.coverage ? 0 : undefined,
-      enableRip7212: true,
     },
   },
   exposed: {

package-lock.json

@@ -59,7 +59,7 @@
     "@eslint/compat": "^1.2.1",
     "@ethereumjs/mpt": "^10.1.0",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",
-    "@nomicfoundation/hardhat-ethers": "^3.1.3",
+    "@nomicfoundation/hardhat-ethers": "^3.0.9",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.13",
     "@openzeppelin/docs-utils": "^0.1.5",
     "@openzeppelin/merkle-tree": "^1.0.7",

package.json

@@ -3,7 +3,7 @@ const semver = require('semver');
 const { range } = require('./helpers');
 
 module.exports = {
-  versions: ['0.4.26', '0.5.16', '0.6.12', '0.7.6', '0.8.31']
+  versions: ['0.4.26', '0.5.16', '0.6.12', '0.7.6', '0.8.33']
     .map(semver.parse)
     .flatMap(({ major, minor, patch }) => range(patch + 1).map(p => `${major}.${minor}.${p}`)),
   compile: (source, version) =>

scripts/solc-versions.js

@@ -16,6 +16,7 @@ contract P256Test is Test {
         (bytes32 r, bytes32 s) = vm.signP256(privateKey, digest);
         s = _ensureLowerS(s);
         assertTrue(P256.verify(digest, r, s, bytes32(x), bytes32(y)));
+        assertTrue(P256.verifyNative(digest, r, s, bytes32(x), bytes32(y)));
         assertTrue(P256.verifySolidity(digest, r, s, bytes32(x), bytes32(y)));
     }
 
@@ -31,22 +32,6 @@ contract P256Test is Test {
         assertTrue((qx0 == bytes32(x) && qy0 == bytes32(y)) || (qx1 == bytes32(x) && qy1 == bytes32(y)));
     }
 
-    function testVerifyNativeUnsupportedRIP7212(bytes32 digest, uint256 seed) public {
-        // By default, the precompile at address 0x100 is not supported.
-
-        uint256 privateKey = _asPrivateKey(seed);
-
-        (uint256 x, uint256 y) = vm.publicKeyP256(privateKey);
-        (bytes32 r, bytes32 s) = vm.signP256(privateKey, digest);
-        s = _ensureLowerS(s);
-
-        (bool success, bytes memory returndata) = address(this).call(
-            abi.encodeCall(P256Test.verifyNative, (digest, r, s, bytes32(x), bytes32(y)))
-        );
-        assertFalse(success);
-        assertEq(returndata, abi.encodeWithSelector(Errors.MissingPrecompile.selector, address(0x100)));
-    }
-
     function _asPrivateKey(uint256 seed) private pure returns (uint256) {
         return bound(seed, 1, P256.N - 1);
     }

test/utils/cryptography/P256.t.sol

@@ -31,7 +31,7 @@ describe('RSA', function () {
         it(`signature length ${length} ${test.extra} ${result ? 'works' : 'fails'}`, async function () {
           const data = '0x' + test.Msg;
           const sig = '0x' + test.S;
-          const exp = '0x' + test.e;
+          const exp = ethers.stripZerosLeft('0x' + test.e); // strip zeros to reduce gas cost of the precompile
           const mod = '0x' + test.n;
 
           expect(await this.mock.$pkcs1Sha256(bytes32(ethers.sha256(data)), sig, exp, mod)).to.equal(result);