@alchemy/smart-accounts 5.0.0-beta.21 → 5.0.0-beta.23

package/dist/esm/index.d.ts

@@ -43,7 +43,7 @@ export type * from "./ma-v2/types.js";
 export type * from "./ma-v2/utils/account.js";
 export { DefaultAddress, DefaultModuleAddress, DEFAULT_OWNER_ENTITY_ID, EXECUTE_USER_OP_SELECTOR, getMAV2UpgradeToData, buildFullNonceKey, serializeModuleEntity, isModularAccountV2, } from "./ma-v2/utils/account.js";
 export type * from "./ma-v2/utils/deferredActions.js";
-export { parseDeferredAction, buildDeferredActionDigest, } from "./ma-v2/utils/deferredActions.js";
+export { parseDeferredAction, encodeDeferredActionWithSignature, } from "./ma-v2/utils/deferredActions.js";
 export type * from "./ma-v2/utils/hooks.js";
 export { serializeValidationConfig, serializeHookConfig, } from "./ma-v2/utils/hooks.js";
 export type * from "./ma-v2/utils/signature.js";

package/dist/esm/index.js

@@ -26,7 +26,7 @@ export { TimeRangeModule } from "./ma-v2/modules/time-range-module/module.js";
 export { PermissionBuilder, PermissionType, } from "./ma-v2/permissionBuilder.js";
 export { predictModularAccountV2Address } from "./ma-v2/predictAddress.js";
 export { DefaultAddress, DefaultModuleAddress, DEFAULT_OWNER_ENTITY_ID, EXECUTE_USER_OP_SELECTOR, getMAV2UpgradeToData, buildFullNonceKey, serializeModuleEntity, isModularAccountV2, } from "./ma-v2/utils/account.js";
