Skip to content
This repository was archived by the owner on Oct 20, 2024. It is now read-only.

Commit f4f1fd1

Browse files
hazim-jhazim-j
authored
Update to latest EntryPoint (#43)
1 parent e2c58dd commit f4f1fd1

File tree

6 files changed

+333
-321
lines changed

6 files changed

+333
-321
lines changed

‎abi/entrypoint.json

Lines changed: 100 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
[
2-
{
3-
"inputs": [
4-
{
5-
"internalType": "uint256",
6-
"name": "_paymasterStake",
7-
"type": "uint256"
8-
},
9-
{ "internalType": "uint32", "name": "_unstakeDelaySec", "type": "uint32" }
10-
],
11-
"stateMutability": "nonpayable",
12-
"type": "constructor"
13-
},
142
{
153
"inputs": [
164
{ "internalType": "uint256", "name": "opIndex", "type": "uint256" },
@@ -20,13 +8,94 @@
208
"name": "FailedOp",
219
"type": "error"
2210
},
11+
{
12+
"inputs": [
13+
{ "internalType": "address", "name": "sender", "type": "address" }
14+
],
15+
"name": "SenderAddressResult",
16+
"type": "error"
17+
},
2318
{
2419
"inputs": [
2520
{ "internalType": "address", "name": "aggregator", "type": "address" }
2621
],
2722
"name": "SignatureValidationFailed",
2823
"type": "error"
2924
},
25+
{
26+
"inputs": [
27+
{ "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
28+
{ "internalType": "uint256", "name": "prefund", "type": "uint256" },
29+
{ "internalType": "uint256", "name": "deadline", "type": "uint256" },
30+
{
31+
"components": [
32+
{
33+
"internalType": "uint256",
34+
"name": "paymasterStake",
35+
"type": "uint256"
36+
},
37+
{
38+
"internalType": "uint256",
39+
"name": "paymasterUnstakeDelay",
40+
"type": "uint256"
41+
}
42+
],
43+
"internalType": "struct IEntryPoint.PaymasterInfo",
44+
"name": "paymasterInfo",
45+
"type": "tuple"
46+
}
47+
],
48+
"name": "SimulationResult",
49+
"type": "error"
50+
},
51+
{
52+
"inputs": [
53+
{ "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
54+
{ "internalType": "uint256", "name": "prefund", "type": "uint256" },
55+
{ "internalType": "uint256", "name": "deadline", "type": "uint256" },
56+
{
57+
"components": [
58+
{
59+
"internalType": "uint256",
60+
"name": "paymasterStake",
61+
"type": "uint256"
62+
},
63+
{
64+
"internalType": "uint256",
65+
"name": "paymasterUnstakeDelay",
66+
"type": "uint256"
67+
}
68+
],
69+
"internalType": "struct IEntryPoint.PaymasterInfo",
70+
"name": "paymasterInfo",
71+
"type": "tuple"
72+
},
73+
{
74+
"components": [
75+
{
76+
"internalType": "address",
77+
"name": "actualAggregator",
78+
"type": "address"
79+
},
80+
{
81+
"internalType": "uint256",
82+
"name": "aggregatorStake",
83+
"type": "uint256"
84+
},
85+
{
86+
"internalType": "uint256",
87+
"name": "aggregatorUnstakeDelay",
88+
"type": "uint256"
89+
}
90+
],
91+
"internalType": "struct IEntryPoint.AggregationInfo",
92+
"name": "aggregationInfo",
93+
"type": "tuple"
94+
}
95+
],
96+
"name": "SimulationResultWithAggregation",
97+
"type": "error"
98+
},
3099
{
31100
"anonymous": false,
32101
"inputs": [
@@ -121,7 +190,7 @@
121190
{
122191
"indexed": true,
123192
"internalType": "bytes32",
124-
"name": "requestId",
193+
"name": "userOpHash",
125194
"type": "bytes32"
126195
},
127196
{
@@ -170,7 +239,7 @@
170239
{
171240
"indexed": true,
172241
"internalType": "bytes32",
173-
"name": "requestId",
242+
"name": "userOpHash",
174243
"type": "bytes32"
175244
},
176245
{
@@ -286,6 +355,15 @@
286355
"stateMutability": "view",
287356
"type": "function"
288357
},
358+
{
359+
"inputs": [
360+
{ "internalType": "bytes", "name": "initCode", "type": "bytes" }
361+
],
362+
"name": "getSenderAddress",
363+
"outputs": [],
364+
"stateMutability": "nonpayable",
365+
"type": "function"
366+
},
289367
{
290368
"inputs": [
291369
{
@@ -331,37 +409,11 @@
331409
"type": "tuple"
332410
}
333411
],
334-
"name": "getRequestId",
412+
"name": "getUserOpHash",
335413
"outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
336414
"stateMutability": "view",
337415
"type": "function"
338416
},
339-
{
340-
"inputs": [
341-
{ "internalType": "bytes", "name": "initCode", "type": "bytes" }
342-
],
343-
"name": "getSenderAddress",
344-
"outputs": [
345-
{ "internalType": "address", "name": "sender", "type": "address" }
346-
],
347-
"stateMutability": "nonpayable",
348-
"type": "function"
349-
},
350-
{
351-
"inputs": [
352-
{ "internalType": "address", "name": "sender", "type": "address" }
353-
],
354-
"name": "getSenderStorage",
355-
"outputs": [
356-
{
357-
"internalType": "uint256[]",
358-
"name": "senderStorageCells",
359-
"type": "uint256[]"
360-
}
361-
],
362-
"stateMutability": "view",
363-
"type": "function"
364-
},
365417
{
366418
"inputs": [
367419
{
@@ -537,7 +589,11 @@
537589
"name": "mUserOp",
538590
"type": "tuple"
539591
},
540-
{ "internalType": "bytes32", "name": "requestId", "type": "bytes32" },
592+
{
593+
"internalType": "bytes32",
594+
"name": "userOpHash",
595+
"type": "bytes32"
596+
},
541597
{ "internalType": "uint256", "name": "prefund", "type": "uint256" },
542598
{
543599
"internalType": "uint256",
@@ -559,13 +615,6 @@
559615
"stateMutability": "nonpayable",
560616
"type": "function"
561617
},
562-
{
563-
"inputs": [],
564-
"name": "paymasterStake",
565-
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
566-
"stateMutability": "view",
567-
"type": "function"
568-
},
569618
{
570619
"inputs": [
571620
{
@@ -609,22 +658,10 @@
609658
"internalType": "struct UserOperation",
610659
"name": "userOp",
611660
"type": "tuple"
612-
},
613-
{ "internalType": "bool", "name": "offChainSigCheck", "type": "bool" }
661+
}
614662
],
615663
"name": "simulateValidation",
616-
"outputs": [
617-
{ "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
618-
{ "internalType": "uint256", "name": "prefund", "type": "uint256" },
619-
{
620-
"internalType": "address",
621-
"name": "actualAggregator",
622-
"type": "address"
623-
},
624-
{ "internalType": "bytes", "name": "sigForUserOp", "type": "bytes" },
625-
{ "internalType": "bytes", "name": "sigForAggregation", "type": "bytes" },
626-
{ "internalType": "bytes", "name": "offChainSigInfo", "type": "bytes" }
627-
],
664+
"outputs": [],
628665
"stateMutability": "nonpayable",
629666
"type": "function"
630667
},
@@ -635,13 +672,6 @@
635672
"stateMutability": "nonpayable",
636673
"type": "function"
637674
},
638-
{
639-
"inputs": [],
640-
"name": "unstakeDelaySec",
641-
"outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],
642-
"stateMutability": "view",
643-
"type": "function"
644-
},
645675
{
646676
"inputs": [
647677
{

‎internal/config/values.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func GetValues() *Values {
4141
// Default variables
4242
viper.SetDefault("erc4337_bundler_port", 4337)
4343
viper.SetDefault("erc4337_bundler_data_directory", "/tmp/stackup_bundler")
44-
viper.SetDefault("erc4337_bundler_supported_entry_points", "0x1b98F08dB8F12392EAE339674e568fe29929bC47")
44+
viper.SetDefault("erc4337_bundler_supported_entry_points", "0x1D9a2CB3638C2FC8bF9C01D088B79E75CD188b17")
4545
viper.SetDefault("erc4337_bundler_max_verification_gas", 1500000)
4646
viper.SetDefault("erc4337_bundler_gin_mode", gin.ReleaseMode)
4747

0 commit comments

Comments
 (0)