@account-kit/smart-contracts 4.25.1 → 4.27.0

package/src/ma-v2/modules/single-signer-validation/signer.ts

@@ -61,7 +61,7 @@ export const singleSignerMessageSigner = (
     },
 
     signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {
-      const sig = await signer
+      let sig = await signer
         .signMessage({ raw: uoHash })
         .then((signature: Hex) =>
           packUOSignature({
@@ -70,7 +70,12 @@ export const singleSignerMessageSigner = (
           })
         );
 
-      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
+      if (deferredActionData) {
+        sig = concatHex([deferredActionData, sig]);
+        deferredActionData = undefined;
+      }
+
+      return sig;
     },
 
     // we apply the expected 1271 packing here since the account contract will expect it

package/src/ma-v2/permissionBuilder.ts

@@ -32,6 +32,7 @@ import {
   MultipleNativeTokenTransferError,
   NoFunctionsProvidedError,
   RootPermissionOnlyError,
+  SelectorNotAllowed,
   UnsupportedPermissionTypeError,
   ValidationConfigUnsetError,
   ZeroAddressError,
@@ -318,6 +319,14 @@ export class PermissionBuilder {
       if (permission.data.functions.length === 0) {
         throw new NoFunctionsProvidedError(permission);
       }
+      // Explicitly disallow adding execute & executeBatch
+      if (permission.data.functions.includes(ACCOUNT_EXECUTE_SELECTOR)) {
+        throw new SelectorNotAllowed("execute");
+      } else if (
+        permission.data.functions.includes(ACCOUNT_EXECUTEBATCH_SELECTOR)
+      ) {
+        throw new SelectorNotAllowed("executeBatch");
+      }
       this.selectors = [...this.selectors, ...permission.data.functions];
     }
 

package/src/ma-v2/permissionBuilderErrors.ts

@@ -1,7 +1,9 @@
 import { BaseError, type Address } from "@aa-sdk/core";
 import type { Permission } from "./permissionBuilder";
 
-export class RootPermissionOnlyError extends BaseError {
+export abstract class PermissionBuilderError extends BaseError {}
+
+export class RootPermissionOnlyError extends PermissionBuilderError {
   override name = "PermissionBuilder: RootPermissionOnlyError";
 
   /**
@@ -14,7 +16,7 @@ export class RootPermissionOnlyError extends BaseError {
   }
 }
 
-export class AccountAddressAsTargetError extends BaseError {
+export class AccountAddressAsTargetError extends PermissionBuilderError {
   override name = "PermissionBuilder: AccountAddressAsTargetError";
 
   /**
@@ -29,7 +31,7 @@ export class AccountAddressAsTargetError extends BaseError {
   }
 }
 
-export class DuplicateTargetAddressError extends BaseError {
+export class DuplicateTargetAddressError extends PermissionBuilderError {
   override name = "PermissionBuilder: DuplicateTargetAddressError";
 
   /**
@@ -45,7 +47,7 @@ export class DuplicateTargetAddressError extends BaseError {
   }
 }
 
-export class NoFunctionsProvidedError extends BaseError {
+export class NoFunctionsProvidedError extends PermissionBuilderError {
   override name = "PermissionBuilder: NoFunctionsProvidedError";
 
   /**
@@ -58,7 +60,7 @@ export class NoFunctionsProvidedError extends BaseError {
   }
 }
 
-export class ExpiredDeadlineError extends BaseError {
+export class ExpiredDeadlineError extends PermissionBuilderError {
   override name = "PermissionBuilder: ExpiredDeadlineError";
 
   /**
@@ -74,7 +76,7 @@ export class ExpiredDeadlineError extends BaseError {
   }
 }
 
-export class DeadlineOverLimitError extends BaseError {
+export class DeadlineOverLimitError extends PermissionBuilderError {
   override name = "PermissionBuilder: DeadlineOverLimitError";
 
   /**
@@ -89,7 +91,7 @@ export class DeadlineOverLimitError extends BaseError {
   }
 }
 
-export class ValidationConfigUnsetError extends BaseError {
+export class ValidationConfigUnsetError extends PermissionBuilderError {
   override name = "PermissionBuilder: ValidationConfigUnsetError";
 
   /**
@@ -100,7 +102,7 @@ export class ValidationConfigUnsetError extends BaseError {
   }
 }
 
-export class MultipleNativeTokenTransferError extends BaseError {
+export class MultipleNativeTokenTransferError extends PermissionBuilderError {
   override name = "PermissionBuilder: MultipleNativeTokenTransferError";
 
   /**
@@ -115,7 +117,7 @@ export class MultipleNativeTokenTransferError extends BaseError {
   }
 }
 
-export class ZeroAddressError extends BaseError {
+export class ZeroAddressError extends PermissionBuilderError {
   override name = "PermissionBuilder: ZeroAddressError";
 
   /**
@@ -128,7 +130,7 @@ export class ZeroAddressError extends BaseError {
   }
 }
 
-export class MultipleGasLimitError extends BaseError {
+export class MultipleGasLimitError extends PermissionBuilderError {
   override name = "PermissionBuilder: MultipleGasLimitError";
 
   /**
@@ -141,7 +143,7 @@ export class MultipleGasLimitError extends BaseError {
   }
 }
 
-export class UnsupportedPermissionTypeError extends BaseError {
+export class UnsupportedPermissionTypeError extends PermissionBuilderError {
   override name = "PermissionBuilder: UnsupportedPermissionTypeError";
 
   /**
@@ -151,3 +153,16 @@ export class UnsupportedPermissionTypeError extends BaseError {
     super(`Unsupported permission type`);
   }
 }
+
+export class SelectorNotAllowed extends PermissionBuilderError {
+  override name = "SelectorNotAllowed";
+
+  /**
+   * Constructor for initializing an error message indicating that the selector being added is not allowed.
+   *
+   * @param {string} functionName The function name of the selector that is being added.
+   */
+  constructor(functionName: string) {
+    super(`Cannot add ${functionName} on the account`);
+  }
+}

package/src/ma-v2/utils.ts

@@ -10,6 +10,7 @@ import {
   parseAbi,
   size,
   concatHex,
+  hexToNumber,
 } from "viem";
 import {
   arbitrum,
@@ -270,13 +271,19 @@ export const buildFullNonceKey = ({
 export const parseDeferredAction = (
   deferredAction: Hex
 ): {
+  entityId: number;
+  isGlobalValidation: boolean;
   nonce: bigint;
   deferredActionData: Hex;
   hasAssociatedExecHooks: boolean;
 } => {
+  // 2 for 0x, 2 for 00/01, 38 for parallel nonce, 8 for entity id, 2 for options byte, 16 for parallel nonce
   return {
+    entityId: hexToNumber(`0x${deferredAction.slice(42, 50)}`),
+    isGlobalValidation:
+      hexToNumber(`0x${deferredAction.slice(50, 52)}`) % 2 === 1,
     nonce: BigInt(`0x${deferredAction.slice(4, 68)}`),
-    deferredActionData: `0x${deferredAction.slice(68)}`,
+    deferredActionData: `0x${deferredAction.slice(68)}` as `0x${string}`,
     hasAssociatedExecHooks: deferredAction[3] === "1",
   };
 };