Target Osaka EVM during tests (#6217)

Co-authored-by: ernestognw <ernestognw@gmail.com>

Author: Amxx

.github/actions/setup/action.yml

@@ -55,7 +55,7 @@ runs:
         FOUNDRY_DEFAULT_VERSION: "stable"
         JAVA_DEFAULT_VERSION: "21"
         PYTHON_DEFAULT_VERSION: "3.13"
-        SOLC_DEFAULT_VERSION: "0.8.27"
+        SOLC_DEFAULT_VERSION: "0.8.31"
     # Node & npm setup
     - name: Install Node (${{ steps.versions.outputs.node }})
       if: inputs.node != 'off'

contracts/token/ERC20/extensions/ERC20Wrapper.sol

@@ -27,7 +27,7 @@ abstract contract ERC20Wrapper is ERC20 {
     error ERC20InvalidUnderlying(address token);
 
     constructor(IERC20 underlyingToken) {
-        if (underlyingToken == this) {
+        if (address(underlyingToken) == address(this)) {
             revert ERC20InvalidUnderlying(address(this));
         }
         _underlying = underlyingToken;

foundry.toml

@@ -1,6 +1,6 @@
 [profile.default]
-solc_version = '0.8.27'
-evm_version = 'prague'
+solc_version = '0.8.31'
+evm_version = 'osaka'
 optimizer = true
 optimizer_runs = 200
 src = 'contracts'

hardhat.config.js

@@ -1,5 +1,5 @@
 /// ENVVAR
-// - COMPILER:      compiler version (default: 0.8.27)
+// - COMPILER:      compiler version (default: 0.8.31)
 // - SRC:           contracts folder to compile (default: contracts)
 // - RUNS:          number of optimization runs (default: 200)
 // - IR:            enable IR compilation (default: false)
@@ -18,7 +18,7 @@ const { argv } = require('yargs/yargs')()
     compiler: {
       alias: 'compileVersion',
       type: 'string',
-      default: '0.8.27',
+      default: '0.8.31',
     },
     src: {
       alias: 'source',
@@ -38,7 +38,7 @@ const { argv } = require('yargs/yargs')()
     evm: {
       alias: 'evmVersion',
       type: 'string',
-      default: 'prague',
+      default: 'osaka',
     },
     // Extra modules
     coverage: {
@@ -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

@@ -72,7 +72,7 @@
     "glob": "^13.0.0",
     "globals": "^16.0.0",
     "graphlib": "^2.1.8",
-    "hardhat": "^2.24.3",
+    "hardhat": "^2.28.0",
     "hardhat-exposed": "^0.3.15",
     "hardhat-gas-reporter": "^2.1.0",
     "hardhat-ignore-warnings": "^0.2.11",

package.json

@@ -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);
     }
@@ -57,9 +42,4 @@ contract P256Test is Test {
             return _s > P256.N / 2 ? bytes32(P256.N - _s) : s;
         }
     }
-
-    // See https://github.com/foundry-rs/foundry/issues/10237
-    function verifyNative(bytes32 digest, bytes32 r, bytes32 s, bytes32 x, bytes32 y) external view {
-        P256.verifyNative(digest, r, s, x, y);
-    }
 }

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);