@account-kit/smart-contracts 4.25.1 → 4.26.0

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

@@ -7,7 +7,7 @@ import { nativeSMASigner } from "../nativeSMASigner.js";
 import { singleSignerMessageSigner } from "../../modules/single-signer-validation/signer.js";
 export const executeUserOpSelector = "0x8DD7712F";
 export async function createMAv2Base(config) {
-    const { transport, chain, signer, entryPoint = getEntryPoint(chain, { version: "0.7.0" }), signerEntity = {
+    let { transport, chain, signer, entryPoint = getEntryPoint(chain, { version: "0.7.0" }), signerEntity = {
         isGlobalValidation: true,
         entityId: DEFAULT_OWNER_ENTITY_ID,
     }, signerEntity: { isGlobalValidation = true, entityId = DEFAULT_OWNER_ENTITY_ID, } = {}, accountAddress, deferredAction, ...remainingToSmartContractAccountParams } = config;
@@ -23,23 +23,29 @@ export async function createMAv2Base(config) {
         abi: entryPoint.abi,
         client,
     });
-    let useDeferredAction = false;
-    let nonce = 0n;
-    let deferredActionData = "0x";
+    // These default values signal that we should not use the set deferred action nonce
+    let nonce;
+    let deferredActionData;
     let hasAssociatedExecHooks = false;
     if (deferredAction) {
-        ({ nonce, deferredActionData, hasAssociatedExecHooks } =
-            parseDeferredAction(deferredAction));
+        let deferredActionNonce = 0n;
+        // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls
+        ({
+            entityId,
+            isGlobalValidation,
+            nonce: deferredActionNonce,
+        } = 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,
-            nonce >> 64n,
+            deferredActionNonce >> 64n,
         ]));
-        // we only add the deferred action in if the nonce has not been consumed
-        if (nonce === nextNonceForDeferredAction) {
-            useDeferredAction = true;
+        if (deferredActionNonce === nextNonceForDeferredAction) {
+            ({ nonce, deferredActionData, hasAssociatedExecHooks } =
+                parseDeferredAction(deferredAction));
         }
-        else if (nonce > nextNonceForDeferredAction) {
+        else if (deferredActionNonce > nextNonceForDeferredAction) {
+            // if nonce is greater than the next nonce, its invalid, so we throw
             throw new InvalidDeferredActionNonce();
         }
     }
@@ -61,8 +67,10 @@ export async function createMAv2Base(config) {
     }));
     const isAccountDeployed = async () => !!(await client.getCode({ address: accountAddress }));
     const getNonce = async (nonceKey = 0n) => {
-        if (useDeferredAction) {
-            return nonce;
+        if (nonce) {
+            const tempNonce = nonce;
+            nonce = undefined; // set to falsy value once used
+            return tempNonce;
         }
         if (nonceKey > maxUint152) {
             throw new InvalidNonceKeyError(nonceKey);
@@ -112,10 +120,14 @@ export async function createMAv2Base(config) {
         const validationData = await getValidationData({
             entityId: Number(entityId),
         });
-        return (useDeferredAction && hasAssociatedExecHooks) ||
-            validationData.executionHooks.length
-            ? concatHex([executeUserOpSelector, callData])
-            : callData;
+        if (hasAssociatedExecHooks) {
+            hasAssociatedExecHooks = false; // set to falsy value once used
+            return concatHex([executeUserOpSelector, callData]);
+        }
+        if (validationData.executionHooks.length) {
+            return concatHex([executeUserOpSelector, callData]);
+        }
+        return callData;
     };
     const baseAccount = await toSmartContractAccount({
         ...remainingToSmartContractAccountParams,

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":"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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"]}
+{"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  let {\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  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce: bigint = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\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        deferredActionNonce >> 64n,\n      ])) as bigint;\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\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 (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\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    if (hasAssociatedExecHooks) {\n      hasAssociatedExecHooks = false; // set to falsy value once used\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([executeUserOpSelector, callData]);\n    }\n    return 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/account/nativeSMASigner.js

@@ -34,13 +34,17 @@ export const nativeSMASigner = (signer, chain, accountAddress, deferredActionDat
             return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
         },
         signUserOperationHash: async (uoHash) => {
-            const sig = await signer
+            let sig = await signer
                 .signMessage({ raw: uoHash })
                 .then((signature) => packUOSignature({
                 // orderedHookData: [],
                 validationSignature: signature,
             }));
-            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
         async signMessage({ message }) {

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

@@ -1 +1 @@
-{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n  concat,\n  concatHex,\n} from \"viem\";\n\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n} from \"../utils.js\";\nimport { SignatureType } from \"../modules/utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  deferredActionData?: Hex\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      const sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          })\n        );\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? concat([\n            SignatureType.EOA,\n            await signer.signTypedData(typedDataDefinition),\n          ])\n        : pack1271Signature({\n            validationSignature: await signer.signTypedData({\n              domain: {\n                chainId: Number(chain.id),\n                verifyingContract: accountAddress,\n              },\n              types: {\n                ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n              },\n              message: {\n                hash: await hashTypedData(typedDataDefinition),\n              },\n              primaryType: \"ReplaySafeHash\",\n            }),\n            entityId: DEFAULT_OWNER_ENTITY_ID,\n          });\n    },\n  };\n};\n"]}
+{"version":3,"file":"nativeSMASigner.js","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n  concat,\n  concatHex,\n} from \"viem\";\n\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n} from \"../utils.js\";\nimport { SignatureType } from \"../modules/utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example\n * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n *\n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = nativeSMASigner(signer, chain, account.address);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const nativeSMASigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  deferredActionData?: Hex\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      let sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          })\n        );\n\n      if (deferredActionData) {\n        sig = concatHex([deferredActionData, sig]);\n        deferredActionData = undefined;\n      }\n\n      return sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract: accountAddress,\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId: DEFAULT_OWNER_ENTITY_ID,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      return isDeferredAction\n        ? concat([\n            SignatureType.EOA,\n            await signer.signTypedData(typedDataDefinition),\n          ])\n        : pack1271Signature({\n            validationSignature: await signer.signTypedData({\n              domain: {\n                chainId: Number(chain.id),\n                verifyingContract: accountAddress,\n              },\n              types: {\n                ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n              },\n              message: {\n                hash: await hashTypedData(typedDataDefinition),\n              },\n              primaryType: \"ReplaySafeHash\",\n            }),\n            entityId: DEFAULT_OWNER_ENTITY_ID,\n          });\n    },\n  };\n};\n"]}

package/dist/esm/src/ma-v2/modules/single-signer-validation/signer.js

@@ -36,13 +36,17 @@ export const singleSignerMessageSigner = (signer, chain, accountAddress, entityI
             return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
         },
         signUserOperationHash: async (uoHash) => {
-            const sig = await signer
+            let sig = await signer
                 .signMessage({ raw: uoHash })
                 .then((signature) => packUOSignature({
                 // orderedHookData: [],
                 validationSignature: signature,
             }));
-            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
         async signMessage({ message }) {

package/dist/esm/src/ma-v2/modules/single-signer-validation/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  concatHex,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n  concat,\n} from \"viem\";\nimport {\n  getDefaultSingleSignerValidationModuleAddress,\n  SignatureType,\n} from \"../utils.js\";\n\nimport { packUOSignature, pack1271Signature } from \"../../utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example \n \n * ```ts\n * import { singleSignerMessageSigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n * \n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = singleSignerMessageSigner(signer, chain, account.address, account.signerEntity.entityId);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {number} entityId the entity id of the signing validation\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const singleSignerMessageSigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  entityId: number,\n  deferredActionData?: Hex\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      const sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          })\n        );\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = await hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract:\n              getDefaultSingleSignerValidationModuleAddress(chain),\n            salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      const validationSignature = await signer.signTypedData({\n        domain: {\n          chainId: Number(chain.id),\n          verifyingContract:\n            getDefaultSingleSignerValidationModuleAddress(chain),\n          salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n        },\n        types: {\n          ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n        },\n        message: {\n          hash: hashTypedData(typedDataDefinition),\n        },\n        primaryType: \"ReplaySafeHash\",\n      });\n\n      // TODO: Handle non-EOA signer case\n      return isDeferredAction\n        ? concat([SignatureType.EOA, validationSignature])\n        : pack1271Signature({\n            validationSignature,\n            entityId,\n          });\n    },\n  };\n};\n"]}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport {\n  hashMessage,\n  hashTypedData,\n  concatHex,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type Chain,\n  type Address,\n  concat,\n} from \"viem\";\nimport {\n  getDefaultSingleSignerValidationModuleAddress,\n  SignatureType,\n} from \"../utils.js\";\n\nimport { packUOSignature, pack1271Signature } from \"../../utils.js\";\n/**\n * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.\n *\n * @example \n \n * ```ts\n * import { singleSignerMessageSigner } from \"@account-kit/smart-contracts\";\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n *\n * const MNEMONIC = \"...\":\n * \n * const account = createModularAccountV2({ config });\n *\n * const signer = LocalAccountSigner.mnemonicToAccountSigner(MNEMONIC);\n *\n * const messageSigner = singleSignerMessageSigner(signer, chain, account.address, account.signerEntity.entityId);\n * ```\n *\n * @param {SmartAccountSigner} signer Signer to use for signing operations\n * @param {Chain} chain Chain object for the signer\n * @param {Address} accountAddress address of the smart account using this signer\n * @param {number} entityId the entity id of the signing validation\n * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures\n * @returns {object} an object with methods for signing operations and managing signatures\n */\nexport const singleSignerMessageSigner = (\n  signer: SmartAccountSigner,\n  chain: Chain,\n  accountAddress: Address,\n  entityId: number,\n  deferredActionData?: Hex\n) => {\n  return {\n    getDummySignature: (): Hex => {\n      const sig = packUOSignature({\n        // orderedHookData: [],\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {\n      let sig = await signer\n        .signMessage({ raw: uoHash })\n        .then((signature: Hex) =>\n          packUOSignature({\n            // orderedHookData: [],\n            validationSignature: signature,\n          })\n        );\n\n      if (deferredActionData) {\n        sig = concatHex([deferredActionData, sig]);\n        deferredActionData = undefined;\n      }\n\n      return sig;\n    },\n\n    // we apply the expected 1271 packing here since the account contract will expect it\n    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {\n      const hash = await hashMessage(message);\n\n      return pack1271Signature({\n        validationSignature: await signer.signTypedData({\n          domain: {\n            chainId: Number(chain.id),\n            verifyingContract:\n              getDefaultSingleSignerValidationModuleAddress(chain),\n            salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n          },\n          types: {\n            ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n          },\n          message: {\n            hash,\n          },\n          primaryType: \"ReplaySafeHash\",\n        }),\n        entityId,\n      });\n    },\n\n    // TODO: maybe move \"sign deferred actions\" to a separate function?\n    // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing\n    signTypedData: async <\n      const typedData extends TypedData | Record<string, unknown>,\n      primaryType extends keyof typedData | \"EIP712Domain\" = keyof typedData\n    >(\n      typedDataDefinition: TypedDataDefinition<typedData, primaryType>\n    ): Promise<Hex> => {\n      // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping\n      const isDeferredAction =\n        typedDataDefinition?.primaryType === \"DeferredAction\" &&\n        typedDataDefinition?.domain?.verifyingContract === accountAddress;\n\n      const validationSignature = await signer.signTypedData({\n        domain: {\n          chainId: Number(chain.id),\n          verifyingContract:\n            getDefaultSingleSignerValidationModuleAddress(chain),\n          salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n        },\n        types: {\n          ReplaySafeHash: [{ name: \"hash\", type: \"bytes32\" }],\n        },\n        message: {\n          hash: hashTypedData(typedDataDefinition),\n        },\n        primaryType: \"ReplaySafeHash\",\n      });\n\n      // TODO: Handle non-EOA signer case\n      return isDeferredAction\n        ? concat([SignatureType.EOA, validationSignature])\n        : pack1271Signature({\n            validationSignature,\n            entityId,\n          });\n    },\n  };\n};\n"]}

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

@@ -7,7 +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";
+import { AccountAddressAsTargetError, DeadlineOverLimitError, DuplicateTargetAddressError, ExpiredDeadlineError, MultipleGasLimitError, MultipleNativeTokenTransferError, NoFunctionsProvidedError, RootPermissionOnlyError, SelectorNotAllowed, 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";
@@ -164,6 +164,13 @@ 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];
         }
         this.permissions.push(permission);

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

@@ -1 +1 @@
-{"version":3,"file":"permissionBuilder.js","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilder.ts"],"names":[],"mappings":"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","sourcesContent":["import { maxUint48, toHex, zeroAddress, type Address, type Hex } from \"viem\";\nimport {\n  HookType,\n  type HookConfig,\n  type ValidationConfig,\n} from \"./actions/common/types.js\";\nimport {\n  installValidationActions,\n  type InstallValidationParams,\n} from \"./actions/install-validation/installValidation.js\";\nimport type { ModularAccountV2Client } from \"./client/client.js\";\nimport {\n  deferralActions,\n  type DeferredActionTypedData,\n} from \"./actions/deferralActions.js\";\nimport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nimport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n} from \"./modules/utils.js\";\nimport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nimport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nimport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nimport {\n  AccountAddressAsTargetError,\n  DeadlineOverLimitError,\n  DuplicateTargetAddressError,\n  ExpiredDeadlineError,\n  MultipleGasLimitError,\n  MultipleNativeTokenTransferError,\n  NoFunctionsProvidedError,\n  RootPermissionOnlyError,\n  UnsupportedPermissionTypeError,\n  ValidationConfigUnsetError,\n  ZeroAddressError,\n} from \"./permissionBuilderErrors.js\";\n\n// We use this to offset the ERC20 spend limit entityId\nconst HALF_UINT32 = 2147483647;\nconst ERC20_APPROVE_SELECTOR = \"0x095ea7b3\";\nconst ERC20_TRANSFER_SELECTOR = \"0xa9059cbb\";\nconst ACCOUNT_EXECUTE_SELECTOR = \"0xb61d27f6\";\nconst ACCOUNT_EXECUTEBATCH_SELECTOR = \"0x34fcd5be\";\n\nexport enum PermissionType {\n  NATIVE_TOKEN_TRANSFER = \"native-token-transfer\",\n  ERC20_TOKEN_TRANSFER = \"erc20-token-transfer\",\n  // ERC721_TOKEN_TRANSFER = \"erc721-token-transfer\", //Unimplemented\n  // ERC1155_TOKEN_TRANSFER = \"erc1155-token-transfer\", //Unimplemented\n  GAS_LIMIT = \"gas-limit\",\n  // CALL_LIMIT = \"call-limit\", //Unimplemented\n  // RATE_LIMIT = \"rate-limit\", //Unimplemented\n  CONTRACT_ACCESS = \"contract-access\",\n  ACCOUNT_FUNCTIONS = \"account-functions\",\n  FUNCTIONS_ON_ALL_CONTRACTS = \"functions-on-all-contracts\",\n  FUNCTIONS_ON_CONTRACT = \"functions-on-contract\",\n  ROOT = \"root\",\n}\n\nenum HookIdentifier {\n  NATIVE_TOKEN_TRANSFER,\n  ERC20_TOKEN_TRANSFER,\n  GAS_LIMIT,\n  PREVAL_ALLOWLIST, // aggregate of CONTRACT_ACCESS, ACCOUNT_FUNCTIONS, FUNCTIONS_ON_ALL_CONTRACTS, FUNCTIONS_ON_CONTRACT\n}\n\ntype PreExecutionHookConfig = {\n  address: Address;\n  entityId: number;\n  hookType: HookType.EXECUTION;\n  hasPreHooks: true;\n  hasPostHooks: false;\n};\n\ntype PreValidationHookConfig = {\n  address: Address;\n  entityId: number;\n  hookType: HookType.VALIDATION;\n  hasPreHooks: true;\n  hasPostHooks: false;\n};\n\ntype RawHooks = {\n  [HookIdentifier.NATIVE_TOKEN_TRANSFER]:\n    | {\n        hookConfig: PreExecutionHookConfig;\n        initData: {\n          entityId: number;\n          spendLimit: bigint;\n        };\n      }\n    | undefined;\n  [HookIdentifier.ERC20_TOKEN_TRANSFER]:\n    | {\n        hookConfig: PreExecutionHookConfig;\n        initData: {\n          entityId: number;\n          inputs: Array<{\n            target: Address;\n            hasSelectorAllowlist: boolean;\n            hasERC20SpendLimit: boolean;\n            erc20SpendLimit: bigint;\n            selectors: Array<Hex>;\n          }>;\n        };\n      }\n    | undefined;\n  [HookIdentifier.GAS_LIMIT]:\n    | {\n        hookConfig: PreValidationHookConfig;\n        initData: {\n          entityId: number;\n          spendLimit: bigint;\n        };\n      }\n    | undefined;\n  [HookIdentifier.PREVAL_ALLOWLIST]:\n    | {\n        hookConfig: PreValidationHookConfig;\n\n        initData: {\n          entityId: number;\n          inputs: Array<{\n            target: Address;\n            hasSelectorAllowlist: boolean;\n            hasERC20SpendLimit: boolean;\n            erc20SpendLimit: bigint;\n            selectors: Array<Hex>;\n          }>;\n        };\n      }\n    | undefined;\n};\n\ntype OneOf<T extends {}[]> = T[number];\n\ntype Key = {\n  publicKey: Hex;\n  type: \"secp256k1\" | \"contract\";\n};\n\nexport type Permission = OneOf<\n  [\n    {\n      // this permission allows transfer of native tokens from the account\n      type: PermissionType.NATIVE_TOKEN_TRANSFER;\n      data: {\n        allowance: Hex;\n      };\n    },\n    {\n      // this permission allows transfer or approval of erc20 tokens from the account\n      type: PermissionType.ERC20_TOKEN_TRANSFER;\n      data: {\n        address: Address; // erc20 token contract address\n        allowance: Hex;\n      };\n    },\n    {\n      // this permissions allows the key to spend gas for UOs\n      type: PermissionType.GAS_LIMIT;\n      data: {\n        limit: Hex;\n      };\n    },\n    {\n      // this permission grants access to all functions in a contract\n      type: PermissionType.CONTRACT_ACCESS;\n      data: {\n        address: Address;\n      };\n    },\n    {\n      // this permission grants access to functions in the account\n      type: PermissionType.ACCOUNT_FUNCTIONS;\n      data: {\n        functions: Hex[]; // function signatures\n      };\n    },\n    {\n      // this permission grants access to a function selector in any address or contract\n      type: PermissionType.FUNCTIONS_ON_ALL_CONTRACTS;\n      data: {\n        functions: Hex[]; // function signatures\n      };\n    },\n    {\n      // this permission grants access to specified functions on a specific contract\n      type: PermissionType.FUNCTIONS_ON_CONTRACT;\n      data: {\n        address: Address;\n        functions: Hex[];\n      };\n    },\n    {\n      // this permission grants full access to everything\n      type: PermissionType.ROOT;\n      data?: never;\n    }\n  ]\n>;\n\ntype Hook = {\n  hookConfig: HookConfig;\n  initData: Hex;\n};\n\nexport class PermissionBuilder {\n  private client: ModularAccountV2Client;\n  private validationConfig: ValidationConfig = {\n    moduleAddress: zeroAddress,\n    entityId: 0, // uint32\n    isGlobal: false,\n    isSignatureValidation: false,\n    isUserOpValidation: false,\n  };\n  private selectors: Hex[] = [];\n  private installData: Hex = \"0x\";\n  private permissions: Permission[] = [];\n  private hooks: Hook[] = [];\n  private nonce: bigint = 0n;\n  private hasAssociatedExecHooks: boolean = false;\n  private deadline: number = 0;\n\n  constructor({\n    client,\n    key,\n    entityId,\n    nonce,\n    selectors,\n    hooks,\n    deadline,\n  }: {\n    client: ModularAccountV2Client;\n    key: Key;\n    entityId: number;\n    nonce: bigint;\n    selectors?: Hex[];\n    hooks?: Hook[];\n    deadline?: number;\n  }) {\n    this.client = client;\n    this.validationConfig = {\n      moduleAddress: getDefaultSingleSignerValidationModuleAddress(\n        this.client.chain\n      ),\n      entityId,\n      isUserOpValidation: true,\n      isGlobal: false,\n      isSignatureValidation: false,\n    };\n    this.installData = SingleSignerValidationModule.encodeOnInstallData({\n      entityId: entityId,\n      signer: key.publicKey,\n    });\n    this.nonce = nonce;\n    if (selectors) this.selectors = selectors;\n    if (hooks) this.hooks = hooks;\n    if (deadline) this.deadline = deadline;\n  }\n\n  addSelector({ selector }: { selector: Hex }): this {\n    this.selectors.push(selector);\n    return this;\n  }\n\n  addPermission({ permission }: { permission: Permission }): this {\n    // Check 1: If we're adding root, we can't have any other permissions\n    if (permission.type === PermissionType.ROOT) {\n      if (this.permissions.length !== 0) {\n        throw new RootPermissionOnlyError(permission);\n      }\n      this.permissions.push(permission);\n      // Set isGlobal to true\n      this.validationConfig.isGlobal = true;\n      return this;\n    }\n\n    // Check 2: If the permission is NOT ROOT (guaranteed), ensure there is no ROOT permission set\n    // Will resolve to undefined if ROOT is not found\n    // NOTE: Technically this could be replaced by checking permissions[0] since it should not be possible\n    // to have >1 permission with root among them\n    if (this.permissions.find((p) => p.type === PermissionType.ROOT)) {\n      throw new RootPermissionOnlyError(permission);\n    }\n\n    // Check 3: If the permission is either CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT, ensure it doesn't collide with another like it.\n    if (\n      permission.type === PermissionType.CONTRACT_ACCESS ||\n      permission.type === PermissionType.FUNCTIONS_ON_CONTRACT\n    ) {\n      // Check 3.1: address must not be the account address, or the user should use the ACCOUNT_FUNCTIONS permission\n      if (permission.data.address === this.client.account.address) {\n        throw new AccountAddressAsTargetError(permission);\n      }\n\n      // Check 3.2: there must not be an existing permission with this address as a target\n      const targetAddress = permission.data.address;\n      const existingPermissionWithSameAddress = this.permissions.find(\n        (p) =>\n          (p.type === PermissionType.CONTRACT_ACCESS &&\n            \"address\" in p.data &&\n            p.data.address === targetAddress) ||\n          (p.type === PermissionType.FUNCTIONS_ON_CONTRACT &&\n            \"address\" in p.data &&\n            p.data.address === targetAddress)\n      );\n\n      if (existingPermissionWithSameAddress) {\n        throw new DuplicateTargetAddressError(permission, targetAddress);\n      }\n    }\n\n    // Check 4: If the permission is ACCOUNT_FUNCTIONS, add selectors\n    if (permission.type === PermissionType.ACCOUNT_FUNCTIONS) {\n      if (permission.data.functions.length === 0) {\n        throw new NoFunctionsProvidedError(permission);\n      }\n      this.selectors = [...this.selectors, ...permission.data.functions];\n    }\n\n    this.permissions.push(permission);\n    return this;\n  }\n\n  addPermissions({ permissions }: { permissions: Permission[] }): this {\n    // We could validate each permission here, but for simplicity we'll just add them\n    // A better approach would be to call addPermission for each one\n    permissions.forEach((permission) => {\n      this.addPermission({ permission });\n    });\n    return this;\n  }\n\n  // Use for building deferred action typed data to sign\n  async compileDeferred(): Promise<{\n    typedData: DeferredActionTypedData;\n    fullPreSignatureDeferredActionDigest: Hex;\n  }> {\n    // Add time range module hook via expiry\n    if (this.deadline !== 0) {\n      if (this.deadline < Date.now() / 1000) {\n        throw new ExpiredDeadlineError(this.deadline, Date.now() / 1000);\n      }\n      if (this.deadline > maxUint48) {\n        throw new DeadlineOverLimitError(this.deadline);\n      }\n\n      this.hooks.push(\n        TimeRangeModule.buildHook(\n          {\n            entityId: this.validationConfig.entityId,\n            validUntil: this.deadline,\n            validAfter: 0,\n          },\n          getDefaultTimeRangeModuleAddress(this.client.chain)\n        )\n      );\n    }\n\n    const installValidationCall = await this.compileRaw();\n\n    const { typedData } = await deferralActions(\n      this.client\n    ).createDeferredActionTypedDataObject({\n      callData: installValidationCall,\n      deadline: this.deadline,\n      nonce: this.nonce,\n    });\n\n    const preSignatureDigest = deferralActions(\n      this.client\n    ).buildPreSignatureDeferredActionDigest({ typedData });\n\n    // Encode additional information to build the full pre-signature digest\n    const fullPreSignatureDeferredActionDigest: `0x${string}` = `0x0${\n      this.hasAssociatedExecHooks ? \"1\" : \"0\"\n    }${toHex(this.nonce, {\n      size: 32,\n    }).slice(2)}${preSignatureDigest.slice(2)}`;\n\n    return {\n      typedData,\n      fullPreSignatureDeferredActionDigest,\n    };\n  }\n\n  // Use for direct `installValidation()` low-level calls (maybe useless)\n  async compileRaw(): Promise<Hex> {\n    // Translate all permissions into raw hooks if >0\n    if (this.permissions.length > 0) {\n      const rawHooks = this.translatePermissions(\n        this.validationConfig.entityId\n      );\n      // Add the translated permissions as hooks\n      this.addHooks(rawHooks);\n    }\n    this.validateConfiguration();\n\n    return await installValidationActions(this.client).encodeInstallValidation({\n      validationConfig: this.validationConfig,\n      selectors: this.selectors,\n      installData: this.installData,\n      hooks: this.hooks,\n      account: this.client.account,\n    });\n  }\n\n  // Use for compiling args to installValidation\n  async compileInstallArgs(): Promise<InstallValidationParams> {\n    this.validateConfiguration();\n\n    return {\n      validationConfig: this.validationConfig,\n      selectors: this.selectors,\n      installData: this.installData,\n      hooks: this.hooks,\n      account: this.client.account,\n    };\n  }\n\n  private validateConfiguration(): void {\n    if (\n      this.validationConfig.isGlobal === false &&\n      this.selectors.length === 0\n    ) {\n      throw new ValidationConfigUnsetError();\n    }\n  }\n\n  // Used to translate consolidated permissions into raw unencoded hooks\n  // Note entityId will be a member object later\n  private translatePermissions(entityId: number): RawHooks {\n    const rawHooks: RawHooks = {\n      [HookIdentifier.NATIVE_TOKEN_TRANSFER]: undefined,\n      [HookIdentifier.ERC20_TOKEN_TRANSFER]: undefined,\n      [HookIdentifier.GAS_LIMIT]: undefined,\n      [HookIdentifier.PREVAL_ALLOWLIST]: undefined,\n    };\n\n    this.permissions.forEach((permission) => {\n      switch (permission.type) {\n        case PermissionType.NATIVE_TOKEN_TRANSFER:\n          // Should never be added twice, check is on addPermission(s) too\n          if (rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] !== undefined) {\n            throw new MultipleNativeTokenTransferError(permission);\n          }\n          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] = {\n            hookConfig: {\n              address: getDefaultNativeTokenLimitModuleAddress(\n                this.client.chain\n              ),\n              entityId,\n              hookType: HookType.EXECUTION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              spendLimit: BigInt(permission.data.allowance),\n            },\n          };\n          this.hasAssociatedExecHooks = true;\n          break;\n        case PermissionType.ERC20_TOKEN_TRANSFER:\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId: entityId + HALF_UINT32,\n              hookType: HookType.EXECUTION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId: entityId + HALF_UINT32,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: true,\n                  erc20SpendLimit: BigInt(permission.data.allowance),\n                  selectors: [],\n                },\n              ],\n            },\n          };\n          this.hasAssociatedExecHooks = true;\n          // Also allow `approve` and `transfer` for the erc20\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: true,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: [ERC20_APPROVE_SELECTOR, ERC20_TRANSFER_SELECTOR], // approve, transfer\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.GAS_LIMIT:\n          // Should only ever be added once, check is also on addPermission(s)\n          if (rawHooks[HookIdentifier.GAS_LIMIT] !== undefined) {\n            throw new MultipleGasLimitError(permission);\n          }\n          rawHooks[HookIdentifier.GAS_LIMIT] = {\n            hookConfig: {\n              address: getDefaultNativeTokenLimitModuleAddress(\n                this.client.chain\n              ),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              spendLimit: BigInt(permission.data.limit),\n            },\n          };\n          break;\n        case PermissionType.CONTRACT_ACCESS:\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: [],\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.ACCOUNT_FUNCTIONS:\n          // This is handled in add permissions\n          break;\n        case PermissionType.FUNCTIONS_ON_ALL_CONTRACTS:\n          if (permission.data.functions.length === 0) {\n            throw new NoFunctionsProvidedError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: zeroAddress,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: permission.data.functions,\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.FUNCTIONS_ON_CONTRACT:\n          if (permission.data.functions.length === 0) {\n            throw new NoFunctionsProvidedError(permission);\n          }\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: true,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: permission.data.functions,\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.ROOT:\n          // Root permission handled in addPermission\n          break;\n        default:\n          assertNever(permission);\n      }\n\n      // isGlobal guaranteed to be false since it's only set with root permissions,\n      // we must add access to execute & executeBatch if there's a preVal allowlist hook set.\n      if (rawHooks[HookIdentifier.PREVAL_ALLOWLIST] !== undefined) {\n        const selectorsToAdd: `0x${string}`[] = [\n          ACCOUNT_EXECUTE_SELECTOR,\n          ACCOUNT_EXECUTEBATCH_SELECTOR,\n        ]; // execute, executeBatch\n\n        // Only add the selectors if they aren't already in this.selectors\n        const newSelectors = selectorsToAdd.filter(\n          (selector) => !this.selectors.includes(selector)\n        );\n\n        this.selectors = [...this.selectors, ...newSelectors];\n      }\n    });\n\n    return rawHooks;\n  }\n\n  private addHooks(rawHooks: RawHooks) {\n    if (rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].hookConfig,\n        initData: NativeTokenLimitModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].hookConfig,\n        initData: AllowlistModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.GAS_LIMIT]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.GAS_LIMIT].hookConfig,\n        initData: NativeTokenLimitModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.GAS_LIMIT].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.PREVAL_ALLOWLIST]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.PREVAL_ALLOWLIST].hookConfig,\n        initData: AllowlistModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST].initData\n        ),\n      });\n    }\n  }\n}\n\nexport function assertNever(_valid: never): never {\n  throw new UnsupportedPermissionTypeError();\n}\n"]}
+{"version":3,"file":"permissionBuilder.js","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilder.ts"],"names":[],"mappings":"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","sourcesContent":["import { maxUint48, toHex, zeroAddress, type Address, type Hex } from \"viem\";\nimport {\n  HookType,\n  type HookConfig,\n  type ValidationConfig,\n} from \"./actions/common/types.js\";\nimport {\n  installValidationActions,\n  type InstallValidationParams,\n} from \"./actions/install-validation/installValidation.js\";\nimport type { ModularAccountV2Client } from \"./client/client.js\";\nimport {\n  deferralActions,\n  type DeferredActionTypedData,\n} from \"./actions/deferralActions.js\";\nimport { NativeTokenLimitModule } from \"./modules/native-token-limit-module/module.js\";\nimport {\n  getDefaultAllowlistModuleAddress,\n  getDefaultNativeTokenLimitModuleAddress,\n  getDefaultSingleSignerValidationModuleAddress,\n  getDefaultTimeRangeModuleAddress,\n} from \"./modules/utils.js\";\nimport { SingleSignerValidationModule } from \"./modules/single-signer-validation/module.js\";\nimport { AllowlistModule } from \"./modules/allowlist-module/module.js\";\nimport { TimeRangeModule } from \"./modules/time-range-module/module.js\";\nimport {\n  AccountAddressAsTargetError,\n  DeadlineOverLimitError,\n  DuplicateTargetAddressError,\n  ExpiredDeadlineError,\n  MultipleGasLimitError,\n  MultipleNativeTokenTransferError,\n  NoFunctionsProvidedError,\n  RootPermissionOnlyError,\n  SelectorNotAllowed,\n  UnsupportedPermissionTypeError,\n  ValidationConfigUnsetError,\n  ZeroAddressError,\n} from \"./permissionBuilderErrors.js\";\n\n// We use this to offset the ERC20 spend limit entityId\nconst HALF_UINT32 = 2147483647;\nconst ERC20_APPROVE_SELECTOR = \"0x095ea7b3\";\nconst ERC20_TRANSFER_SELECTOR = \"0xa9059cbb\";\nconst ACCOUNT_EXECUTE_SELECTOR = \"0xb61d27f6\";\nconst ACCOUNT_EXECUTEBATCH_SELECTOR = \"0x34fcd5be\";\n\nexport enum PermissionType {\n  NATIVE_TOKEN_TRANSFER = \"native-token-transfer\",\n  ERC20_TOKEN_TRANSFER = \"erc20-token-transfer\",\n  // ERC721_TOKEN_TRANSFER = \"erc721-token-transfer\", //Unimplemented\n  // ERC1155_TOKEN_TRANSFER = \"erc1155-token-transfer\", //Unimplemented\n  GAS_LIMIT = \"gas-limit\",\n  // CALL_LIMIT = \"call-limit\", //Unimplemented\n  // RATE_LIMIT = \"rate-limit\", //Unimplemented\n  CONTRACT_ACCESS = \"contract-access\",\n  ACCOUNT_FUNCTIONS = \"account-functions\",\n  FUNCTIONS_ON_ALL_CONTRACTS = \"functions-on-all-contracts\",\n  FUNCTIONS_ON_CONTRACT = \"functions-on-contract\",\n  ROOT = \"root\",\n}\n\nenum HookIdentifier {\n  NATIVE_TOKEN_TRANSFER,\n  ERC20_TOKEN_TRANSFER,\n  GAS_LIMIT,\n  PREVAL_ALLOWLIST, // aggregate of CONTRACT_ACCESS, ACCOUNT_FUNCTIONS, FUNCTIONS_ON_ALL_CONTRACTS, FUNCTIONS_ON_CONTRACT\n}\n\ntype PreExecutionHookConfig = {\n  address: Address;\n  entityId: number;\n  hookType: HookType.EXECUTION;\n  hasPreHooks: true;\n  hasPostHooks: false;\n};\n\ntype PreValidationHookConfig = {\n  address: Address;\n  entityId: number;\n  hookType: HookType.VALIDATION;\n  hasPreHooks: true;\n  hasPostHooks: false;\n};\n\ntype RawHooks = {\n  [HookIdentifier.NATIVE_TOKEN_TRANSFER]:\n    | {\n        hookConfig: PreExecutionHookConfig;\n        initData: {\n          entityId: number;\n          spendLimit: bigint;\n        };\n      }\n    | undefined;\n  [HookIdentifier.ERC20_TOKEN_TRANSFER]:\n    | {\n        hookConfig: PreExecutionHookConfig;\n        initData: {\n          entityId: number;\n          inputs: Array<{\n            target: Address;\n            hasSelectorAllowlist: boolean;\n            hasERC20SpendLimit: boolean;\n            erc20SpendLimit: bigint;\n            selectors: Array<Hex>;\n          }>;\n        };\n      }\n    | undefined;\n  [HookIdentifier.GAS_LIMIT]:\n    | {\n        hookConfig: PreValidationHookConfig;\n        initData: {\n          entityId: number;\n          spendLimit: bigint;\n        };\n      }\n    | undefined;\n  [HookIdentifier.PREVAL_ALLOWLIST]:\n    | {\n        hookConfig: PreValidationHookConfig;\n\n        initData: {\n          entityId: number;\n          inputs: Array<{\n            target: Address;\n            hasSelectorAllowlist: boolean;\n            hasERC20SpendLimit: boolean;\n            erc20SpendLimit: bigint;\n            selectors: Array<Hex>;\n          }>;\n        };\n      }\n    | undefined;\n};\n\ntype OneOf<T extends {}[]> = T[number];\n\ntype Key = {\n  publicKey: Hex;\n  type: \"secp256k1\" | \"contract\";\n};\n\nexport type Permission = OneOf<\n  [\n    {\n      // this permission allows transfer of native tokens from the account\n      type: PermissionType.NATIVE_TOKEN_TRANSFER;\n      data: {\n        allowance: Hex;\n      };\n    },\n    {\n      // this permission allows transfer or approval of erc20 tokens from the account\n      type: PermissionType.ERC20_TOKEN_TRANSFER;\n      data: {\n        address: Address; // erc20 token contract address\n        allowance: Hex;\n      };\n    },\n    {\n      // this permissions allows the key to spend gas for UOs\n      type: PermissionType.GAS_LIMIT;\n      data: {\n        limit: Hex;\n      };\n    },\n    {\n      // this permission grants access to all functions in a contract\n      type: PermissionType.CONTRACT_ACCESS;\n      data: {\n        address: Address;\n      };\n    },\n    {\n      // this permission grants access to functions in the account\n      type: PermissionType.ACCOUNT_FUNCTIONS;\n      data: {\n        functions: Hex[]; // function signatures\n      };\n    },\n    {\n      // this permission grants access to a function selector in any address or contract\n      type: PermissionType.FUNCTIONS_ON_ALL_CONTRACTS;\n      data: {\n        functions: Hex[]; // function signatures\n      };\n    },\n    {\n      // this permission grants access to specified functions on a specific contract\n      type: PermissionType.FUNCTIONS_ON_CONTRACT;\n      data: {\n        address: Address;\n        functions: Hex[];\n      };\n    },\n    {\n      // this permission grants full access to everything\n      type: PermissionType.ROOT;\n      data?: never;\n    }\n  ]\n>;\n\ntype Hook = {\n  hookConfig: HookConfig;\n  initData: Hex;\n};\n\nexport class PermissionBuilder {\n  private client: ModularAccountV2Client;\n  private validationConfig: ValidationConfig = {\n    moduleAddress: zeroAddress,\n    entityId: 0, // uint32\n    isGlobal: false,\n    isSignatureValidation: false,\n    isUserOpValidation: false,\n  };\n  private selectors: Hex[] = [];\n  private installData: Hex = \"0x\";\n  private permissions: Permission[] = [];\n  private hooks: Hook[] = [];\n  private nonce: bigint = 0n;\n  private hasAssociatedExecHooks: boolean = false;\n  private deadline: number = 0;\n\n  constructor({\n    client,\n    key,\n    entityId,\n    nonce,\n    selectors,\n    hooks,\n    deadline,\n  }: {\n    client: ModularAccountV2Client;\n    key: Key;\n    entityId: number;\n    nonce: bigint;\n    selectors?: Hex[];\n    hooks?: Hook[];\n    deadline?: number;\n  }) {\n    this.client = client;\n    this.validationConfig = {\n      moduleAddress: getDefaultSingleSignerValidationModuleAddress(\n        this.client.chain\n      ),\n      entityId,\n      isUserOpValidation: true,\n      isGlobal: false,\n      isSignatureValidation: false,\n    };\n    this.installData = SingleSignerValidationModule.encodeOnInstallData({\n      entityId: entityId,\n      signer: key.publicKey,\n    });\n    this.nonce = nonce;\n    if (selectors) this.selectors = selectors;\n    if (hooks) this.hooks = hooks;\n    if (deadline) this.deadline = deadline;\n  }\n\n  addSelector({ selector }: { selector: Hex }): this {\n    this.selectors.push(selector);\n    return this;\n  }\n\n  addPermission({ permission }: { permission: Permission }): this {\n    // Check 1: If we're adding root, we can't have any other permissions\n    if (permission.type === PermissionType.ROOT) {\n      if (this.permissions.length !== 0) {\n        throw new RootPermissionOnlyError(permission);\n      }\n      this.permissions.push(permission);\n      // Set isGlobal to true\n      this.validationConfig.isGlobal = true;\n      return this;\n    }\n\n    // Check 2: If the permission is NOT ROOT (guaranteed), ensure there is no ROOT permission set\n    // Will resolve to undefined if ROOT is not found\n    // NOTE: Technically this could be replaced by checking permissions[0] since it should not be possible\n    // to have >1 permission with root among them\n    if (this.permissions.find((p) => p.type === PermissionType.ROOT)) {\n      throw new RootPermissionOnlyError(permission);\n    }\n\n    // Check 3: If the permission is either CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT, ensure it doesn't collide with another like it.\n    if (\n      permission.type === PermissionType.CONTRACT_ACCESS ||\n      permission.type === PermissionType.FUNCTIONS_ON_CONTRACT\n    ) {\n      // Check 3.1: address must not be the account address, or the user should use the ACCOUNT_FUNCTIONS permission\n      if (permission.data.address === this.client.account.address) {\n        throw new AccountAddressAsTargetError(permission);\n      }\n\n      // Check 3.2: there must not be an existing permission with this address as a target\n      const targetAddress = permission.data.address;\n      const existingPermissionWithSameAddress = this.permissions.find(\n        (p) =>\n          (p.type === PermissionType.CONTRACT_ACCESS &&\n            \"address\" in p.data &&\n            p.data.address === targetAddress) ||\n          (p.type === PermissionType.FUNCTIONS_ON_CONTRACT &&\n            \"address\" in p.data &&\n            p.data.address === targetAddress)\n      );\n\n      if (existingPermissionWithSameAddress) {\n        throw new DuplicateTargetAddressError(permission, targetAddress);\n      }\n    }\n\n    // Check 4: If the permission is ACCOUNT_FUNCTIONS, add selectors\n    if (permission.type === PermissionType.ACCOUNT_FUNCTIONS) {\n      if (permission.data.functions.length === 0) {\n        throw new NoFunctionsProvidedError(permission);\n      }\n      // Explicitly disallow adding execute & executeBatch\n      if (permission.data.functions.includes(ACCOUNT_EXECUTE_SELECTOR)) {\n        throw new SelectorNotAllowed(\"execute\");\n      } else if (\n        permission.data.functions.includes(ACCOUNT_EXECUTEBATCH_SELECTOR)\n      ) {\n        throw new SelectorNotAllowed(\"executeBatch\");\n      }\n      this.selectors = [...this.selectors, ...permission.data.functions];\n    }\n\n    this.permissions.push(permission);\n    return this;\n  }\n\n  addPermissions({ permissions }: { permissions: Permission[] }): this {\n    // We could validate each permission here, but for simplicity we'll just add them\n    // A better approach would be to call addPermission for each one\n    permissions.forEach((permission) => {\n      this.addPermission({ permission });\n    });\n    return this;\n  }\n\n  // Use for building deferred action typed data to sign\n  async compileDeferred(): Promise<{\n    typedData: DeferredActionTypedData;\n    fullPreSignatureDeferredActionDigest: Hex;\n  }> {\n    // Add time range module hook via expiry\n    if (this.deadline !== 0) {\n      if (this.deadline < Date.now() / 1000) {\n        throw new ExpiredDeadlineError(this.deadline, Date.now() / 1000);\n      }\n      if (this.deadline > maxUint48) {\n        throw new DeadlineOverLimitError(this.deadline);\n      }\n\n      this.hooks.push(\n        TimeRangeModule.buildHook(\n          {\n            entityId: this.validationConfig.entityId,\n            validUntil: this.deadline,\n            validAfter: 0,\n          },\n          getDefaultTimeRangeModuleAddress(this.client.chain)\n        )\n      );\n    }\n\n    const installValidationCall = await this.compileRaw();\n\n    const { typedData } = await deferralActions(\n      this.client\n    ).createDeferredActionTypedDataObject({\n      callData: installValidationCall,\n      deadline: this.deadline,\n      nonce: this.nonce,\n    });\n\n    const preSignatureDigest = deferralActions(\n      this.client\n    ).buildPreSignatureDeferredActionDigest({ typedData });\n\n    // Encode additional information to build the full pre-signature digest\n    const fullPreSignatureDeferredActionDigest: `0x${string}` = `0x0${\n      this.hasAssociatedExecHooks ? \"1\" : \"0\"\n    }${toHex(this.nonce, {\n      size: 32,\n    }).slice(2)}${preSignatureDigest.slice(2)}`;\n\n    return {\n      typedData,\n      fullPreSignatureDeferredActionDigest,\n    };\n  }\n\n  // Use for direct `installValidation()` low-level calls (maybe useless)\n  async compileRaw(): Promise<Hex> {\n    // Translate all permissions into raw hooks if >0\n    if (this.permissions.length > 0) {\n      const rawHooks = this.translatePermissions(\n        this.validationConfig.entityId\n      );\n      // Add the translated permissions as hooks\n      this.addHooks(rawHooks);\n    }\n    this.validateConfiguration();\n\n    return await installValidationActions(this.client).encodeInstallValidation({\n      validationConfig: this.validationConfig,\n      selectors: this.selectors,\n      installData: this.installData,\n      hooks: this.hooks,\n      account: this.client.account,\n    });\n  }\n\n  // Use for compiling args to installValidation\n  async compileInstallArgs(): Promise<InstallValidationParams> {\n    this.validateConfiguration();\n\n    return {\n      validationConfig: this.validationConfig,\n      selectors: this.selectors,\n      installData: this.installData,\n      hooks: this.hooks,\n      account: this.client.account,\n    };\n  }\n\n  private validateConfiguration(): void {\n    if (\n      this.validationConfig.isGlobal === false &&\n      this.selectors.length === 0\n    ) {\n      throw new ValidationConfigUnsetError();\n    }\n  }\n\n  // Used to translate consolidated permissions into raw unencoded hooks\n  // Note entityId will be a member object later\n  private translatePermissions(entityId: number): RawHooks {\n    const rawHooks: RawHooks = {\n      [HookIdentifier.NATIVE_TOKEN_TRANSFER]: undefined,\n      [HookIdentifier.ERC20_TOKEN_TRANSFER]: undefined,\n      [HookIdentifier.GAS_LIMIT]: undefined,\n      [HookIdentifier.PREVAL_ALLOWLIST]: undefined,\n    };\n\n    this.permissions.forEach((permission) => {\n      switch (permission.type) {\n        case PermissionType.NATIVE_TOKEN_TRANSFER:\n          // Should never be added twice, check is on addPermission(s) too\n          if (rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] !== undefined) {\n            throw new MultipleNativeTokenTransferError(permission);\n          }\n          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] = {\n            hookConfig: {\n              address: getDefaultNativeTokenLimitModuleAddress(\n                this.client.chain\n              ),\n              entityId,\n              hookType: HookType.EXECUTION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              spendLimit: BigInt(permission.data.allowance),\n            },\n          };\n          this.hasAssociatedExecHooks = true;\n          break;\n        case PermissionType.ERC20_TOKEN_TRANSFER:\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId: entityId + HALF_UINT32,\n              hookType: HookType.EXECUTION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId: entityId + HALF_UINT32,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: true,\n                  erc20SpendLimit: BigInt(permission.data.allowance),\n                  selectors: [],\n                },\n              ],\n            },\n          };\n          this.hasAssociatedExecHooks = true;\n          // Also allow `approve` and `transfer` for the erc20\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: true,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: [ERC20_APPROVE_SELECTOR, ERC20_TRANSFER_SELECTOR], // approve, transfer\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.GAS_LIMIT:\n          // Should only ever be added once, check is also on addPermission(s)\n          if (rawHooks[HookIdentifier.GAS_LIMIT] !== undefined) {\n            throw new MultipleGasLimitError(permission);\n          }\n          rawHooks[HookIdentifier.GAS_LIMIT] = {\n            hookConfig: {\n              address: getDefaultNativeTokenLimitModuleAddress(\n                this.client.chain\n              ),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              spendLimit: BigInt(permission.data.limit),\n            },\n          };\n          break;\n        case PermissionType.CONTRACT_ACCESS:\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: [],\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.ACCOUNT_FUNCTIONS:\n          // This is handled in add permissions\n          break;\n        case PermissionType.FUNCTIONS_ON_ALL_CONTRACTS:\n          if (permission.data.functions.length === 0) {\n            throw new NoFunctionsProvidedError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: zeroAddress,\n                  hasSelectorAllowlist: false,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: permission.data.functions,\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.FUNCTIONS_ON_CONTRACT:\n          if (permission.data.functions.length === 0) {\n            throw new NoFunctionsProvidedError(permission);\n          }\n          if (permission.data.address === zeroAddress) {\n            throw new ZeroAddressError(permission);\n          }\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST] = {\n            hookConfig: {\n              address: getDefaultAllowlistModuleAddress(this.client.chain),\n              entityId,\n              hookType: HookType.VALIDATION,\n              hasPreHooks: true,\n              hasPostHooks: false,\n            },\n            initData: {\n              entityId,\n              inputs: [\n                // Add previous inputs if they exist\n                ...(rawHooks[HookIdentifier.PREVAL_ALLOWLIST]?.initData\n                  .inputs || []),\n                {\n                  target: permission.data.address,\n                  hasSelectorAllowlist: true,\n                  hasERC20SpendLimit: false,\n                  erc20SpendLimit: 0n,\n                  selectors: permission.data.functions,\n                },\n              ],\n            },\n          };\n          break;\n        case PermissionType.ROOT:\n          // Root permission handled in addPermission\n          break;\n        default:\n          assertNever(permission);\n      }\n\n      // isGlobal guaranteed to be false since it's only set with root permissions,\n      // we must add access to execute & executeBatch if there's a preVal allowlist hook set.\n      if (rawHooks[HookIdentifier.PREVAL_ALLOWLIST] !== undefined) {\n        const selectorsToAdd: `0x${string}`[] = [\n          ACCOUNT_EXECUTE_SELECTOR,\n          ACCOUNT_EXECUTEBATCH_SELECTOR,\n        ]; // execute, executeBatch\n\n        // Only add the selectors if they aren't already in this.selectors\n        const newSelectors = selectorsToAdd.filter(\n          (selector) => !this.selectors.includes(selector)\n        );\n\n        this.selectors = [...this.selectors, ...newSelectors];\n      }\n    });\n\n    return rawHooks;\n  }\n\n  private addHooks(rawHooks: RawHooks) {\n    if (rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].hookConfig,\n        initData: NativeTokenLimitModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].hookConfig,\n        initData: AllowlistModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.GAS_LIMIT]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.GAS_LIMIT].hookConfig,\n        initData: NativeTokenLimitModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.GAS_LIMIT].initData\n        ),\n      });\n    }\n\n    if (rawHooks[HookIdentifier.PREVAL_ALLOWLIST]) {\n      this.hooks.push({\n        hookConfig: rawHooks[HookIdentifier.PREVAL_ALLOWLIST].hookConfig,\n        initData: AllowlistModule.encodeOnInstallData(\n          rawHooks[HookIdentifier.PREVAL_ALLOWLIST].initData\n        ),\n      });\n    }\n  }\n}\n\nexport function assertNever(_valid: never): never {\n  throw new UnsupportedPermissionTypeError();\n}\n"]}

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

