fix: reviews

Author: howydev

account-kit/smart-contracts/src/ma-v2/actions/deferralActions.ts

@@ -68,7 +68,7 @@ export type BuildUserOperationWithDeferredActionParams = {
 
 export type EntityIdAndNonceParams = {
   entityId: number;
-  nonce: bigint;
+  nonceKey: bigint;
   isGlobalValidation: boolean;
 };
 
@@ -120,8 +120,10 @@ export const deferralActions: (
       client: client,
     });
 
+    // 2 = deferred action flags    0b10
+    // 1 = isGlobal validation flag 0b01
     const fullNonceKey: bigint = buildFullNonce({
-      nonce: nonceKeyOverride,
+      nonceKey: nonceKeyOverride,
       entityId,
       isGlobalValidation,
       isDeferredAction: true,
@@ -238,15 +240,15 @@ export const deferralActions: (
 
   const getEntityIdAndNonce = async ({
     entityId,
-    nonce,
+    nonceKey,
     isGlobalValidation,
   }: EntityIdAndNonceParams) => {
     if (!client.account) {
       throw new AccountNotFoundError();
     }
 
-    if (nonce > maxUint152) {
-      throw new InvalidNonceKeyError(nonce);
+    if (nonceKey > maxUint152) {
+      throw new InvalidNonceKeyError(nonceKey);
     }
 
     const entryPoint = client.account.getEntryPoint();
@@ -261,7 +263,7 @@ export const deferralActions: (
         client.account.address,
         entryPoint.address,
         buildFullNonce({
-          nonce,
+          nonceKey,
           entityId,
           isGlobalValidation,
           isDeferredAction: true,

account-kit/smart-contracts/src/ma-v2/client/client.test.ts

@@ -1370,25 +1370,24 @@ describe("MA v2 Tests", async () => {
       for (let startNonce = 0n; startNonce < 5n; startNonce++) {
         const { entityId, nonce } = await newClient.getEntityIdAndNonce({
           entityId: startEntityId,
-          nonce: startNonce,
+          nonceKey: startNonce,
           isGlobalValidation: true,
         });
 
         const expectedEntityId: number = Math.max(1, startEntityId);
 
         // account not deployed, expect to get 1 when we pass in 0
-        assert(entityId === expectedEntityId);
-        assert(
-          nonce ===
-            (await entryPointContract.read.getNonce([
-              newClient.account.address,
-              buildFullNonce({
-                nonce: startNonce,
-                entityId: expectedEntityId,
-                isDeferredAction: true,
-              }),
-            ]))
-        );
+        expect(entityId).toEqual(expectedEntityId);
+        await expect(
+          entryPointContract.read.getNonce([
+            newClient.account.address,
+            buildFullNonce({
+              nonceKey: startNonce,
+              entityId: expectedEntityId,
+              isDeferredAction: true,
+            }),
+          ])
+        ).resolves.toEqual(nonce);
       }
     }
 
@@ -1412,13 +1411,16 @@ describe("MA v2 Tests", async () => {
     });
     await newClient.waitForUserOperationTransaction(uo1);
 
-    const selectors = ["execute", "executeBatch"].map(
+    const fns: ContractFunctionName<typeof semiModularAccountBytecodeAbi>[] = [
+      "execute",
+      "executeBatch",
+    ];
+
+    const selectors = fns.map(
       (s) =>
         prepareEncodeFunctionData({
           abi: semiModularAccountBytecodeAbi,
-          functionName: s as ContractFunctionName<
-            typeof semiModularAccountBytecodeAbi
-          >,
+          functionName: s,
         }).functionName
     );
 
@@ -1447,25 +1449,24 @@ describe("MA v2 Tests", async () => {
       for (let startNonce = 0n; startNonce < 5n; startNonce++) {
         const { entityId, nonce } = await newClient.getEntityIdAndNonce({
           entityId: startEntityId,
-          nonce: startNonce,
+          nonceKey: startNonce,
           isGlobalValidation: true,
         });
 
         const expectedEntityId: number = Math.max(startEntityId, 3);
 
         // expect to get max(3, startEntityId)
-        assert(entityId === expectedEntityId);
-        assert(
-          nonce ===
-            (await entryPointContract.read.getNonce([
-              newClient.account.address,
-              buildFullNonce({
-                nonce: startNonce,
-                entityId: expectedEntityId,
-                isDeferredAction: true,
-              }),
-            ]))
-        );
+        expect(entityId).toEqual(expectedEntityId);
+        await expect(
+          entryPointContract.read.getNonce([
+            newClient.account.address,
+            buildFullNonce({
+              nonceKey: startNonce,
+              entityId: expectedEntityId,
+              isDeferredAction: true,
+            }),
+          ])
+        ).resolves.toEqual(nonce);
       }
     }
   });

account-kit/smart-contracts/src/ma-v2/utils.ts

@@ -233,21 +233,21 @@ export const entityIdAndNonceReaderBytecode =
   "0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe";
 
 export type BuildNonceParams = {
-  nonce?: bigint;
+  nonceKey?: bigint;
   entityId?: number;
   isGlobalValidation?: boolean;
   isDeferredAction?: boolean;
   isDirectCallValidation?: boolean;
 };
 
 export const buildFullNonce = ({
-  nonce = 0n,
+  nonceKey = 0n,
   entityId = 0,
   isGlobalValidation = true,
   isDeferredAction = false,
 }: BuildNonceParams): bigint => {
   return (
-    (nonce << 40n) +
+    (nonceKey << 40n) +
     BigInt(entityId << 8) +
     (isDeferredAction ? 2n : 0n) +
     (isGlobalValidation ? 1n : 0n)