feat: add a nonce key override to support parallel nonces

alchemyplatform · Feb 15, 2024 · f3dd86d · f3dd86d
1 parent 6fd817f
commit f3dd86d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/core/src/account/smartContractAccount.ts b/packages/core/src/account/smartContractAccount.ts
@@ -78,7 +78,7 @@ export type SmartContractAccount<
     typedDataDefinition: TypedDataDefinition<typedData, primaryType>
   ) => Promise<Hex>;
   encodeUpgradeToAndCall: (params: UpgradeToAndCallParams) => Promise<Hex>;
-  getNonce(): Promise<bigint>;
+  getNonce(nonceKey?: bigint): Promise<bigint>;
   getInitCode: () => Promise<Hex>;
   isAccountDeployed: () => Promise<boolean>;
   getFactoryAddress: () => Address;
@@ -244,12 +244,12 @@ export async function toSmartContractAccount<
     return initCode === "0x";
   };
 
-  const getNonce = async () => {
+  const getNonce = async (nonceKey = 0n) => {
     if (!(await isAccountDeployed())) {
       return 0n;
     }
 
-    return entryPointContract.read.getNonce([accountAddress_, BigInt(0)]);
+    return entryPointContract.read.getNonce([accountAddress_, nonceKey]);
   };
 
   const account = toAccount({

diff --git a/packages/core/src/actions/smartAccount/buildUserOperation.ts b/packages/core/src/actions/smartAccount/buildUserOperation.ts
@@ -35,7 +35,7 @@ export const buildUserOperation: <
     uo: {
       initCode: account.getInitCode(),
       sender: account.address,
-      nonce: account.getNonce(),
+      nonce: account.getNonce(overrides?.nonceKey),
       callData: Array.isArray(uo)
         ? account.encodeBatchExecute(uo)
         : typeof uo === "string"

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -54,6 +54,7 @@ export type UserOperationOverrides = Partial<{
     | UserOperationStruct["verificationGasLimit"]
     | Percentage;
   paymasterAndData: UserOperationStruct["paymasterAndData"];
+  nonceKey: bigint;
 }>;
 
 // represents the request as it needs to be formatted for RPC requests