@@ -97,3 +97,12 @@ export declare class UnsupportedPermissionTypeError extends BaseError {
      */
     constructor();
 }
+export declare class SelectorNotAllowed extends BaseError {
+    name: string;
+    /**
+     * 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);
+}

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

@@ -173,4 +173,20 @@ export class UnsupportedPermissionTypeError extends BaseError {
         });
     }
 }
+export class SelectorNotAllowed extends BaseError {
+    /**
+     * 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) {
+        super(`Cannot add ${functionName} on the account`);
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "SelectorNotAllowed"
+        });
+    }
+}
 //# sourceMappingURL=permissionBuilderErrors.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"permissionBuilderErrors.js","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilderErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAGvD,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IAGpD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,UAAU,UAAU,+CAA+C,CAAC,CAAC;QARpE;;;;mBAAO,4CAA4C;WAAC;IAS7D,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,wEAAwE,CAC3F,CAAC;QAVK;;;;mBAAO,gDAAgD;WAAC;IAWjE,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD;;;;;OAKG;IACH,YAAY,UAAsB,EAAE,aAAsB;QACxD,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,aAAa,aAAa,kIAAkI,CAC/K,CAAC;QAXK;;;;mBAAO,gDAAgD;WAAC;IAYjE,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IAGrD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,yBAAyB,CAAC,CAAC;QAR5C;;;;mBAAO,6CAA6C;WAAC;IAS9D,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;;OAKG;IACH,YAAY,QAAgB,EAAE,WAAmB;QAC/C,KAAK,CACH,+BAA+B,QAAQ,0BAA0B,WAAW,GAAG,CAChF,CAAC;QAXK;;;;mBAAO,yCAAyC;WAAC;IAY1D,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,SAAS;IAGnD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,+BAA+B,QAAQ,oCAAoC,CAC5E,CAAC;QAVK;;;;mBAAO,2CAA2C;WAAC;IAW5D,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,SAAS;IAGvD;;OAEG;IACH;QACE,KAAK,CAAC,+DAA+D,CAAC,CAAC;QANhE;;;;mBAAO,+CAA+C;WAAC;IAOhE,CAAC;CACF;AAED,MAAM,OAAO,gCAAiC,SAAQ,SAAS;IAG7D;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,0DAA0D,CAC7E,CAAC;QAVK;;;;mBAAO,qDAAqD;WAAC;IAWtE,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAG7C;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,yBAAyB,CAAC,CAAC;QAR5C;;;;mBAAO,qCAAqC;WAAC;IAStD,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,8CAA8C,CAAC,CAAC;QARjE;;;;mBAAO,0CAA0C;WAAC;IAS3D,CAAC;CACF;AAED,MAAM,OAAO,8BAA+B,SAAQ,SAAS;IAG3D;;OAEG;IACH;QACE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAN9B;;;;mBAAO,mDAAmD;WAAC;IAOpE,CAAC;CACF","sourcesContent":["import { BaseError, type Address } from \"@aa-sdk/core\";\nimport type { Permission } from \"./permissionBuilder\";\n\nexport class RootPermissionOnlyError extends BaseError {\n  override name = \"PermissionBuilder: RootPermissionOnlyError\";\n\n  /**\n   * Constructor for initializing an error message indicating that an account could not be found to execute the specified action.\n   *\n   * @param {Permission} permission The permission trying to be added atop the root permission\n   */\n  constructor(permission: Permission) {\n    super(`Adding ${permission}: Cannot add permissions with ROOT permission`);\n  }\n}\n\nexport class AccountAddressAsTargetError extends BaseError {\n  override name = \"PermissionBuilder: AccountAddressAsTargetError\";\n\n  /**\n   * Constructor for initializing an error message indicating that account address is used as target.\n   *\n   * @param {Permission} permission The permission with account address as target\n   */\n  constructor(permission: Permission) {\n    super(\n      `${permission.type}: Account address as target, use ACCOUNT_FUNCTIONS for account address`\n    );\n  }\n}\n\nexport class DuplicateTargetAddressError extends BaseError {\n  override name = \"PermissionBuilder: DuplicateTargetAddressError\";\n\n  /**\n   * Constructor for initializing an error message indicating duplicate target address in permissions.\n   *\n   * @param {Permission} permission The permission with duplicate target address\n   * @param {Address} targetAddress The duplicate target address\n   */\n  constructor(permission: Permission, targetAddress: Address) {\n    super(\n      `${permission.type}: Address ${targetAddress} already has a permission. Cannot add multiple CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT permissions for the same target address.`\n    );\n  }\n}\n\nexport class NoFunctionsProvidedError extends BaseError {\n  override name = \"PermissionBuilder: NoFunctionsProvidedError\";\n\n  /**\n   * Constructor for initializing an error message indicating no functions were provided.\n   *\n   * @param {Permission} permission The permission missing functions\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: No functions provided`);\n  }\n}\n\nexport class ExpiredDeadlineError extends BaseError {\n  override name = \"PermissionBuilder: ExpiredDeadlineError\";\n\n  /**\n   * Constructor for initializing an error message indicating the deadline has expired.\n   *\n   * @param {number} deadline The expired deadline timestamp\n   * @param {number} currentTime The current timestamp\n   */\n  constructor(deadline: number, currentTime: number) {\n    super(\n      `compileDeferred(): deadline ${deadline} cannot be before now (${currentTime})`\n    );\n  }\n}\n\nexport class DeadlineOverLimitError extends BaseError {\n  override name = \"PermissionBuilder: DeadlineOverLimitError\";\n\n  /**\n   * Constructor for initializing an error message indicating the deadline has expired.\n   *\n   * @param {number} deadline The expired deadline timestamp\n   */\n  constructor(deadline: number) {\n    super(\n      `compileDeferred(): deadline ${deadline} cannot be > max uint48 (2^48 - 1)`\n    );\n  }\n}\n\nexport class ValidationConfigUnsetError extends BaseError {\n  override name = \"PermissionBuilder: ValidationConfigUnsetError\";\n\n  /**\n   * Constructor for initializing an error message indicating the validation config is unset.\n   */\n  constructor() {\n    super(\"Validation config unset, use permissionBuilder.configure(...)\");\n  }\n}\n\nexport class MultipleNativeTokenTransferError extends BaseError {\n  override name = \"PermissionBuilder: MultipleNativeTokenTransferError\";\n\n  /**\n   * Constructor for initializing an error message indicating multiple native token transfer permissions.\n   *\n   * @param {Permission} permission The duplicate native token transfer permission\n   */\n  constructor(permission: Permission) {\n    super(\n      `${permission.type}: Must have at most ONE native token transfer permission`\n    );\n  }\n}\n\nexport class ZeroAddressError extends BaseError {\n  override name = \"PermissionBuilder: ZeroAddressError\";\n\n  /**\n   * Constructor for initializing an error message indicating zero address was provided.\n   *\n   * @param {Permission} permission The permission with zero address\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: Zero address provided`);\n  }\n}\n\nexport class MultipleGasLimitError extends BaseError {\n  override name = \"PermissionBuilder: MultipleGasLimitError\";\n\n  /**\n   * Constructor for initializing an error message indicating multiple gas limit permissions.\n   *\n   * @param {Permission} permission The duplicate gas limit permission\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: Must have at most ONE gas limit permission`);\n  }\n}\n\nexport class UnsupportedPermissionTypeError extends BaseError {\n  override name = \"PermissionBuilder: UnsupportedPermissionTypeError\";\n\n  /**\n   * Constructor for initializing an error message indicating an unsupported permission type.\n   */\n  constructor() {\n    super(`Unsupported permission type`);\n  }\n}\n"]}
