@account-kit/smart-contracts 4.23.1 → 4.25.0

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

@@ -37,6 +37,43 @@ export declare function getMAV2UpgradeToData<TTransport extends Transport = Tran
     createModularAccountV2FromExisting: () => Promise<ModularAccountV2<TSigner>>;
 }>;
 export declare const entityIdAndNonceReaderBytecode = "0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe";
+export declare const mintableERC20Bytecode = "0x608060405234801561000f575f80fd5b506040518060400160405280600d81526020016c26b4b73a30b13632aa37b5b2b760991b81525060405180604001604052806002815260200161135560f21b8152508160039081610060919061010d565b50600461006d828261010d565b5050506101c7565b634e487b7160e01b5f52604160045260245ffd5b600181811c9082168061009d57607f821691505b6020821081036100bb57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f82111561010857805f5260205f20601f840160051c810160208510156100e65750805b601f840160051c820191505b81811015610105575f81556001016100f2565b50505b505050565b81516001600160401b0381111561012657610126610075565b61013a816101348454610089565b846100c1565b6020601f82116001811461016c575f83156101555750848201515b5f19600385901b1c1916600184901b178455610105565b5f84815260208120601f198516915b8281101561019b578785015182556020948501946001909201910161017b565b50848210156101b857868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b610737806101d45f395ff3fe608060405234801561000f575f80fd5b506004361061008c575f3560e01c806306fdde0314610090578063095ea7b3146100ae57806318160ddd146100d157806323b872dd146100e3578063313ce567146100f657806340c10f191461010557806370a082311461011a57806395d89b4114610142578063a9059cbb1461014a578063dd62ed3e1461015d575b5f80fd5b610098610170565b6040516100a59190610572565b60405180910390f35b6100c16100bc3660046105c2565b610200565b60405190151581526020016100a5565b6002545b6040519081526020016100a5565b6100c16100f13660046105ea565b610219565b604051601281526020016100a5565b6101186101133660046105c2565b61023c565b005b6100d5610128366004610624565b6001600160a01b03165f9081526020819052604090205490565b61009861024a565b6100c16101583660046105c2565b610259565b6100d561016b366004610644565b610266565b60606003805461017f90610675565b80601f01602080910402602001604051908101604052809291908181526020018280546101ab90610675565b80156101f65780601f106101cd576101008083540402835291602001916101f6565b820191905f5260205f20905b8154815290600101906020018083116101d957829003601f168201915b5050505050905090565b5f3361020d818585610290565b60019150505b92915050565b5f336102268582856102a2565b6102318585856102fc565b506001949350505050565b6102468282610359565b5050565b60606004805461017f90610675565b5f3361020d8185856102fc565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b61029d838383600161038d565b505050565b5f6102ad8484610266565b90505f198110156102f657818110156102e857828183604051637dc7a0d960e11b81526004016102df939291906106ad565b60405180910390fd5b6102f684848484035f61038d565b50505050565b6001600160a01b038316610325575f604051634b637e8f60e11b81526004016102df91906106ce565b6001600160a01b03821661034e575f60405163ec442f0560e01b81526004016102df91906106ce565b61029d83838361045f565b6001600160a01b038216610382575f60405163ec442f0560e01b81526004016102df91906106ce565b6102465f838361045f565b6001600160a01b0384166103b6575f60405163e602df0560e01b81526004016102df91906106ce565b6001600160a01b0383166103df575f604051634a1406b160e11b81526004016102df91906106ce565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102f657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161045191815260200190565b60405180910390a350505050565b6001600160a01b038316610489578060025f82825461047e91906106e2565b909155506104e69050565b6001600160a01b0383165f90815260208190526040902054818110156104c85783818360405163391434e360e21b81526004016102df939291906106ad565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b03821661050257600280548290039055610520565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161056591815260200190565b60405180910390a3505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b03811681146105bd575f80fd5b919050565b5f80604083850312156105d3575f80fd5b6105dc836105a7565b946020939093013593505050565b5f805f606084860312156105fc575f80fd5b610605846105a7565b9250610613602085016105a7565b929592945050506040919091013590565b5f60208284031215610634575f80fd5b61063d826105a7565b9392505050565b5f8060408385031215610655575f80fd5b61065e836105a7565b915061066c602084016105a7565b90509250929050565b600181811c9082168061068957607f821691505b6020821081036106a757634e487b7160e01b5f52602260045260245ffd5b50919050565b6001600160a01b039390931683526020830191909152604082015260600190565b6001600160a01b0391909116815260200190565b8082018082111561021357634e487b7160e01b5f52601160045260245ffdfea2646970667358221220f9ae46a2e15270bfb77fe3d4d0ee0e45b749e3dde93805ee2cf795cb800244e664736f6c634300081a0033";
+export declare const mintableERC20Abi: readonly [{
+    readonly name: "transfer";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly type: "address";
+        readonly name: "to";
+    }, {
+        readonly type: "uint256";
+        readonly name: "amount";
+    }];
+    readonly outputs: readonly [];
+}, {
+    readonly name: "mint";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly type: "address";
+        readonly name: "to";
+    }, {
+        readonly type: "uint256";
+        readonly name: "amount";
+    }];
+    readonly outputs: readonly [];
+}, {
+    readonly name: "balanceOf";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly type: "address";
+        readonly name: "target";
+    }];
+    readonly outputs: readonly [{
+        readonly type: "uint256";
+    }];
+}];
 export type BuildNonceParams = {
     nonceKey?: bigint;
     entityId?: number;
@@ -45,4 +82,9 @@ export type BuildNonceParams = {
     isDirectCallValidation?: boolean;
 };
 export declare const buildFullNonceKey: ({ nonceKey, entityId, isGlobalValidation, isDeferredAction, }: BuildNonceParams) => bigint;
+export declare const parseDeferredAction: (deferredAction: Hex) => {
+    nonce: bigint;
+    deferredActionData: Hex;
+    hasAssociatedExecHooks: boolean;
+};
 //# sourceMappingURL=utils.d.ts.map

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":"AAAA,OAAO,EAKL,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AAcd,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAElC,mBAAmB,EAAE,GAAG,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,uBAAuB,GAAG;IACpC,mBAAmB,EAAE,GAAG,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAGF,eAAO,MAAM,eAAe,6BAGzB,qBAAqB,KAAG,GAE1B,CAAC;AAGF,eAAO,MAAM,iBAAiB,uCAG3B,uBAAuB,KAAG,GAQ5B,CAAC;AAEF,eAAO,MAAM,4BAA4B,UAAW,KAAK,KAAG,OAgB3D,CAAC;AAEF,eAAO,MAAM,8BAA8B,UAAW,KAAK,KAAG,OAgB7D,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAAW,KAAK,KAAG,OAgB5D,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAW,KAAK,KAAG,OAgBzD,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,KAAK,KAAG,OAgBpD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,IACzE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAElC;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAE3E,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EACxD,IAAI,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC5C,OAAO,CACR,aAAa,GAAG;IACd,kCAAkC,EAAE,MAAM,OAAO,CAC/C,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;CACH,CACF,CA8BA;AAED,eAAO,MAAM,8BAA8B,y+EAC67E,CAAC;AAEz+E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,iBAAiB,kEAK3B,gBAAgB,KAAG,MAOrB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,KAAK,SAAS,EAEf,MAAM,MAAM,CAAC;AAcd,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAElC,mBAAmB,EAAE,GAAG,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,uBAAuB,GAAG;IACpC,mBAAmB,EAAE,GAAG,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAGF,eAAO,MAAM,eAAe,6BAGzB,qBAAqB,KAAG,GAE1B,CAAC;AAGF,eAAO,MAAM,iBAAiB,uCAG3B,uBAAuB,KAAG,GAQ5B,CAAC;AAEF,eAAO,MAAM,4BAA4B,UAAW,KAAK,KAAG,OAgB3D,CAAC;AAEF,eAAO,MAAM,8BAA8B,UAAW,KAAK,KAAG,OAgB7D,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAAW,KAAK,KAAG,OAgB5D,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAW,KAAK,KAAG,OAgBzD,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,KAAK,KAAG,OAgBpD,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,IACzE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAElC;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAE3E,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EACxD,IAAI,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC5C,OAAO,CACR,aAAa,GAAG;IACd,kCAAkC,EAAE,MAAM,OAAO,CAC/C,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;CACH,CACF,CA8BA;AAED,eAAO,MAAM,8BAA8B,y+EAC67E,CAAC;AAEz+E,eAAO,MAAM,qBAAqB,6hJAC0/I,CAAC;AAE7hJ,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAI3B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,iBAAiB,kEAK3B,gBAAgB,KAAG,MAOrB,CAAC;AAGF,eAAO,MAAM,mBAAmB,mBACd,GAAG,KAClB;IACD,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,GAAG,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;CAOjC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.23.1",
+  "version": "4.25.0",
   "description": "aa-sdk compatible interfaces for Alchemy Smart Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -47,12 +47,13 @@
     "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
     "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/smart-contracts",
+    "fern:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../docs/pages/reference/account-kit/smart-contracts --fern",
     "clean": "rm -rf ./dist",
     "test": "vitest",
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@account-kit/plugingen": "^4.23.1",
+    "@account-kit/plugingen": "^4.25.0",
     "change-case": "^5.1.2",
     "dedent": "^1.5.1",
     "dotenv": "^16.3.1",
@@ -72,10 +73,10 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "e35c609723a3d4aae8fd1ebedfdad5ce6db432ff",
+  "gitHead": "0e582d6b5775a147e8d43fb1cc4b9625319c21cb",
   "dependencies": {
-    "@aa-sdk/core": "^4.23.1",
-    "@account-kit/infra": "^4.23.1"
+    "@aa-sdk/core": "^4.25.0",
+    "@account-kit/infra": "^4.25.0"
   },
   "peerDependencies": {
     "viem": "^2.22.6"

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

@@ -3,13 +3,14 @@ import {
   getEntryPoint,
   InvalidEntityIdError,
   InvalidNonceKeyError,
+  InvalidDeferredActionNonce,
   toSmartContractAccount,
   type AccountOp,
   type SmartAccountSigner,
   type SmartContractAccountWithSigner,
   type ToSmartContractAccountParams,
 } from "@aa-sdk/core";
-import { DEFAULT_OWNER_ENTITY_ID } from "../../utils.js";
+import { DEFAULT_OWNER_ENTITY_ID, parseDeferredAction } from "../../utils.js";
 import {
   type Hex,
   type Address,
@@ -85,6 +86,7 @@ export type CreateMAV2BaseParams<
   signer: TSigner;
   signerEntity?: SignerEntity;
   accountAddress: Address;
+  deferredAction?: Hex;
 };
 
 export type CreateMAV2BaseReturnType<
@@ -108,6 +110,7 @@ export async function createMAv2Base<
       entityId = DEFAULT_OWNER_ENTITY_ID,
     } = {},
     accountAddress,
+    deferredAction,
     ...remainingToSmartContractAccountParams
   } = config;
 
