Update EntryPoint to eth-infinitism/account-abstraction@f3b5f79 (#101)

Author: hazim-j

abi/entrypoint.json

@@ -3,16 +3,17 @@
     "inputs": [
       { "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
       { "internalType": "uint256", "name": "paid", "type": "uint256" },
-      { "internalType": "uint64", "name": "validAfter", "type": "uint64" },
-      { "internalType": "uint64", "name": "validBefore", "type": "uint64" }
+      { "internalType": "uint48", "name": "validAfter", "type": "uint48" },
+      { "internalType": "uint48", "name": "validUntil", "type": "uint48" },
+      { "internalType": "bool", "name": "targetSuccess", "type": "bool" },
+      { "internalType": "bytes", "name": "targetResult", "type": "bytes" }
     ],
     "name": "ExecutionResult",
     "type": "error"
   },
   {
     "inputs": [
       { "internalType": "uint256", "name": "opIndex", "type": "uint256" },
-      { "internalType": "address", "name": "paymaster", "type": "address" },
       { "internalType": "string", "name": "reason", "type": "string" }
     ],
     "name": "FailedOp",
@@ -39,8 +40,8 @@
           { "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
           { "internalType": "uint256", "name": "prefund", "type": "uint256" },
           { "internalType": "bool", "name": "sigFailed", "type": "bool" },
-          { "internalType": "uint64", "name": "validAfter", "type": "uint64" },
-          { "internalType": "uint64", "name": "validUntil", "type": "uint64" },
+          { "internalType": "uint48", "name": "validAfter", "type": "uint48" },
+          { "internalType": "uint48", "name": "validUntil", "type": "uint48" },
           {
             "internalType": "bytes",
             "name": "paymasterContext",
@@ -101,8 +102,8 @@
           { "internalType": "uint256", "name": "preOpGas", "type": "uint256" },
           { "internalType": "uint256", "name": "prefund", "type": "uint256" },
           { "internalType": "bool", "name": "sigFailed", "type": "bool" },
-          { "internalType": "uint64", "name": "validAfter", "type": "uint64" },
-          { "internalType": "uint64", "name": "validUntil", "type": "uint64" },
+          { "internalType": "uint48", "name": "validAfter", "type": "uint48" },
+          { "internalType": "uint48", "name": "validUntil", "type": "uint48" },
           {
             "internalType": "bytes",
             "name": "paymasterContext",
@@ -156,7 +157,7 @@
         "components": [
           {
             "internalType": "address",
-            "name": "actualAggregator",
+            "name": "aggregator",
             "type": "address"
           },
           {
@@ -235,7 +236,7 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": false,
+        "indexed": true,
         "internalType": "address",
         "name": "aggregator",
         "type": "address"
@@ -262,7 +263,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "withdrawTime",
+        "name": "unstakeDelaySec",
         "type": "uint256"
       }
     ],
@@ -427,17 +428,18 @@
   },
   {
     "inputs": [
+      { "internalType": "bytes", "name": "initCode", "type": "bytes" },
       { "internalType": "address", "name": "sender", "type": "address" },
-      { "internalType": "address", "name": "paymaster", "type": "address" }
+      { "internalType": "bytes", "name": "paymasterAndData", "type": "bytes" }
     ],
-    "name": "_simulateFindAggregator",
+    "name": "_validateSenderAndPaymaster",
     "outputs": [],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
-      { "internalType": "uint32", "name": "_unstakeDelaySec", "type": "uint32" }
+      { "internalType": "uint32", "name": "unstakeDelaySec", "type": "uint32" }
     ],
     "name": "addStake",
     "outputs": [],
@@ -470,7 +472,7 @@
       { "internalType": "bool", "name": "staked", "type": "bool" },
       { "internalType": "uint112", "name": "stake", "type": "uint112" },
       { "internalType": "uint32", "name": "unstakeDelaySec", "type": "uint32" },
-      { "internalType": "uint64", "name": "withdrawTime", "type": "uint64" }
+      { "internalType": "uint48", "name": "withdrawTime", "type": "uint48" }
     ],
     "stateMutability": "view",
     "type": "function"
@@ -491,7 +493,7 @@
             "name": "unstakeDelaySec",
             "type": "uint32"
           },
-          { "internalType": "uint64", "name": "withdrawTime", "type": "uint64" }
+          { "internalType": "uint48", "name": "withdrawTime", "type": "uint48" }
         ],
         "internalType": "struct IStakeManager.DepositInfo",
         "name": "info",
@@ -804,7 +806,9 @@
         "internalType": "struct UserOperation",
         "name": "op",
         "type": "tuple"
-      }
+      },
+      { "internalType": "address", "name": "target", "type": "address" },
+      { "internalType": "bytes", "name": "targetCallData", "type": "bytes" }
     ],
     "name": "simulateHandleOp",
     "outputs": [],

internal/config/values.go

@@ -53,7 +53,7 @@ func GetValues() *Values {
 	// Default variables
 	viper.SetDefault("erc4337_bundler_port", 4337)
 	viper.SetDefault("erc4337_bundler_data_directory", "/tmp/stackup_bundler")
-	viper.SetDefault("erc4337_bundler_supported_entry_points", "0xCEb7363Cc430D6332D341f5BabBF00dD5f4Ba119")
+	viper.SetDefault("erc4337_bundler_supported_entry_points", "0x0576a174D229E3cFA37253523E645A78A0C91B57")
 	viper.SetDefault("erc4337_bundler_max_verification_gas", 1500000)
 	viper.SetDefault("erc4337_bundler_max_ops_for_unstaked_sender", 4)
 	viper.SetDefault("erc4337_bundler_blocks_in_the_future", 25)

internal/testutils/constants.go

@@ -20,27 +20,27 @@ var (
 		Staked:          true,
 		Stake:           big.NewInt(OneETH.Int64()),
 		UnstakeDelaySec: DefaultUnstakeDelaySec,
-		WithdrawTime:    uint64(time.Now().Unix()),
+		WithdrawTime:    big.NewInt(time.Now().Unix()),
 	}
 	StakedZeroDepositInfo = &entrypoint.IStakeManagerDepositInfo{
 		Deposit:         big.NewInt(0),
 		Staked:          true,
 		Stake:           big.NewInt(OneETH.Int64()),
 		UnstakeDelaySec: DefaultUnstakeDelaySec,
-		WithdrawTime:    uint64(time.Now().Unix()),
+		WithdrawTime:    big.NewInt(time.Now().Unix()),
 	}
 	NonStakedDepositInfo = &entrypoint.IStakeManagerDepositInfo{
 		Deposit:         big.NewInt(OneETH.Int64()),
 		Staked:          false,
 		Stake:           big.NewInt(0),
 		UnstakeDelaySec: uint32(0),
-		WithdrawTime:    uint64(0),
+		WithdrawTime:    big.NewInt(0),
 	}
 	NonStakedZeroDepositInfo = &entrypoint.IStakeManagerDepositInfo{
 		Deposit:         big.NewInt(0),
 		Staked:          false,
 		Stake:           big.NewInt(0),
 		UnstakeDelaySec: uint32(0),
-		WithdrawTime:    uint64(0),
+		WithdrawTime:    big.NewInt(0),
 	}
 )