+{"version":3,"file":"permissionBuilderErrors.js","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilderErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,cAAc,CAAC;AAGvD,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IAGpD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,UAAU,UAAU,+CAA+C,CAAC,CAAC;QARpE;;;;mBAAO,4CAA4C;WAAC;IAS7D,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,wEAAwE,CAC3F,CAAC;QAVK;;;;mBAAO,gDAAgD;WAAC;IAWjE,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD;;;;;OAKG;IACH,YAAY,UAAsB,EAAE,aAAsB;QACxD,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,aAAa,aAAa,kIAAkI,CAC/K,CAAC;QAXK;;;;mBAAO,gDAAgD;WAAC;IAYjE,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IAGrD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,yBAAyB,CAAC,CAAC;QAR5C;;;;mBAAO,6CAA6C;WAAC;IAS9D,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAGjD;;;;;OAKG;IACH,YAAY,QAAgB,EAAE,WAAmB;QAC/C,KAAK,CACH,+BAA+B,QAAQ,0BAA0B,WAAW,GAAG,CAChF,CAAC;QAXK;;;;mBAAO,yCAAyC;WAAC;IAY1D,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,SAAS;IAGnD;;;;OAIG;IACH,YAAY,QAAgB;QAC1B,KAAK,CACH,+BAA+B,QAAQ,oCAAoC,CAC5E,CAAC;QAVK;;;;mBAAO,2CAA2C;WAAC;IAW5D,CAAC;CACF;AAED,MAAM,OAAO,0BAA2B,SAAQ,SAAS;IAGvD;;OAEG;IACH;QACE,KAAK,CAAC,+DAA+D,CAAC,CAAC;QANhE;;;;mBAAO,+CAA+C;WAAC;IAOhE,CAAC;CACF;AAED,MAAM,OAAO,gCAAiC,SAAQ,SAAS;IAG7D;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CACH,GAAG,UAAU,CAAC,IAAI,0DAA0D,CAC7E,CAAC;QAVK;;;;mBAAO,qDAAqD;WAAC;IAWtE,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAG7C;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,yBAAyB,CAAC,CAAC;QAR5C;;;;mBAAO,qCAAqC;WAAC;IAStD,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD;;;;OAIG;IACH,YAAY,UAAsB;QAChC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,8CAA8C,CAAC,CAAC;QARjE;;;;mBAAO,0CAA0C;WAAC;IAS3D,CAAC;CACF;AAED,MAAM,OAAO,8BAA+B,SAAQ,SAAS;IAG3D;;OAEG;IACH;QACE,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAN9B;;;;mBAAO,mDAAmD;WAAC;IAOpE,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAG/C;;;;OAIG;IACH,YAAY,YAAoB;QAC9B,KAAK,CAAC,cAAc,YAAY,iBAAiB,CAAC,CAAC;QAR5C;;;;mBAAO,oBAAoB;WAAC;IASrC,CAAC;CACF","sourcesContent":["import { BaseError, type Address } from \"@aa-sdk/core\";\nimport type { Permission } from \"./permissionBuilder\";\n\nexport class RootPermissionOnlyError extends BaseError {\n  override name = \"PermissionBuilder: RootPermissionOnlyError\";\n\n  /**\n   * Constructor for initializing an error message indicating that an account could not be found to execute the specified action.\n   *\n   * @param {Permission} permission The permission trying to be added atop the root permission\n   */\n  constructor(permission: Permission) {\n    super(`Adding ${permission}: Cannot add permissions with ROOT permission`);\n  }\n}\n\nexport class AccountAddressAsTargetError extends BaseError {\n  override name = \"PermissionBuilder: AccountAddressAsTargetError\";\n\n  /**\n   * Constructor for initializing an error message indicating that account address is used as target.\n   *\n   * @param {Permission} permission The permission with account address as target\n   */\n  constructor(permission: Permission) {\n    super(\n      `${permission.type}: Account address as target, use ACCOUNT_FUNCTIONS for account address`\n    );\n  }\n}\n\nexport class DuplicateTargetAddressError extends BaseError {\n  override name = \"PermissionBuilder: DuplicateTargetAddressError\";\n\n  /**\n   * Constructor for initializing an error message indicating duplicate target address in permissions.\n   *\n   * @param {Permission} permission The permission with duplicate target address\n   * @param {Address} targetAddress The duplicate target address\n   */\n  constructor(permission: Permission, targetAddress: Address) {\n    super(\n      `${permission.type}: Address ${targetAddress} already has a permission. Cannot add multiple CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT permissions for the same target address.`\n    );\n  }\n}\n\nexport class NoFunctionsProvidedError extends BaseError {\n  override name = \"PermissionBuilder: NoFunctionsProvidedError\";\n\n  /**\n   * Constructor for initializing an error message indicating no functions were provided.\n   *\n   * @param {Permission} permission The permission missing functions\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: No functions provided`);\n  }\n}\n\nexport class ExpiredDeadlineError extends BaseError {\n  override name = \"PermissionBuilder: ExpiredDeadlineError\";\n\n  /**\n   * Constructor for initializing an error message indicating the deadline has expired.\n   *\n   * @param {number} deadline The expired deadline timestamp\n   * @param {number} currentTime The current timestamp\n   */\n  constructor(deadline: number, currentTime: number) {\n    super(\n      `compileDeferred(): deadline ${deadline} cannot be before now (${currentTime})`\n    );\n  }\n}\n\nexport class DeadlineOverLimitError extends BaseError {\n  override name = \"PermissionBuilder: DeadlineOverLimitError\";\n\n  /**\n   * Constructor for initializing an error message indicating the deadline has expired.\n   *\n   * @param {number} deadline The expired deadline timestamp\n   */\n  constructor(deadline: number) {\n    super(\n      `compileDeferred(): deadline ${deadline} cannot be > max uint48 (2^48 - 1)`\n    );\n  }\n}\n\nexport class ValidationConfigUnsetError extends BaseError {\n  override name = \"PermissionBuilder: ValidationConfigUnsetError\";\n\n  /**\n   * Constructor for initializing an error message indicating the validation config is unset.\n   */\n  constructor() {\n    super(\"Validation config unset, use permissionBuilder.configure(...)\");\n  }\n}\n\nexport class MultipleNativeTokenTransferError extends BaseError {\n  override name = \"PermissionBuilder: MultipleNativeTokenTransferError\";\n\n  /**\n   * Constructor for initializing an error message indicating multiple native token transfer permissions.\n   *\n   * @param {Permission} permission The duplicate native token transfer permission\n   */\n  constructor(permission: Permission) {\n    super(\n      `${permission.type}: Must have at most ONE native token transfer permission`\n    );\n  }\n}\n\nexport class ZeroAddressError extends BaseError {\n  override name = \"PermissionBuilder: ZeroAddressError\";\n\n  /**\n   * Constructor for initializing an error message indicating zero address was provided.\n   *\n   * @param {Permission} permission The permission with zero address\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: Zero address provided`);\n  }\n}\n\nexport class MultipleGasLimitError extends BaseError {\n  override name = \"PermissionBuilder: MultipleGasLimitError\";\n\n  /**\n   * Constructor for initializing an error message indicating multiple gas limit permissions.\n   *\n   * @param {Permission} permission The duplicate gas limit permission\n   */\n  constructor(permission: Permission) {\n    super(`${permission.type}: Must have at most ONE gas limit permission`);\n  }\n}\n\nexport class UnsupportedPermissionTypeError extends BaseError {\n  override name = \"PermissionBuilder: UnsupportedPermissionTypeError\";\n\n  /**\n   * Constructor for initializing an error message indicating an unsupported permission type.\n   */\n  constructor() {\n    super(`Unsupported permission type`);\n  }\n}\n\nexport class SelectorNotAllowed extends BaseError {\n  override name = \"SelectorNotAllowed\";\n\n  /**\n   * Constructor for initializing an error message indicating that the selector being added is not allowed.\n   *\n   * @param {string} functionName The function name of the selector that is being added.\n   */\n  constructor(functionName: string) {\n    super(`Cannot add ${functionName} on the account`);\n  }\n}\n"]}

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