@@ -120,6 +123,36 @@ export async function createMAv2Base<
     chain,
   });
 
+  const entryPointContract = getContract({
+    address: entryPoint.address,
+    abi: entryPoint.abi,
+    client,
+  });
+
+  let useDeferredAction: boolean = false;
+  let nonce: bigint = 0n;
+  let deferredActionData: Hex = "0x";
+  let hasAssociatedExecHooks: boolean = false;
+
+  if (deferredAction) {
+    ({ nonce, deferredActionData, hasAssociatedExecHooks } =
+      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,
+      ])) 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) {
+      throw new InvalidDeferredActionNonce();
+    }
+  }
+
   const encodeExecute: (tx: AccountOp) => Promise<Hex> = async ({
     target,
     data,
@@ -150,18 +183,16 @@ export async function createMAv2Base<
 
   const isAccountDeployed: () => Promise<boolean> = async () =>
     !!(await client.getCode({ address: accountAddress }));
-  // TODO: add deferred action flag
+
   const getNonce = async (nonceKey: bigint = 0n): Promise<bigint> => {
+    if (useDeferredAction) {
+      return nonce;
+    }
+
     if (nonceKey > maxUint152) {
       throw new InvalidNonceKeyError(nonceKey);
     }
 
-    const entryPointContract = getContract({
-      address: entryPoint.address,
-      abi: entryPoint.abi,
-      client,
-    });
-
     const fullNonceKey: bigint =
       (nonceKey << 40n) +
       (BigInt(entityId) << 8n) +
@@ -216,7 +247,8 @@ export async function createMAv2Base<
       entityId: Number(entityId),
     });
 
-    return validationData.executionHooks.length
+    return (useDeferredAction && hasAssociatedExecHooks) ||
+      validationData.executionHooks.length
       ? concatHex([executeUserOpSelector, callData])
       : callData;
   };