-export { parseDeferredAction, buildDeferredActionDigest, } from "./ma-v2/utils/deferredActions.js";
+export { parseDeferredAction, encodeDeferredActionWithSignature, } from "./ma-v2/utils/deferredActions.js";
 export { serializeValidationConfig, serializeHookConfig, } from "./ma-v2/utils/hooks.js";
 export { packUOSignature, pack1271Signature, toReplaySafeTypedData, } from "./ma-v2/utils/signature.js";
 // Errors

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["export type * from \"./types.js\";\n\n// LightAccount\nexport type * from \"./light-account/accounts/account.js\";\nexport { toLightAccount } from \"./light-account/accounts/account.js\";\n\nexport type * from \"./light-account/accounts/multi-owner-account.js\";\nexport { toMultiOwnerLightAccount } from \"./light-account/accounts/multi-owner-account.js\";\n\nexport type * from \"./light-account/predictAddress.js\";\nexport {\n  predictLightAccountAddress,\n  predictMultiOwnerLightAccountAddress,\n} from \"./light-account/predictAddress.js\";\n\nexport { AccountVersionRegistry } from \"./light-account/registry.js\";\nexport type * from \"./light-account/registry.js\";\nexport {\n  defaultLightAccountVersion,\n  getLightAccountImplAddress,\n  LightAccountUnsupported1271Factories,\n  LightAccountUnsupported1271Impls,\n} from \"./light-account/utils.js\";\n\nexport {\n  encodeCallsLA,\n  decodeCallsLA,\n} from \"./light-account/accounts/calldataCodec.js\";\n\nexport {\n  lightAccountStaticImplV1_0_1,\n  lightAccountStaticImplV1_0_2,\n  lightAccountStaticImplV1_1_0,\n  lightAccountStaticImplV2_0_0,\n  multiOwnerLightAccountStaticImplV2_0_0,\n} from \"./light-account/lightAccountStaticImpl.js\";\n\n// ModularAccountV1\nexport type * from \"./ma-v1/accounts/base.js\";\nexport { toModularAccountV1Base } from \"./ma-v1/accounts/base.js\";\n\nexport type * from \"./ma-v1/accounts/multi-owner-account.js\";\nexport { toMultiOwnerModularAccountV1 } from \"./ma-v1/accounts/multi-owner-account.js\";\n\nexport type * from \"./ma-v1/predictAddress.js\";\nexport { predictMultiOwnerModularAccountV1Address } from \"./ma-v1/predictAddress.js\";\n\nexport { multiOwnerModularAccountStaticImpl } from \"./ma-v1/mav1StaticImpl.js\";\n\nexport {\n  DefaultMaV1Address,\n  DefaultMaV1PluginAddress,\n} from \"./ma-v1/account.js\";\n\nexport {\n  encodeCallsMAv1,\n  decodeCallsMAv1,\n} from \"./ma-v1/accounts/calldataCodec.js\";\n\n// ModularAccountV2\nexport type * from \"./ma-v2/accounts/account.js\";\nexport { toModularAccountV2 } from \"./ma-v2/accounts/account.js\";\n\nexport type * from \"./ma-v2/accounts/base.js\";\nexport { toModularAccountV2Base } from \"./ma-v2/accounts/base.js\";\n\nexport {\n  encodeCallsMAv2,\n  decodeCallsMAv2,\n} from \"./ma-v2/accounts/calldataCodec.js\";\n\nexport type * from \"./ma-v2/decorators/deferralActions.js\";\nexport { deferralActions } from \"./ma-v2/decorators/deferralActions.js\";\n\nexport type * from \"./ma-v2/decorators/installValidation.js\";\nexport { installValidationActions } from \"./ma-v2/decorators/installValidation.js\";\n\nexport {\n  semiModularAccountV2StaticImpl,\n  semiModularAccount7702StaticImpl,\n} from \"./ma-v2/mav2StaticImpl.js\";\nexport type * from \"./ma-v2/mav2StaticImpl.js\";\n\n// Modules\nexport { AllowlistModule } from \"./ma-v2/modules/allowlist-module/module.js\";\nexport { NativeTokenLimitModule } from \"./ma-v2/modules/native-token-limit-module/module.js\";\nexport { PaymasterGuardModule } from \"./ma-v2/modules/paymaster-guard-module/module.js\";\nexport { SingleSignerValidationModule } from \"./ma-v2/modules/single-signer-validation/module.js\";\nexport { TimeRangeModule } from \"./ma-v2/modules/time-range-module/module.js\";\n\nexport type * from \"./ma-v2/permissionBuilder.js\";\nexport {\n  PermissionBuilder,\n  PermissionType,\n} from \"./ma-v2/permissionBuilder.js\";\n\nexport type * from \"./ma-v2/predictAddress.js\";\nexport { predictModularAccountV2Address } from \"./ma-v2/predictAddress.js\";\n\nexport type * from \"./ma-v2/types.js\";\n\nexport type * from \"./ma-v2/utils/account.js\";\nexport {\n  DefaultAddress,\n  DefaultModuleAddress,\n  DEFAULT_OWNER_ENTITY_ID,\n  EXECUTE_USER_OP_SELECTOR,\n  getMAV2UpgradeToData,\n  buildFullNonceKey,\n  serializeModuleEntity,\n  isModularAccountV2,\n} from \"./ma-v2/utils/account.js\";\n\nexport type * from \"./ma-v2/utils/deferredActions.js\";\nexport {\n  parseDeferredAction,\n  buildDeferredActionDigest,\n} from \"./ma-v2/utils/deferredActions.js\";\n\nexport type * from \"./ma-v2/utils/hooks.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n} from \"./ma-v2/utils/hooks.js\";\n\nexport type * from \"./ma-v2/utils/signature.js\";\nexport {\n  packUOSignature,\n  pack1271Signature,\n  toReplaySafeTypedData,\n} from \"./ma-v2/utils/signature.js\";\n\n// Errors\nexport { EntityIdOverrideError } from \"./errors/EntityIdOverrideError.js\";\nexport { InvalidDeferredActionNonceError } from \"./errors/InvalidDeferredActionNonceError.js\";\nexport { InvalidEntityIdError } from \"./errors/InvalidEntityIdError.js\";\nexport { InvalidNonceKeyError } from \"./errors/InvalidNonceKeyError.js\";\nexport { InvalidOwnerError } from \"./errors/InvalidOwnerError.js\";\nexport {\n  PermissionBuilderError,\n  RootPermissionOnlyError,\n  AccountAddressAsTargetError,\n  DuplicateTargetAddressError,\n  NoFunctionsProvidedError,\n  ExpiredDeadlineError,\n  DeadlineOverLimitError,\n  ValidationConfigUnsetError,\n  MultipleNativeTokenTransferError,\n  ZeroAddressError,\n  MultipleGasLimitError,\n  UnsupportedPermissionTypeError,\n  SelectorNotAllowed,\n} from \"./errors/permissionBuilderErrors.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["export type * from \"./types.js\";\n\n// LightAccount\nexport type * from \"./light-account/accounts/account.js\";\nexport { toLightAccount } from \"./light-account/accounts/account.js\";\n\nexport type * from \"./light-account/accounts/multi-owner-account.js\";\nexport { toMultiOwnerLightAccount } from \"./light-account/accounts/multi-owner-account.js\";\n\nexport type * from \"./light-account/predictAddress.js\";\nexport {\n  predictLightAccountAddress,\n  predictMultiOwnerLightAccountAddress,\n} from \"./light-account/predictAddress.js\";\n\nexport { AccountVersionRegistry } from \"./light-account/registry.js\";\nexport type * from \"./light-account/registry.js\";\nexport {\n  defaultLightAccountVersion,\n  getLightAccountImplAddress,\n  LightAccountUnsupported1271Factories,\n  LightAccountUnsupported1271Impls,\n} from \"./light-account/utils.js\";\n\nexport {\n  encodeCallsLA,\n  decodeCallsLA,\n} from \"./light-account/accounts/calldataCodec.js\";\n\nexport {\n  lightAccountStaticImplV1_0_1,\n  lightAccountStaticImplV1_0_2,\n  lightAccountStaticImplV1_1_0,\n  lightAccountStaticImplV2_0_0,\n  multiOwnerLightAccountStaticImplV2_0_0,\n} from \"./light-account/lightAccountStaticImpl.js\";\n\n// ModularAccountV1\nexport type * from \"./ma-v1/accounts/base.js\";\nexport { toModularAccountV1Base } from \"./ma-v1/accounts/base.js\";\n\nexport type * from \"./ma-v1/accounts/multi-owner-account.js\";\nexport { toMultiOwnerModularAccountV1 } from \"./ma-v1/accounts/multi-owner-account.js\";\n\nexport type * from \"./ma-v1/predictAddress.js\";\nexport { predictMultiOwnerModularAccountV1Address } from \"./ma-v1/predictAddress.js\";\n\nexport { multiOwnerModularAccountStaticImpl } from \"./ma-v1/mav1StaticImpl.js\";\n\nexport {\n  DefaultMaV1Address,\n  DefaultMaV1PluginAddress,\n} from \"./ma-v1/account.js\";\n\nexport {\n  encodeCallsMAv1,\n  decodeCallsMAv1,\n} from \"./ma-v1/accounts/calldataCodec.js\";\n\n// ModularAccountV2\nexport type * from \"./ma-v2/accounts/account.js\";\nexport { toModularAccountV2 } from \"./ma-v2/accounts/account.js\";\n\nexport type * from \"./ma-v2/accounts/base.js\";\nexport { toModularAccountV2Base } from \"./ma-v2/accounts/base.js\";\n\nexport {\n  encodeCallsMAv2,\n  decodeCallsMAv2,\n} from \"./ma-v2/accounts/calldataCodec.js\";\n\nexport type * from \"./ma-v2/decorators/deferralActions.js\";\nexport { deferralActions } from \"./ma-v2/decorators/deferralActions.js\";\n\nexport type * from \"./ma-v2/decorators/installValidation.js\";\nexport { installValidationActions } from \"./ma-v2/decorators/installValidation.js\";\n\nexport {\n  semiModularAccountV2StaticImpl,\n  semiModularAccount7702StaticImpl,\n} from \"./ma-v2/mav2StaticImpl.js\";\nexport type * from \"./ma-v2/mav2StaticImpl.js\";\n\n// Modules\nexport { AllowlistModule } from \"./ma-v2/modules/allowlist-module/module.js\";\nexport { NativeTokenLimitModule } from \"./ma-v2/modules/native-token-limit-module/module.js\";\nexport { PaymasterGuardModule } from \"./ma-v2/modules/paymaster-guard-module/module.js\";\nexport { SingleSignerValidationModule } from \"./ma-v2/modules/single-signer-validation/module.js\";\nexport { TimeRangeModule } from \"./ma-v2/modules/time-range-module/module.js\";\n\nexport type * from \"./ma-v2/permissionBuilder.js\";\nexport {\n  PermissionBuilder,\n  PermissionType,\n} from \"./ma-v2/permissionBuilder.js\";\n\nexport type * from \"./ma-v2/predictAddress.js\";\nexport { predictModularAccountV2Address } from \"./ma-v2/predictAddress.js\";\n\nexport type * from \"./ma-v2/types.js\";\n\nexport type * from \"./ma-v2/utils/account.js\";\nexport {\n  DefaultAddress,\n  DefaultModuleAddress,\n  DEFAULT_OWNER_ENTITY_ID,\n  EXECUTE_USER_OP_SELECTOR,\n  getMAV2UpgradeToData,\n  buildFullNonceKey,\n  serializeModuleEntity,\n  isModularAccountV2,\n} from \"./ma-v2/utils/account.js\";\n\nexport type * from \"./ma-v2/utils/deferredActions.js\";\nexport {\n  parseDeferredAction,\n  encodeDeferredActionWithSignature,\n} from \"./ma-v2/utils/deferredActions.js\";\n\nexport type * from \"./ma-v2/utils/hooks.js\";\nexport {\n  serializeValidationConfig,\n  serializeHookConfig,\n} from \"./ma-v2/utils/hooks.js\";\n\nexport type * from \"./ma-v2/utils/signature.js\";\nexport {\n  packUOSignature,\n  pack1271Signature,\n  toReplaySafeTypedData,\n} from \"./ma-v2/utils/signature.js\";\n\n// Errors\nexport { EntityIdOverrideError } from \"./errors/EntityIdOverrideError.js\";\nexport { InvalidDeferredActionNonceError } from \"./errors/InvalidDeferredActionNonceError.js\";\nexport { InvalidEntityIdError } from \"./errors/InvalidEntityIdError.js\";\nexport { InvalidNonceKeyError } from \"./errors/InvalidNonceKeyError.js\";\nexport { InvalidOwnerError } from \"./errors/InvalidOwnerError.js\";\nexport {\n  PermissionBuilderError,\n  RootPermissionOnlyError,\n  AccountAddressAsTargetError,\n  DuplicateTargetAddressError,\n  NoFunctionsProvidedError,\n  ExpiredDeadlineError,\n  DeadlineOverLimitError,\n  ValidationConfigUnsetError,\n  MultipleNativeTokenTransferError,\n  ZeroAddressError,\n  MultipleGasLimitError,\n  UnsupportedPermissionTypeError,\n  SelectorNotAllowed,\n} from \"./errors/permissionBuilderErrors.js\";\n"]}