@@ -83,6 +83,8 @@ export type BuildNonceParams = {
 };
 export declare const buildFullNonceKey: ({ nonceKey, entityId, isGlobalValidation, isDeferredAction, }: BuildNonceParams) => bigint;
 export declare const parseDeferredAction: (deferredAction: Hex) => {
+    entityId: number;
+    isGlobalValidation: boolean;
     nonce: bigint;
     deferredActionData: Hex;
     hasAssociatedExecHooks: boolean;

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

@@ -1,4 +1,4 @@
-import { concat, toHex, custom, encodeFunctionData, parseAbi, size, concatHex, } from "viem";
+import { concat, toHex, custom, encodeFunctionData, parseAbi, size, concatHex, hexToNumber, } from "viem";
 import { arbitrum, arbitrumSepolia, base, baseSepolia, mainnet, optimism, optimismSepolia, polygon, polygonAmoy, sepolia, } from "@account-kit/infra";
 import { createModularAccountV2 } from "./account/modularAccountV2.js";
 import {} from "./account/common/modularAccountV2Base.js";
@@ -163,7 +163,10 @@ export const buildFullNonceKey = ({ nonceKey = 0n, entityId = 0, isGlobalValidat
 };
 // Parses out the 3 components from a deferred action
 export const parseDeferredAction = (deferredAction) => {
+    // 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)}`,
         hasAssociatedExecHooks: deferredAction[3] === "1",

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,kBAAkB,EAKlB,QAAQ,EACR,IAAI,EACJ,SAAS,GACV,MAAM,MAAM,CAAC;AACd,OAAO,EACL,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,WAAW,EACX,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,WAAW,EACX,OAAO,GACR,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAyB,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GAMnB,MAAM,cAAc,CAAC;AAEtB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAazC,gDAAgD;AAChD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;AAC9B,iEAAiE;AACjE,mBAAmB,GACG,EAAO,EAAE;IAC/B,OAAO,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,gDAAgD;AAChD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,mBAAmB,EACnB,QAAQ,GACgB,EAAO,EAAE;IACjC,OAAO,MAAM,CAAC;QACZ,MAAM;QACN,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5B,MAAM;QACN,MAAM,EAAE,qBAAqB;QAC7B,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAY,EAAW,EAAE;IACpE,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,wBAAwB;QACxB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb;YACE,OAAO,4CAA4C,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,KAAY,EAAW,EAAE;IACtE,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,wBAAwB;QACxB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb;YACE,OAAO,4CAA4C,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,KAAY,EAAW,EAAE;IACrE,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,wBAAwB;QACxB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb;YACE,OAAO,4CAA4C,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE;IAClE,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,wBAAwB;QACxB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb;YACE,OAAO,4CAA4C,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAY,EAAW,EAAE;IAC7D,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,wBAAwB;QACxB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb;YACE,OAAO,4CAA4C,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AASF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAQxC,MAAwD,EACxD,IAA6C;IAQ7C,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;IAEpD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,oBAAoB,EAAE,CAAC;IACnC,CAAC;IACD,MAAM,OAAO,GAAG,QAA2D,CAAC;IAE5E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC;QAClC,GAAG,EAAE,4BAA4B;QACjC,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;KAC/C,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,6BAA6B,CAAC,KAAK,CAAC;QACjD,kBAAkB,EAAE,QAAQ;QAC5B,kCAAkC,EAAE,KAAK,IAAI,EAAE,CAC7C,sBAAsB,CAAC;YACrB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YACnC,KAAK,EAAE,KAAc;YACrB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE;YAC3B,cAAc,EAAE,OAAO,CAAC,OAAO;SAChC,CAAC;KACL,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,8BAA8B,GACzC,s+EAAs+E,CAAC;AAEz+E,MAAM,CAAC,MAAM,qBAAqB,GAChC,0hJAA0hJ,CAAC;AAE7hJ,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACvC,wDAAwD;IACxD,oDAAoD;IACpD,+DAA+D;CAChE,CAAC,CAAC;AAUH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,CAAC,EACZ,kBAAkB,GAAG,IAAI,EACzB,gBAAgB,GAAG,KAAK,GACP,EAAU,EAAE;IAC7B,OAAO,CACL,CAAC,QAAQ,IAAI,GAAG,CAAC;QACjB,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;QACrB,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/B,CAAC;AACJ,CAAC,CAAC;AAEF,qDAAqD;AACrD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,cAAmB,EAKnB,EAAE;IACF,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QACjD,kBAAkB,EAAE,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;QACnD,sBAAsB,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG;KAClD,CAAC;AACJ,CAAC,CAAC;AAMF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,oCAAoC,EACpC,GAAG,GAC6B,EAAO,EAAE;IACzC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,MAAM,WAAW,GAAG,SAAS,CAAC;QAC5B,oCAAoC;QACpC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7B,GAAG;KACJ,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC","sourcesContent":["import {\n  concat,\n  toHex,\n  custom,\n  encodeFunctionData,\n  type Hex,\n  type Chain,\n  type Address,\n  type Transport,\n  parseAbi,\n  size,\n  concatHex,\n} from \"viem\";\nimport {\n  arbitrum,\n  arbitrumSepolia,\n  base,\n  baseSepolia,\n  mainnet,\n  optimism,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  sepolia,\n} from \"@account-kit/infra\";\nimport { createModularAccountV2 } from \"./account/modularAccountV2.js\";\nimport { type ModularAccountV2 } from \"./account/common/modularAccountV2Base.js\";\nimport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\nimport {\n  AccountNotFoundError,\n  ChainNotFoundError,\n  type GetAccountParameter,\n  type SmartAccountClient,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type UpgradeToData,\n} from \"@aa-sdk/core\";\n\nexport const DEFAULT_OWNER_ENTITY_ID = 0;\n\nexport type PackUOSignatureParams = {\n  // orderedHookData: HookData[];\n  validationSignature: Hex;\n};\n\n// TODO: direct call validation 1271\nexport type Pack1271SignatureParams = {\n  validationSignature: Hex;\n  entityId: number;\n};\n\n// Signature packing utility for user operations\nexport const packUOSignature = ({\n  // orderedHookData, TODO: integrate in next iteration of MAv2 sdk\n  validationSignature,\n}: PackUOSignatureParams): Hex => {\n  return concat([\"0xFF\", \"0x00\", validationSignature]);\n};\n\n// Signature packing utility for 1271 signatures\nexport const pack1271Signature = ({\n  validationSignature,\n  entityId,\n}: Pack1271SignatureParams): Hex => {\n  return concat([\n    \"0x00\",\n    toHex(entityId, { size: 4 }),\n    \"0xFF\",\n    \"0x00\", // EOA type signature\n    validationSignature,\n  ]);\n};\n\nexport const getDefaultMAV2FactoryAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x00000000000017c61b5bEe81050EC8eFc9c6fecd\";\n  }\n};\n\nexport const getDefaultSMAV2BytecodeAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x000000000000c5A9089039570Dd36455b5C07383\";\n  }\n};\n\nexport const getDefaultSMAV2StorageAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x0000000000006E2f9d80CaEc0Da6500f005EB25A\";\n  }\n};\n\nexport const getDefaultSMAV27702Address = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x69007702764179f14F51cdce752f4f775d74E139\";\n  }\n};\n\nexport const getDefaultMAV2Address = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x00000000000002377B26b1EdA7b0BC371C60DD4f\";\n  }\n};\n\nexport type GetMAV2UpgradeToData<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TAccount extends\n    | SmartContractAccountWithSigner<string, TSigner>\n    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined\n> = GetAccountParameter<TAccount>;\n\n/**\n * Retrieves the data necessary to upgrade to a Modular Account V2 (MA v2).\n * Note that the upgrade will be to the Semi Modular Account Storage variant\n *\n * @example\n * ```ts\n * import { createLightAccountClient, getMAV2UpgradeToData } from \"@account-kit/smart-contracts\";\n *\n * const client = createLightAccountClient({});\n * const upgradeData = await getMAV2UpgradeToData(client, {});\n * ```\n *\n * @param {SmartAccountClient<TTransport, TChain, TAccount>} client The smart account client\n * @param {GetMAV2UpgradeToData<TSigner, TAccount>} args The arguments required for the upgrade\n * @returns {Promise<UpgradeToData & { createModularAccountV2FromExisting: () => Promise<ModularAccountV2<TSigner>>}>} A promise that resolves to upgrade data augmented with a function to create a Modular Account V2\n */\nexport async function getMAV2UpgradeToData<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TAccount extends\n    | SmartContractAccountWithSigner<string, TSigner>\n    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined\n>(\n  client: SmartAccountClient<TTransport, TChain, TAccount>,\n  args: GetMAV2UpgradeToData<TSigner, TAccount>\n): Promise<\n  UpgradeToData & {\n    createModularAccountV2FromExisting: () => Promise<\n      ModularAccountV2<TSigner>\n    >;\n  }\n> {\n  const { account: account_ = client.account } = args;\n\n  if (!account_) {\n    throw new AccountNotFoundError();\n  }\n  const account = account_ as SmartContractAccountWithSigner<string, TSigner>;\n\n  const chain = client.chain;\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const initData = encodeFunctionData({\n    abi: semiModularAccountStorageAbi,\n    functionName: \"initialize\",\n    args: [await account.getSigner().getAddress()],\n  });\n\n  return {\n    implAddress: getDefaultSMAV2StorageAddress(chain),\n    initializationData: initData,\n    createModularAccountV2FromExisting: async () =>\n      createModularAccountV2({\n        transport: custom(client.transport),\n        chain: chain as Chain,\n        signer: account.getSigner(),\n        accountAddress: account.address,\n      }),\n  };\n}\n\nexport const entityIdAndNonceReaderBytecode =\n  \"0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe\";\n\nexport const mintableERC20Bytecode =\n  \"0x608060405234801561000f575f80fd5b506040518060400160405280600d81526020016c26b4b73a30b13632aa37b5b2b760991b81525060405180604001604052806002815260200161135560f21b8152508160039081610060919061010d565b50600461006d828261010d565b5050506101c7565b634e487b7160e01b5f52604160045260245ffd5b600181811c9082168061009d57607f821691505b6020821081036100bb57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f82111561010857805f5260205f20601f840160051c810160208510156100e65750805b601f840160051c820191505b81811015610105575f81556001016100f2565b50505b505050565b81516001600160401b0381111561012657610126610075565b61013a816101348454610089565b846100c1565b6020601f82116001811461016c575f83156101555750848201515b5f19600385901b1c1916600184901b178455610105565b5f84815260208120601f198516915b8281101561019b578785015182556020948501946001909201910161017b565b50848210156101b857868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b610737806101d45f395ff3fe608060405234801561000f575f80fd5b506004361061008c575f3560e01c806306fdde0314610090578063095ea7b3146100ae57806318160ddd146100d157806323b872dd146100e3578063313ce567146100f657806340c10f191461010557806370a082311461011a57806395d89b4114610142578063a9059cbb1461014a578063dd62ed3e1461015d575b5f80fd5b610098610170565b6040516100a59190610572565b60405180910390f35b6100c16100bc3660046105c2565b610200565b60405190151581526020016100a5565b6002545b6040519081526020016100a5565b6100c16100f13660046105ea565b610219565b604051601281526020016100a5565b6101186101133660046105c2565b61023c565b005b6100d5610128366004610624565b6001600160a01b03165f9081526020819052604090205490565b61009861024a565b6100c16101583660046105c2565b610259565b6100d561016b366004610644565b610266565b60606003805461017f90610675565b80601f01602080910402602001604051908101604052809291908181526020018280546101ab90610675565b80156101f65780601f106101cd576101008083540402835291602001916101f6565b820191905f5260205f20905b8154815290600101906020018083116101d957829003601f168201915b5050505050905090565b5f3361020d818585610290565b60019150505b92915050565b5f336102268582856102a2565b6102318585856102fc565b506001949350505050565b6102468282610359565b5050565b60606004805461017f90610675565b5f3361020d8185856102fc565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b61029d838383600161038d565b505050565b5f6102ad8484610266565b90505f198110156102f657818110156102e857828183604051637dc7a0d960e11b81526004016102df939291906106ad565b60405180910390fd5b6102f684848484035f61038d565b50505050565b6001600160a01b038316610325575f604051634b637e8f60e11b81526004016102df91906106ce565b6001600160a01b03821661034e575f60405163ec442f0560e01b81526004016102df91906106ce565b61029d83838361045f565b6001600160a01b038216610382575f60405163ec442f0560e01b81526004016102df91906106ce565b6102465f838361045f565b6001600160a01b0384166103b6575f60405163e602df0560e01b81526004016102df91906106ce565b6001600160a01b0383166103df575f604051634a1406b160e11b81526004016102df91906106ce565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102f657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161045191815260200190565b60405180910390a350505050565b6001600160a01b038316610489578060025f82825461047e91906106e2565b909155506104e69050565b6001600160a01b0383165f90815260208190526040902054818110156104c85783818360405163391434e360e21b81526004016102df939291906106ad565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b03821661050257600280548290039055610520565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161056591815260200190565b60405180910390a3505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146105bd575f80fd5b919050565b5f80604083850312156105d3575f80fd5b6105dc836105a7565b946020939093013593505050565b5f805f606084860312156105fc575f80fd5b610605846105a7565b9250610613602085016105a7565b929592945050506040919091013590565b5f60208284031215610634575f80fd5b61063d826105a7565b9392505050565b5f8060408385031215610655575f80fd5b61065e836105a7565b915061066c602084016105a7565b90509250929050565b600181811c9082168061068957607f821691505b6020821081036106a757634e487b7160e01b5f52602260045260245ffd5b50919050565b6001600160a01b039390931683526020830191909152604082015260600190565b6001600160a01b0391909116815260200190565b8082018082111561021357634e487b7160e01b5f52601160045260245ffdfea2646970667358221220f9ae46a2e15270bfb77fe3d4d0ee0e45b749e3dde93805ee2cf795cb800244e664736f6c634300081a0033\";\n\nexport const mintableERC20Abi = parseAbi([\n  \"function transfer(address to, uint256 amount) external\",\n  \"function mint(address to, uint256 amount) external\",\n  \"function balanceOf(address target) external returns (uint256)\",\n]);\n\nexport type BuildNonceParams = {\n  nonceKey?: bigint;\n  entityId?: number;\n  isGlobalValidation?: boolean;\n  isDeferredAction?: boolean;\n  isDirectCallValidation?: boolean;\n};\n\nexport const buildFullNonceKey = ({\n  nonceKey = 0n,\n  entityId = 0,\n  isGlobalValidation = true,\n  isDeferredAction = false,\n}: BuildNonceParams): bigint => {\n  return (\n    (nonceKey << 40n) +\n    BigInt(entityId << 8) +\n    (isDeferredAction ? 2n : 0n) +\n    (isGlobalValidation ? 1n : 0n)\n  );\n};\n\n// Parses out the 3 components from a deferred action\nexport const parseDeferredAction = (\n  deferredAction: Hex\n): {\n  nonce: bigint;\n  deferredActionData: Hex;\n  hasAssociatedExecHooks: boolean;\n} => {\n  return {\n    nonce: BigInt(`0x${deferredAction.slice(4, 68)}`),\n    deferredActionData: `0x${deferredAction.slice(68)}`,\n    hasAssociatedExecHooks: deferredAction[3] === \"1\",\n  };\n};\nexport type BuildDeferredActionDigestParams = {\n  fullPreSignatureDeferredActionDigest: Hex;\n  sig: Hex;\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 */\nexport 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"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concat,\n  toHex,\n  custom,\n  encodeFunctionData,\n  type Hex,\n  type Chain,\n  type Address,\n  type Transport,\n  parseAbi,\n  size,\n  concatHex,\n  hexToNumber,\n} from \"viem\";\nimport {\n  arbitrum,\n  arbitrumSepolia,\n  base,\n  baseSepolia,\n  mainnet,\n  optimism,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  sepolia,\n} from \"@account-kit/infra\";\nimport { createModularAccountV2 } from \"./account/modularAccountV2.js\";\nimport { type ModularAccountV2 } from \"./account/common/modularAccountV2Base.js\";\nimport { semiModularAccountStorageAbi } from \"./abis/semiModularAccountStorageAbi.js\";\nimport {\n  AccountNotFoundError,\n  ChainNotFoundError,\n  type GetAccountParameter,\n  type SmartAccountClient,\n  type SmartAccountSigner,\n  type SmartContractAccountWithSigner,\n  type UpgradeToData,\n} from \"@aa-sdk/core\";\n\nexport const DEFAULT_OWNER_ENTITY_ID = 0;\n\nexport type PackUOSignatureParams = {\n  // orderedHookData: HookData[];\n  validationSignature: Hex;\n};\n\n// TODO: direct call validation 1271\nexport type Pack1271SignatureParams = {\n  validationSignature: Hex;\n  entityId: number;\n};\n\n// Signature packing utility for user operations\nexport const packUOSignature = ({\n  // orderedHookData, TODO: integrate in next iteration of MAv2 sdk\n  validationSignature,\n}: PackUOSignatureParams): Hex => {\n  return concat([\"0xFF\", \"0x00\", validationSignature]);\n};\n\n// Signature packing utility for 1271 signatures\nexport const pack1271Signature = ({\n  validationSignature,\n  entityId,\n}: Pack1271SignatureParams): Hex => {\n  return concat([\n    \"0x00\",\n    toHex(entityId, { size: 4 }),\n    \"0xFF\",\n    \"0x00\", // EOA type signature\n    validationSignature,\n  ]);\n};\n\nexport const getDefaultMAV2FactoryAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x00000000000017c61b5bEe81050EC8eFc9c6fecd\";\n  }\n};\n\nexport const getDefaultSMAV2BytecodeAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x000000000000c5A9089039570Dd36455b5C07383\";\n  }\n};\n\nexport const getDefaultSMAV2StorageAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x0000000000006E2f9d80CaEc0Da6500f005EB25A\";\n  }\n};\n\nexport const getDefaultSMAV27702Address = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x69007702764179f14F51cdce752f4f775d74E139\";\n  }\n};\n\nexport const getDefaultMAV2Address = (chain: Chain): Address => {\n  switch (chain.id) {\n    // TODO: case mekong.id:\n    case sepolia.id:\n    case baseSepolia.id:\n    case polygon.id:\n    case mainnet.id:\n    case polygonAmoy.id:\n    case optimism.id:\n    case optimismSepolia.id:\n    case arbitrum.id:\n    case arbitrumSepolia.id:\n    case base.id:\n    default:\n      return \"0x00000000000002377B26b1EdA7b0BC371C60DD4f\";\n  }\n};\n\nexport type GetMAV2UpgradeToData<\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TAccount extends\n    | SmartContractAccountWithSigner<string, TSigner>\n    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined\n> = GetAccountParameter<TAccount>;\n\n/**\n * Retrieves the data necessary to upgrade to a Modular Account V2 (MA v2).\n * Note that the upgrade will be to the Semi Modular Account Storage variant\n *\n * @example\n * ```ts\n * import { createLightAccountClient, getMAV2UpgradeToData } from \"@account-kit/smart-contracts\";\n *\n * const client = createLightAccountClient({});\n * const upgradeData = await getMAV2UpgradeToData(client, {});\n * ```\n *\n * @param {SmartAccountClient<TTransport, TChain, TAccount>} client The smart account client\n * @param {GetMAV2UpgradeToData<TSigner, TAccount>} args The arguments required for the upgrade\n * @returns {Promise<UpgradeToData & { createModularAccountV2FromExisting: () => Promise<ModularAccountV2<TSigner>>}>} A promise that resolves to upgrade data augmented with a function to create a Modular Account V2\n */\nexport async function getMAV2UpgradeToData<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TSigner extends SmartAccountSigner = SmartAccountSigner,\n  TAccount extends\n    | SmartContractAccountWithSigner<string, TSigner>\n    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined\n>(\n  client: SmartAccountClient<TTransport, TChain, TAccount>,\n  args: GetMAV2UpgradeToData<TSigner, TAccount>\n): Promise<\n  UpgradeToData & {\n    createModularAccountV2FromExisting: () => Promise<\n      ModularAccountV2<TSigner>\n    >;\n  }\n> {\n  const { account: account_ = client.account } = args;\n\n  if (!account_) {\n    throw new AccountNotFoundError();\n  }\n  const account = account_ as SmartContractAccountWithSigner<string, TSigner>;\n\n  const chain = client.chain;\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const initData = encodeFunctionData({\n    abi: semiModularAccountStorageAbi,\n    functionName: \"initialize\",\n    args: [await account.getSigner().getAddress()],\n  });\n\n  return {\n    implAddress: getDefaultSMAV2StorageAddress(chain),\n    initializationData: initData,\n    createModularAccountV2FromExisting: async () =>\n      createModularAccountV2({\n        transport: custom(client.transport),\n        chain: chain as Chain,\n        signer: account.getSigner(),\n        accountAddress: account.address,\n      }),\n  };\n}\n\nexport const entityIdAndNonceReaderBytecode =\n  \"0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe\";\n\nexport const mintableERC20Bytecode =\n  \"0x608060405234801561000f575f80fd5b506040518060400160405280600d81526020016c26b4b73a30b13632aa37b5b2b760991b81525060405180604001604052806002815260200161135560f21b8152508160039081610060919061010d565b50600461006d828261010d565b5050506101c7565b634e487b7160e01b5f52604160045260245ffd5b600181811c9082168061009d57607f821691505b6020821081036100bb57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f82111561010857805f5260205f20601f840160051c810160208510156100e65750805b601f840160051c820191505b81811015610105575f81556001016100f2565b50505b505050565b81516001600160401b0381111561012657610126610075565b61013a816101348454610089565b846100c1565b6020601f82116001811461016c575f83156101555750848201515b5f19600385901b1c1916600184901b178455610105565b5f84815260208120601f198516915b8281101561019b578785015182556020948501946001909201910161017b565b50848210156101b857868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b610737806101d45f395ff3fe608060405234801561000f575f80fd5b506004361061008c575f3560e01c806306fdde0314610090578063095ea7b3146100ae57806318160ddd146100d157806323b872dd146100e3578063313ce567146100f657806340c10f191461010557806370a082311461011a57806395d89b4114610142578063a9059cbb1461014a578063dd62ed3e1461015d575b5f80fd5b610098610170565b6040516100a59190610572565b60405180910390f35b6100c16100bc3660046105c2565b610200565b60405190151581526020016100a5565b6002545b6040519081526020016100a5565b6100c16100f13660046105ea565b610219565b604051601281526020016100a5565b6101186101133660046105c2565b61023c565b005b6100d5610128366004610624565b6001600160a01b03165f9081526020819052604090205490565b61009861024a565b6100c16101583660046105c2565b610259565b6100d561016b366004610644565b610266565b60606003805461017f90610675565b80601f01602080910402602001604051908101604052809291908181526020018280546101ab90610675565b80156101f65780601f106101cd576101008083540402835291602001916101f6565b820191905f5260205f20905b8154815290600101906020018083116101d957829003601f168201915b5050505050905090565b5f3361020d818585610290565b60019150505b92915050565b5f336102268582856102a2565b6102318585856102fc565b506001949350505050565b6102468282610359565b5050565b60606004805461017f90610675565b5f3361020d8185856102fc565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b61029d838383600161038d565b505050565b5f6102ad8484610266565b90505f198110156102f657818110156102e857828183604051637dc7a0d960e11b81526004016102df939291906106ad565b60405180910390fd5b6102f684848484035f61038d565b50505050565b6001600160a01b038316610325575f604051634b637e8f60e11b81526004016102df91906106ce565b6001600160a01b03821661034e575f60405163ec442f0560e01b81526004016102df91906106ce565b61029d83838361045f565b6001600160a01b038216610382575f60405163ec442f0560e01b81526004016102df91906106ce565b6102465f838361045f565b6001600160a01b0384166103b6575f60405163e602df0560e01b81526004016102df91906106ce565b6001600160a01b0383166103df575f604051634a1406b160e11b81526004016102df91906106ce565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102f657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161045191815260200190565b60405180910390a350505050565b6001600160a01b038316610489578060025f82825461047e91906106e2565b909155506104e69050565b6001600160a01b0383165f90815260208190526040902054818110156104c85783818360405163391434e360e21b81526004016102df939291906106ad565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b03821661050257600280548290039055610520565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161056591815260200190565b60405180910390a3505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146105bd575f80fd5b919050565b5f80604083850312156105d3575f80fd5b6105dc836105a7565b946020939093013593505050565b5f805f606084860312156105fc575f80fd5b610605846105a7565b9250610613602085016105a7565b929592945050506040919091013590565b5f60208284031215610634575f80fd5b61063d826105a7565b9392505050565b5f8060408385031215610655575f80fd5b61065e836105a7565b915061066c602084016105a7565b90509250929050565b600181811c9082168061068957607f821691505b6020821081036106a757634e487b7160e01b5f52602260045260245ffd5b50919050565b6001600160a01b039390931683526020830191909152604082015260600190565b6001600160a01b0391909116815260200190565b8082018082111561021357634e487b7160e01b5f52601160045260245ffdfea2646970667358221220f9ae46a2e15270bfb77fe3d4d0ee0e45b749e3dde93805ee2cf795cb800244e664736f6c634300081a0033\";\n\nexport const mintableERC20Abi = parseAbi([\n  \"function transfer(address to, uint256 amount) external\",\n  \"function mint(address to, uint256 amount) external\",\n  \"function balanceOf(address target) external returns (uint256)\",\n]);\n\nexport type BuildNonceParams = {\n  nonceKey?: bigint;\n  entityId?: number;\n  isGlobalValidation?: boolean;\n  isDeferredAction?: boolean;\n  isDirectCallValidation?: boolean;\n};\n\nexport const buildFullNonceKey = ({\n  nonceKey = 0n,\n  entityId = 0,\n  isGlobalValidation = true,\n  isDeferredAction = false,\n}: BuildNonceParams): bigint => {\n  return (\n    (nonceKey << 40n) +\n    BigInt(entityId << 8) +\n    (isDeferredAction ? 2n : 0n) +\n    (isGlobalValidation ? 1n : 0n)\n  );\n};\n\n// Parses out the 3 components from a deferred action\nexport const parseDeferredAction = (\n  deferredAction: Hex\n): {\n  entityId: number;\n  isGlobalValidation: boolean;\n  nonce: bigint;\n  deferredActionData: Hex;\n  hasAssociatedExecHooks: boolean;\n} => {\n  // 2 for 0x, 2 for 00/01, 38 for parallel nonce, 8 for entity id, 2 for options byte, 16 for parallel nonce\n  return {\n    entityId: hexToNumber(`0x${deferredAction.slice(42, 50)}`),\n    isGlobalValidation:\n      hexToNumber(`0x${deferredAction.slice(50, 52)}`) % 2 === 1,\n    nonce: BigInt(`0x${deferredAction.slice(4, 68)}`),\n    deferredActionData: `0x${deferredAction.slice(68)}` as `0x${string}`,\n    hasAssociatedExecHooks: deferredAction[3] === \"1\",\n  };\n};\nexport type BuildDeferredActionDigestParams = {\n  fullPreSignatureDeferredActionDigest: Hex;\n  sig: Hex;\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 */\nexport 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"]}

