WIP: Add 'BigNonce' field support

eth-infinitism · Aug 16, 2024 · 03b140e · 03b140e
1 parent d28f475
commit 03b140e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/packages/bundler/src/runBundler.ts b/packages/bundler/src/runBundler.ts
@@ -21,6 +21,7 @@ import { bundlerConfigDefault } from './BundlerConfig'
 import { parseEther } from 'ethers/lib/utils'
 import { MethodHandlerRIP7560 } from './MethodHandlerRIP7560'
 import { JsonRpcProvider } from '@ethersproject/providers'
+import { deployNonceManager } from '@account-abstraction/utils/dist/src/RIP7712NonceManagerUtils'
 
 // this is done so that console.log outputs BigNumber as hex string instead of unreadable object
 export const inspectCustomSymbol = Symbol.for('nodejs.util.inspect.custom')
@@ -134,6 +135,10 @@ export async function runBundler (argv: string[], overrideExit = true): Promise<
     process.exit(1)
   }
 
+  if (config.rip7560) {
+    await deployNonceManager(provider, wallet as any)
+  }
+
   const {
     entryPoint
   } = await connectContracts(wallet, !config.rip7560)

diff --git a/packages/bundler/test/RIP7560Mode.test.ts b/packages/bundler/test/RIP7560Mode.test.ts
@@ -36,6 +36,7 @@ describe.skip('RIP7560Mode', function () {
       operationRIP7560 = {
         accessList: undefined,
         nonce: '0x0',
+        bigNonce: '0x0',
         sender: '0x0000000000000000000000000000000000000000',
         callGasLimit: '0x0',
         maxFeePerGas: '0x0',

diff --git a/packages/utils/src/RIP7560Utils.ts b/packages/utils/src/RIP7560Utils.ts
@@ -40,8 +40,9 @@ function rlpEncodeRip7560Tx (op: OperationRIP7560, forSignature = true): string
   input.push(bigNumberishToUnpaddedBuffer(op.verificationGasLimit))
   input.push(bigNumberishToUnpaddedBuffer(op.paymasterVerificationGasLimit ?? 0))
   input.push(bigNumberishToUnpaddedBuffer(op.paymasterPostOpGasLimit ?? 0))
+  input.push(bigNumberishToUnpaddedBuffer(op.bigNonce))
   input.push(nonZeroAddr(undefined)) // to
-  input.push(bigNumberishToUnpaddedBuffer(op.nonce))
+  // input.push(bigNumberishToUnpaddedBuffer(op.nonce))
   input.push(bigNumberishToUnpaddedBuffer(0)) // value
   let rlpEncoded: any = encode(input)
   rlpEncoded = Buffer.from([4, ...rlpEncoded])

diff --git a/packages/utils/src/interfaces/OperationRIP7560.ts b/packages/utils/src/interfaces/OperationRIP7560.ts
@@ -6,4 +6,5 @@ export interface OperationRIP7560 extends OperationBase {
   accessList: any
   value: BigNumberish
   builderFee: BigNumberish
+  bigNonce: BigNumberish
 }
diff --git a/packages/validation-manager/src/index.ts b/packages/validation-manager/src/index.ts
@@ -26,6 +26,7 @@ export async function supportsDebugTraceCall (provider: JsonRpcProvider, rip7560
       value: '0x0',
       sender: AddressZero,
       nonce: '0x0',
+      bigNonce: '0x0',
       callData: '0x',
       callGasLimit: '0x0',
       verificationGasLimit: '0x10000',