package/dist/esm/ma-v2/decorators/deferralActions.d.ts

@@ -25,7 +25,7 @@ export type CreateDeferredActionTypedDataParams = {
     deadline: number;
     nonce: bigint;
 };
-export type BuildPreSignatureDeferredActionDigestParams = {
+export type BuildPreSignatureDeferredActionPayloadParams = {
     typedData: DeferredActionTypedData;
 };
 export type EntityIdAndNonceParams = {
@@ -36,7 +36,7 @@ export type EntityIdAndNonceParams = {
 };
 export type DeferralActions = {
     createDeferredActionTypedDataObject: (args: CreateDeferredActionTypedDataParams) => Promise<DeferredActionReturnData>;
-    buildPreSignatureDeferredActionDigest: (args: BuildPreSignatureDeferredActionDigestParams) => Hex;
+    buildPreSignatureDeferredActionPayload: (args: BuildPreSignatureDeferredActionPayloadParams) => Hex;
     getEntityIdAndNonce: (args: EntityIdAndNonceParams) => Promise<{
         nonce: bigint;
         entityId: number;
@@ -46,6 +46,6 @@ export type DeferralActions = {
  * 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`.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildPreSignatureDeferredActionPayload`, and `buildUserOperationWithDeferredAction`.
  */
 export declare const deferralActions: <TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartAccount = SmartAccount>(client: Client<TTransport, TChain, TAccount>) => DeferralActions;

package/dist/esm/ma-v2/decorators/deferralActions.js

@@ -10,7 +10,7 @@ export const ENTITY_ID_AND_NONCE_READER_BYTECODE = "0x60806040523480156100105760
  * 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`.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildPreSignatureDeferredActionPayload`, and `buildUserOperationWithDeferredAction`.
  */
 export const deferralActions = (client) => {
     const createDeferredActionTypedDataObject = async ({ callData, deadline, nonce, }) => {
@@ -40,7 +40,7 @@ export const deferralActions = (client) => {
             },
         };
     };
-    const buildPreSignatureDeferredActionDigest = ({ typedData, }) => {
+    const buildPreSignatureDeferredActionPayload = ({ typedData, }) => {
         const account = client.account;
         if (!account || !isModularAccountV2(account)) {
             throw new AccountNotFoundError();
@@ -93,7 +93,7 @@ export const deferralActions = (client) => {
     };
     return {
         createDeferredActionTypedDataObject,
-        buildPreSignatureDeferredActionDigest,
+        buildPreSignatureDeferredActionPayload,
         getEntityIdAndNonce,
     };
 };

package/dist/esm/ma-v2/decorators/deferralActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferralActions.js","sourceRoot":"","sources":["../../../../src/ma-v2/decorators/deferralActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concatHex,\n  type Hex,\n  type Client,\n  type Chain,\n  type Transport,\n  encodePacked,\n  size,\n  toHex,\n  maxUint152,\n  encodeDeployData,\n  hexToNumber,\n  isHex,\n  type TypedDataDefinition,\n} from \"viem\";\nimport type { SmartAccount } from \"viem/account-abstraction\";\nimport { entityIdAndNonceReaderAbi } from \"../abis/entityIdAndNonceReader.js\";\nimport { getAction } from \"viem/utils\";\nimport { call } from \"viem/actions\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { buildFullNonceKey, isModularAccountV2 } from \"../utils/account.js\";\nimport { AccountNotFoundError, BaseError } from \"@alchemy/common\";\n\nexport const ENTITY_ID_AND_NONCE_READER_BYTECODE =\n  \"0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe\";\n\nexport type DeferredActionTypedData = TypedDataDefinition<\n  {\n    DeferredAction: [\n      { name: \"nonce\"; type: \"uint256\" },\n      { name: \"deadline\"; type: \"uint48\" },\n      { name: \"call\"; type: \"bytes\" },\n    ];\n  },\n  \"DeferredAction\"\n>;\n\nexport type DeferredActionReturnData = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type CreateDeferredActionTypedDataParams = {\n  callData: Hex;\n  deadline: number;\n  nonce: bigint;\n};\n\nexport type BuildPreSignatureDeferredActionDigestParams = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type EntityIdAndNonceParams = {\n  entityId?: number;\n  nonceKey?: bigint;\n  isGlobalValidation: boolean;\n  isDeferredAction?: boolean;\n};\n\nexport type DeferralActions = {\n  createDeferredActionTypedDataObject: (\n    args: CreateDeferredActionTypedDataParams,\n  ) => Promise<DeferredActionReturnData>;\n  buildPreSignatureDeferredActionDigest: (\n    args: BuildPreSignatureDeferredActionDigestParams,\n  ) => Hex;\n  getEntityIdAndNonce: (\n    args: EntityIdAndNonceParams,\n  ) => Promise<{ nonce: bigint; entityId: number }>;\n};\n\n/**\n * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildDeferredActionDigest`, and `buildUserOperationWithDeferredAction`.\n */\nexport const deferralActions = <\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TAccount extends SmartAccount = SmartAccount,\n>(\n  client: Client<TTransport, TChain, TAccount>,\n): DeferralActions => {\n  const createDeferredActionTypedDataObject = async ({\n    callData,\n    deadline,\n    nonce,\n  }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    return {\n      typedData: {\n        domain: {\n          chainId: client.chain.id,\n          verifyingContract: client.account.address,\n        },\n        types: {\n          DeferredAction: [\n            { name: \"nonce\", type: \"uint256\" },\n            { name: \"deadline\", type: \"uint48\" },\n            { name: \"call\", type: \"bytes\" },\n          ],\n        },\n        primaryType: \"DeferredAction\",\n        message: {\n          nonce: nonce,\n          deadline: deadline,\n          call: callData,\n        },\n      },\n    };\n  };\n\n  const buildPreSignatureDeferredActionDigest = ({\n    typedData,\n  }: BuildPreSignatureDeferredActionDigestParams): Hex => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    const signerEntity = account.signerEntity;\n    const validationLocator =\n      (BigInt(signerEntity.entityId) << 8n) |\n      (signerEntity.isGlobalValidation ? 1n : 0n);\n\n    const encodedCallData = encodePacked(\n      [\"uint168\", \"uint48\", \"bytes\"],\n      [validationLocator, typedData.message.deadline, typedData.message.call],\n    );\n\n    const encodedDataLength = size(encodedCallData);\n    const encodedData = concatHex([\n      toHex(encodedDataLength, { size: 4 }),\n      encodedCallData,\n    ]);\n    return encodedData;\n  };\n\n  const getEntityIdAndNonce = async ({\n    entityId = 1,\n    nonceKey = 0n,\n    isGlobalValidation,\n    isDeferredAction = true,\n  }: EntityIdAndNonceParams) => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const bytecode = encodeDeployData({\n      abi: entityIdAndNonceReaderAbi,\n      bytecode: ENTITY_ID_AND_NONCE_READER_BYTECODE,\n      args: [\n        account.address,\n        account.entryPoint.address,\n        buildFullNonceKey({\n          nonceKey,\n          entityId,\n          isGlobalValidation,\n          isDeferredAction,\n        }),\n      ],\n    });\n\n    const action = getAction(client, call, \"call\");\n    const { data } = await action({ data: bytecode });\n    if (!data) {\n      throw new BaseError(\"No data returned from contract call\");\n    }\n    if (!isHex(data)) {\n      throw new BaseError(\"Expected hex data from contract call\");\n    }\n\n    return {\n      nonce: BigInt(data),\n      entityId: hexToNumber(`0x${data.slice(40, 48)}`),\n    };\n  };\n\n  return {\n    createDeferredActionTypedDataObject,\n    buildPreSignatureDeferredActionDigest,\n    getEntityIdAndNonce,\n  };\n};\n"]}
+{"version":3,"file":"deferralActions.js","sourceRoot":"","sources":["../../../../src/ma-v2/decorators/deferralActions.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concatHex,\n  type Hex,\n  type Client,\n  type Chain,\n  type Transport,\n  encodePacked,\n  size,\n  toHex,\n  maxUint152,\n  encodeDeployData,\n  hexToNumber,\n  isHex,\n  type TypedDataDefinition,\n} from \"viem\";\nimport type { SmartAccount } from \"viem/account-abstraction\";\nimport { entityIdAndNonceReaderAbi } from \"../abis/entityIdAndNonceReader.js\";\nimport { getAction } from \"viem/utils\";\nimport { call } from \"viem/actions\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { buildFullNonceKey, isModularAccountV2 } from \"../utils/account.js\";\nimport { AccountNotFoundError, BaseError } from \"@alchemy/common\";\n\nexport const ENTITY_ID_AND_NONCE_READER_BYTECODE =\n  \"0x608060405234801561001057600080fd5b506040516104f13803806104f183398101604081905261002f916101e5565b60006008826001600160c01b0316901c90506000808263ffffffff1611610057576001610059565b815b90506001600160a01b0385163b15610133575b60006001600160a01b03861663d31b575b6bffffffff0000000000000000604085901b166040516001600160e01b031960e084901b1681526001600160401b03199091166004820152602401600060405180830381865afa1580156100d5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526100fd91908101906103c6565b805190915060ff161580156101155750606081015151155b156101205750610133565b8161012a816104a4565b9250505061006c565b604051631aab3f0d60e11b81526001600160a01b03868116600483015264ffffffff01600160c01b038516600884901b64ffffffff0016176024830152600091908616906335567e1a90604401602060405180830381865afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c191906104d7565b90508060005260206000f35b6001600160a01b03811681146101e257600080fd5b50565b6000806000606084860312156101fa57600080fd5b8351610205816101cd565b6020850151909350610216816101cd565b60408501519092506001600160c01b038116811461023357600080fd5b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b604051608081016001600160401b03811182821017156102765761027661023e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156102a4576102a461023e565b604052919050565b60006001600160401b038211156102c5576102c561023e565b5060051b60200190565b600082601f8301126102e057600080fd5b81516102f36102ee826102ac565b61027c565b8082825260208201915060208360051b86010192508583111561031557600080fd5b602085015b8381101561034857805166ffffffffffffff198116811461033a57600080fd5b83526020928301920161031a565b5095945050505050565b600082601f83011261036357600080fd5b81516103716102ee826102ac565b8082825260208201915060208360051b86010192508583111561039357600080fd5b602085015b838110156103485780516001600160e01b0319811681146103b857600080fd5b835260209283019201610398565b6000602082840312156103d857600080fd5b81516001600160401b038111156103ee57600080fd5b82016080818503121561040057600080fd5b610408610254565b815160ff8116811461041957600080fd5b815260208201516001600160401b0381111561043457600080fd5b610440868285016102cf565b60208301525060408201516001600160401b0381111561045f57600080fd5b61046b868285016102cf565b60408301525060608201516001600160401b0381111561048a57600080fd5b61049686828501610352565b606083015250949350505050565b600063ffffffff821663ffffffff81036104ce57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6000602082840312156104e957600080fd5b505191905056fe\";\n\nexport type DeferredActionTypedData = TypedDataDefinition<\n  {\n    DeferredAction: [\n      { name: \"nonce\"; type: \"uint256\" },\n      { name: \"deadline\"; type: \"uint48\" },\n      { name: \"call\"; type: \"bytes\" },\n    ];\n  },\n  \"DeferredAction\"\n>;\n\nexport type DeferredActionReturnData = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type CreateDeferredActionTypedDataParams = {\n  callData: Hex;\n  deadline: number;\n  nonce: bigint;\n};\n\nexport type BuildPreSignatureDeferredActionPayloadParams = {\n  typedData: DeferredActionTypedData;\n};\n\nexport type EntityIdAndNonceParams = {\n  entityId?: number;\n  nonceKey?: bigint;\n  isGlobalValidation: boolean;\n  isDeferredAction?: boolean;\n};\n\nexport type DeferralActions = {\n  createDeferredActionTypedDataObject: (\n    args: CreateDeferredActionTypedDataParams,\n  ) => Promise<DeferredActionReturnData>;\n  buildPreSignatureDeferredActionPayload: (\n    args: BuildPreSignatureDeferredActionPayloadParams,\n  ) => Hex;\n  getEntityIdAndNonce: (\n    args: EntityIdAndNonceParams,\n  ) => Promise<{ nonce: bigint; entityId: number }>;\n};\n\n/**\n * Provides deferred action functionalities for a MA v2 client, ensuring compatibility with `SmartAccountClient`.\n *\n * @param {ModularAccountV2Client} client - The client instance which provides account and sendUserOperation functionality.\n * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildPreSignatureDeferredActionPayload`, and `buildUserOperationWithDeferredAction`.\n */\nexport const deferralActions = <\n  TTransport extends Transport = Transport,\n  TChain extends Chain = Chain,\n  TAccount extends SmartAccount = SmartAccount,\n>(\n  client: Client<TTransport, TChain, TAccount>,\n): DeferralActions => {\n  const createDeferredActionTypedDataObject = async ({\n    callData,\n    deadline,\n    nonce,\n  }: CreateDeferredActionTypedDataParams): Promise<DeferredActionReturnData> => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    return {\n      typedData: {\n        domain: {\n          chainId: client.chain.id,\n          verifyingContract: client.account.address,\n        },\n        types: {\n          DeferredAction: [\n            { name: \"nonce\", type: \"uint256\" },\n            { name: \"deadline\", type: \"uint48\" },\n            { name: \"call\", type: \"bytes\" },\n          ],\n        },\n        primaryType: \"DeferredAction\",\n        message: {\n          nonce: nonce,\n          deadline: deadline,\n          call: callData,\n        },\n      },\n    };\n  };\n\n  const buildPreSignatureDeferredActionPayload = ({\n    typedData,\n  }: BuildPreSignatureDeferredActionPayloadParams): Hex => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    const signerEntity = account.signerEntity;\n    const validationLocator =\n      (BigInt(signerEntity.entityId) << 8n) |\n      (signerEntity.isGlobalValidation ? 1n : 0n);\n\n    const encodedCallData = encodePacked(\n      [\"uint168\", \"uint48\", \"bytes\"],\n      [validationLocator, typedData.message.deadline, typedData.message.call],\n    );\n\n    const encodedDataLength = size(encodedCallData);\n    const encodedData = concatHex([\n      toHex(encodedDataLength, { size: 4 }),\n      encodedCallData,\n    ]);\n    return encodedData;\n  };\n\n  const getEntityIdAndNonce = async ({\n    entityId = 1,\n    nonceKey = 0n,\n    isGlobalValidation,\n    isDeferredAction = true,\n  }: EntityIdAndNonceParams) => {\n    const account = client.account;\n    if (!account || !isModularAccountV2(account)) {\n      throw new AccountNotFoundError();\n    }\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const bytecode = encodeDeployData({\n      abi: entityIdAndNonceReaderAbi,\n      bytecode: ENTITY_ID_AND_NONCE_READER_BYTECODE,\n      args: [\n        account.address,\n        account.entryPoint.address,\n        buildFullNonceKey({\n          nonceKey,\n          entityId,\n          isGlobalValidation,\n          isDeferredAction,\n        }),\n      ],\n    });\n\n    const action = getAction(client, call, \"call\");\n    const { data } = await action({ data: bytecode });\n    if (!data) {\n      throw new BaseError(\"No data returned from contract call\");\n    }\n    if (!isHex(data)) {\n      throw new BaseError(\"Expected hex data from contract call\");\n    }\n\n    return {\n      nonce: BigInt(data),\n      entityId: hexToNumber(`0x${data.slice(40, 48)}`),\n    };\n  };\n\n  return {\n    createDeferredActionTypedDataObject,\n    buildPreSignatureDeferredActionPayload,\n    getEntityIdAndNonce,\n  };\n};\n"]}

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

@@ -133,11 +133,11 @@ export declare class PermissionBuilder {
     /**
      * Compiles the deferred action typed data to sign.
      *
-     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionDigest: Hex}>} The deferred action typed data and the full pre-signature deferred action digest.
+     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionPayload: Hex}>} The deferred action typed data and the full pre-signature deferred action payload.
      */
     compileDeferred(): Promise<{
         typedData: DeferredActionTypedData;
-        fullPreSignatureDeferredActionDigest: Hex;
+        fullPreSignatureDeferredActionPayload: Hex;
     }>;
     /**
      * Compiles the raw install arguments for the installValidation function.

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

@@ -222,7 +222,7 @@ export class PermissionBuilder {
     /**
      * Compiles the deferred action typed data to sign.
      *
-     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionDigest: Hex}>} The deferred action typed data and the full pre-signature deferred action digest.
+     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionPayload: Hex}>} The deferred action typed data and the full pre-signature deferred action payload.
      */
     async compileDeferred() {
         // Add time range module hook via expiry
@@ -245,14 +245,14 @@ export class PermissionBuilder {
             deadline: this.deadline,
             nonce: this.nonce,
         });
-        const preSignatureDigest = deferralActions(this.client).buildPreSignatureDeferredActionDigest({ typedData });
-        // Encode additional information to build the full pre-signature digest
-        const fullPreSignatureDeferredActionDigest = `0x0${this.hasAssociatedExecHooks ? "1" : "0"}${toHex(this.nonce, {
+        const preSignaturePayload = deferralActions(this.client).buildPreSignatureDeferredActionPayload({ typedData });
+        // Encode additional information to build the full pre-signature payload
+        const fullPreSignatureDeferredActionPayload = `0x0${this.hasAssociatedExecHooks ? "1" : "0"}${toHex(this.nonce, {
             size: 32,
-        }).slice(2)}${preSignatureDigest.slice(2)}`;
+        }).slice(2)}${preSignaturePayload.slice(2)}`;
         return {
             typedData,
-            fullPreSignatureDeferredActionDigest,
+            fullPreSignatureDeferredActionPayload,
         };
     }
     /**

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

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

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

@@ -13,17 +13,17 @@ export declare const parseDeferredAction: (deferredAction: Hex) => {
     deferredActionData: Hex;
     hasAssociatedExecHooks: boolean;
 };
-export type BuildDeferredActionDigestParams = {
-    fullPreSignatureDeferredActionDigest: Hex;
+export type EncodeDeferredActionWithSignatureParams = {
+    fullPreSignatureDeferredActionPayload: Hex;
     sig: Hex;
     signaturePrefix?: SignaturePrefix;
 };
 /**
- * Creates the digest which must be prepended to the userOp signature.
+ * Encodes the deferred action with its signature, producing the payload to prepend to the userOp signature.
  *
  * Assumption: The client this extends is used to sign the typed data.
  *
- * @param {BuildDeferredActionDigestParams} params - The parameters for building the deferred action digest.
- * @returns {Hex} The encoded digest to be prepended to the userOp signature.
+ * @param {EncodeDeferredActionWithSignatureParams} params - The parameters for encoding the deferred action with its signature.
+ * @returns {Hex} The encoded payload to be prepended to the userOp signature.
  */
-export declare const buildDeferredActionDigest: ({ fullPreSignatureDeferredActionDigest, sig, }: BuildDeferredActionDigestParams) => Hex;
+export declare const encodeDeferredActionWithSignature: ({ fullPreSignatureDeferredActionPayload, sig, }: EncodeDeferredActionWithSignatureParams) => Hex;

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

@@ -17,19 +17,19 @@ export const parseDeferredAction = (deferredAction) => {
     };
 };
 /**
- * Creates the digest which must be prepended to the userOp signature.
+ * Encodes the deferred action with its signature, producing the payload to prepend to the userOp signature.
  *
  * Assumption: The client this extends is used to sign the typed data.
  *
- * @param {BuildDeferredActionDigestParams} params - The parameters for building the deferred action digest.
- * @returns {Hex} The encoded digest to be prepended to the userOp signature.
+ * @param {EncodeDeferredActionWithSignatureParams} params - The parameters for encoding the deferred action with its signature.
+ * @returns {Hex} The encoded payload to be prepended to the userOp signature.
  */
-export const buildDeferredActionDigest = ({ fullPreSignatureDeferredActionDigest, sig, }) => {
+export const encodeDeferredActionWithSignature = ({ fullPreSignatureDeferredActionPayload, sig, }) => {
     // 6492 sigs don't work here.
     const _sig = parseErc6492Signature(sig).signature;
     const sigLength = size(_sig);
     const encodedData = concatHex([
-        fullPreSignatureDeferredActionDigest,
+        fullPreSignatureDeferredActionPayload,
         toHex(sigLength, { size: 4 }),
         _sig,
     ]);

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

@@ -1 +1 @@
-{"version":3,"file":"deferredActions.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/deferredActions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,IAAI,EACJ,KAAK,GAEN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,cAAmB,EAOnB,EAAE;IACF,2GAA2G;IAC3G,OAAO;QACL,QAAQ,EAAE,WAAW,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAC1D,kBAAkB,EAChB,WAAW,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;QAC5D,KAAK,EAAE,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QACjD,kBAAkB,EAAE,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAS;QAC1D,sBAAsB,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG;KAClD,CAAC;AACJ,CAAC,CAAC;AAQF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,oCAAoC,EACpC,GAAG,GAC6B,EAAO,EAAE;IACzC,6BAA6B;IAC7B,MAAM,IAAI,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;IAElD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,WAAW,GAAG,SAAS,CAAC;QAC5B,oCAAoC;QACpC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7B,IAAI;KACL,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC","sourcesContent":["import {\n  concatHex,\n  hexToNumber,\n  parseErc6492Signature,\n  size,\n  toHex,\n  type Hex,\n} from \"viem\";\nimport { SignaturePrefix } from \"../types.js\";\n\n/**\n * Parses out the 3 components from a deferred action.\n *\n * @param {Hex} deferredAction - The deferred action to parse.\n * @returns {object} The parsed deferred action.\n */\nexport const parseDeferredAction = (\n  deferredAction: Hex,\n): {\n  entityId: number;\n  isGlobalValidation: boolean;\n  nonce: bigint;\n  deferredActionData: Hex;\n  hasAssociatedExecHooks: boolean;\n} => {\n  // 2 for 0x, 2 for 00/01, 38 for parallel nonce, 8 for entity id, 2 for options byte, 16 for parallel nonce\n  return {\n    entityId: hexToNumber(`0x${deferredAction.slice(42, 50)}`),\n    isGlobalValidation:\n      hexToNumber(`0x${deferredAction.slice(50, 52)}`) % 2 === 1,\n    nonce: BigInt(`0x${deferredAction.slice(4, 68)}`),\n    deferredActionData: `0x${deferredAction.slice(68)}` as Hex,\n    hasAssociatedExecHooks: deferredAction[3] === \"1\",\n  };\n};\n\nexport type BuildDeferredActionDigestParams = {\n  fullPreSignatureDeferredActionDigest: Hex;\n  sig: Hex;\n  signaturePrefix?: SignaturePrefix;\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 {BuildDeferredActionDigestParams} params - The parameters for building the deferred action digest.\n * @returns {Hex} The encoded digest to be prepended to the userOp signature.\n */\nexport const buildDeferredActionDigest = ({\n  fullPreSignatureDeferredActionDigest,\n  sig,\n}: BuildDeferredActionDigestParams): Hex => {\n  // 6492 sigs don't work here.\n  const _sig = parseErc6492Signature(sig).signature;\n\n  const sigLength = size(_sig);\n\n  const encodedData = concatHex([\n    fullPreSignatureDeferredActionDigest,\n    toHex(sigLength, { size: 4 }),\n    _sig,\n  ]);\n  return encodedData;\n};\n"]}
+{"version":3,"file":"deferredActions.js","sourceRoot":"","sources":["../../../../src/ma-v2/utils/deferredActions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,IAAI,EACJ,KAAK,GAEN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,cAAmB,EAOnB,EAAE;IACF,2GAA2G;IAC3G,OAAO;QACL,QAAQ,EAAE,WAAW,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAC1D,kBAAkB,EAChB,WAAW,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;QAC5D,KAAK,EAAE,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QACjD,kBAAkB,EAAE,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAS;QAC1D,sBAAsB,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG;KAClD,CAAC;AACJ,CAAC,CAAC;AAQF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,EAChD,qCAAqC,EACrC,GAAG,GACqC,EAAO,EAAE;IACjD,6BAA6B;IAC7B,MAAM,IAAI,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;IAElD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,WAAW,GAAG,SAAS,CAAC;QAC5B,qCAAqC;QACrC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7B,IAAI;KACL,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC","sourcesContent":["import {\n  concatHex,\n  hexToNumber,\n  parseErc6492Signature,\n  size,\n  toHex,\n  type Hex,\n} from \"viem\";\nimport { SignaturePrefix } from \"../types.js\";\n\n/**\n * Parses out the 3 components from a deferred action.\n *\n * @param {Hex} deferredAction - The deferred action to parse.\n * @returns {object} The parsed deferred action.\n */\nexport const parseDeferredAction = (\n  deferredAction: Hex,\n): {\n  entityId: number;\n  isGlobalValidation: boolean;\n  nonce: bigint;\n  deferredActionData: Hex;\n  hasAssociatedExecHooks: boolean;\n} => {\n  // 2 for 0x, 2 for 00/01, 38 for parallel nonce, 8 for entity id, 2 for options byte, 16 for parallel nonce\n  return {\n    entityId: hexToNumber(`0x${deferredAction.slice(42, 50)}`),\n    isGlobalValidation:\n      hexToNumber(`0x${deferredAction.slice(50, 52)}`) % 2 === 1,\n    nonce: BigInt(`0x${deferredAction.slice(4, 68)}`),\n    deferredActionData: `0x${deferredAction.slice(68)}` as Hex,\n    hasAssociatedExecHooks: deferredAction[3] === \"1\",\n  };\n};\n\nexport type EncodeDeferredActionWithSignatureParams = {\n  fullPreSignatureDeferredActionPayload: Hex;\n  sig: Hex;\n  signaturePrefix?: SignaturePrefix;\n};\n\n/**\n * Encodes the deferred action with its signature, producing the payload to prepend to the userOp signature.\n *\n * Assumption: The client this extends is used to sign the typed data.\n *\n * @param {EncodeDeferredActionWithSignatureParams} params - The parameters for encoding the deferred action with its signature.\n * @returns {Hex} The encoded payload to be prepended to the userOp signature.\n */\nexport const encodeDeferredActionWithSignature = ({\n  fullPreSignatureDeferredActionPayload,\n  sig,\n}: EncodeDeferredActionWithSignatureParams): Hex => {\n  // 6492 sigs don't work here.\n  const _sig = parseErc6492Signature(sig).signature;\n\n  const sigLength = size(_sig);\n\n  const encodedData = concatHex([\n    fullPreSignatureDeferredActionPayload,\n    toHex(sigLength, { size: 4 }),\n    _sig,\n  ]);\n  return encodedData;\n};\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "5.0.0-beta.20";
+export declare const VERSION = "5.0.0-beta.22";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "5.0.0-beta.20";
+export const VERSION = "5.0.0-beta.22";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"5.0.0-beta.20\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"5.0.0-beta.22\";\n"]}

package/dist/types/index.d.ts

@@ -43,7 +43,7 @@ export type * from "./ma-v2/types.js";
 export type * from "./ma-v2/utils/account.js";
 export { DefaultAddress, DefaultModuleAddress, DEFAULT_OWNER_ENTITY_ID, EXECUTE_USER_OP_SELECTOR, getMAV2UpgradeToData, buildFullNonceKey, serializeModuleEntity, isModularAccountV2, } from "./ma-v2/utils/account.js";
 export type * from "./ma-v2/utils/deferredActions.js";
-export { parseDeferredAction, buildDeferredActionDigest, } from "./ma-v2/utils/deferredActions.js";
+export { parseDeferredAction, encodeDeferredActionWithSignature, } from "./ma-v2/utils/deferredActions.js";
 export type * from "./ma-v2/utils/hooks.js";
 export { serializeValidationConfig, serializeHookConfig, } from "./ma-v2/utils/hooks.js";
 export type * from "./ma-v2/utils/signature.js";

package/dist/types/index.d.ts.map

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

package/dist/types/ma-v2/decorators/deferralActions.d.ts

@@ -25,7 +25,7 @@ export type CreateDeferredActionTypedDataParams = {
     deadline: number;
     nonce: bigint;
 };
-export type BuildPreSignatureDeferredActionDigestParams = {
+export type BuildPreSignatureDeferredActionPayloadParams = {
     typedData: DeferredActionTypedData;
 };
 export type EntityIdAndNonceParams = {
@@ -36,7 +36,7 @@ export type EntityIdAndNonceParams = {
 };
 export type DeferralActions = {
     createDeferredActionTypedDataObject: (args: CreateDeferredActionTypedDataParams) => Promise<DeferredActionReturnData>;
-    buildPreSignatureDeferredActionDigest: (args: BuildPreSignatureDeferredActionDigestParams) => Hex;
+    buildPreSignatureDeferredActionPayload: (args: BuildPreSignatureDeferredActionPayloadParams) => Hex;
     getEntityIdAndNonce: (args: EntityIdAndNonceParams) => Promise<{
         nonce: bigint;
         entityId: number;
@@ -46,7 +46,7 @@ export type DeferralActions = {
  * 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`.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildPreSignatureDeferredActionPayload`, and `buildUserOperationWithDeferredAction`.
  */
 export declare const deferralActions: <TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartAccount = SmartAccount>(client: Client<TTransport, TChain, TAccount>) => DeferralActions;
 //# sourceMappingURL=deferralActions.d.ts.map

package/dist/types/ma-v2/decorators/deferralActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deferralActions.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/decorators/deferralActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,SAAS,EAQd,KAAK,mBAAmB,EACzB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAQ7D,eAAO,MAAM,mCAAmC,y+EACw7E,CAAC;AAEz+E,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CACvD;IACE,cAAc,EAAE;QACd;YAAE,IAAI,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,SAAS,CAAA;SAAE;QAClC;YAAE,IAAI,EAAE,UAAU,CAAC;YAAC,IAAI,EAAE,QAAQ,CAAA;SAAE;QACpC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,OAAO,CAAA;SAAE;KAChC,CAAC;CACH,EACD,gBAAgB,CACjB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,uBAAuB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,2CAA2C,GAAG;IACxD,SAAS,EAAE,uBAAuB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,mCAAmC,EAAE,CACnC,IAAI,EAAE,mCAAmC,KACtC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvC,qCAAqC,EAAE,CACrC,IAAI,EAAE,2CAA2C,KAC9C,GAAG,CAAC;IACT,mBAAmB,EAAE,CACnB,IAAI,EAAE,sBAAsB,KACzB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,QAAQ,SAAS,YAAY,GAAG,YAAY,EAE5C,QAAQ,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,KAC3C,eA8GF,CAAC"}
+{"version":3,"file":"deferralActions.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/decorators/deferralActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,SAAS,EAQd,KAAK,mBAAmB,EACzB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAQ7D,eAAO,MAAM,mCAAmC,y+EACw7E,CAAC;AAEz+E,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CACvD;IACE,cAAc,EAAE;QACd;YAAE,IAAI,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,SAAS,CAAA;SAAE;QAClC;YAAE,IAAI,EAAE,UAAU,CAAC;YAAC,IAAI,EAAE,QAAQ,CAAA;SAAE;QACpC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,OAAO,CAAA;SAAE;KAChC,CAAC;CACH,EACD,gBAAgB,CACjB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,uBAAuB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,4CAA4C,GAAG;IACzD,SAAS,EAAE,uBAAuB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,mCAAmC,EAAE,CACnC,IAAI,EAAE,mCAAmC,KACtC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvC,sCAAsC,EAAE,CACtC,IAAI,EAAE,4CAA4C,KAC/C,GAAG,CAAC;IACT,mBAAmB,EAAE,CACnB,IAAI,EAAE,sBAAsB,KACzB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,KAAK,EAC5B,QAAQ,SAAS,YAAY,GAAG,YAAY,EAE5C,QAAQ,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,KAC3C,eA8GF,CAAC"}

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

@@ -133,11 +133,11 @@ export declare class PermissionBuilder {
     /**
      * Compiles the deferred action typed data to sign.
      *
-     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionDigest: Hex}>} The deferred action typed data and the full pre-signature deferred action digest.
+     * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionPayload: Hex}>} The deferred action typed data and the full pre-signature deferred action payload.
      */
     compileDeferred(): Promise<{
         typedData: DeferredActionTypedData;
-        fullPreSignatureDeferredActionDigest: Hex;
+        fullPreSignatureDeferredActionPayload: Hex;
     }>;
     /**
      * Compiles the raw install arguments for the installValidation function.

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

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

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

@@ -13,18 +13,18 @@ export declare const parseDeferredAction: (deferredAction: Hex) => {
     deferredActionData: Hex;
     hasAssociatedExecHooks: boolean;
 };
-export type BuildDeferredActionDigestParams = {
-    fullPreSignatureDeferredActionDigest: Hex;
+export type EncodeDeferredActionWithSignatureParams = {
+    fullPreSignatureDeferredActionPayload: Hex;
     sig: Hex;
     signaturePrefix?: SignaturePrefix;
 };
 /**
- * Creates the digest which must be prepended to the userOp signature.
+ * Encodes the deferred action with its signature, producing the payload to prepend to the userOp signature.
  *
  * Assumption: The client this extends is used to sign the typed data.
  *
- * @param {BuildDeferredActionDigestParams} params - The parameters for building the deferred action digest.
- * @returns {Hex} The encoded digest to be prepended to the userOp signature.
+ * @param {EncodeDeferredActionWithSignatureParams} params - The parameters for encoding the deferred action with its signature.
+ * @returns {Hex} The encoded payload to be prepended to the userOp signature.
  */
-export declare const buildDeferredActionDigest: ({ fullPreSignatureDeferredActionDigest, sig, }: BuildDeferredActionDigestParams) => Hex;
+export declare const encodeDeferredActionWithSignature: ({ fullPreSignatureDeferredActionPayload, sig, }: EncodeDeferredActionWithSignatureParams) => Hex;
 //# sourceMappingURL=deferredActions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deferredActions.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/utils/deferredActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,GAAG,EACT,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,gBAAgB,GAAG,KAClB;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,GAAG,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;CAWjC,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,oCAAoC,EAAE,GAAG,CAAC;IAC1C,GAAG,EAAE,GAAG,CAAC;IACT,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,GAAI,gDAGvC,+BAA+B,KAAG,GAYpC,CAAC"}
+{"version":3,"file":"deferredActions.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/utils/deferredActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,GAAG,EACT,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,gBAAgB,GAAG,KAClB;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,GAAG,CAAC;IACxB,sBAAsB,EAAE,OAAO,CAAC;CAWjC,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG;IACpD,qCAAqC,EAAE,GAAG,CAAC;IAC3C,GAAG,EAAE,GAAG,CAAC;IACT,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,GAAI,iDAG/C,uCAAuC,KAAG,GAY5C,CAAC"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "5.0.0-beta.20";
+export declare const VERSION = "5.0.0-beta.22";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/smart-accounts",
-  "version": "5.0.0-beta.21",
+  "version": "5.0.0-beta.23",
   "description": "This package contains all of the viem interfaces for Alchemy's Smart Contract Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -39,12 +39,12 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@alchemy/aa-infra": "5.0.0-beta.21",
+    "@alchemy/aa-infra": "5.0.0-beta.23",
     "typescript-template": "workspace:*",
     "viem": "^2.45.0"
   },
   "dependencies": {
-    "@alchemy/common": "5.0.0-beta.21"
+    "@alchemy/common": "5.0.0-beta.23"
   },
   "peerDependencies": {
     "viem": "^2.45.0"
@@ -61,5 +61,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "f7b6c8132c10a86488ea3ebbe73dce14965fe669"
+  "gitHead": "1354e8caf42c7f7bf389320f75f2920c6c00876b"
 }

package/src/index.ts

@@ -114,7 +114,7 @@ export {
 export type * from "./ma-v2/utils/deferredActions.js";
 export {
   parseDeferredAction,
-  buildDeferredActionDigest,
+  encodeDeferredActionWithSignature,
 } from "./ma-v2/utils/deferredActions.js";
 
 export type * from "./ma-v2/utils/hooks.js";

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

@@ -45,7 +45,7 @@ export type CreateDeferredActionTypedDataParams = {
   nonce: bigint;
 };
 
-export type BuildPreSignatureDeferredActionDigestParams = {
+export type BuildPreSignatureDeferredActionPayloadParams = {
   typedData: DeferredActionTypedData;
 };
 
@@ -60,8 +60,8 @@ export type DeferralActions = {
   createDeferredActionTypedDataObject: (
     args: CreateDeferredActionTypedDataParams,
   ) => Promise<DeferredActionReturnData>;
-  buildPreSignatureDeferredActionDigest: (
-    args: BuildPreSignatureDeferredActionDigestParams,
+  buildPreSignatureDeferredActionPayload: (
+    args: BuildPreSignatureDeferredActionPayloadParams,
   ) => Hex;
   getEntityIdAndNonce: (
     args: EntityIdAndNonceParams,
@@ -72,7 +72,7 @@ export type DeferralActions = {
  * 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`.
+ * @returns {object} - An object containing three methods: `createDeferredActionTypedDataObject`, `buildPreSignatureDeferredActionPayload`, and `buildUserOperationWithDeferredAction`.
  */
 export const deferralActions = <
   TTransport extends Transport = Transport,
@@ -114,9 +114,9 @@ export const deferralActions = <
     };
   };
 
-  const buildPreSignatureDeferredActionDigest = ({
+  const buildPreSignatureDeferredActionPayload = ({
     typedData,
-  }: BuildPreSignatureDeferredActionDigestParams): Hex => {
+  }: BuildPreSignatureDeferredActionPayloadParams): Hex => {
     const account = client.account;
     if (!account || !isModularAccountV2(account)) {
       throw new AccountNotFoundError();
@@ -187,7 +187,7 @@ export const deferralActions = <
 
   return {
     createDeferredActionTypedDataObject,
-    buildPreSignatureDeferredActionDigest,
+    buildPreSignatureDeferredActionPayload,
     getEntityIdAndNonce,
   };
 };

package/src/ma-v2/permissionBuilder.ts

@@ -384,11 +384,11 @@ export class PermissionBuilder {
   /**
    * Compiles the deferred action typed data to sign.
    *
-   * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionDigest: Hex}>} The deferred action typed data and the full pre-signature deferred action digest.
+   * @returns {Promise<{typedData: DeferredActionTypedData, fullPreSignatureDeferredActionPayload: Hex}>} The deferred action typed data and the full pre-signature deferred action payload.
    */
   async compileDeferred(): Promise<{
     typedData: DeferredActionTypedData;
-    fullPreSignatureDeferredActionDigest: Hex;
+    fullPreSignatureDeferredActionPayload: Hex;
   }> {
     // Add time range module hook via expiry
     if (this.deadline !== 0) {
@@ -421,20 +421,20 @@ export class PermissionBuilder {
       nonce: this.nonce,
     });
 
-    const preSignatureDigest = deferralActions(
+    const preSignaturePayload = deferralActions(
       this.client,
-    ).buildPreSignatureDeferredActionDigest({ typedData });
+    ).buildPreSignatureDeferredActionPayload({ typedData });
 
-    // Encode additional information to build the full pre-signature digest
-    const fullPreSignatureDeferredActionDigest: `0x${string}` = `0x0${
+    // Encode additional information to build the full pre-signature payload
+    const fullPreSignatureDeferredActionPayload: `0x${string}` = `0x0${
       this.hasAssociatedExecHooks ? "1" : "0"
     }${toHex(this.nonce, {
       size: 32,
-    }).slice(2)}${preSignatureDigest.slice(2)}`;
+    }).slice(2)}${preSignaturePayload.slice(2)}`;
 
     return {
       typedData,
-      fullPreSignatureDeferredActionDigest,
+      fullPreSignatureDeferredActionPayload,
     };
   }
 

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

@@ -34,31 +34,31 @@ export const parseDeferredAction = (
   };
 };
 
-export type BuildDeferredActionDigestParams = {
-  fullPreSignatureDeferredActionDigest: Hex;
+export type EncodeDeferredActionWithSignatureParams = {
+  fullPreSignatureDeferredActionPayload: Hex;
   sig: Hex;
   signaturePrefix?: SignaturePrefix;
 };
 
 /**
- * Creates the digest which must be prepended to the userOp signature.
+ * Encodes the deferred action with its signature, producing the payload to prepend to the userOp signature.
  *
  * Assumption: The client this extends is used to sign the typed data.
  *
- * @param {BuildDeferredActionDigestParams} params - The parameters for building the deferred action digest.
- * @returns {Hex} The encoded digest to be prepended to the userOp signature.
+ * @param {EncodeDeferredActionWithSignatureParams} params - The parameters for encoding the deferred action with its signature.
+ * @returns {Hex} The encoded payload to be prepended to the userOp signature.
  */
-export const buildDeferredActionDigest = ({
-  fullPreSignatureDeferredActionDigest,
+export const encodeDeferredActionWithSignature = ({
+  fullPreSignatureDeferredActionPayload,
   sig,
-}: BuildDeferredActionDigestParams): Hex => {
+}: EncodeDeferredActionWithSignatureParams): Hex => {
   // 6492 sigs don't work here.
   const _sig = parseErc6492Signature(sig).signature;
 
   const sigLength = size(_sig);
 
   const encodedData = concatHex([
-    fullPreSignatureDeferredActionDigest,
+    fullPreSignatureDeferredActionPayload,
     toHex(sigLength, { size: 4 }),
     _sig,
   ]);

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "5.0.0-beta.21";
+export const VERSION = "5.0.0-beta.23";