package/dist/types/src/ma-v2/account/common/modularAccountV2Base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modularAccountV2Base.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EAClC,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,SAAS,EAOf,MAAM,MAAM,CAAC;AAMd,eAAO,MAAM,qBAAqB,EAAE,GAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,SAAS,GAAG,EAAE,CAAC;IAChC,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,8BAA8B,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IACzE,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC,IAAI,CACN,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAE1E,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,aAAa,GACb,eAAe,GACf,mBAAmB,CACtB,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEvC,wBAAsB,cAAc,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,wBAAwB,CAAC,OAAO,CAAC,CA0L1E"}
+{"version":3,"file":"modularAccountV2Base.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/account/common/modularAccountV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EAClC,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,SAAS,EAOf,MAAM,MAAM,CAAC;AAMd,eAAO,MAAM,qBAAqB,EAAE,GAAkB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,SAAS,GAAG,EAAE,CAAC;IAChC,cAAc,EAAE,SAAS,GAAG,EAAE,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,8BAA8B,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IACzE,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC,IAAI,CACN,4BAA4B,CAAC,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAE1E,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,aAAa,GACb,eAAe,GACf,mBAAmB,CACtB,GAAG;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,IACrD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEvC,wBAAsB,cAAc,CAClC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAqM1E"}

package/dist/types/src/ma-v2/account/nativeSMASigner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nativeSMASigner.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,eAAe,EAEpB,KAAK,mBAAmB,EACxB,KAAK,KAAK,EACV,KAAK,OAAO,EAGb,MAAM,MAAM,CAAC;AAQd;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,WAClB,kBAAkB,SACnB,KAAK,kBACI,OAAO,uBACF,GAAG;6BAGC,GAAG;oCAUY,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAcd,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA4BvE,QAAQ,GAAG,CAAC;CA6BlB,CAAC"}
+{"version":3,"file":"nativeSMASigner.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/account/nativeSMASigner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,eAAe,EAEpB,KAAK,mBAAmB,EACxB,KAAK,KAAK,EACV,KAAK,OAAO,EAGb,MAAM,MAAM,CAAC;AAQd;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,WAClB,kBAAkB,SACnB,KAAK,kBACI,OAAO,uBACF,GAAG;6BAGC,GAAG;oCAUY,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAmBd,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA4BvE,QAAQ,GAAG,CAAC;CA6BlB,CAAC"}