@@ -231,8 +263,14 @@ export async function createMAv2Base<
     encodeBatchExecute,
     getNonce,
     ...(entityId === DEFAULT_OWNER_ENTITY_ID
-      ? nativeSMASigner(signer, chain, accountAddress)
-      : singleSignerMessageSigner(signer, chain, accountAddress, entityId)),
+      ? nativeSMASigner(signer, chain, accountAddress, deferredActionData)
+      : singleSignerMessageSigner(
+          signer,
+          chain,
+          accountAddress,
+          entityId,
+          deferredActionData
+        )),
   });
 
   return {

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

@@ -36,6 +36,7 @@ export type CreateModularAccountV2Params<
 > & {
   signer: TSigner;
   entryPoint?: EntryPointDef<"0.7.0", Chain>;
+  deferredAction?: Hex;
   signerEntity?: SignerEntity;
 }) &
   (
@@ -103,6 +104,7 @@ export async function createModularAccountV2(
       entityId: DEFAULT_OWNER_ENTITY_ID,
     },
     signerEntity: { entityId = DEFAULT_OWNER_ENTITY_ID } = {},
+    deferredAction,
   } = config;
 
   const client = createBundlerClient({
@@ -183,6 +185,7 @@ export async function createModularAccountV2(
     signer,
     entryPoint,
     signerEntity,
+    deferredAction,
     ...accountFunctions,
   });
 }

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

