@account-kit/smart-contracts 4.18.0-alpha.3 → 4.18.0

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

@@ -1,5 +1,6 @@
-import { hashMessage, hashTypedData, } from "viem";
+import { hashMessage, hashTypedData, concat, } from "viem";
 import { packUOSignature, pack1271Signature, DEFAULT_OWNER_ENTITY_ID, } from "../utils.js";
+import { SignatureType } from "../modules/utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
  *
@@ -65,7 +66,10 @@ export const nativeSMASigner = (signer, chain, accountAddress) => {
             const isDeferredAction = typedDataDefinition?.primaryType === "DeferredAction" &&
                 typedDataDefinition?.domain?.verifyingContract === accountAddress;
             return isDeferredAction
-                ? signer.signTypedData(typedDataDefinition)
+                ? concat([
+                    SignatureType.EOA,
+                    await signer.signTypedData(typedDataDefinition),
+                ])
                 : pack1271Signature({
                     validationSignature: await signer.signTypedData({
                         domain: {

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":"AACA,OAAO,EACL,WAAW,EACX,aAAa,GAOd,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACvB,EAAE;IACF,OAAO;QACL,iBAAiB,EAAE,GAAQ,EAAE;YAC3B,MAAM,mBAAmB,GACvB,sIAAsI,CAAC;YAEzI,OAAO,eAAe,CAAC;gBACrB,uBAAuB;gBACvB,mBAAmB,EAAE,mBAAmB;aACzC,CAAC,CAAC;QACL,CAAC;QAED,qBAAqB,EAAE,CAAC,MAAW,EAAgB,EAAE;YACnD,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CACjE,eAAe,CAAC;gBACd,uBAAuB;gBACvB,mBAAmB,EAAE,SAAS;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,oFAAoF;QACpF,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,iBAAiB,CAAC;gBACvB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;oBAC9C,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,iBAAiB,EAAE,cAAc;qBAClC;oBACD,KAAK,EAAE;wBACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE;wBACP,IAAI;qBACL;oBACD,WAAW,EAAE,gBAAgB;iBAC9B,CAAC;gBACF,QAAQ,EAAE,uBAAuB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,qHAAqH;QACrH,aAAa,EAAE,KAAK,EAIlB,mBAAgE,EAClD,EAAE;YAChB,uIAAuI;YACvI,MAAM,gBAAgB,GACpB,mBAAmB,EAAE,WAAW,KAAK,gBAAgB;gBACrD,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;YAEpE,OAAO,gBAAgB;gBACrB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC;gBAC3C,CAAC,CAAC,iBAAiB,CAAC;oBAChB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;wBAC9C,MAAM,EAAE;4BACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,iBAAiB,EAAE,cAAc;yBAClC;wBACD,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;yBACpD;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,MAAM,aAAa,CAAC,mBAAmB,CAAC;yBAC/C;wBACD,WAAW,EAAE,gBAAgB;qBAC9B,CAAC;oBACF,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","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} from \"viem\";\n\nimport {\n  packUOSignature,\n  pack1271Signature,\n  DEFAULT_OWNER_ENTITY_ID,\n} 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 * ```ts\n * import { nativeSMASigner } from \"@account-kit/smart-contracts\";\n \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 * @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) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\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        ? signer.signTypedData(typedDataDefinition)\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":"AACA,OAAO,EACL,WAAW,EACX,aAAa,EAOb,MAAM,GACP,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACvB,EAAE;IACF,OAAO;QACL,iBAAiB,EAAE,GAAQ,EAAE;YAC3B,MAAM,mBAAmB,GACvB,sIAAsI,CAAC;YAEzI,OAAO,eAAe,CAAC;gBACrB,uBAAuB;gBACvB,mBAAmB,EAAE,mBAAmB;aACzC,CAAC,CAAC;QACL,CAAC;QAED,qBAAqB,EAAE,CAAC,MAAW,EAAgB,EAAE;YACnD,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CACjE,eAAe,CAAC;gBACd,uBAAuB;gBACvB,mBAAmB,EAAE,SAAS;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,oFAAoF;QACpF,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAElC,OAAO,iBAAiB,CAAC;gBACvB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;oBAC9C,MAAM,EAAE;wBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,iBAAiB,EAAE,cAAc;qBAClC;oBACD,KAAK,EAAE;wBACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBACpD;oBACD,OAAO,EAAE;wBACP,IAAI;qBACL;oBACD,WAAW,EAAE,gBAAgB;iBAC9B,CAAC;gBACF,QAAQ,EAAE,uBAAuB;aAClC,CAAC,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,qHAAqH;QACrH,aAAa,EAAE,KAAK,EAIlB,mBAAgE,EAClD,EAAE;YAChB,uIAAuI;YACvI,MAAM,gBAAgB,GACpB,mBAAmB,EAAE,WAAW,KAAK,gBAAgB;gBACrD,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;YAEpE,OAAO,gBAAgB;gBACrB,CAAC,CAAC,MAAM,CAAC;oBACL,aAAa,CAAC,GAAG;oBACjB,MAAM,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC;iBAChD,CAAC;gBACJ,CAAC,CAAC,iBAAiB,CAAC;oBAChB,mBAAmB,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;wBAC9C,MAAM,EAAE;4BACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,iBAAiB,EAAE,cAAc;yBAClC;wBACD,KAAK,EAAE;4BACL,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;yBACpD;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,MAAM,aAAa,CAAC,mBAAmB,CAAC;yBAC/C;wBACD,WAAW,EAAE,gBAAgB;qBAC9B,CAAC;oBACF,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","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} 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 \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 * @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) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\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/actions/DeferralActions.d.ts

@@ -0,0 +1,63 @@
+import { type UserOperationCallData, type BatchUserOperationCallData, type UserOperationRequest_v7 } from "@aa-sdk/core";
+import { type Address, type Hex } from "viem";
+import type { ModularAccountV2Client } from "../client/client.js";
+export type DeferredActionTypedData = {
+    domain: {
+        chainId: number;
+        verifyingContract: Address;
+    };
+    types: {
+        DeferredAction: [
+            {
+                name: "nonce";
+                type: "uint256";
+            },
+            {
+                name: "deadline";
+                type: "uint48";
+            },
+            {
+                name: "call";
+                type: "bytes";
+            }
+        ];
+    };
+    primaryType: "DeferredAction";
+    message: {
+        nonce: bigint;
+        deadline: number;
+        call: Hex;
+    };
+};
+export type DeferredActionReturnData = {
+    typedData: DeferredActionTypedData;
+    nonceOverride: bigint;
+};
+export type CreateDeferredActionTypedDataParams = {
+    callData: Hex;
+    deadline: number;
+    entityId: number;
+    isGlobalValidation: boolean;
+    nonceKeyOverride?: bigint;
+};
+export type BuildDeferredActionDigestParams = {
+    typedData: DeferredActionTypedData;
+    sig: Hex;
+};
+export type BuildUserOperationWithDeferredActionParams = {
+    uo: UserOperationCallData | BatchUserOperationCallData;
+    signaturePrepend: Hex;
+    nonceOverride: bigint;
+};
+export type DeferralActions = {
+    createDeferredActionTypedDataObject: (args: CreateDeferredActionTypedDataParams) => Promise<DeferredActionReturnData>;
+    buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;
+    buildUserOperationWithDeferredAction: (args: BuildUserOperationWithDeferredActionParams) => Promise<UserOperationRequest_v7>;
+};
+/**
+ * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
+ *
+ * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.
+ */
+export declare const deferralActions: (client: ModularAccountV2Client) => DeferralActions;

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

@@ -0,0 +1,122 @@
+import { AccountNotFoundError, InvalidNonceKeyError, EntryPointNotFoundError, } from "@aa-sdk/core";
+import { concatHex, maxUint152, getContract, encodePacked, size, toHex, } from "viem";
+/**
+ * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
+ *
+ * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.
+ */
+export const deferralActions = (client) => {
+    const createDeferredActionTypedDataObject = async ({ callData, deadline, entityId, isGlobalValidation, nonceKeyOverride, }) => {
+        if (!client.account) {
+            throw new AccountNotFoundError();
+        }
+        const baseNonceKey = nonceKeyOverride || 0n;
+        if (baseNonceKey > maxUint152) {
+            throw new InvalidNonceKeyError(baseNonceKey);
+        }
+        const entryPoint = client.account.getEntryPoint();
+        if (entryPoint === undefined) {
+            throw new EntryPointNotFoundError(client.chain, "0.7.0");
+        }
+        const entryPointContract = getContract({
+            address: entryPoint.address,
+            abi: entryPoint.abi,
+            client: client,
+        });
+        // 2 = deferred action flags    0b10
+        // 1 = isGlobal validation flag 0b01
+        const fullNonceKey = ((baseNonceKey << 40n) + (BigInt(entityId) << 8n)) |
+            2n |
+            (isGlobalValidation ? 1n : 0n);
+        const nonceOverride = (await entryPointContract.read.getNonce([
+            client.account.address,
+            fullNonceKey,
+        ]));
+        return {
+            typedData: {
+                domain: {
+                    chainId: await client.getChainId(),
+                    verifyingContract: client.account.address,
+                },
+                types: {
+                    DeferredAction: [
+                        { name: "nonce", type: "uint256" },
+                        { name: "deadline", type: "uint48" },
+                        { name: "call", type: "bytes" },
+                    ],
+                },
+                primaryType: "DeferredAction",
+                message: {
+                    nonce: nonceOverride,
+                    deadline: deadline,
+                    call: callData,
+                },
+            },
+            nonceOverride: nonceOverride,
+        };
+    };
+    /**
+     * Creates the digest which must be prepended to the userOp signature.
+     *
+     * Assumption: The client this extends is used to sign the typed data.
+     *
+     * @param {object} args The argument object containing the following:
+     * @param {DeferredActionTypedData} args.typedData The typed data object for the deferred action
+     * @param {Hex} args.sig The signature to include in the digest
+     * @returns {Hex} The encoded digest to be prepended to the userOp signature
+     */
+    const buildDeferredActionDigest = ({ typedData, sig, }) => {
+        const signerEntity = client.account.signerEntity;
+        const validationLocator = (BigInt(signerEntity.entityId) << 8n) |
+            (signerEntity.isGlobalValidation ? 1n : 0n);
+        let encodedData = encodePacked(["uint168", "uint48", "bytes"], [validationLocator, typedData.message.deadline, typedData.message.call]);
+        const encodedDataLength = size(encodedData);
+        const sigLength = size(sig);
+        encodedData = concatHex([
+            toHex(encodedDataLength, { size: 4 }),
+            encodedData,
+            toHex(sigLength, { size: 4 }),
+            sig,
+        ]);
+        return encodedData;
+    };
+    /**
+     * Builds a user operation with a deferred action by wrapping buildUserOperation() with a dummy signature override.
+     *
+     * @param {object} args The argument object containing the following:
+     * @param {UserOperationCallData | BatchUserOperationCallData} args.uo The user operation call data to build
+     * @param {Hex} args.signaturePrepend The signature data to prepend to the dummy signature
+     * @param {bigint} args.nonceOverride The nonce to override in the user operation, generally given from the typed data builder
+     * @returns {Promise<UserOperationRequest_v7>} The unsigned user operation request with the deferred action
+     */
+    const buildUserOperationWithDeferredAction = async ({ uo, signaturePrepend, nonceOverride, }) => {
+        // Check if client.account is defined
+        if (client.account === undefined) {
+            throw new AccountNotFoundError();
+        }
+        // Pre-fetch the dummy sig so we can override `client.account.getDummySignature()`
+        const dummySig = await client.account.getDummySignature();
+        // Cache the previous dummy signature getter
+        const previousDummySigGetter = client.account.getDummySignature;
+        // Override client.account.getDummySignature() so `client.buildUserOperation()` uses the prepended hex and the dummy signature during gas estimation
+        client.account.getDummySignature = () => {
+            return concatHex([signaturePrepend, dummySig]);
+        };
+        const unsignedUo = (await client.buildUserOperation({
+            uo: uo,
+            overrides: {
+                nonce: nonceOverride,
+            },
+        }));
+        // Restore the dummy signature getter
+        client.account.getDummySignature = previousDummySigGetter;
+        return unsignedUo;
+    };
+    return {
+        createDeferredActionTypedDataObject,
+        buildDeferredActionDigest,
+        buildUserOperationWithDeferredAction,
+    };
+};
+//# sourceMappingURL=DeferralActions.js.map

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

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

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

@@ -1,5 +1,5 @@
-import { hashMessage, hashTypedData, concatHex, } from "viem";
-import { getDefaultSingleSignerValidationModuleAddress } from "../utils.js";
+import { hashMessage, hashTypedData, concatHex, concat, } from "viem";
+import { getDefaultSingleSignerValidationModuleAddress, SignatureType, } from "../utils.js";
 import { packUOSignature, pack1271Signature } from "../../utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
@@ -77,12 +77,13 @@ export const singleSignerMessageSigner = (signer, chain, accountAddress, entityI
                     ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
                 },
                 message: {
-                    hash: await hashTypedData(typedDataDefinition),
+                    hash: hashTypedData(typedDataDefinition),
                 },
                 primaryType: "ReplaySafeHash",
             });
+            // TODO: Handle non-EOA signer case
             return isDeferredAction
-                ? validationSignature
+                ? concat([SignatureType.EOA, validationSignature])
                 : pack1271Signature({
                     validationSignature,
                     entityId,

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} from \"viem\";\nimport { getDefaultSingleSignerValidationModuleAddress } 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 * @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) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\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: await hashTypedData(typedDataDefinition),\n        },\n        primaryType: \"ReplaySafeHash\",\n      });\n\n      return isDeferredAction\n        ? 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 * @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) => {\n  return {\n    getDummySignature: (): Hex => {\n      const dummyEcdsaSignature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      return packUOSignature({\n        // orderedHookData: [],\n        validationSignature: dummyEcdsaSignature,\n      });\n    },\n\n    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {\n      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>\n        packUOSignature({\n          // orderedHookData: [],\n          validationSignature: signature,\n        })\n      );\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/modules/utils.d.ts

@@ -1,4 +1,8 @@
 import type { Chain, Address } from "viem";
+export declare enum SignatureType {
+    EOA = "0x00",
+    CONTRACT = "0x01"
+}
 /**
  * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.
  *

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

@@ -1,4 +1,9 @@
 import { arbitrum, arbitrumSepolia, base, baseSepolia, mainnet, optimism, optimismSepolia, polygon, polygonAmoy, sepolia, } from "@account-kit/infra";
+export var SignatureType;
+(function (SignatureType) {
+    SignatureType["EOA"] = "0x00";
+    SignatureType["CONTRACT"] = "0x01";
+})(SignatureType || (SignatureType = {}));
 /**
  * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Chain, Address } 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\";\n\n/**\n * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultWebauthnValidationModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const webauthnValidationAddress: Address = getDefaultWebauthnValidationModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The webauthn validation module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultWebauthnValidationModuleAddress = (\n  chain: Chain\n): 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 \"0x0000000000001D9d34E07D9834274dF9ae575217\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the time range module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultTimeRangeModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const timeRangeModuleAddress: Address = getDefaultTimeRangeModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The time range module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultTimeRangeModuleAddress = (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 \"0x00000000000082B8e2012be914dFA4f62A0573eA\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the single signer validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultSingleSignerValidationModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const singleSignerValidationAddress: Address = getDefaultSingleSignerValidationModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The single signer validation module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultSingleSignerValidationModuleAddress = (\n  chain: Chain\n): 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 \"0x00000000000099DE0BF6fA90dEB851E2A2df7d83\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the paymaster guard module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultPaymasterGuardModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const paymasterGuardAddress: Address = getDefaultPaymasterGuardModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The paymaster guard module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultPaymasterGuardModuleAddress = (\n  chain: Chain\n): 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 \"0x0000000000001aA7A7F7E29abe0be06c72FD42A1\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the native token limit module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultNativeTokenLimitModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const nativeTokenLimitAddress: Address = getDefaultNativeTokenLimitModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The native token limit module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultNativeTokenLimitModuleAddress = (\n  chain: Chain\n): 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 \"0x00000000000001e541f0D090868FBe24b59Fbe06\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the allowlist module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultAllowlistModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const allowlistModule: Address = getDefaultAllowlistModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The allowlist module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultAllowlistModuleAddress = (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 \"0x0000000000002311EEE9A2B887af1F144dbb4F6e\";\n  }\n};\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Chain, Address } 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\";\n\nexport enum SignatureType {\n  EOA = \"0x00\",\n  CONTRACT = \"0x01\",\n}\n\n/**\n * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultWebauthnValidationModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const webauthnValidationAddress: Address = getDefaultWebauthnValidationModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The webauthn validation module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultWebauthnValidationModuleAddress = (\n  chain: Chain\n): 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 \"0x0000000000001D9d34E07D9834274dF9ae575217\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the time range module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultTimeRangeModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const timeRangeModuleAddress: Address = getDefaultTimeRangeModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The time range module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultTimeRangeModuleAddress = (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 \"0x00000000000082B8e2012be914dFA4f62A0573eA\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the single signer validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultSingleSignerValidationModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const singleSignerValidationAddress: Address = getDefaultSingleSignerValidationModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The single signer validation module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultSingleSignerValidationModuleAddress = (\n  chain: Chain\n): 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 \"0x00000000000099DE0BF6fA90dEB851E2A2df7d83\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the paymaster guard module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultPaymasterGuardModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const paymasterGuardAddress: Address = getDefaultPaymasterGuardModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The paymaster guard module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultPaymasterGuardModuleAddress = (\n  chain: Chain\n): 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 \"0x0000000000001aA7A7F7E29abe0be06c72FD42A1\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the native token limit module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultNativeTokenLimitModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const nativeTokenLimitAddress: Address = getDefaultNativeTokenLimitModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The native token limit module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultNativeTokenLimitModuleAddress = (\n  chain: Chain\n): 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 \"0x00000000000001e541f0D090868FBe24b59Fbe06\";\n  }\n};\n\n/**\n * Maps a given chain to a specific address of the allowlist module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.\n *\n * @example\n * ```ts\n * import { getDefaultAllowlistModuleAddress } from \"@account-kit/smart-contracts\";\n * import { Chain, Address } from \"viem\";\n *\n * const chain: Chain = ...\n * const allowlistModule: Address = getDefaultAllowlistModuleAddress(chain);\n * ```\n * @param {Chain} chain The chain object containing the chain ID to map\n * @returns {Address} The allowlist module address associated with the specified chain ID or a default address if no specific mapping exists\n */\nexport const getDefaultAllowlistModuleAddress = (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 \"0x0000000000002311EEE9A2B887af1F144dbb4F6e\";\n  }\n};\n"]}

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,EACb,MAAM,MAAM,CAAC;AAOd;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,WAClB,kBAAkB,SACnB,KAAK,kBACI,OAAO;6BAGE,GAAG;oCAUM,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAUR,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA4BvE,QAAQ,GAAG,CAAC;CA0BlB,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,EAEb,MAAM,MAAM,CAAC;AAQd;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,eAAe,WAClB,kBAAkB,SACnB,KAAK,kBACI,OAAO;6BAGE,GAAG;oCAUM,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAUR,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA4BvE,QAAQ,GAAG,CAAC;CA6BlB,CAAC"}

package/dist/types/src/ma-v2/actions/DeferralActions.d.ts

@@ -0,0 +1,64 @@
+import { type UserOperationCallData, type BatchUserOperationCallData, type UserOperationRequest_v7 } from "@aa-sdk/core";
+import { type Address, type Hex } from "viem";
+import type { ModularAccountV2Client } from "../client/client.js";
+export type DeferredActionTypedData = {
+    domain: {
+        chainId: number;
+        verifyingContract: Address;
+    };
+    types: {
+        DeferredAction: [
+            {
+                name: "nonce";
+                type: "uint256";
+            },
+            {
+                name: "deadline";
+                type: "uint48";
+            },
+            {
+                name: "call";
+                type: "bytes";
+            }
+        ];
+    };
+    primaryType: "DeferredAction";
+    message: {
+        nonce: bigint;
+        deadline: number;
+        call: Hex;
+    };
+};
+export type DeferredActionReturnData = {
+    typedData: DeferredActionTypedData;
+    nonceOverride: bigint;
+};
+export type CreateDeferredActionTypedDataParams = {
+    callData: Hex;
+    deadline: number;
+    entityId: number;
+    isGlobalValidation: boolean;
+    nonceKeyOverride?: bigint;
+};
+export type BuildDeferredActionDigestParams = {
+    typedData: DeferredActionTypedData;
+    sig: Hex;
+};
+export type BuildUserOperationWithDeferredActionParams = {
+    uo: UserOperationCallData | BatchUserOperationCallData;
+    signaturePrepend: Hex;
+    nonceOverride: bigint;
+};
+export type DeferralActions = {
+    createDeferredActionTypedDataObject: (args: CreateDeferredActionTypedDataParams) => Promise<DeferredActionReturnData>;
+    buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;
+    buildUserOperationWithDeferredAction: (args: BuildUserOperationWithDeferredActionParams) => Promise<UserOperationRequest_v7>;
+};
+/**
+ * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
+ *
+ * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.
+ */
+export declare const deferralActions: (client: ModularAccountV2Client) => DeferralActions;
+//# sourceMappingURL=DeferralActions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DeferralActions.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/actions/DeferralActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC7B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,GAAG,EAOT,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IACF,KAAK,EAAE;QACL,cAAc,EAAE;YACd;gBAAE,IAAI,EAAE,OAAO,CAAC;gBAAC,IAAI,EAAE,SAAS,CAAA;aAAE;YAClC;gBAAE,IAAI,EAAE,UAAU,CAAC;gBAAC,IAAI,EAAE,QAAQ,CAAA;aAAE;YACpC;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,OAAO,CAAA;aAAE;SAChC,CAAC;KACH,CAAC;IACF,WAAW,EAAE,gBAAgB,CAAC;IAC9B,OAAO,EAAE;QACP,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,uBAAuB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,SAAS,EAAE,uBAAuB,CAAC;IACnC,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,EAAE,EAAE,qBAAqB,GAAG,0BAA0B,CAAC;IACvD,gBAAgB,EAAE,GAAG,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,mCAAmC,EAAE,CACnC,IAAI,EAAE,mCAAmC,KACtC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvC,yBAAyB,EAAE,CAAC,IAAI,EAAE,+BAA+B,KAAK,GAAG,CAAC;IAC1E,oCAAoC,EAAE,CACpC,IAAI,EAAE,0CAA0C,KAC7C,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACvC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,CAC5B,MAAM,EAAE,sBAAsB,KAC3B,eAqJJ,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,EACb,MAAM,MAAM,CAAC;AAId;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,yBAAyB,WAC5B,kBAAkB,SACnB,KAAK,kBACI,OAAO,YACb,MAAM;6BAGS,GAAG;oCAUM,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAUR,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA8BvE,QAAQ,GAAG,CAAC;CA8BlB,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;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,yBAAyB,WAC5B,kBAAkB,SACnB,KAAK,kBACI,OAAO,YACb,MAAM;6BAGS,GAAG;oCAUM,GAAG,KAAG,QAAQ,GAAG,CAAC;;iBAUR,eAAe;QAAK,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oJA8BvE,QAAQ,GAAG,CAAC;CA+BlB,CAAC"}

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

@@ -1,4 +1,8 @@
 import type { Chain, Address } from "viem";
+export declare enum SignatureType {
+    EOA = "0x00",
+    CONTRACT = "0x01"
+}
 /**
  * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAc3C;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yCAAyC,UAC7C,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gCAAgC,UAAW,KAAK,KAAG,OAgB/D,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,6CAA6C,UACjD,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qCAAqC,UACzC,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,uCAAuC,UAC3C,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gCAAgC,UAAW,KAAK,KAAG,OAgB/D,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/ma-v2/modules/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAc3C,oBAAY,aAAa;IACvB,GAAG,SAAS;IACZ,QAAQ,SAAS;CAClB;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yCAAyC,UAC7C,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gCAAgC,UAAW,KAAK,KAAG,OAgB/D,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,6CAA6C,UACjD,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qCAAqC,UACzC,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,uCAAuC,UAC3C,KAAK,KACX,OAgBF,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gCAAgC,UAAW,KAAK,KAAG,OAgB/D,CAAC"}

package/package.json

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

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

@@ -8,6 +8,7 @@ import {
   type TypedDataDefinition,
   type Chain,
   type Address,
+  concat,
 } from "viem";
 
 import {
@@ -15,6 +16,7 @@ import {
   pack1271Signature,
   DEFAULT_OWNER_ENTITY_ID,
 } from "../utils.js";
+import { SignatureType } from "../modules/utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
  *
@@ -99,7 +101,10 @@ export const nativeSMASigner = (
         typedDataDefinition?.domain?.verifyingContract === accountAddress;
 
       return isDeferredAction
-        ? signer.signTypedData(typedDataDefinition)
+        ? concat([
+            SignatureType.EOA,
+            await signer.signTypedData(typedDataDefinition),
+          ])
         : pack1271Signature({
             validationSignature: await signer.signTypedData({
               domain: {

package/src/ma-v2/actions/DeferralActions.ts

@@ -0,0 +1,232 @@
+import {
+  AccountNotFoundError,
+  InvalidNonceKeyError,
+  EntryPointNotFoundError,
+  type UserOperationCallData,
+  type BatchUserOperationCallData,
+  type UserOperationRequest_v7,
+} from "@aa-sdk/core";
+import {
+  type Address,
+  type Hex,
+  concatHex,
+  maxUint152,
+  getContract,
+  encodePacked,
+  size,
+  toHex,
+} from "viem";
+import type { ModularAccountV2Client } from "../client/client.js";
+
+export type DeferredActionTypedData = {
+  domain: {
+    chainId: number;
+    verifyingContract: Address;
+  };
+  types: {
+    DeferredAction: [
+      { name: "nonce"; type: "uint256" },
+      { name: "deadline"; type: "uint48" },
+      { name: "call"; type: "bytes" }
+    ];
+  };
+  primaryType: "DeferredAction";
+  message: {
+    nonce: bigint;
+    deadline: number;
+    call: Hex;
+  };
+};
+
+export type DeferredActionReturnData = {
+  typedData: DeferredActionTypedData;
+  nonceOverride: bigint;
+};
+
+export type CreateDeferredActionTypedDataParams = {
+  callData: Hex;
+  deadline: number;
+  entityId: number;
+  isGlobalValidation: boolean;
+  nonceKeyOverride?: bigint;
+};
+
+export type BuildDeferredActionDigestParams = {
+  typedData: DeferredActionTypedData;
+  sig: Hex;
+};
+
+export type BuildUserOperationWithDeferredActionParams = {
+  uo: UserOperationCallData | BatchUserOperationCallData;
+  signaturePrepend: Hex;
+  nonceOverride: bigint;
+};
+
+export type DeferralActions = {
+  createDeferredActionTypedDataObject: (
+    args: CreateDeferredActionTypedDataParams
+  ) => Promise<DeferredActionReturnData>;
+  buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;
+  buildUserOperationWithDeferredAction: (
+    args: BuildUserOperationWithDeferredActionParams
+  ) => Promise<UserOperationRequest_v7>;
+};
+
+/**
+ * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.
+ *
+ * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.
+ */
+export const deferralActions: (
+  client: ModularAccountV2Client
+) => DeferralActions = (client: ModularAccountV2Client): DeferralActions => {
+  const createDeferredActionTypedDataObject = async ({
+    callData,
+    deadline,
+    entityId,
+    isGlobalValidation,
+    nonceKeyOverride,
+  }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {
+    if (!client.account) {
+      throw new AccountNotFoundError();
+    }
+
+    const baseNonceKey = nonceKeyOverride || 0n;
+    if (baseNonceKey > maxUint152) {
+      throw new InvalidNonceKeyError(baseNonceKey);
+    }
+
+    const entryPoint = client.account.getEntryPoint();
+    if (entryPoint === undefined) {
+      throw new EntryPointNotFoundError(client.chain, "0.7.0");
+    }
+
+    const entryPointContract = getContract({
+      address: entryPoint.address,
+      abi: entryPoint.abi,
+      client: client,
+    });
+
+    // 2 = deferred action flags    0b10
+    // 1 = isGlobal validation flag 0b01
+    const fullNonceKey: bigint =
+      ((baseNonceKey << 40n) + (BigInt(entityId) << 8n)) |
+      2n |
+      (isGlobalValidation ? 1n : 0n);
+
+    const nonceOverride = (await entryPointContract.read.getNonce([
+      client.account.address,
+      fullNonceKey,
+    ])) as bigint;
+
+    return {
+      typedData: {
+        domain: {
+          chainId: await client.getChainId(),
+          verifyingContract: client.account.address,
+        },
+        types: {
+          DeferredAction: [
+            { name: "nonce", type: "uint256" },
+            { name: "deadline", type: "uint48" },
+            { name: "call", type: "bytes" },
+          ],
+        },
+        primaryType: "DeferredAction",
+        message: {
+          nonce: nonceOverride,
+          deadline: deadline,
+          call: callData,
+        },
+      },
+      nonceOverride: nonceOverride,
+    };
+  };
+
+  /**
+   * Creates the digest which must be prepended to the userOp signature.
+   *
+   * Assumption: The client this extends is used to sign the typed data.
+   *
+   * @param {object} args The argument object containing the following:
+   * @param {DeferredActionTypedData} args.typedData The typed data object for the deferred action
+   * @param {Hex} args.sig The signature to include in the digest
+   * @returns {Hex} The encoded digest to be prepended to the userOp signature
+   */
+  const buildDeferredActionDigest = ({
+    typedData,
+    sig,
+  }: BuildDeferredActionDigestParams): Hex => {
+    const signerEntity = client.account.signerEntity;
+    const validationLocator =
+      (BigInt(signerEntity.entityId) << 8n) |
+      (signerEntity.isGlobalValidation ? 1n : 0n);
+
+    let encodedData = encodePacked(
+      ["uint168", "uint48", "bytes"],
+      [validationLocator, typedData.message.deadline, typedData.message.call]
+    );
+
+    const encodedDataLength = size(encodedData);
+    const sigLength = size(sig);
+
+    encodedData = concatHex([
+      toHex(encodedDataLength, { size: 4 }),
+      encodedData,
+      toHex(sigLength, { size: 4 }),
+      sig,
+    ]);
+
+    return encodedData;
+  };
+
+  /**
+   * Builds a user operation with a deferred action by wrapping buildUserOperation() with a dummy signature override.
+   *
+   * @param {object} args The argument object containing the following:
+   * @param {UserOperationCallData | BatchUserOperationCallData} args.uo The user operation call data to build
+   * @param {Hex} args.signaturePrepend The signature data to prepend to the dummy signature
+   * @param {bigint} args.nonceOverride The nonce to override in the user operation, generally given from the typed data builder
+   * @returns {Promise<UserOperationRequest_v7>} The unsigned user operation request with the deferred action
+   */
+  const buildUserOperationWithDeferredAction = async ({
+    uo,
+    signaturePrepend,
+    nonceOverride,
+  }: BuildUserOperationWithDeferredActionParams): Promise<UserOperationRequest_v7> => {
+    // Check if client.account is defined
+    if (client.account === undefined) {
+      throw new AccountNotFoundError();
+    }
+
+    // Pre-fetch the dummy sig so we can override `client.account.getDummySignature()`
+    const dummySig = await client.account.getDummySignature();
+
+    // Cache the previous dummy signature getter
+    const previousDummySigGetter = client.account.getDummySignature;
+
+    // Override client.account.getDummySignature() so `client.buildUserOperation()` uses the prepended hex and the dummy signature during gas estimation
+    client.account.getDummySignature = () => {
+      return concatHex([signaturePrepend, dummySig as Hex]);
+    };
+
+    const unsignedUo = (await client.buildUserOperation({
+      uo: uo,
+      overrides: {
+        nonce: nonceOverride,
+      },
+    })) as UserOperationRequest_v7;
+
+    // Restore the dummy signature getter
+    client.account.getDummySignature = previousDummySigGetter;
+
+    return unsignedUo;
+  };
+
+  return {
+    createDeferredActionTypedDataObject,
+    buildDeferredActionDigest,
+    buildUserOperationWithDeferredAction,
+  };
+};

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

@@ -9,8 +9,12 @@ import {
   type TypedDataDefinition,
   type Chain,
   type Address,
+  concat,
 } from "viem";
-import { getDefaultSingleSignerValidationModuleAddress } from "../utils.js";
+import {
+  getDefaultSingleSignerValidationModuleAddress,
+  SignatureType,
+} from "../utils.js";
 
 import { packUOSignature, pack1271Signature } from "../../utils.js";
 /**
@@ -111,13 +115,14 @@ export const singleSignerMessageSigner = (
           ReplaySafeHash: [{ name: "hash", type: "bytes32" }],
         },
         message: {
-          hash: await hashTypedData(typedDataDefinition),
+          hash: hashTypedData(typedDataDefinition),
         },
         primaryType: "ReplaySafeHash",
       });
 
+      // TODO: Handle non-EOA signer case
       return isDeferredAction
-        ? validationSignature
+        ? concat([SignatureType.EOA, validationSignature])
         : pack1271Signature({
             validationSignature,
             entityId,

package/src/ma-v2/modules/utils.ts

@@ -12,6 +12,11 @@ import {
   sepolia,
 } from "@account-kit/infra";
 
+export enum SignatureType {
+  EOA = "0x00",
+  CONTRACT = "0x01",
+}
+
 /**
  * Maps a given chain to a specific address of the webauthn validation module by its chain ID. If no direct mapping exists, it defaults to returning a specific address.
  *