package/dist/types/src/ma-v2/modules/single-signer-validation/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAIL,KAAK,GAAG,EACR,KAAK,eAAe,EAEpB,KAAK,mBAAmB,EACxB,KAAK,KAAK,EACV,KAAK,OAAO,EAEb,MAAM,MAAM,CAAC;AAOd;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,yBAAyB,WAC5B,kBAAkB,SACnB,KAAK,kBACI,OAAO,YACb,MAAM,uBACK,GAAG;6BAGC,GAAG;oCAUY,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAcd,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA8BvE,QAAQ,GAAG,CAAC;CA+BlB,CAAC"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../../../../../src/ma-v2/modules/single-signer-validation/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAIL,KAAK,GAAG,EACR,KAAK,eAAe,EAEpB,KAAK,mBAAmB,EACxB,KAAK,KAAK,EACV,KAAK,OAAO,EAEb,MAAM,MAAM,CAAC;AAOd;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,yBAAyB,WAC5B,kBAAkB,SACnB,KAAK,kBACI,OAAO,YACb,MAAM,uBACK,GAAG;6BAGC,GAAG;oCAUY,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAmBd,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA8BvE,QAAQ,GAAG,CAAC;CA+BlB,CAAC"}

package/dist/types/src/ma-v2/permissionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"permissionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilder.ts"],"names":[],"mappings":"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"}