@@ -9,6 +9,7 @@ import {
   type Chain,
   type Address,
   concat,
+  concatHex,
 } from "viem";
 
 import {
@@ -23,7 +24,6 @@ import { SignatureType } from "../modules/utils.js";
  * @example
  * ```ts
  * import { nativeSMASigner } from "@account-kit/smart-contracts";
- 
  * import { LocalAccountSigner } from "@aa-sdk/core";
  *
  * const MNEMONIC = "...":
@@ -38,31 +38,37 @@ import { SignatureType } from "../modules/utils.js";
  * @param {SmartAccountSigner} signer Signer to use for signing operations
  * @param {Chain} chain Chain object for the signer
  * @param {Address} accountAddress address of the smart account using this signer
+ * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures
  * @returns {object} an object with methods for signing operations and managing signatures
  */
 export const nativeSMASigner = (
   signer: SmartAccountSigner,
   chain: Chain,
-  accountAddress: Address
+  accountAddress: Address,
+  deferredActionData?: Hex
 ) => {
   return {
     getDummySignature: (): Hex => {
-      const dummyEcdsaSignature =
-        "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
-
-      return packUOSignature({
+      const sig = packUOSignature({
         // orderedHookData: [],
-        validationSignature: dummyEcdsaSignature,
+        validationSignature:
+          "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c",
       });
+
+      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
     },
 
-    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {
-      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>
-        packUOSignature({
-          // orderedHookData: [],
-          validationSignature: signature,
-        })
-      );
+    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {
+      const sig = await signer
+        .signMessage({ raw: uoHash })
+        .then((signature: Hex) =>
+          packUOSignature({
+            // orderedHookData: [],
+            validationSignature: signature,
+          })
+        );
+
+      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
     },
 
     // we apply the expected 1271 packing here since the account contract will expect it

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

@@ -11,7 +11,6 @@ import {
   type Hex,
   concatHex,
   maxUint152,
-  getContract,
   encodePacked,
   size,
   toHex,
@@ -44,22 +43,23 @@ export type DeferredActionTypedData = {
 
 export type DeferredActionReturnData = {
   typedData: DeferredActionTypedData;
-  nonceOverride: bigint;
 };
 
 export type CreateDeferredActionTypedDataParams = {
   callData: Hex;
   deadline: number;
-  entityId: number;
-  isGlobalValidation: boolean;
-  nonceKeyOverride?: bigint;
+  nonce: bigint;
 };
 
 export type BuildDeferredActionDigestParams = {
-  typedData: DeferredActionTypedData;
+  fullPreSignatureDeferredActionDigest: Hex;
   sig: Hex;
 };
 
+export type BuildPreSignatureDeferredActionDigestParams = {
+  typedData: DeferredActionTypedData;
+};
+
 export type BuildUserOperationWithDeferredActionParams = {
   uo: UserOperationCallData | BatchUserOperationCallData;
   signaturePrepend: Hex;
@@ -67,9 +67,10 @@ export type BuildUserOperationWithDeferredActionParams = {
 };
 
 export type EntityIdAndNonceParams = {
-  entityId: number;
-  nonceKey: bigint;
+  entityId?: number;
+  nonceKey?: bigint;
   isGlobalValidation: boolean;
+  isDeferredAction?: boolean;
 };
 
 export type DeferralActions = {
@@ -77,6 +78,9 @@ export type DeferralActions = {
     args: CreateDeferredActionTypedDataParams
   ) => Promise<DeferredActionReturnData>;
   buildDeferredActionDigest: (args: BuildDeferredActionDigestParams) => Hex;
+  buildPreSignatureDeferredActionDigest: (
+    args: BuildPreSignatureDeferredActionDigestParams
+  ) => Hex;
   buildUserOperationWithDeferredAction: (
     args: BuildUserOperationWithDeferredActionParams
   ) => Promise<UserOperationRequest_v7>;
@@ -97,43 +101,17 @@ export const deferralActions: (
   const createDeferredActionTypedDataObject = async ({
     callData,
     deadline,
-    entityId,
-    isGlobalValidation,
-    nonceKeyOverride = 0n,
+    nonce,
   }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {
     if (!client.account) {
       throw new AccountNotFoundError();
     }
 
-    if (nonceKeyOverride > maxUint152) {
-      throw new InvalidNonceKeyError(nonceKeyOverride);
-    }
-
     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 = buildFullNonceKey({
-      nonceKey: nonceKeyOverride,
-      entityId,
-      isGlobalValidation,
-      isDeferredAction: true,
-    });
-
-    const nonceOverride = (await entryPointContract.read.getNonce([
-      client.account.address,
-      fullNonceKey,
-    ])) as bigint;
-
     return {
       typedData: {
         domain: {
@@ -149,12 +127,11 @@ export const deferralActions: (
         },
         primaryType: "DeferredAction",
         message: {
-          nonce: nonceOverride,
+          nonce: nonce,
           deadline: deadline,
           call: callData,
         },
       },
-      nonceOverride: nonceOverride,
     };
   };
 
@@ -164,34 +141,42 @@ export const deferralActions: (
    * 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.fullPreSignatureDeferredActionDigest The The data to append the signature and length to
    * @param {Hex} args.sig The signature to include in the digest
    * @returns {Hex} The encoded digest to be prepended to the userOp signature
    */
   const buildDeferredActionDigest = ({
-    typedData,
+    fullPreSignatureDeferredActionDigest,
     sig,
   }: BuildDeferredActionDigestParams): Hex => {
+    const sigLength = size(sig);
+
+    const encodedData = concatHex([
+      fullPreSignatureDeferredActionDigest,
+      toHex(sigLength, { size: 4 }),
+      sig,
+    ]);
+    return encodedData;
+  };
+
+  const buildPreSignatureDeferredActionDigest = ({
+    typedData,
+  }: BuildPreSignatureDeferredActionDigestParams): Hex => {
     const signerEntity = client.account.signerEntity;
     const validationLocator =
       (BigInt(signerEntity.entityId) << 8n) |
       (signerEntity.isGlobalValidation ? 1n : 0n);
 
-    let encodedData = encodePacked(
+    const encodedCallData = encodePacked(
       ["uint168", "uint48", "bytes"],
       [validationLocator, typedData.message.deadline, typedData.message.call]
     );
 
-    const encodedDataLength = size(encodedData);
-    const sigLength = size(sig);
-
-    encodedData = concatHex([
+    const encodedDataLength = size(encodedCallData);
+    const encodedData = concatHex([
       toHex(encodedDataLength, { size: 4 }),
-      encodedData,
-      toHex(sigLength, { size: 4 }),
-      sig,
+      encodedCallData,
     ]);
-
     return encodedData;
   };
 
@@ -239,9 +224,10 @@ export const deferralActions: (
   };
 
   const getEntityIdAndNonce = async ({
-    entityId,
-    nonceKey,
+    entityId = 1,
+    nonceKey = 0n,
     isGlobalValidation,
+    isDeferredAction = true,
   }: EntityIdAndNonceParams) => {
     if (!client.account) {
       throw new AccountNotFoundError();
@@ -266,7 +252,7 @@ export const deferralActions: (
           nonceKey,
           entityId,
           isGlobalValidation,
-          isDeferredAction: true,
+          isDeferredAction,
         }),
       ],
     });
@@ -285,6 +271,7 @@ export const deferralActions: (
   return {
     createDeferredActionTypedDataObject,
     buildDeferredActionDigest,
+    buildPreSignatureDeferredActionDigest,
     buildUserOperationWithDeferredAction,
     getEntityIdAndNonce,
   };

package/src/ma-v2/index.ts

@@ -20,6 +20,10 @@ export {
 } from "./actions/common/utils.js";
 export type * from "./actions/install-validation/installValidation.js";
 export { installValidationActions } from "./actions/install-validation/installValidation.js";
+export type * from "./actions/deferralActions.js";
+export { deferralActions } from "./actions/deferralActions.js";
+export type * from "./permissionBuilder.js";
+export { PermissionBuilder, PermissionType } from "./permissionBuilder.js";
 
 export {
   getDefaultAllowlistModuleAddress,

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

@@ -39,32 +39,38 @@ import { packUOSignature, pack1271Signature } from "../../utils.js";
  * @param {Chain} chain Chain object for the signer
  * @param {Address} accountAddress address of the smart account using this signer
  * @param {number} entityId the entity id of the signing validation
+ * @param {Hex} deferredActionData optional deferred action data to prepend to the uo signatures
  * @returns {object} an object with methods for signing operations and managing signatures
  */
 export const singleSignerMessageSigner = (
   signer: SmartAccountSigner,
   chain: Chain,
   accountAddress: Address,
-  entityId: number
+  entityId: number,
+  deferredActionData?: Hex
 ) => {
   return {
     getDummySignature: (): Hex => {
-      const dummyEcdsaSignature =
-        "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
-
-      return packUOSignature({
+      const sig = packUOSignature({
         // orderedHookData: [],
-        validationSignature: dummyEcdsaSignature,
+        validationSignature:
+          "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c",
       });
+
+      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
     },
 
-    signUserOperationHash: (uoHash: Hex): Promise<Hex> => {
-      return signer.signMessage({ raw: uoHash }).then((signature: Hex) =>
-        packUOSignature({
-          // orderedHookData: [],
-          validationSignature: signature,
-        })
-      );
+    signUserOperationHash: async (uoHash: Hex): Promise<Hex> => {
+      const sig = await signer
+        .signMessage({ raw: uoHash })
+        .then((signature: Hex) =>
+          packUOSignature({
+            // orderedHookData: [],
+            validationSignature: signature,
+          })
+        );
+
+      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;
     },
 
     // we apply the expected 1271 packing here since the account contract will expect it