@account-kit/smart-contracts 4.24.0 → 4.25.1

package/dist/esm/src/ma-v2/account/common/modularAccountV2Base.js

@@ -1,5 +1,5 @@
-import { createBundlerClient, getEntryPoint, InvalidEntityIdError, InvalidNonceKeyError, InvalidDeferredActionNonce, InvalidDeferredActionMode, toSmartContractAccount, } from "@aa-sdk/core";
-import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
+import { createBundlerClient, getEntryPoint, InvalidEntityIdError, InvalidNonceKeyError, InvalidDeferredActionNonce, toSmartContractAccount, } from "@aa-sdk/core";
+import { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from "../../utils.js";
 import { encodeFunctionData, maxUint32, zeroAddress, getContract, concatHex, maxUint152, } from "viem";
 import { modularAccountAbi } from "../../abis/modularAccountAbi.js";
 import { serializeModuleEntity } from "../../actions/common/utils.js";
@@ -28,9 +28,8 @@ export async function createMAv2Base(config) {
     let deferredActionData = "0x";
     let hasAssociatedExecHooks = false;
     if (deferredAction) {
-        if (deferredAction.slice(2, 4) !== "00") {
-            throw new InvalidDeferredActionMode();
-        }
+        ({ nonce, deferredActionData, hasAssociatedExecHooks } =
+            parseDeferredAction(deferredAction));
         // Set these values if the deferred action has not been consumed. We check this with the EP
         const nextNonceForDeferredAction = (await entryPointContract.read.getNonce([
             accountAddress,
@@ -38,10 +37,7 @@ export async function createMAv2Base(config) {
         ]));
         // we only add the deferred action in if the nonce has not been consumed
         if (nonce === nextNonceForDeferredAction) {
-            nonce = BigInt(`0x${deferredAction.slice(6, 70)}`);
             useDeferredAction = true;
-            deferredActionData = `0x${deferredAction.slice(70)}`;
-            hasAssociatedExecHooks = deferredAction[5] === "1";
         }
         else if (nonce > nextNonceForDeferredAction) {
             throw new InvalidDeferredActionNonce();

package/dist/esm/src/ma-v2/account/common/modularAccountV2Base.js.map

@@ -1 +1 @@
-{"version":3,"file":"modularAccountV2Base.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,GAKvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAKL,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAE7F,MAAM,CAAC,MAAM,qBAAqB,GAAQ,YAAY,CAAC;AAiEvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAElC,MAAqC;IACrC,MAAM,EACJ,SAAS,EACT,KAAK,EACL,MAAM,EACN,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EACvD,YAAY,GAAG;QACb,kBAAkB,EAAE,IAAI;QACxB,QAAQ,EAAE,uBAAuB;KAClC,EACD,YAAY,EAAE,EACZ,kBAAkB,GAAG,IAAI,EACzB,QAAQ,GAAG,uBAAuB,GACnC,GAAG,EAAE,EACN,cAAc,EACd,cAAc,EACd,GAAG,qCAAqC,EACzC,GAAG,MAAM,CAAC;IAEX,IAAI,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACjC,SAAS;QACT,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,WAAW,CAAC;QACrC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;QACnB,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,iBAAiB,GAAY,KAAK,CAAC;IACvC,IAAI,KAAK,GAAW,EAAE,CAAC;IACvB,IAAI,kBAAkB,GAAQ,IAAI,CAAC;IACnC,IAAI,sBAAsB,GAAY,KAAK,CAAC;IAE5C,IAAI,cAAc,EAAE,CAAC;QACnB,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACxC,MAAM,IAAI,yBAAyB,EAAE,CAAC;QACxC,CAAC;QACD,2FAA2F;QAC3F,MAAM,0BAA0B,GAC9B,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,cAAc;YACd,KAAK,IAAI,GAAG;SACb,CAAC,CAAW,CAAC;QAEhB,wEAAwE;QACxE,IAAI,KAAK,KAAK,0BAA0B,EAAE,CAAC;YACzC,KAAK,GAAG,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACnD,iBAAiB,GAAG,IAAI,CAAC;YACzB,kBAAkB,GAAG,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACrD,sBAAsB,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QACrD,CAAC;aAAM,IAAI,KAAK,GAAG,0BAA0B,EAAE,CAAC;YAC9C,MAAM,IAAI,0BAA0B,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAoC,KAAK,EAAE,EAC5D,MAAM,EACN,IAAI,EACJ,KAAK,GACN,EAAE,EAAE,CACH,MAAM,cAAc,CAClB,kBAAkB,CAAC;QACjB,GAAG,EAAE,iBAAiB;QACtB,YAAY,EAAE,SAAS;QACvB,IAAI,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC;KAClC,CAAC,CACH,CAAC;IAEJ,MAAM,kBAAkB,GAAuC,KAAK,EAAE,GAAG,EAAE,EAAE,CAC3E,MAAM,cAAc,CAClB,kBAAkB,CAAC;QACjB,GAAG,EAAE,iBAAiB;QACtB,YAAY,EAAE,cAAc;QAC5B,IAAI,EAAE;YACJ,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACf,MAAM,EAAE,EAAE,CAAC,MAAM;gBACjB,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;aACtB,CAAC,CAAC;SACJ;KACF,CAAC,CACH,CAAC;IAEJ,MAAM,iBAAiB,GAA2B,KAAK,IAAI,EAAE,CAC3D,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAmB,EAAE;QAChE,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,QAAQ,GAAG,UAAU,EAAE,CAAC;YAC1B,MAAM,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,YAAY,GAChB,CAAC,QAAQ,IAAI,GAAG,CAAC;YACjB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxB,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEjC,OAAO,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,cAAc;YACd,YAAY;SACb,CAAoB,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAAC;QAClC,OAAO,EAAE,cAAc;QACvB,GAAG,EAAE,iBAAiB;QACtB,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,KAAK,EAAE,QAAa,EAAE,EAAE;QAC/C,IAAI,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,MAAM,EAAE,WAAW;gBACnB,qBAAqB,EAAE,KAAK;gBAC5B,qBAAqB,EAAE,KAAK;gBAC5B,cAAc,EAAE,EAAE;aACnB,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,IAA0B,EAAE,EAAE;QAC7D,IAAI,CAAC,CAAC,MAAM,iBAAiB,EAAE,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,eAAe,EAAE,EAAE;gBACnB,cAAc,EAAE,EAAE;gBAClB,SAAS,EAAE,EAAE;gBACb,eAAe,EAAE,CAAC;aACnB,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,uBAAuB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACnD,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC;YAClD,qBAAqB,CAAC;gBACpB,aAAa,EAAE,uBAAuB,IAAI,WAAW;gBACrD,QAAQ,EAAE,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC;aACxC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAAE,QAAa,EAAgB,EAAE;QAC3D,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC;YAC7C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,OAAO,CAAC,iBAAiB,IAAI,sBAAsB,CAAC;YAClD,cAAc,CAAC,cAAc,CAAC,MAAM;YACpC,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;YAC9C,CAAC,CAAC,QAAQ,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC;QAC/C,GAAG,qCAAqC;QACxC,SAAS;QACT,KAAK;QACL,UAAU;QACV,cAAc;QACd,aAAa;QACb,kBAAkB;QAClB,QAAQ;QACR,GAAG,CAAC,QAAQ,KAAK,uBAAuB;YACtC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,CAAC;YACpE,CAAC,CAAC,yBAAyB,CACvB,MAAM,EACN,KAAK,EACL,cAAc,EACd,QAAQ,EACR,kBAAkB,CACnB,CAAC;KACP,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,WAAW;QACd,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM;QACvB,YAAY;QACZ,gBAAgB;QAChB,iBAAiB;QACjB,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import {\n  createBundlerClient,\n  getEntryPoint,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  InvalidDeferredActionNonce,\n  InvalidDeferredActionMode,\n  toSmartContractAccount,\n  type AccountOp,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport { DEFAULT_OWNER_ENTITY_ID } from \"../../utils.js\";\nimport {\n  type Hex,\n  type Address,\n  type Chain,\n  type Transport,\n  encodeFunctionData,\n  maxUint32,\n  zeroAddress,\n  getContract,\n  concatHex,\n  maxUint152,\n} from \"viem\";\nimport { modularAccountAbi } from \"../../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../../actions/common/utils.js\";\nimport { nativeSMASigner } from \"../nativeSMASigner.js\";\nimport { singleSignerMessageSigner } from \"../../modules/single-signer-validation/signer.js\";\n\nexport const executeUserOpSelector: Hex = \"0x8DD7712F\";\n\nexport type SignerEntity = {\n  isGlobalValidation: boolean;\n  entityId: number;\n};\n\nexport type ExecutionDataView = {\n  module: Address;\n  skipRuntimeValidation: boolean;\n  allowGlobalValidation: boolean;\n  executionHooks: readonly Hex[];\n};\n\nexport type ValidationDataView = {\n  validationHooks: readonly Hex[];\n  executionHooks: readonly Hex[];\n  selectors: readonly Hex[];\n  validationFlags: number;\n};\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type ModularAccountV2<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = SmartContractAccountWithSigner<\"ModularAccountV2\", TSigner, \"0.7.0\"> & {\n  signerEntity: SignerEntity;\n  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n  getValidationData: (\n    args: ValidationDataParams\n  ) => Promise<ValidationDataView>;\n  encodeCallData: (callData: Hex) => Promise<Hex>;\n};\n\nexport type CreateMAV2BaseParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TTransport extends Transport = Transport\n> = Omit<\n  ToSmartContractAccountParams<\"ModularAccountV2\", TTransport, Chain, \"0.7.0\">,\n  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.\n  | \"encodeExecute\"\n  | \"encodeBatchExecute\"\n  | \"getNonce\"\n  | \"signMessage\"\n  | \"signTypedData\"\n  | \"getDummySignature\"\n> & {\n  signer: TSigner;\n  signerEntity?: SignerEntity;\n  accountAddress: Address;\n  deferredAction?: Hex;\n};\n\nexport type CreateMAV2BaseReturnType<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Promise<ModularAccountV2<TSigner>>;\n\nexport async function createMAv2Base<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {\n  const {\n    transport,\n    chain,\n    signer,\n    entryPoint = getEntryPoint(chain, { version: \"0.7.0\" }),\n    signerEntity = {\n      isGlobalValidation: true,\n      entityId: DEFAULT_OWNER_ENTITY_ID,\n    },\n    signerEntity: {\n      isGlobalValidation = true,\n      entityId = DEFAULT_OWNER_ENTITY_ID,\n    } = {},\n    accountAddress,\n    deferredAction,\n    ...remainingToSmartContractAccountParams\n  } = config;\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  let useDeferredAction: boolean = false;\n  let nonce: bigint = 0n;\n  let deferredActionData: Hex = \"0x\";\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    if (deferredAction.slice(2, 4) !== \"00\") {\n      throw new InvalidDeferredActionMode();\n    }\n    // Set these values if the deferred action has not been consumed. We check this with the EP\n    const nextNonceForDeferredAction: bigint =\n      (await entryPointContract.read.getNonce([\n        accountAddress,\n        nonce >> 64n,\n      ])) as bigint;\n\n    // we only add the deferred action in if the nonce has not been consumed\n    if (nonce === nextNonceForDeferredAction) {\n      nonce = BigInt(`0x${deferredAction.slice(6, 70)}`);\n      useDeferredAction = true;\n      deferredActionData = `0x${deferredAction.slice(70)}`;\n      hasAssociatedExecHooks = deferredAction[5] === \"1\";\n    } else if (nonce > nextNonceForDeferredAction) {\n      throw new InvalidDeferredActionNonce();\n    }\n  }\n\n  const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({\n    target,\n    data,\n    value,\n  }) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      })\n    );\n\n  const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"executeBatch\",\n        args: [\n          txs.map((tx) => ({\n            target: tx.target,\n            data: tx.data,\n            value: tx.value ?? 0n,\n          })),\n        ],\n      })\n    );\n\n  const isAccountDeployed: () => Promise<boolean> = async () =>\n    !!(await client.getCode({ address: accountAddress }));\n\n  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {\n    if (useDeferredAction) {\n      return nonce;\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey: bigint =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    return entryPointContract.read.getNonce([\n      accountAddress,\n      fullNonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const accountContract = getContract({\n    address: accountAddress,\n    abi: modularAccountAbi,\n    client,\n  });\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return await accountContract.read.getExecutionData([selector]);\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    return await accountContract.read.getValidationData([\n      serializeModuleEntity({\n        moduleAddress: validationModuleAddress ?? zeroAddress,\n        entityId: entityId ?? Number(maxUint32),\n      }),\n    ]);\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n\n    return (useDeferredAction && hasAssociatedExecHooks) ||\n      validationData.executionHooks.length\n      ? concatHex([executeUserOpSelector, callData])\n      : callData;\n  };\n\n  const baseAccount = await toSmartContractAccount({\n    ...remainingToSmartContractAccountParams,\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)\n      : singleSignerMessageSigner(\n          signer,\n          chain,\n          accountAddress,\n          entityId,\n          deferredActionData\n        )),\n  });\n\n  return {\n    ...baseAccount,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}
+{"version":3,"file":"modularAccountV2Base.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createBundlerClient,\n  getEntryPoint,\n  InvalidEntityIdError,\n  InvalidNonceKeyError,\n  InvalidDeferredActionNonce,\n  toSmartContractAccount,\n  type AccountOp,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type ToSmartContractAccountParams,\n} from \"@aa-sdk/core\";\nimport { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from \"../../utils.js\";\nimport {\n  type Hex,\n  type Address,\n  type Chain,\n  type Transport,\n  encodeFunctionData,\n  maxUint32,\n  zeroAddress,\n  getContract,\n  concatHex,\n  maxUint152,\n} from \"viem\";\nimport { modularAccountAbi } from \"../../abis/modularAccountAbi.js\";\nimport { serializeModuleEntity } from \"../../actions/common/utils.js\";\nimport { nativeSMASigner } from \"../nativeSMASigner.js\";\nimport { singleSignerMessageSigner } from \"../../modules/single-signer-validation/signer.js\";\n\nexport const executeUserOpSelector: Hex = \"0x8DD7712F\";\n\nexport type SignerEntity = {\n  isGlobalValidation: boolean;\n  entityId: number;\n};\n\nexport type ExecutionDataView = {\n  module: Address;\n  skipRuntimeValidation: boolean;\n  allowGlobalValidation: boolean;\n  executionHooks: readonly Hex[];\n};\n\nexport type ValidationDataView = {\n  validationHooks: readonly Hex[];\n  executionHooks: readonly Hex[];\n  selectors: readonly Hex[];\n  validationFlags: number;\n};\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type ModularAccountV2<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = SmartContractAccountWithSigner<\"ModularAccountV2\", TSigner, \"0.7.0\"> & {\n  signerEntity: SignerEntity;\n  getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n  getValidationData: (\n    args: ValidationDataParams\n  ) => Promise<ValidationDataView>;\n  encodeCallData: (callData: Hex) => Promise<Hex>;\n};\n\nexport type CreateMAV2BaseParams<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TTransport extends Transport = Transport\n> = Omit<\n  ToSmartContractAccountParams<\"ModularAccountV2\", TTransport, Chain, \"0.7.0\">,\n  // Implements the following methods required by `toSmartContractAccount`, and passes through any other parameters.\n  | \"encodeExecute\"\n  | \"encodeBatchExecute\"\n  | \"getNonce\"\n  | \"signMessage\"\n  | \"signTypedData\"\n  | \"getDummySignature\"\n> & {\n  signer: TSigner;\n  signerEntity?: SignerEntity;\n  accountAddress: Address;\n  deferredAction?: Hex;\n};\n\nexport type CreateMAV2BaseReturnType<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n> = Promise<ModularAccountV2<TSigner>>;\n\nexport async function createMAv2Base<\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {\n  const {\n    transport,\n    chain,\n    signer,\n    entryPoint = getEntryPoint(chain, { version: \"0.7.0\" }),\n    signerEntity = {\n      isGlobalValidation: true,\n      entityId: DEFAULT_OWNER_ENTITY_ID,\n    },\n    signerEntity: {\n      isGlobalValidation = true,\n      entityId = DEFAULT_OWNER_ENTITY_ID,\n    } = {},\n    accountAddress,\n    deferredAction,\n    ...remainingToSmartContractAccountParams\n  } = config;\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const client = createBundlerClient({\n    transport,\n    chain,\n  });\n\n  const entryPointContract = getContract({\n    address: entryPoint.address,\n    abi: entryPoint.abi,\n    client,\n  });\n\n  let useDeferredAction: boolean = false;\n  let nonce: bigint = 0n;\n  let deferredActionData: Hex = \"0x\";\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n      parseDeferredAction(deferredAction));\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP\n    const nextNonceForDeferredAction: bigint =\n      (await entryPointContract.read.getNonce([\n        accountAddress,\n        nonce >> 64n,\n      ])) as bigint;\n\n    // we only add the deferred action in if the nonce has not been consumed\n    if (nonce === nextNonceForDeferredAction) {\n      useDeferredAction = true;\n    } else if (nonce > nextNonceForDeferredAction) {\n      throw new InvalidDeferredActionNonce();\n    }\n  }\n\n  const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({\n    target,\n    data,\n    value,\n  }) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"execute\",\n        args: [target, value ?? 0n, data],\n      })\n    );\n\n  const encodeBatchExecute: (txs: AccountOp[]) => Promise<Hex> = async (txs) =>\n    await encodeCallData(\n      encodeFunctionData({\n        abi: modularAccountAbi,\n        functionName: \"executeBatch\",\n        args: [\n          txs.map((tx) => ({\n            target: tx.target,\n            data: tx.data,\n            value: tx.value ?? 0n,\n          })),\n        ],\n      })\n    );\n\n  const isAccountDeployed: () => Promise<boolean> = async () =>\n    !!(await client.getCode({ address: accountAddress }));\n\n  const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {\n    if (useDeferredAction) {\n      return nonce;\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey: bigint =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    return entryPointContract.read.getNonce([\n      accountAddress,\n      fullNonceKey,\n    ]) as Promise<bigint>;\n  };\n\n  const accountContract = getContract({\n    address: accountAddress,\n    abi: modularAccountAbi,\n    client,\n  });\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return await accountContract.read.getExecutionData([selector]);\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    return await accountContract.read.getValidationData([\n      serializeModuleEntity({\n        moduleAddress: validationModuleAddress ?? zeroAddress,\n        entityId: entityId ?? Number(maxUint32),\n      }),\n    ]);\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n\n    return (useDeferredAction && hasAssociatedExecHooks) ||\n      validationData.executionHooks.length\n      ? concatHex([executeUserOpSelector, callData])\n      : callData;\n  };\n\n  const baseAccount = await toSmartContractAccount({\n    ...remainingToSmartContractAccountParams,\n    transport,\n    chain,\n    entryPoint,\n    accountAddress,\n    encodeExecute,\n    encodeBatchExecute,\n    getNonce,\n    ...(entityId === DEFAULT_OWNER_ENTITY_ID\n      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)\n      : singleSignerMessageSigner(\n          signer,\n          chain,\n          accountAddress,\n          entityId,\n          deferredActionData\n        )),\n  });\n\n  return {\n    ...baseAccount,\n    getSigner: () => signer,\n    signerEntity,\n    getExecutionData,\n    getValidationData,\n    encodeCallData,\n  };\n}\n"]}

package/dist/esm/src/ma-v2/actions/deferralActions.d.ts

@@ -37,10 +37,6 @@ export type CreateDeferredActionTypedDataParams = {
     deadline: number;
     nonce: bigint;
 };
-export type BuildDeferredActionDigestParams = {
-    fullPreSignatureDeferredActionDigest: Hex;
-    sig: Hex;
-};
 export type BuildPreSignatureDeferredActionDigestParams = {
     typedData: DeferredActionTypedData;
 };
@@ -57,7 +53,6 @@ export type EntityIdAndNonceParams = {
 };
 export type DeferralActions = {
     createDeferredActionTypedDataObject: (args: CreateDeferredActionTypedDataParams) => Promise<DeferredActionReturnData>;
-    buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;
     buildPreSignatureDeferredActionDigest: (args: BuildPreSignatureDeferredActionDigestParams) => Hex;
     buildUserOperationWithDeferredAction: (args: BuildUserOperationWithDeferredActionParams) => Promise<UserOperationRequest_v7>;
     getEntityIdAndNonce: (args: EntityIdAndNonceParams) => Promise<{

package/dist/esm/src/ma-v2/actions/deferralActions.js

@@ -39,25 +39,6 @@ export const deferralActions = (client) => {
             },
         };
     };
-    /**
-     * Creates the digest which must be prepended to the userOp signature.
-     *
-     * Assumption: The client this extends is used to sign the typed data.
-     *
-     * @param {object} args The argument object containing the following:
-     * @param {Hex} args.fullPreSignatureDeferredActionDigest The The data to append the signature and length to
-     * @param {Hex} args.sig The signature to include in the digest
-     * @returns {Hex} The encoded digest to be prepended to the userOp signature
-     */
-    const buildDeferredActionDigest = ({ fullPreSignatureDeferredActionDigest, sig, }) => {
-        const sigLength = size(sig);
-        const encodedData = concatHex([
-            fullPreSignatureDeferredActionDigest,
-            toHex(sigLength, { size: 4 }),
-            sig,
-        ]);
-        return encodedData;
-    };
     const buildPreSignatureDeferredActionDigest = ({ typedData, }) => {
         const signerEntity = client.account.signerEntity;
         const validationLocator = (BigInt(signerEntity.entityId) << 8n) |
@@ -138,7 +119,6 @@ export const deferralActions = (client) => {
     };
     return {
         createDeferredActionTypedDataObject,
-        buildDeferredActionDigest,
         buildPreSignatureDeferredActionDigest,
         buildUserOperationWithDeferredAction,
         getEntityIdAndNonce,

package/dist/esm/src/ma-v2/actions/deferralActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferralActions.js","sourceRoot":"","sources":["../../../../../src/ma-v2/actions/deferralActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  InvalidNonceKeyError,\n  EntryPointNotFoundError,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type UserOperationRequest_v7,\n} from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Hex,\n  concatHex,\n  maxUint152,\n  encodePacked,\n  size,\n  toHex,\n  encodeDeployData,\n  hexToNumber,\n} from \"viem\";\nimport { entityIdAndNonceReaderBytecode, buildFullNonceKey } from \"../utils.js\";\nimport { entityIdAndNonceReaderAbi } from \"../abis/entityIdAndNonceReader.js\";\nimport type { ModularAccountV2Client } from \"../client/client.js\";\n\nexport type DeferredActionTypedData = {\n  domain: {\n    chainId: number;\n    verifyingContract: Address;\n  };\n  types: {\n    DeferredAction: [\n      { name: \"nonce\"; type: \"uint256\" },\n      { name: \"deadline\"; type: \"uint48\" },\n      { name: \"call\"; type: \"bytes\" }\n    ];\n  };\n  primaryType: \"DeferredAction\";\n  message: {\n    nonce: bigint;\n    deadline: number;\n    call: Hex;\n  };\n};\n\nexport type DeferredActionReturnData = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type CreateDeferredActionTypedDataParams = {\n  callData: Hex;\n  deadline: number;\n  nonce: bigint;\n};\n\nexport type BuildDeferredActionDigestParams = {\n  fullPreSignatureDeferredActionDigest: Hex;\n  sig: Hex;\n};\n\nexport type BuildPreSignatureDeferredActionDigestParams = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type BuildUserOperationWithDeferredActionParams = {\n  uo: UserOperationCallData | BatchUserOperationCallData;\n  signaturePrepend: Hex;\n  nonceOverride: bigint;\n};\n\nexport type EntityIdAndNonceParams = {\n  entityId?: number;\n  nonceKey?: bigint;\n  isGlobalValidation: boolean;\n  isDeferredAction?: boolean;\n};\n\nexport type DeferralActions = {\n  createDeferredActionTypedDataObject: (\n    args: CreateDeferredActionTypedDataParams\n  ) => Promise<DeferredActionReturnData>;\n  buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;\n  buildPreSignatureDeferredActionDigest: (\n    args: BuildPreSignatureDeferredActionDigestParams\n  ) => Hex;\n  buildUserOperationWithDeferredAction: (\n    args: BuildUserOperationWithDeferredActionParams\n  ) => Promise<UserOperationRequest_v7>;\n  getEntityIdAndNonce: (\n    args: EntityIdAndNonceParams\n  ) => Promise<{ nonce: bigint; entityId: number }>;\n};\n\n/**\n * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.\n */\nexport const deferralActions: (\n  client: ModularAccountV2Client\n) => DeferralActions = (client: ModularAccountV2Client): DeferralActions => {\n  const createDeferredActionTypedDataObject = async ({\n    callData,\n    deadline,\n    nonce,\n  }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {\n    if (!client.account) {\n      throw new AccountNotFoundError();\n    }\n\n    const entryPoint = client.account.getEntryPoint();\n    if (entryPoint === undefined) {\n      throw new EntryPointNotFoundError(client.chain, \"0.7.0\");\n    }\n\n    return {\n      typedData: {\n        domain: {\n          chainId: await client.getChainId(),\n          verifyingContract: client.account.address,\n        },\n        types: {\n          DeferredAction: [\n            { name: \"nonce\", type: \"uint256\" },\n            { name: \"deadline\", type: \"uint48\" },\n            { name: \"call\", type: \"bytes\" },\n          ],\n        },\n        primaryType: \"DeferredAction\",\n        message: {\n          nonce: nonce,\n          deadline: deadline,\n          call: callData,\n        },\n      },\n    };\n  };\n\n  /**\n   * Creates the digest which must be prepended to the userOp signature.\n   *\n   * Assumption: The client this extends is used to sign the typed data.\n   *\n   * @param {object} args The argument object containing the following:\n   * @param {Hex} args.fullPreSignatureDeferredActionDigest The The data to append the signature and length to\n   * @param {Hex} args.sig The signature to include in the digest\n   * @returns {Hex} The encoded digest to be prepended to the userOp signature\n   */\n  const buildDeferredActionDigest = ({\n    fullPreSignatureDeferredActionDigest,\n    sig,\n  }: BuildDeferredActionDigestParams): Hex => {\n    const sigLength = size(sig);\n\n    const encodedData = concatHex([\n      fullPreSignatureDeferredActionDigest,\n      toHex(sigLength, { size: 4 }),\n      sig,\n    ]);\n    return encodedData;\n  };\n\n  const buildPreSignatureDeferredActionDigest = ({\n    typedData,\n  }: BuildPreSignatureDeferredActionDigestParams): Hex => {\n    const signerEntity = client.account.signerEntity;\n    const validationLocator =\n      (BigInt(signerEntity.entityId) << 8n) |\n      (signerEntity.isGlobalValidation ? 1n : 0n);\n\n    const encodedCallData = encodePacked(\n      [\"uint168\", \"uint48\", \"bytes\"],\n      [validationLocator, typedData.message.deadline, typedData.message.call]\n    );\n\n    const encodedDataLength = size(encodedCallData);\n    const encodedData = concatHex([\n      toHex(encodedDataLength, { size: 4 }),\n      encodedCallData,\n    ]);\n    return encodedData;\n  };\n\n  /**\n   * Builds a user operation with a deferred action by wrapping buildUserOperation() with a dummy signature override.\n   *\n   * @param {object} args The argument object containing the following:\n   * @param {UserOperationCallData | BatchUserOperationCallData} args.uo The user operation call data to build\n   * @param {Hex} args.signaturePrepend The signature data to prepend to the dummy signature\n   * @param {bigint} args.nonceOverride The nonce to override in the user operation, generally given from the typed data builder\n   * @returns {Promise<UserOperationRequest_v7>} The unsigned user operation request with the deferred action\n   */\n  const buildUserOperationWithDeferredAction = async ({\n    uo,\n    signaturePrepend,\n    nonceOverride,\n  }: BuildUserOperationWithDeferredActionParams): Promise<UserOperationRequest_v7> => {\n    // Check if client.account is defined\n    if (client.account === undefined) {\n      throw new AccountNotFoundError();\n    }\n\n    // Pre-fetch the dummy sig so we can override `client.account.getDummySignature()`\n    const dummySig = await client.account.getDummySignature();\n\n    // Cache the previous dummy signature getter\n    const previousDummySigGetter = client.account.getDummySignature;\n\n    // Override client.account.getDummySignature() so `client.buildUserOperation()` uses the prepended hex and the dummy signature during gas estimation\n    client.account.getDummySignature = () => {\n      return concatHex([signaturePrepend, dummySig as Hex]);\n    };\n\n    const unsignedUo = (await client.buildUserOperation({\n      uo: uo,\n      overrides: {\n        nonce: nonceOverride,\n      },\n    })) as UserOperationRequest_v7;\n\n    // Restore the dummy signature getter\n    client.account.getDummySignature = previousDummySigGetter;\n\n    return unsignedUo;\n  };\n\n  const getEntityIdAndNonce = async ({\n    entityId = 1,\n    nonceKey = 0n,\n    isGlobalValidation,\n    isDeferredAction = true,\n  }: EntityIdAndNonceParams) => {\n    if (!client.account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const entryPoint = client.account.getEntryPoint();\n    if (entryPoint === undefined) {\n      throw new EntryPointNotFoundError(client.chain, \"0.7.0\");\n    }\n\n    const bytecode = encodeDeployData({\n      abi: entityIdAndNonceReaderAbi,\n      bytecode: entityIdAndNonceReaderBytecode,\n      args: [\n        client.account.address,\n        entryPoint.address,\n        buildFullNonceKey({\n          nonceKey,\n          entityId,\n          isGlobalValidation,\n          isDeferredAction,\n        }),\n      ],\n    });\n\n    const { data } = await client.call({ data: bytecode });\n    if (!data) {\n      throw new Error(\"No data returned from contract call\");\n    }\n\n    return {\n      nonce: BigInt(data),\n      entityId: hexToNumber(`0x${data.slice(40, 48)}`),\n    };\n  };\n\n  return {\n    createDeferredActionTypedDataObject,\n    buildDeferredActionDigest,\n    buildPreSignatureDeferredActionDigest,\n    buildUserOperationWithDeferredAction,\n    getEntityIdAndNonce,\n  };\n};\n"]}
+{"version":3,"file":"deferralActions.js","sourceRoot":"","sources":["../../../../../src/ma-v2/actions/deferralActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountNotFoundError,\n  InvalidNonceKeyError,\n  EntryPointNotFoundError,\n  type UserOperationCallData,\n  type BatchUserOperationCallData,\n  type UserOperationRequest_v7,\n} from \"@aa-sdk/core\";\nimport {\n  type Address,\n  type Hex,\n  concatHex,\n  maxUint152,\n  encodePacked,\n  size,\n  toHex,\n  encodeDeployData,\n  hexToNumber,\n} from \"viem\";\nimport { entityIdAndNonceReaderBytecode, buildFullNonceKey } from \"../utils.js\";\nimport { entityIdAndNonceReaderAbi } from \"../abis/entityIdAndNonceReader.js\";\nimport type { ModularAccountV2Client } from \"../client/client.js\";\n\nexport type DeferredActionTypedData = {\n  domain: {\n    chainId: number;\n    verifyingContract: Address;\n  };\n  types: {\n    DeferredAction: [\n      { name: \"nonce\"; type: \"uint256\" },\n      { name: \"deadline\"; type: \"uint48\" },\n      { name: \"call\"; type: \"bytes\" }\n    ];\n  };\n  primaryType: \"DeferredAction\";\n  message: {\n    nonce: bigint;\n    deadline: number;\n    call: Hex;\n  };\n};\n\nexport type DeferredActionReturnData = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type CreateDeferredActionTypedDataParams = {\n  callData: Hex;\n  deadline: number;\n  nonce: bigint;\n};\n\nexport type BuildPreSignatureDeferredActionDigestParams = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type BuildUserOperationWithDeferredActionParams = {\n  uo: UserOperationCallData | BatchUserOperationCallData;\n  signaturePrepend: Hex;\n  nonceOverride: bigint;\n};\n\nexport type EntityIdAndNonceParams = {\n  entityId?: number;\n  nonceKey?: bigint;\n  isGlobalValidation: boolean;\n  isDeferredAction?: boolean;\n};\n\nexport type DeferralActions = {\n  createDeferredActionTypedDataObject: (\n    args: CreateDeferredActionTypedDataParams\n  ) => Promise<DeferredActionReturnData>;\n  buildPreSignatureDeferredActionDigest: (\n    args: BuildPreSignatureDeferredActionDigestParams\n  ) => Hex;\n  buildUserOperationWithDeferredAction: (\n    args: BuildUserOperationWithDeferredActionParams\n  ) => Promise<UserOperationRequest_v7>;\n  getEntityIdAndNonce: (\n    args: EntityIdAndNonceParams\n  ) => Promise<{ nonce: bigint; entityId: number }>;\n};\n\n/**\n * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.\n */\nexport const deferralActions: (\n  client: ModularAccountV2Client\n) => DeferralActions = (client: ModularAccountV2Client): DeferralActions => {\n  const createDeferredActionTypedDataObject = async ({\n    callData,\n    deadline,\n    nonce,\n  }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {\n    if (!client.account) {\n      throw new AccountNotFoundError();\n    }\n\n    const entryPoint = client.account.getEntryPoint();\n    if (entryPoint === undefined) {\n      throw new EntryPointNotFoundError(client.chain, \"0.7.0\");\n    }\n\n    return {\n      typedData: {\n        domain: {\n          chainId: await client.getChainId(),\n          verifyingContract: client.account.address,\n        },\n        types: {\n          DeferredAction: [\n            { name: \"nonce\", type: \"uint256\" },\n            { name: \"deadline\", type: \"uint48\" },\n            { name: \"call\", type: \"bytes\" },\n          ],\n        },\n        primaryType: \"DeferredAction\",\n        message: {\n          nonce: nonce,\n          deadline: deadline,\n          call: callData,\n        },\n      },\n    };\n  };\n\n  const buildPreSignatureDeferredActionDigest = ({\n    typedData,\n  }: BuildPreSignatureDeferredActionDigestParams): Hex => {\n    const signerEntity = client.account.signerEntity;\n    const validationLocator =\n      (BigInt(signerEntity.entityId) << 8n) |\n      (signerEntity.isGlobalValidation ? 1n : 0n);\n\n    const encodedCallData = encodePacked(\n      [\"uint168\", \"uint48\", \"bytes\"],\n      [validationLocator, typedData.message.deadline, typedData.message.call]\n    );\n\n    const encodedDataLength = size(encodedCallData);\n    const encodedData = concatHex([\n      toHex(encodedDataLength, { size: 4 }),\n      encodedCallData,\n    ]);\n    return encodedData;\n  };\n\n  /**\n   * Builds a user operation with a deferred action by wrapping buildUserOperation() with a dummy signature override.\n   *\n   * @param {object} args The argument object containing the following:\n   * @param {UserOperationCallData | BatchUserOperationCallData} args.uo The user operation call data to build\n   * @param {Hex} args.signaturePrepend The signature data to prepend to the dummy signature\n   * @param {bigint} args.nonceOverride The nonce to override in the user operation, generally given from the typed data builder\n   * @returns {Promise<UserOperationRequest_v7>} The unsigned user operation request with the deferred action\n   */\n  const buildUserOperationWithDeferredAction = async ({\n    uo,\n    signaturePrepend,\n    nonceOverride,\n  }: BuildUserOperationWithDeferredActionParams): Promise<UserOperationRequest_v7> => {\n    // Check if client.account is defined\n    if (client.account === undefined) {\n      throw new AccountNotFoundError();\n    }\n\n    // Pre-fetch the dummy sig so we can override `client.account.getDummySignature()`\n    const dummySig = await client.account.getDummySignature();\n\n    // Cache the previous dummy signature getter\n    const previousDummySigGetter = client.account.getDummySignature;\n\n    // Override client.account.getDummySignature() so `client.buildUserOperation()` uses the prepended hex and the dummy signature during gas estimation\n    client.account.getDummySignature = () => {\n      return concatHex([signaturePrepend, dummySig as Hex]);\n    };\n\n    const unsignedUo = (await client.buildUserOperation({\n      uo: uo,\n      overrides: {\n        nonce: nonceOverride,\n      },\n    })) as UserOperationRequest_v7;\n\n    // Restore the dummy signature getter\n    client.account.getDummySignature = previousDummySigGetter;\n\n    return unsignedUo;\n  };\n\n  const getEntityIdAndNonce = async ({\n    entityId = 1,\n    nonceKey = 0n,\n    isGlobalValidation,\n    isDeferredAction = true,\n  }: EntityIdAndNonceParams) => {\n    if (!client.account) {\n      throw new AccountNotFoundError();\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const entryPoint = client.account.getEntryPoint();\n    if (entryPoint === undefined) {\n      throw new EntryPointNotFoundError(client.chain, \"0.7.0\");\n    }\n\n    const bytecode = encodeDeployData({\n      abi: entityIdAndNonceReaderAbi,\n      bytecode: entityIdAndNonceReaderBytecode,\n      args: [\n        client.account.address,\n        entryPoint.address,\n        buildFullNonceKey({\n          nonceKey,\n          entityId,\n          isGlobalValidation,\n          isDeferredAction,\n        }),\n      ],\n    });\n\n    const { data } = await client.call({ data: bytecode });\n    if (!data) {\n      throw new Error(\"No data returned from contract call\");\n    }\n\n    return {\n      nonce: BigInt(data),\n      entityId: hexToNumber(`0x${data.slice(40, 48)}`),\n    };\n  };\n\n  return {\n    createDeferredActionTypedDataObject,\n    buildPreSignatureDeferredActionDigest,\n    buildUserOperationWithDeferredAction,\n    getEntityIdAndNonce,\n  };\n};\n"]}

package/dist/esm/src/ma-v2/index.d.ts

@@ -12,8 +12,9 @@ export type * from "./actions/deferralActions.js";
 export { deferralActions } from "./actions/deferralActions.js";
 export type * from "./permissionBuilder.js";
 export { PermissionBuilder, PermissionType } from "./permissionBuilder.js";
+export * from "./permissionBuilderErrors.js";
 export { getDefaultAllowlistModuleAddress, getDefaultNativeTokenLimitModuleAddress, getDefaultPaymasterGuardModuleAddress, getDefaultSingleSignerValidationModuleAddress, getDefaultTimeRangeModuleAddress, getDefaultWebauthnValidationModuleAddress, } from "./modules/utils.js";
-export { buildFullNonceKey } from "./utils.js";
+export { buildFullNonceKey, buildDeferredActionDigest } from "./utils.js";
 export { allowlistModuleAbi } from "./modules/allowlist-module/abis/allowlistModuleAbi.js";
 export { AllowlistModule } from "./modules/allowlist-module/module.js";
 export { nativeTokenLimitModuleAbi } from "./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js";

package/dist/esm/src/ma-v2/index.js

@@ -9,8 +9,9 @@ export { serializeValidationConfig, serializeHookConfig, serializeModuleEntity,
 export { installValidationActions } from "./actions/install-validation/installValidation.js";
 export { deferralActions } from "./actions/deferralActions.js";
 export { PermissionBuilder, PermissionType } from "./permissionBuilder.js";
+export * from "./permissionBuilderErrors.js";
 export { getDefaultAllowlistModuleAddress, getDefaultNativeTokenLimitModuleAddress, getDefaultPaymasterGuardModuleAddress, getDefaultSingleSignerValidationModuleAddress, getDefaultTimeRangeModuleAddress, getDefaultWebauthnValidationModuleAddress, } from "./modules/utils.js";
-export { buildFullNonceKey } from "./utils.js";
+export { buildFullNonceKey, buildDeferredActionDigest } from "./utils.js";
 export { allowlistModuleAbi } from "./modules/allowlist-module/abis/allowlistModuleAbi.js";
 export { AllowlistModule } from "./modules/allowlist-module/module.js";
 export { nativeTokenLimitModuleAbi } from "./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js";

package/dist/esm/src/ma-v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQ/D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE3E,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC","sourcesContent":["// ma v2 exports\nexport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nexport { modularAccountAbi } from \"./abis/modularAccountAbi.js\";\nexport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nexport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\n\nexport { nativeSMASigner } from \"./account/nativeSMASigner.js\";\n\nexport type {\n  ModuleEntity,\n  ValidationConfig,\n  HookConfig,\n  ValidationData,\n} from \"./actions/common/types.js\";\nexport { HookType } from \"./actions/common/types.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"./actions/common/utils.js\";\nexport type * from \"./actions/install-validation/installValidation.js\";\nexport { installValidationActions } from \"./actions/install-validation/installValidation.js\";\nexport type * from \"./actions/deferralActions.js\";\nexport { deferralActions } from \"./actions/deferralActions.js\";\nexport type * from \"./permissionBuilder.js\";\nexport { PermissionBuilder, PermissionType } from \"./permissionBuilder.js\";\n\nexport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultPaymasterGuardModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n  getDefaultWebauthnValidationModuleAddress,\n} from \"./modules/utils.js\";\nexport { buildFullNonceKey } from \"./utils.js\";\nexport { allowlistModuleAbi } from \"./modules/allowlist-module/abis/allowlistModuleAbi.js\";\nexport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nexport { nativeTokenLimitModuleAbi } from \"./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js\";\nexport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nexport { paymasterGuardModuleAbi } from \"./modules/paymaster-guard-module/abis/paymasterGuardModuleAbi.js\";\nexport { PaymasterGuardModule } from \"./modules/paymaster-guard-module/module.js\";\nexport { singleSignerValidationModuleAbi } from \"./modules/single-signer-validation/abis/singleSignerValidationModuleAbi.js\";\nexport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nexport { timeRangeModuleAbi } from \"./modules/time-range-module/abis/timeRangeModuleAbi.js\";\nexport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nexport { webauthnValidationModuleAbi } from \"./modules/webauthn-validation/abis/webauthnValidationAbi.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ma-v2/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAQ/D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC3E,cAAc,8BAA8B,CAAC;AAE7C,OAAO,EACL,gCAAgC,EAChC,uCAAuC,EACvC,qCAAqC,EACrC,6CAA6C,EAC7C,gCAAgC,EAChC,yCAAyC,GAC1C,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kEAAkE,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,4EAA4E,CAAC;AAC7H,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6DAA6D,CAAC","sourcesContent":["// ma v2 exports\nexport { accountFactoryAbi } from \"./abis/accountFactoryAbi.js\";\nexport { modularAccountAbi } from \"./abis/modularAccountAbi.js\";\nexport { semiModularAccountBytecodeAbi } from \"./abis/semiModularAccountBytecodeAbi.js\";\nexport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\n\nexport { nativeSMASigner } from \"./account/nativeSMASigner.js\";\n\nexport type {\n  ModuleEntity,\n  ValidationConfig,\n  HookConfig,\n  ValidationData,\n} from \"./actions/common/types.js\";\nexport { HookType } from \"./actions/common/types.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n  serializeModuleEntity,\n} from \"./actions/common/utils.js\";\nexport type * from \"./actions/install-validation/installValidation.js\";\nexport { installValidationActions } from \"./actions/install-validation/installValidation.js\";\nexport type * from \"./actions/deferralActions.js\";\nexport { deferralActions } from \"./actions/deferralActions.js\";\nexport type * from \"./permissionBuilder.js\";\nexport { PermissionBuilder, PermissionType } from \"./permissionBuilder.js\";\nexport * from \"./permissionBuilderErrors.js\";\n\nexport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultPaymasterGuardModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n  getDefaultWebauthnValidationModuleAddress,\n} from \"./modules/utils.js\";\nexport { buildFullNonceKey, buildDeferredActionDigest } from \"./utils.js\";\nexport { allowlistModuleAbi } from \"./modules/allowlist-module/abis/allowlistModuleAbi.js\";\nexport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nexport { nativeTokenLimitModuleAbi } from \"./modules/native-token-limit-module/abis/nativeTokenLimitModuleAbi.js\";\nexport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nexport { paymasterGuardModuleAbi } from \"./modules/paymaster-guard-module/abis/paymasterGuardModuleAbi.js\";\nexport { PaymasterGuardModule } from \"./modules/paymaster-guard-module/module.js\";\nexport { singleSignerValidationModuleAbi } from \"./modules/single-signer-validation/abis/singleSignerValidationModuleAbi.js\";\nexport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nexport { timeRangeModuleAbi } from \"./modules/time-range-module/abis/timeRangeModuleAbi.js\";\nexport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nexport { webauthnValidationModuleAbi } from \"./modules/webauthn-validation/abis/webauthnValidationAbi.js\";\n"]}

package/dist/esm/src/ma-v2/permissionBuilder.d.ts

@@ -81,14 +81,16 @@ export declare class PermissionBuilder {
     private hooks;
     private nonce;
     private hasAssociatedExecHooks;
-    constructor(client: ModularAccountV2Client);
-    configure({ key, entityId, nonce, selectors, hooks, }: {
+    private deadline;
+    constructor({ client, key, entityId, nonce, selectors, hooks, deadline, }: {
+        client: ModularAccountV2Client;
         key: Key;
         entityId: number;
         nonce: bigint;
         selectors?: Hex[];
         hooks?: Hook[];
-    }): this;
+        deadline?: number;
+    });
     addSelector({ selector }: {
         selector: Hex;
     }): this;
@@ -98,11 +100,7 @@ export declare class PermissionBuilder {
     addPermissions({ permissions }: {
         permissions: Permission[];
     }): this;
-    compileDeferred({ deadline, }: {
-        deadline: number;
-        uoValidationEntityId: number;
-        uoIsGlobalValidation: boolean;
-    }): Promise<{
+    compileDeferred(): Promise<{
         typedData: DeferredActionTypedData;
         fullPreSignatureDeferredActionDigest: Hex;
     }>;
@@ -112,4 +110,5 @@ export declare class PermissionBuilder {
     private translatePermissions;
     private addHooks;
 }
+export declare function assertNever(_valid: never): never;
 export {};

package/dist/esm/src/ma-v2/permissionBuilder.js

@@ -1,4 +1,4 @@
-import { toHex, zeroAddress } from "viem";
+import { maxUint48, toHex, zeroAddress } from "viem";
 import { HookType, } from "./actions/common/types.js";
 import { installValidationActions, } from "./actions/install-validation/installValidation.js";
 import { deferralActions, } from "./actions/deferralActions.js";
@@ -7,6 +7,7 @@ import { getDefaultAllowlistModuleAddress, getDefaultNativeTokenLimitModuleAddre
 import { SingleSignerValidationModule } from "./modules/single-signer-validation/module.js";
 import { AllowlistModule } from "./modules/allowlist-module/module.js";
 import { TimeRangeModule } from "./modules/time-range-module/module.js";
+import { AccountAddressAsTargetError, DeadlineOverLimitError, DuplicateTargetAddressError, ExpiredDeadlineError, MultipleGasLimitError, MultipleNativeTokenTransferError, NoFunctionsProvidedError, RootPermissionOnlyError, UnsupportedPermissionTypeError, ValidationConfigUnsetError, ZeroAddressError, } from "./permissionBuilderErrors.js";
 // We use this to offset the ERC20 spend limit entityId
 const HALF_UINT32 = 2147483647;
 const ERC20_APPROVE_SELECTOR = "0x095ea7b3";
@@ -36,7 +37,7 @@ var HookIdentifier;
     HookIdentifier[HookIdentifier["PREVAL_ALLOWLIST"] = 3] = "PREVAL_ALLOWLIST";
 })(HookIdentifier || (HookIdentifier = {}));
 export class PermissionBuilder {
-    constructor(client) {
+    constructor({ client, key, entityId, nonce, selectors, hooks, deadline, }) {
         Object.defineProperty(this, "client", {
             enumerable: true,
             configurable: true,
@@ -91,10 +92,13 @@ export class PermissionBuilder {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "deadline", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         this.client = client;
-    }
-    // Configures the builder
-    configure({ key, entityId, nonce, selectors, hooks, }) {
         this.validationConfig = {
             moduleAddress: getDefaultSingleSignerValidationModuleAddress(this.client.chain),
             entityId,
@@ -106,12 +110,13 @@ export class PermissionBuilder {
             entityId: entityId,
             signer: key.publicKey,
         });
+        this.nonce = nonce;
         if (selectors)
             this.selectors = selectors;
         if (hooks)
             this.hooks = hooks;
-        this.nonce = nonce;
-        return this;
+        if (deadline)
+            this.deadline = deadline;
     }
     addSelector({ selector }) {
         this.selectors.push(selector);
@@ -121,7 +126,7 @@ export class PermissionBuilder {
         // Check 1: If we're adding root, we can't have any other permissions
         if (permission.type === PermissionType.ROOT) {
             if (this.permissions.length !== 0) {
-                throw new Error("PERMISSION: ROOT: Cannot add ROOT permission with other permissions");
+                throw new RootPermissionOnlyError(permission);
             }
             this.permissions.push(permission);
             // Set isGlobal to true
@@ -133,14 +138,14 @@ export class PermissionBuilder {
         // NOTE: Technically this could be replaced by checking permissions[0] since it should not be possible
         // to have >1 permission with root among them
         if (this.permissions.find((p) => p.type === PermissionType.ROOT)) {
-            throw new Error(`PERMISSION: ${permission.type} => Cannot add permissions with ROOT enabled`);
+            throw new RootPermissionOnlyError(permission);
         }
         // Check 3: If the permission is either CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT, ensure it doesn't collide with another like it.
         if (permission.type === PermissionType.CONTRACT_ACCESS ||
             permission.type === PermissionType.FUNCTIONS_ON_CONTRACT) {
             // Check 3.1: address must not be the account address, or the user should use the ACCOUNT_FUNCTIONS permission
             if (permission.data.address === this.client.account.address) {
-                throw new Error(`PERMISSION: ${permission.type} => Account address as target, use ACCOUNT_FUNCTIONS for account address`);
+                throw new AccountAddressAsTargetError(permission);
             }
             // Check 3.2: there must not be an existing permission with this address as a target
             const targetAddress = permission.data.address;
@@ -151,13 +156,15 @@ export class PermissionBuilder {
                     "address" in p.data &&
                     p.data.address === targetAddress));
             if (existingPermissionWithSameAddress) {
-                throw new Error(`PERMISSION: ${permission.type} => Address ${targetAddress} already has a permission. Cannot add multiple CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT permissions for the same target address.`);
+                throw new DuplicateTargetAddressError(permission, targetAddress);
             }
         }
         // Check 4: If the permission is ACCOUNT_FUNCTIONS, add selectors
         if (permission.type === PermissionType.ACCOUNT_FUNCTIONS) {
+            if (permission.data.functions.length === 0) {
+                throw new NoFunctionsProvidedError(permission);
+            }
             this.selectors = [...this.selectors, ...permission.data.functions];
-            return this;
         }
         this.permissions.push(permission);
         return this;
@@ -171,29 +178,30 @@ export class PermissionBuilder {
         return this;
     }
     // Use for building deferred action typed data to sign
-    async compileDeferred({ deadline, }) {
-        // Need to remove this because compileRaw may add selectors
-        // this.validateConfiguration();
+    async compileDeferred() {
         // Add time range module hook via expiry
-        if (deadline !== 0) {
-            if (deadline < Date.now() / 1000) {
-                throw new Error(`PERMISSION: compileDeferred(): Deadline ${deadline} cannot be before now (${Date.now() / 1000})`);
+        if (this.deadline !== 0) {
+            if (this.deadline < Date.now() / 1000) {
+                throw new ExpiredDeadlineError(this.deadline, Date.now() / 1000);
+            }
+            if (this.deadline > maxUint48) {
+                throw new DeadlineOverLimitError(this.deadline);
             }
             this.hooks.push(TimeRangeModule.buildHook({
-                entityId: this.validationConfig.entityId, // will be timerange entityId
-                validUntil: deadline,
+                entityId: this.validationConfig.entityId,
+                validUntil: this.deadline,
                 validAfter: 0,
             }, getDefaultTimeRangeModuleAddress(this.client.chain)));
         }
         const installValidationCall = await this.compileRaw();
         const { typedData } = await deferralActions(this.client).createDeferredActionTypedDataObject({
             callData: installValidationCall,
-            deadline: deadline,
+            deadline: this.deadline,
             nonce: this.nonce,
         });
         const preSignatureDigest = deferralActions(this.client).buildPreSignatureDeferredActionDigest({ typedData });
         // Encode additional information to build the full pre-signature digest
-        const fullPreSignatureDeferredActionDigest = `0x00${this.hasAssociatedExecHooks ? "01" : "00"}${toHex(this.nonce, {
+        const fullPreSignatureDeferredActionDigest = `0x0${this.hasAssociatedExecHooks ? "1" : "0"}${toHex(this.nonce, {
             size: 32,
         }).slice(2)}${preSignatureDigest.slice(2)}`;
         return {
@@ -232,7 +240,7 @@ export class PermissionBuilder {
     validateConfiguration() {
         if (this.validationConfig.isGlobal === false &&
             this.selectors.length === 0) {
-            throw new Error("Validation config unset, use permissionBuilder.configure(...)");
+            throw new ValidationConfigUnsetError();
         }
     }
     // Used to translate consolidated permissions into raw unencoded hooks
@@ -249,7 +257,7 @@ export class PermissionBuilder {
                 case PermissionType.NATIVE_TOKEN_TRANSFER:
                     // Should never be added twice, check is on addPermission(s) too
                     if (rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] !== undefined) {
-                        throw new Error("PERMISSION: NATIVE_TOKEN_TRANSFER => Must have at most ONE native token transfer permission");
+                        throw new MultipleNativeTokenTransferError(permission);
                     }
                     rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] = {
                         hookConfig: {
@@ -268,7 +276,7 @@ export class PermissionBuilder {
                     break;
                 case PermissionType.ERC20_TOKEN_TRANSFER:
                     if (permission.data.address === zeroAddress) {
-                        throw new Error("PERMISSION: ERC20_TOKEN_TRANSFER => Zero address provided");
+                        throw new ZeroAddressError(permission);
                     }
                     rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER] = {
                         hookConfig: {
@@ -324,7 +332,7 @@ export class PermissionBuilder {
                 case PermissionType.GAS_LIMIT:
                     // Should only ever be added once, check is also on addPermission(s)
                     if (rawHooks[HookIdentifier.GAS_LIMIT] !== undefined) {
-                        throw new Error("PERMISSION: GAS_LIMIT => Must have at most ONE gas limit permission");
+                        throw new MultipleGasLimitError(permission);
                     }
                     rawHooks[HookIdentifier.GAS_LIMIT] = {
                         hookConfig: {
@@ -342,7 +350,7 @@ export class PermissionBuilder {
                     break;
                 case PermissionType.CONTRACT_ACCESS:
                     if (permission.data.address === zeroAddress) {
-                        throw new Error("PERMISSION: CONTRACT_ACCESS => Zero address provided");
+                        throw new ZeroAddressError(permission);
                     }
                     rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {
                         hookConfig: {
@@ -370,13 +378,11 @@ export class PermissionBuilder {
                     };
                     break;
                 case PermissionType.ACCOUNT_FUNCTIONS:
-                    if (permission.data.functions.length === 0) {
-                        throw new Error("PERMISSION: ACCOUNT_FUNCTION => No functions provided"); // should be in add perm
-                    }
+                    // This is handled in add permissions
                     break;
                 case PermissionType.FUNCTIONS_ON_ALL_CONTRACTS:
                     if (permission.data.functions.length === 0) {
-                        throw new Error("PERMISSION: FUNCTIONS_ON_ALL_CONTRACTS => No functions provided");
+                        throw new NoFunctionsProvidedError(permission);
                     }
                     rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {
                         hookConfig: {
@@ -405,10 +411,10 @@ export class PermissionBuilder {
                     break;
                 case PermissionType.FUNCTIONS_ON_CONTRACT:
                     if (permission.data.functions.length === 0) {
-                        throw new Error("PERMISSION: FUNCTIONS_ON_CONTRACT => No functions provided");
+                        throw new NoFunctionsProvidedError(permission);
                     }
                     if (permission.data.address === zeroAddress) {
-                        throw new Error("PERMISSION: FUNCTIONS_ON_CONTRACT => Zero address provided");
+                        throw new ZeroAddressError(permission);
                     }
                     rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {
                         hookConfig: {
@@ -439,7 +445,7 @@ export class PermissionBuilder {
                     // Root permission handled in addPermission
                     break;
                 default:
-                    throw new Error(`Unsupported permission type: ${permission.type}`);
+                    assertNever(permission);
             }
             // isGlobal guaranteed to be false since it's only set with root permissions,
             // we must add access to execute & executeBatch if there's a preVal allowlist hook set.
@@ -482,4 +488,7 @@ export class PermissionBuilder {
         }
     }
 }
+export function assertNever(_valid) {
+    throw new UnsupportedPermissionTypeError();
+}
 //# sourceMappingURL=permissionBuilder.js.map