Skip to content

Commit 9e235f0

Browse files
authored
feat: update to use entrypoint v0.9 (#351)
1 parent 94119a6 commit 9e235f0

File tree

147 files changed

+393
-4071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+393
-4071
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Entrypoint config. If empty, scripts default to EP v0.7 at 0x0000000071727De22E5E9d8BAf0edAc6f37da032.
1+
# Entrypoint config. If empty, scripts default to EP v0.9 at 0x433709009B8330FDa32311DF1C2AFA402eD8D009.
22
ENTRYPOINT=
33

44
# AccountFactory's initial owner

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"solidity.packageDefaultDependenciesContractsDirectory": "src",
33
"solidity.packageDefaultDependenciesDirectory": "lib",
4-
"solidity.compileUsingRemoteVersion": "v0.8.26+commit.8a97fa7a",
4+
"solidity.compileUsingRemoteVersion": "v0.8.28+commit.7893614",
55
"editor.formatOnSave": true,
66
"[solidity]": {
77
"editor.defaultFormatter": "JuanBlanco.solidity"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This repository contains:
3434

3535
The contracts conform to these ERC versions:
3636

37-
- ERC-4337: [v0.7.0](https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.7/erc/ERCS/erc-4337.md)
37+
- ERC-4337: [v0.9.0](https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.9/erc/ERCS/erc-4337.md)
3838
- ERC-6900: [v0.8.0](https://github.com/ethereum/ERCs/blob/c081c445424505d549e0236650917a2aaf3c5743/ERCS/erc-6900.md)
3939

4040
## Development

config/solhint-src.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"rules": {
44
"immutable-vars-naming": ["error"],
55
"no-unused-import": ["error"],
6-
"compiler-version": ["error", ">=0.8.26"],
6+
"compiler-version": ["error", ">=0.8.28"],
77
"func-visibility": ["error", { "ignoreConstructors": true }],
88
"max-line-length": ["error", 120],
99
"func-param-name-mixedcase": ["error"],

config/solhint-test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"func-name-mixedcase": "off",
55
"immutable-vars-naming": ["error"],
66
"no-unused-import": ["error"],
7-
"compiler-version": ["error", ">=0.8.26"],
7+
"compiler-version": ["error", ">=0.8.28"],
88
"custom-errors": "off",
99
"func-visibility": ["error", { "ignoreConstructors": true }],
1010
"max-line-length": ["error", 120],

foundry.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[profile.default]
2-
solc = '0.8.26'
2+
solc = '0.8.28'
33
via_ir = false
4-
evm_version = 'paris'
4+
evm_version = 'cancun'
55
src = 'src'
66
test = 'test'
77
libs = ['lib', 'node_modules']

gas-snapshots/ModularAccount.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"Runtime_AccountCreation": "176235",
3-
"Runtime_BatchTransfers": "92896",
4-
"Runtime_Erc20Transfer": "78331",
5-
"Runtime_InstallSessionKey_Case1": "429599",
6-
"Runtime_NativeTransfer": "54483",
7-
"Runtime_UseSessionKey_Case1_Counter": "78977",
8-
"Runtime_UseSessionKey_Case1_Token": "112423",
9-
"UserOp_BatchTransfers": "197713",
10-
"UserOp_Erc20Transfer": "184690",
11-
"UserOp_InstallSessionKey_Case1": "537276",
12-
"UserOp_NativeTransfer": "160938",
13-
"UserOp_UseSessionKey_Case1_Counter": "195926",
14-
"UserOp_UseSessionKey_Case1_Token": "229498",
15-
"UserOp_deferredValidation": "232843"
2+
"Runtime_AccountCreation": "176053",
3+
"Runtime_BatchTransfers": "92180",
4+
"Runtime_Erc20Transfer": "77942",
5+
"Runtime_InstallSessionKey_Case1": "429401",
6+
"Runtime_NativeTransfer": "54261",
7+
"Runtime_UseSessionKey_Case1_Counter": "78463",
8+
"Runtime_UseSessionKey_Case1_Token": "111478",
9+
"UserOp_BatchTransfers": "178973",
10+
"UserOp_Erc20Transfer": "165953",
11+
"UserOp_InstallSessionKey_Case1": "518452",
12+
"UserOp_NativeTransfer": "142226",
13+
"UserOp_UseSessionKey_Case1_Counter": "175349",
14+
"UserOp_UseSessionKey_Case1_Token": "208454",
15+
"UserOp_deferredValidation": "214053"
1616
}
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"Runtime_AccountCreation": "97764",
3-
"Runtime_BatchTransfers": "88740",
4-
"Runtime_Erc20Transfer": "74220",
5-
"Runtime_InstallSessionKey_Case1": "427817",
6-
"Runtime_NativeTransfer": "50382",
7-
"Runtime_UseSessionKey_Case1_Counter": "79280",
8-
"Runtime_UseSessionKey_Case1_Token": "112726",
9-
"UserOp_BatchTransfers": "192854",
10-
"UserOp_Erc20Transfer": "179911",
11-
"UserOp_InstallSessionKey_Case1": "534616",
12-
"UserOp_NativeTransfer": "156189",
13-
"UserOp_UseSessionKey_Case1_Counter": "196193",
14-
"UserOp_UseSessionKey_Case1_Token": "229765",
15-
"UserOp_deferredValidation": "228832"
2+
"Runtime_AccountCreation": "97770",
3+
"Runtime_BatchTransfers": "88037",
4+
"Runtime_Erc20Transfer": "73844",
5+
"Runtime_InstallSessionKey_Case1": "427632",
6+
"Runtime_NativeTransfer": "50173",
7+
"Runtime_UseSessionKey_Case1_Counter": "78765",
8+
"Runtime_UseSessionKey_Case1_Token": "111780",
9+
"UserOp_BatchTransfers": "174154",
10+
"UserOp_Erc20Transfer": "161190",
11+
"UserOp_InstallSessionKey_Case1": "515796",
12+
"UserOp_NativeTransfer": "137481",
13+
"UserOp_UseSessionKey_Case1_Counter": "175616",
14+
"UserOp_UseSessionKey_Case1_Token": "208709",
15+
"UserOp_deferredValidation": "210071"
1616
}

gas-snapshots/SimpleAccount.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"Runtime_AccountCreation": "174143"
2+
"Runtime_AccountCreation": "174219"
33
}

gas/BenchmarkBase.sol

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: UNLICENSED
2-
pragma solidity ^0.8.26;
2+
pragma solidity ^0.8.28;
33

44
import {console} from "forge-std/console.sol";
55

@@ -40,7 +40,7 @@ abstract contract BenchmarkBase is OptimizedTest {
4040
vm.deal(recipient, 1 wei);
4141
vm.deal(beneficiary, 1 wei);
4242

43-
entryPoint = _deployEntryPoint070();
43+
entryPoint = _deployEntryPoint090();
4444

4545
mockErc20 = new MockERC20();
4646
}
@@ -61,7 +61,8 @@ abstract contract BenchmarkBase is OptimizedTest {
6161
PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
6262
userOps[0] = userOp;
6363

64-
vm.prank(beneficiary);
64+
// solhint-disable avoid-tx-origin
65+
vm.prank(tx.origin);
6566
entryPoint.handleOps(userOps, beneficiary);
6667

6768
gasUsed = vm.lastCallGas().gasTotalUsed;

0 commit comments

Comments
 (0)