package/dist/types/src/ma-v2/permissionBuilderErrors.d.ts

@@ -97,4 +97,13 @@ export declare class UnsupportedPermissionTypeError extends BaseError {
      */
     constructor();
 }
+export declare class SelectorNotAllowed extends BaseError {
+    name: string;
+    /**
+     * 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);
+}
 //# sourceMappingURL=permissionBuilderErrors.d.ts.map

package/dist/types/src/ma-v2/permissionBuilderErrors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissionBuilderErrors.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilderErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,uBAAwB,SAAQ,SAAS;IAC3C,IAAI,SAAgD;IAE7D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAC/C,IAAI,SAAoD;IAEjE;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAKnC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAC/C,IAAI,SAAoD;IAEjE;;;;;OAKG;gBACS,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO;CAK3D;AAED,qBAAa,wBAAyB,SAAQ,SAAS;IAC5C,IAAI,SAAiD;IAE9D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IACxC,IAAI,SAA6C;IAE1D;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAKlD;AAED,qBAAa,sBAAuB,SAAQ,SAAS;IAC1C,IAAI,SAA+C;IAE5D;;;;OAIG;gBACS,QAAQ,EAAE,MAAM;CAK7B;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAC9C,IAAI,SAAmD;IAEhE;;OAEG;;CAIJ;AAED,qBAAa,gCAAiC,SAAQ,SAAS;IACpD,IAAI,SAAyD;IAEtE;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAKnC;AAED,qBAAa,gBAAiB,SAAQ,SAAS;IACpC,IAAI,SAAyC;IAEtD;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,qBAAsB,SAAQ,SAAS;IACzC,IAAI,SAA8C;IAE3D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;IAClD,IAAI,SAAuD;IAEpE;;OAEG;;CAIJ"}
+{"version":3,"file":"permissionBuilderErrors.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/permissionBuilderErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,uBAAwB,SAAQ,SAAS;IAC3C,IAAI,SAAgD;IAE7D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAC/C,IAAI,SAAoD;IAEjE;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAKnC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAC/C,IAAI,SAAoD;IAEjE;;;;;OAKG;gBACS,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO;CAK3D;AAED,qBAAa,wBAAyB,SAAQ,SAAS;IAC5C,IAAI,SAAiD;IAE9D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IACxC,IAAI,SAA6C;IAE1D;;;;;OAKG;gBACS,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAKlD;AAED,qBAAa,sBAAuB,SAAQ,SAAS;IAC1C,IAAI,SAA+C;IAE5D;;;;OAIG;gBACS,QAAQ,EAAE,MAAM;CAK7B;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAC9C,IAAI,SAAmD;IAEhE;;OAEG;;CAIJ;AAED,qBAAa,gCAAiC,SAAQ,SAAS;IACpD,IAAI,SAAyD;IAEtE;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAKnC;AAED,qBAAa,gBAAiB,SAAQ,SAAS;IACpC,IAAI,SAAyC;IAEtD;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,qBAAsB,SAAQ,SAAS;IACzC,IAAI,SAA8C;IAE3D;;;;OAIG;gBACS,UAAU,EAAE,UAAU;CAGnC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;IAClD,IAAI,SAAuD;IAEpE;;OAEG;;CAIJ;AAED,qBAAa,kBAAmB,SAAQ,SAAS;IACtC,IAAI,SAAwB;IAErC;;;;OAIG;gBACS,YAAY,EAAE,MAAM;CAGjC"}

package/dist/types/src/ma-v2/utils.d.ts

@@ -83,6 +83,8 @@ export type BuildNonceParams = {
 };
 export declare const buildFullNonceKey: ({ nonceKey, entityId, isGlobalValidation, isDeferredAction, }: BuildNonceParams) => bigint;
 export declare const parseDeferredAction: (deferredAction: Hex) => {
+    entityId: number;
+    isGlobalValidation: boolean;
     nonce: bigint;
     deferredActionData: Hex;
     hasAssociatedExecHooks: boolean;

package/dist/types/src/ma-v2/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.25.1",
+  "version": "4.26.0",
   "description": "aa-sdk compatible interfaces for Alchemy Smart Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -53,7 +53,7 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@account-kit/plugingen": "^4.25.1",
+    "@account-kit/plugingen": "^4.26.0",
     "change-case": "^5.1.2",
     "dedent": "^1.5.1",
     "dotenv": "^16.3.1",
@@ -73,10 +73,10 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "a9fea72b02f77909ca0dfc9cdecda7af6de0b17d",
+  "gitHead": "cce56919f91518b2bc1f94c1a721d99dd0f21646",
   "dependencies": {
-    "@aa-sdk/core": "^4.25.1",
-    "@account-kit/infra": "^4.25.1"
+    "@aa-sdk/core": "^4.26.0",
+    "@account-kit/infra": "^4.26.0"
   },
   "peerDependencies": {
     "viem": "^2.22.6"

package/src/ma-v2/account/common/modularAccountV2Base.ts

@@ -96,7 +96,7 @@ export type CreateMAV2BaseReturnType<
 export async function createMAv2Base<
   TSigner extends SmartAccountSigner = SmartAccountSigner
 >(config: CreateMAV2BaseParams<TSigner>): CreateMAV2BaseReturnType<TSigner> {
-  const {
+  let {
     transport,
     chain,
     signer,
@@ -129,26 +129,32 @@ export async function createMAv2Base<
     client,
   });
 
-  let useDeferredAction: boolean = false;
-  let nonce: bigint = 0n;
-  let deferredActionData: Hex = "0x";
+  // These default values signal that we should not use the set deferred action nonce
+  let nonce: bigint | undefined;
+  let deferredActionData: Hex | undefined;
   let hasAssociatedExecHooks: boolean = false;
 
   if (deferredAction) {
-    ({ nonce, deferredActionData, hasAssociatedExecHooks } =
-      parseDeferredAction(deferredAction));
+    let deferredActionNonce: bigint = 0n;
+    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls
+    ({
+      entityId,
+      isGlobalValidation,
+      nonce: deferredActionNonce,
+    } = parseDeferredAction(deferredAction));
 
     // Set these values if the deferred action has not been consumed. We check this with the EP
     const nextNonceForDeferredAction: bigint =
       (await entryPointContract.read.getNonce([
         accountAddress,
-        nonce >> 64n,
+        deferredActionNonce >> 64n,
       ])) as bigint;
 
-    // we only add the deferred action in if the nonce has not been consumed
-    if (nonce === nextNonceForDeferredAction) {
-      useDeferredAction = true;
-    } else if (nonce > nextNonceForDeferredAction) {
+    if (deferredActionNonce === nextNonceForDeferredAction) {
+      ({ nonce, deferredActionData, hasAssociatedExecHooks } =
+        parseDeferredAction(deferredAction));
+    } else if (deferredActionNonce > nextNonceForDeferredAction) {
+      // if nonce is greater than the next nonce, its invalid, so we throw
       throw new InvalidDeferredActionNonce();
     }
   }
@@ -185,8 +191,10 @@ export async function createMAv2Base<
     !!(await client.getCode({ address: accountAddress }));
 
   const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {
-    if (useDeferredAction) {
-      return nonce;
+    if (nonce) {
+      const tempNonce = nonce;
+      nonce = undefined; // set to falsy value once used
+      return tempNonce;
     }
 
     if (nonceKey > maxUint152) {
@@ -246,11 +254,14 @@ export async function createMAv2Base<
     const validationData = await getValidationData({
       entityId: Number(entityId),
     });
-
-    return (useDeferredAction && hasAssociatedExecHooks) ||
-      validationData.executionHooks.length
-      ? concatHex([executeUserOpSelector, callData])
-      : callData;
+    if (hasAssociatedExecHooks) {
+      hasAssociatedExecHooks = false; // set to falsy value once used
+      return concatHex([executeUserOpSelector, callData]);
+    }
+    if (validationData.executionHooks.length) {
+      return concatHex([executeUserOpSelector, callData]);
+    }
+    return callData;
   };
 
   const baseAccount = await toSmartContractAccount({

package/src/ma-v2/account/nativeSMASigner.ts

@@ -59,7 +59,7 @@ export const nativeSMASigner = (
     },
 
     signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {
-      const sig = await signer
+      let sig = await signer
         .signMessage({ raw: uoHash })
         .then((signature: Hex) =>
           packUOSignature({
@@ -68,7 +68,12 @@ export const nativeSMASigner = (
           })
         );
 
-      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/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

@@ -151,3 +151,16 @@ export class UnsupportedPermissionTypeError extends BaseError {
     super(`Unsupported permission type`);
   }
 }
+
+export class SelectorNotAllowed extends BaseError {
+  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",
   };
 };