feat: update to use entrypoint v0.9 (#351)

Author: dancoombs

.env.example

@@ -1,4 +1,4 @@
-# Entrypoint config. If empty, scripts default to EP v0.7 at 0x0000000071727De22E5E9d8BAf0edAc6f37da032.
+# Entrypoint config. If empty, scripts default to EP v0.9 at 0x433709009B8330FDa32311DF1C2AFA402eD8D009.
 ENTRYPOINT=
 
 # AccountFactory's initial owner

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.compileUsingRemoteVersion": "v0.8.26+commit.8a97fa7a",
+  "solidity.compileUsingRemoteVersion": "v0.8.28+commit.7893614",
   "editor.formatOnSave": true,
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"

README.md

@@ -34,7 +34,7 @@ This repository contains:
 
 The contracts conform to these ERC versions:
 
-- ERC-4337: [v0.7.0](https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.7/erc/ERCS/erc-4337.md)
+- ERC-4337: [v0.9.0](https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.9/erc/ERCS/erc-4337.md)
 - ERC-6900: [v0.8.0](https://github.com/ethereum/ERCs/blob/c081c445424505d549e0236650917a2aaf3c5743/ERCS/erc-6900.md)
 
 ## Development

config/solhint-src.json

@@ -3,7 +3,7 @@
   "rules": {
     "immutable-vars-naming": ["error"],
     "no-unused-import": ["error"],
-    "compiler-version": ["error", ">=0.8.26"],
+    "compiler-version": ["error", ">=0.8.28"],
     "func-visibility": ["error", { "ignoreConstructors": true }],
     "max-line-length": ["error", 120],
     "func-param-name-mixedcase": ["error"],

config/solhint-test.json

@@ -4,7 +4,7 @@
     "func-name-mixedcase": "off",
     "immutable-vars-naming": ["error"],
     "no-unused-import": ["error"],
-    "compiler-version": ["error", ">=0.8.26"],
+    "compiler-version": ["error", ">=0.8.28"],
     "custom-errors": "off",
     "func-visibility": ["error", { "ignoreConstructors": true }],
     "max-line-length": ["error", 120],

foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
-solc = '0.8.26'
+solc = '0.8.28'
 via_ir = false
-evm_version = 'paris'
+evm_version = 'cancun'
 src = 'src'
 test = 'test'
 libs = ['lib', 'node_modules']

gas-snapshots/ModularAccount.json

@@ -1,16 +1,16 @@
 {
-  "Runtime_AccountCreation": "176235",
-  "Runtime_BatchTransfers": "92896",
-  "Runtime_Erc20Transfer": "78331",
-  "Runtime_InstallSessionKey_Case1": "429599",
-  "Runtime_NativeTransfer": "54483",
-  "Runtime_UseSessionKey_Case1_Counter": "78977",
-  "Runtime_UseSessionKey_Case1_Token": "112423",
-  "UserOp_BatchTransfers": "197713",
-  "UserOp_Erc20Transfer": "184690",
-  "UserOp_InstallSessionKey_Case1": "537276",
-  "UserOp_NativeTransfer": "160938",
-  "UserOp_UseSessionKey_Case1_Counter": "195926",
-  "UserOp_UseSessionKey_Case1_Token": "229498",
-  "UserOp_deferredValidation": "232843"
+  "Runtime_AccountCreation": "176053",
+  "Runtime_BatchTransfers": "92180",
+  "Runtime_Erc20Transfer": "77942",
+  "Runtime_InstallSessionKey_Case1": "429401",
+  "Runtime_NativeTransfer": "54261",
+  "Runtime_UseSessionKey_Case1_Counter": "78463",
+  "Runtime_UseSessionKey_Case1_Token": "111478",
+  "UserOp_BatchTransfers": "178973",
+  "UserOp_Erc20Transfer": "165953",
+  "UserOp_InstallSessionKey_Case1": "518452",
+  "UserOp_NativeTransfer": "142226",
+  "UserOp_UseSessionKey_Case1_Counter": "175349",
+  "UserOp_UseSessionKey_Case1_Token": "208454",
+  "UserOp_deferredValidation": "214053"
 }

gas-snapshots/SemiModularAccount.json

@@ -1,16 +1,16 @@
 {
-  "Runtime_AccountCreation": "97764",
-  "Runtime_BatchTransfers": "88740",
-  "Runtime_Erc20Transfer": "74220",
-  "Runtime_InstallSessionKey_Case1": "427817",
-  "Runtime_NativeTransfer": "50382",
-  "Runtime_UseSessionKey_Case1_Counter": "79280",
-  "Runtime_UseSessionKey_Case1_Token": "112726",
-  "UserOp_BatchTransfers": "192854",
-  "UserOp_Erc20Transfer": "179911",
-  "UserOp_InstallSessionKey_Case1": "534616",
-  "UserOp_NativeTransfer": "156189",
-  "UserOp_UseSessionKey_Case1_Counter": "196193",
-  "UserOp_UseSessionKey_Case1_Token": "229765",
-  "UserOp_deferredValidation": "228832"
+  "Runtime_AccountCreation": "97770",
+  "Runtime_BatchTransfers": "88037",
+  "Runtime_Erc20Transfer": "73844",
+  "Runtime_InstallSessionKey_Case1": "427632",
+  "Runtime_NativeTransfer": "50173",
+  "Runtime_UseSessionKey_Case1_Counter": "78765",
+  "Runtime_UseSessionKey_Case1_Token": "111780",
+  "UserOp_BatchTransfers": "174154",
+  "UserOp_Erc20Transfer": "161190",
+  "UserOp_InstallSessionKey_Case1": "515796",
+  "UserOp_NativeTransfer": "137481",
+  "UserOp_UseSessionKey_Case1_Counter": "175616",
+  "UserOp_UseSessionKey_Case1_Token": "208709",
+  "UserOp_deferredValidation": "210071"
 }

gas-snapshots/SimpleAccount.json

@@ -1,3 +1,3 @@
 {
-  "Runtime_AccountCreation": "174143"
+  "Runtime_AccountCreation": "174219"
 }

gas/BenchmarkBase.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.28;
 
 import {console} from "forge-std/console.sol";
 
@@ -40,7 +40,7 @@ abstract contract BenchmarkBase is OptimizedTest {
         vm.deal(recipient, 1 wei);
         vm.deal(beneficiary, 1 wei);
 
-        entryPoint = _deployEntryPoint070();
+        entryPoint = _deployEntryPoint090();
 
         mockErc20 = new MockERC20();
     }
@@ -61,7 +61,8 @@ abstract contract BenchmarkBase is OptimizedTest {
         PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
         userOps[0] = userOp;
 
-        vm.prank(beneficiary);
+        // solhint-disable avoid-tx-origin
+        vm.prank(tx.origin);
         entryPoint.handleOps(userOps, beneficiary);
 
         gasUsed = vm.lastCallGas().gasTotalUsed;