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

package/README.md

@@ -15,12 +15,10 @@ npm install @alchemy/smart-accounts @alchemy/common viem
 - **`toLightAccount`** - Single-owner LightAccount
 - **`toMultiOwnerLightAccount`** - Multi-owner variant
 - **`predictLightAccountAddress`** / **`predictMultiOwnerLightAccountAddress`** - Counterfactual address prediction
-- **`singleOwnerLightAccountActions`** / **`multiOwnerLightAccountActions`** - Client decorators
 
 ### Modular Account v1 (ERC-6900)
 
 - **`toMultiOwnerModularAccountV1`** - Account constructor
-- **`multiOwnerModularAccountV1Actions`** - Client decorator
 - **`predictMultiOwnerModularAccountV1Address`** - Address prediction
 
 ### Modular Account v2

package/dist/esm/index.d.ts

@@ -3,30 +3,27 @@ export type * from "./light-account/accounts/account.js";
 export { toLightAccount } from "./light-account/accounts/account.js";
 export type * from "./light-account/accounts/multi-owner-account.js";
 export { toMultiOwnerLightAccount } from "./light-account/accounts/multi-owner-account.js";
-export type * from "./light-account/decorators/singleOwner.js";
-export { singleOwnerLightAccountActions } from "./light-account/decorators/singleOwner.js";
-export type * from "./light-account/decorators/multiOwner.js";
-export { multiOwnerLightAccountActions } from "./light-account/decorators/multiOwner.js";
 export type * from "./light-account/predictAddress.js";
 export { predictLightAccountAddress, predictMultiOwnerLightAccountAddress, } from "./light-account/predictAddress.js";
 export { AccountVersionRegistry } from "./light-account/registry.js";
 export type * from "./light-account/registry.js";
 export { defaultLightAccountVersion, getLightAccountImplAddress, LightAccountUnsupported1271Factories, LightAccountUnsupported1271Impls, } from "./light-account/utils.js";
+export { encodeCallsLA, decodeCallsLA, } from "./light-account/accounts/calldataCodec.js";
 export { lightAccountStaticImplV1_0_1, lightAccountStaticImplV1_0_2, lightAccountStaticImplV1_1_0, lightAccountStaticImplV2_0_0, multiOwnerLightAccountStaticImplV2_0_0, } from "./light-account/lightAccountStaticImpl.js";
 export type * from "./ma-v1/accounts/base.js";
 export { toModularAccountV1Base } from "./ma-v1/accounts/base.js";
 export type * from "./ma-v1/accounts/multi-owner-account.js";
 export { toMultiOwnerModularAccountV1 } from "./ma-v1/accounts/multi-owner-account.js";
-export type * from "./ma-v1/decorators/multiOwner.js";
-export { multiOwnerModularAccountV1Actions } from "./ma-v1/decorators/multiOwner.js";
 export type * from "./ma-v1/predictAddress.js";
 export { predictMultiOwnerModularAccountV1Address } from "./ma-v1/predictAddress.js";
 export { multiOwnerModularAccountStaticImpl } from "./ma-v1/mav1StaticImpl.js";
 export { DefaultMaV1Address, DefaultMaV1PluginAddress, } from "./ma-v1/account.js";
+export { encodeCallsMAv1, decodeCallsMAv1, } from "./ma-v1/accounts/calldataCodec.js";
 export type * from "./ma-v2/accounts/account.js";
 export { toModularAccountV2 } from "./ma-v2/accounts/account.js";
 export type * from "./ma-v2/accounts/base.js";
 export { toModularAccountV2Base } from "./ma-v2/accounts/base.js";
+export { encodeCallsMAv2, decodeCallsMAv2, } from "./ma-v2/accounts/calldataCodec.js";
 export type * from "./ma-v2/decorators/deferralActions.js";
 export { deferralActions } from "./ma-v2/decorators/deferralActions.js";
 export type * from "./ma-v2/decorators/installValidation.js";

package/dist/esm/index.js

@@ -1,19 +1,19 @@
 export { toLightAccount } from "./light-account/accounts/account.js";
 export { toMultiOwnerLightAccount } from "./light-account/accounts/multi-owner-account.js";
-export { singleOwnerLightAccountActions } from "./light-account/decorators/singleOwner.js";
-export { multiOwnerLightAccountActions } from "./light-account/decorators/multiOwner.js";
 export { predictLightAccountAddress, predictMultiOwnerLightAccountAddress, } from "./light-account/predictAddress.js";
 export { AccountVersionRegistry } from "./light-account/registry.js";
 export { defaultLightAccountVersion, getLightAccountImplAddress, LightAccountUnsupported1271Factories, LightAccountUnsupported1271Impls, } from "./light-account/utils.js";
+export { encodeCallsLA, decodeCallsLA, } from "./light-account/accounts/calldataCodec.js";
 export { lightAccountStaticImplV1_0_1, lightAccountStaticImplV1_0_2, lightAccountStaticImplV1_1_0, lightAccountStaticImplV2_0_0, multiOwnerLightAccountStaticImplV2_0_0, } from "./light-account/lightAccountStaticImpl.js";
 export { toModularAccountV1Base } from "./ma-v1/accounts/base.js";
 export { toMultiOwnerModularAccountV1 } from "./ma-v1/accounts/multi-owner-account.js";
-export { multiOwnerModularAccountV1Actions } from "./ma-v1/decorators/multiOwner.js";
 export { predictMultiOwnerModularAccountV1Address } from "./ma-v1/predictAddress.js";
 export { multiOwnerModularAccountStaticImpl } from "./ma-v1/mav1StaticImpl.js";
 export { DefaultMaV1Address, DefaultMaV1PluginAddress, } from "./ma-v1/account.js";
+export { encodeCallsMAv1, decodeCallsMAv1, } from "./ma-v1/accounts/calldataCodec.js";
 export { toModularAccountV2 } from "./ma-v2/accounts/account.js";
 export { toModularAccountV2Base } from "./ma-v2/accounts/base.js";
+export { encodeCallsMAv2, decodeCallsMAv2, } from "./ma-v2/accounts/calldataCodec.js";
 export { deferralActions } from "./ma-v2/decorators/deferralActions.js";
 export { installValidationActions } from "./ma-v2/decorators/installValidation.js";
 export { semiModularAccountV2StaticImpl, semiModularAccount7702StaticImpl, } from "./ma-v2/mav2StaticImpl.js";

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAO3F,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAG3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAGzF,OAAO,EACL,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,oCAAoC,EACpC,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,4BAA4B,EAC5B,sCAAsC,GACvC,MAAM,2CAA2C,CAAC;AAInD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AAGvF,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAC;AAGrF,OAAO,EAAE,wCAAwC,EAAE,MAAM,2BAA2B,CAAC;AAErF,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAE/E,OAAO,EACL,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAEnF,OAAO,EACL,8BAA8B,EAC9B,gCAAgC,GACjC,MAAM,2BAA2B,CAAC;AAGnC,UAAU;AACV,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAG9E,OAAO,EACL,iBAAiB,EACjB,cAAc,GACf,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAK3E,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AAEpC,SAAS;AACT,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,2BAA2B,EAC3B,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,0BAA0B,EAC1B,gCAAgC,EAChC,gBAAgB,EAChB,qBAAqB,EACrB,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,qCAAqC,CAAC","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\n// TODO(v5): Something to consider for v5 - can we cut the exports for the account-specific actions\n// from the public interface, and just consume these internally with account + rely on the standard\n// bundlerClient actions for performing state writes (i.e. rotating owners)? I'm not sure it's useful\n// to consumers outside of attaching to instances of a client with the right action.\nexport type * from \"./light-account/decorators/singleOwner.js\";\nexport { singleOwnerLightAccountActions } from \"./light-account/decorators/singleOwner.js\";\n\nexport type * from \"./light-account/decorators/multiOwner.js\";\nexport { multiOwnerLightAccountActions } from \"./light-account/decorators/multiOwner.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  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/decorators/multiOwner.js\";\nexport { multiOwnerModularAccountV1Actions } from \"./ma-v1/decorators/multiOwner.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\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 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  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"]}

package/dist/esm/light-account/accounts/base.js

@@ -15,7 +15,6 @@ export async function toLightAccountBase({ client, abi, accountAddress, owner, t
     const encodeUpgradeToAndCall = async ({ upgradeToAddress, upgradeToInitData, }) => {
         const expectedImplAddresses = Object.values(AccountVersionRegistry[type]).map((x) => x.accountImplementation);
         const getStorageAtAction = getAction(client, getStorageAt, "getStorageAt");
-        // TODO(v5): This is a super fragile workflow, and we should consider not supporting this on the SmartAccount level in v5.
         const storage = await getStorageAtAction({
             address: accountAddress,
             slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,

package/dist/esm/light-account/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,OAAO,EACP,WAAW,EACX,aAAa,EACb,IAAI,GAUL,MAAM,MAAM,CAAC;AACd,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,cAAc,GAEf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAMxE,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EACL,aAAa,IAAI,WAAW,EAC5B,aAAa,IAAI,WAAW,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM1D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,eAAe,GAAG;IACtB,GAAG,EAAE,MAAM;IACX,QAAQ,EAAE,MAAM;IAChB,kBAAkB,EAAE,MAAM;CAClB,CAAC;AAmDX,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAKtC,EACA,MAAM,EACN,GAAG,EACH,cAAc,EACd,KAAK,EACL,IAAI,EACJ,OAAO,EACP,cAAc,GAKf;IACC,MAAM,sBAAsB,GAAG,KAAK,EAAE,EACpC,gBAAgB,EAChB,iBAAiB,GAIlB,EAAgB,EAAE;QACjB,MAAM,qBAAqB,GACzB,MAAM,CAAC,MAAM,CACX,sBAAsB,CAAC,IAAI,CAAC,CAE/B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC;QAEtC,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;QAC3E,0HAA0H;QAC1H,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC;YACvC,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,+BAA+B;SACtC,CAAC,CAAC;QAEH,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,SAAS,CACjB,+BAA+B,+BAA+B,EAAE,CACjE,CAAC;QACJ,CAAC;QAED,uFAAuF;QACvF,IACE,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC;YAChC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACrE,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,0DAA0D,IAAI,IAAI,MAAM,CACtE,OAAO,CACR,EAAE,CACJ,CAAC;QACJ,CAAC;QAED,OAAO,kBAAkB,CAAC;YACxB,GAAG;YACH,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CACrB,aAAkB,EAClB,OAAe,EACM,EAAE;QACvB,OAAO;YACL,qFAAqF;YACrF,uFAAuF;YACvF,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxB,IAAI,EAAE,IAAI;gBACV,iBAAiB,EAAE,cAAc;gBACjC,OAAO;aACR;YACD,KAAK,EAAE;gBACL,mBAAmB,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aAC1D;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,aAAa;aACvB;YACD,WAAW,EAAE,qBAAqB;SACnC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,EAC5B,MAAwB,EACG,EAAE;QAC7B,MAAM,WAAW,GACf,MAAM,CAAC,IAAI,KAAK,sBAAsB;YACpC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5B,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE/B,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,QAAQ;gBACX,OAAO,MAAM,CAAC;YAChB,KAAK,QAAQ;gBACX,MAAM,IAAI,SAAS,CACjB,WAAW,MAAM,CAAC,OAAO,CAAC,uCAAuC,CAClE,CAAC;YACJ,KAAK,QAAQ;gBACX,OAAO;oBACL,IAAI,EAAE,sBAAsB;oBAC5B,IAAI,EAAE,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC;iBACvC,CAAC;YACJ,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACX,OAAO;oBACL,IAAI,EAAE,sBAAsB;oBAC5B,IAAI,EAAE,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC;iBACvC,CAAC;YACJ;gBACE,MAAM,IAAI,SAAS,CACjB,mBAAmB,MAAM,CAAC,OAAO,CAAC,kBAAkB,CACrD,CAAC;QACN,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,SAAc,EAAgB,EAAE;QAC7D,OAAO,sBAAsB,CAC3B,OAA8C,CAC/C;YACC,CAAC,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,UAAU,GACd,sBAAsB,CAAC,IAAI,CAAC,CAAC,OAAO,CACrC,CAAC,UAAU,CAAC;IAEb,OAAO,MAAM,cAAc,CAAC;QAC1B,cAAc;QACd,MAAM;QACN,UAAU;QAEV,KAAK,CAAC,UAAU;YACd,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,KAAK;YACrB,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,IAAI;YACpB,OAAO,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC3C,CAAC;QAED,KAAK,CAAC,gBAAgB;YACpB,MAAM,SAAS,GACb,sIAAsI,CAAC;YAEzI,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ;oBACX,OAAO,SAAS,CAAC;gBACnB,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ;oBACX,OAAO,SAAS,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;gBACrD;oBACE,MAAM,IAAI,SAAS,CAAC,mBAAmB,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;YACxE,MAAM,mBAAmB,GAAG,SAAS,CACnC,MAAM,EACN,aAAa,EACb,eAAe,CAChB,CAAC;YAEF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC;gBAC5C,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;YAEH,MAAM,GAAG,GACP,IAAI,KAAK,sBAAsB;gBAC7B,CAAC,CAAC,MAAM,mBAAmB,CAAC;oBACxB,GAAG,IAAI;oBACP,OAAO,EAAE,KAAK;iBACf,CAAC;gBACJ,CAAC,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjE,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,MAAM;YACxB,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;YACxE,MAAM,mBAAmB,GAAG,SAAS,CACnC,MAAM,EACN,aAAa,EACb,eAAe,CAChB,CAAC;YAEF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC;gBAC5C,IAAI,EAAE,sBAAsB;gBAC5B,IAAI,EAAE,MAA6B;aACpC,CAAC,CAAC;YAEH,MAAM,GAAG,GACP,IAAI,KAAK,sBAAsB;gBAC7B,CAAC,CAAC,MAAM,mBAAmB,CAAC;oBACxB,GAAG,IAAI;oBACP,OAAO,EAAE,KAAK;iBACf,CAAC;gBACJ,CAAC,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjE,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAED,KAAK,CAAC,iBAAiB,CAAC,UAAU;YAChC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,UAAU,CAAC;YACnE,IAAI,SAAc,CAAC;YAEnB,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ;oBACX,MAAM,UAAU,GAAG,oBAAoB,CAAC;wBACtC,OAAO;wBACP,iBAAiB,EAAE,UAAU,CAAC,OAAO;wBACrC,iBAAiB,EAAE,UAAU,CAAC,OAAO;wBACrC,aAAa,EAAE;4BACb,GAAG,aAAa;4BAChB,MAAM,EAAE,cAAc;yBACvB;qBACF,CAAC,CAAC;oBAEH,MAAM,iBAAiB,GAAG,SAAS,CACjC,MAAM,EACN,WAAW,EACX,aAAa,CACd,CAAC;oBAEF,SAAS,GAAG,MAAM,iBAAiB,CAAC;wBAClC,OAAO,EAAE,KAAK;wBACd,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE;qBAC7B,CAAC,CAAC;oBACH,MAAM;gBACR,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ;oBACX,MAAM,mBAAmB,GAAG,SAAS,CACnC,MAAM,EACN,aAAa,EACb,eAAe,CAChB,CAAC;oBAEF,SAAS,GAAG,MAAM,mBAAmB,CAAC;wBACpC,OAAO,EAAE,KAAK;wBACd,GAAG,yBAAyB,CAAC;4BAC3B,OAAO;4BACP,iBAAiB,EAAE,UAAU,CAAC,OAAO;4BACrC,aAAa,EAAE;gCACb,GAAG,aAAa;gCAChB,MAAM,EAAE,cAAc;6BACvB;yBACF,CAAC;qBACH,CAAC,CAAC;oBACH,MAAM;gBACR;oBACE,MAAM,IAAI,SAAS,CAAC,mBAAmB,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzE,CAAC;YAED,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,EAAE;YACN,gBAAgB,EAAE,IAAI;YACtB,sBAAsB,EAAE,GAAG,EAAE,CAAC,OAAO;YACrC,sBAAsB;YACtB,gBAAgB;YAChB,eAAe;SAChB;KACF,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  concatHex,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Abi,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  getUserOperationHash,\n  getUserOperationTypedData,\n  toSmartAccount,\n  type SmartAccountImplementation,\n} from \"viem/account-abstraction\";\nimport { getStorageAt, signMessage, signTypedData } from \"viem/actions\";\nimport type {\n  EntryPointFromAccountRegistry,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../registry.js\";\nimport { EIP1967_PROXY_IMPL_STORAGE_SLOT } from \"../utils.js\";\nimport { AccountVersionRegistry, isLightAccountVersion2 } from \"../registry.js\";\nimport {\n  encodeCallsLA as encodeCalls,\n  decodeCallsLA as decodeCalls,\n} from \"./calldataCodec.js\";\nimport { BaseError, lowerAddress } from \"@alchemy/common\";\nimport type {\n  SignatureRequest,\n  StaticSmartAccountImplementation,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { getAction } from \"viem/utils\";\n\nconst SignaturePrefix = {\n  EOA: \"0x00\",\n  CONTRACT: \"0x01\",\n  CONTRACT_WITH_ADDR: \"0x02\",\n} as const;\n\nexport type BaseLightAccountImplementation<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountImplementation<\n  EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>[\"abi\"],\n  EntryPointFromAccountRegistry<\n    TLightAccountType,\n    TLightAccountVersion\n  >[\"version\"],\n  {\n    getLightAccountVersion: () => TLightAccountVersion;\n    smartAccountType: TLightAccountType;\n    encodeUpgradeToAndCall: (params: {\n      upgradeToAddress: Address;\n      upgradeToInitData: Hex;\n    }) => Promise<Hex>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type LightAccountBase<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountWithDecodeCalls<\n  BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>\n>;\n\nexport type ToLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  abi: Abi;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n};\n\nexport async function toLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n>({\n  client,\n  abi,\n  accountAddress,\n  owner,\n  type,\n  version,\n  getFactoryArgs,\n}: ToLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport\n>): Promise<LightAccountBase<TLightAccountType, TLightAccountVersion>> {\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: {\n    upgradeToAddress: Address;\n    upgradeToInitData: Hex;\n  }): Promise<Hex> => {\n    const expectedImplAddresses = (\n      Object.values(\n        AccountVersionRegistry[type],\n      ) as StaticSmartAccountImplementation<false>[]\n    ).map((x) => x.accountImplementation);\n\n    const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n    // TODO(v5): This is a super fragile workflow, and we should consider not supporting this on the SmartAccount level in v5.\n    const storage = await getStorageAtAction({\n      address: accountAddress,\n      slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n    });\n\n    if (storage == null) {\n      throw new BaseError(\n        `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n      );\n    }\n\n    // Only upgrade undeployed accounts (storage 0) or deployed light accounts, else error.\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n    ) {\n      throw new BaseError(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const get1271Wrapper = (\n    hashedMessage: Hex,\n    version: string,\n  ): TypedDataDefinition => {\n    return {\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: client.chain.id,\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    };\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const messageHash =\n      params.type === \"eth_signTypedData_v4\"\n        ? hashTypedData(params.data)\n        : hashMessage(params.data);\n\n    switch (version) {\n      case \"v1.0.1\":\n        return params;\n      case \"v1.0.2\":\n        throw new BaseError(\n          `Version ${String(version)} of LightAccount doesn't support 1271`,\n        );\n      case \"v1.1.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"1\"),\n        };\n      case \"v2.0.0\":\n      case \"v2.1.0\":\n      case \"v2.2.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"2\"),\n        };\n      default:\n        throw new BaseError(\n          `Unknown version ${String(version)} of LightAccount`,\n        );\n    }\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return isLightAccountVersion2(\n      version as LightAccountVersion<\"LightAccount\">,\n    )\n      ? concatHex([SignaturePrefix.EOA, signature])\n      : signature;\n  };\n\n  const entryPoint = (\n    AccountVersionRegistry[type][version] as StaticSmartAccountImplementation\n  ).entryPoint;\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      return encodeCalls(calls);\n    },\n\n    async decodeCalls(data) {\n      return decodeCalls(data, accountAddress);\n    },\n\n    async getStubSignature() {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n        case \"v2.1.0\":\n        case \"v2.2.0\":\n          return concatHex([SignaturePrefix.EOA, signature]);\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      let signature: Hex;\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n        case \"v2.0.0\":\n          const userOpHash = getUserOperationHash({\n            chainId,\n            entryPointAddress: entryPoint.address,\n            entryPointVersion: entryPoint.version,\n            userOperation: {\n              ...userOperation,\n              sender: accountAddress,\n            },\n          });\n\n          const signMessageAction = getAction(\n            client,\n            signMessage,\n            \"signMessage\",\n          );\n\n          signature = await signMessageAction({\n            account: owner,\n            message: { raw: userOpHash },\n          });\n          break;\n        case \"v2.1.0\":\n        case \"v2.2.0\":\n          const signTypedDataAction = getAction(\n            client,\n            signTypedData,\n            \"signTypedData\",\n          );\n\n          signature = await signTypedDataAction({\n            account: owner,\n            ...getUserOperationTypedData({\n              chainId,\n              entryPointAddress: entryPoint.address,\n              userOperation: {\n                ...userOperation,\n                sender: accountAddress,\n              },\n            }),\n          });\n          break;\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n\n      return formatSignature(signature);\n    },\n\n    extend: {\n      smartAccountType: type,\n      getLightAccountVersion: () => version,\n      encodeUpgradeToAndCall,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concatHex,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Abi,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  getUserOperationHash,\n  getUserOperationTypedData,\n  toSmartAccount,\n  type SmartAccountImplementation,\n} from \"viem/account-abstraction\";\nimport { getStorageAt, signMessage, signTypedData } from \"viem/actions\";\nimport type {\n  EntryPointFromAccountRegistry,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../registry.js\";\nimport { EIP1967_PROXY_IMPL_STORAGE_SLOT } from \"../utils.js\";\nimport { AccountVersionRegistry, isLightAccountVersion2 } from \"../registry.js\";\nimport {\n  encodeCallsLA as encodeCalls,\n  decodeCallsLA as decodeCalls,\n} from \"./calldataCodec.js\";\nimport { BaseError, lowerAddress } from \"@alchemy/common\";\nimport type {\n  SignatureRequest,\n  StaticSmartAccountImplementation,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { getAction } from \"viem/utils\";\n\nconst SignaturePrefix = {\n  EOA: \"0x00\",\n  CONTRACT: \"0x01\",\n  CONTRACT_WITH_ADDR: \"0x02\",\n} as const;\n\nexport type BaseLightAccountImplementation<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountImplementation<\n  EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>[\"abi\"],\n  EntryPointFromAccountRegistry<\n    TLightAccountType,\n    TLightAccountVersion\n  >[\"version\"],\n  {\n    getLightAccountVersion: () => TLightAccountVersion;\n    smartAccountType: TLightAccountType;\n    encodeUpgradeToAndCall: (params: {\n      upgradeToAddress: Address;\n      upgradeToInitData: Hex;\n    }) => Promise<Hex>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type LightAccountBase<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountWithDecodeCalls<\n  BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>\n>;\n\nexport type ToLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  abi: Abi;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n};\n\nexport async function toLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n>({\n  client,\n  abi,\n  accountAddress,\n  owner,\n  type,\n  version,\n  getFactoryArgs,\n}: ToLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport\n>): Promise<LightAccountBase<TLightAccountType, TLightAccountVersion>> {\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: {\n    upgradeToAddress: Address;\n    upgradeToInitData: Hex;\n  }): Promise<Hex> => {\n    const expectedImplAddresses = (\n      Object.values(\n        AccountVersionRegistry[type],\n      ) as StaticSmartAccountImplementation<false>[]\n    ).map((x) => x.accountImplementation);\n\n    const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n    const storage = await getStorageAtAction({\n      address: accountAddress,\n      slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n    });\n\n    if (storage == null) {\n      throw new BaseError(\n        `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n      );\n    }\n\n    // Only upgrade undeployed accounts (storage 0) or deployed light accounts, else error.\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n    ) {\n      throw new BaseError(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const get1271Wrapper = (\n    hashedMessage: Hex,\n    version: string,\n  ): TypedDataDefinition => {\n    return {\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: client.chain.id,\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    };\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const messageHash =\n      params.type === \"eth_signTypedData_v4\"\n        ? hashTypedData(params.data)\n        : hashMessage(params.data);\n\n    switch (version) {\n      case \"v1.0.1\":\n        return params;\n      case \"v1.0.2\":\n        throw new BaseError(\n          `Version ${String(version)} of LightAccount doesn't support 1271`,\n        );\n      case \"v1.1.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"1\"),\n        };\n      case \"v2.0.0\":\n      case \"v2.1.0\":\n      case \"v2.2.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"2\"),\n        };\n      default:\n        throw new BaseError(\n          `Unknown version ${String(version)} of LightAccount`,\n        );\n    }\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return isLightAccountVersion2(\n      version as LightAccountVersion<\"LightAccount\">,\n    )\n      ? concatHex([SignaturePrefix.EOA, signature])\n      : signature;\n  };\n\n  const entryPoint = (\n    AccountVersionRegistry[type][version] as StaticSmartAccountImplementation\n  ).entryPoint;\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      return encodeCalls(calls);\n    },\n\n    async decodeCalls(data) {\n      return decodeCalls(data, accountAddress);\n    },\n\n    async getStubSignature() {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n        case \"v2.1.0\":\n        case \"v2.2.0\":\n          return concatHex([SignaturePrefix.EOA, signature]);\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      let signature: Hex;\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n        case \"v2.0.0\":\n          const userOpHash = getUserOperationHash({\n            chainId,\n            entryPointAddress: entryPoint.address,\n            entryPointVersion: entryPoint.version,\n            userOperation: {\n              ...userOperation,\n              sender: accountAddress,\n            },\n          });\n\n          const signMessageAction = getAction(\n            client,\n            signMessage,\n            \"signMessage\",\n          );\n\n          signature = await signMessageAction({\n            account: owner,\n            message: { raw: userOpHash },\n          });\n          break;\n        case \"v2.1.0\":\n        case \"v2.2.0\":\n          const signTypedDataAction = getAction(\n            client,\n            signTypedData,\n            \"signTypedData\",\n          );\n\n          signature = await signTypedDataAction({\n            account: owner,\n            ...getUserOperationTypedData({\n              chainId,\n              entryPointAddress: entryPoint.address,\n              userOperation: {\n                ...userOperation,\n                sender: accountAddress,\n              },\n            }),\n          });\n          break;\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n\n      return formatSignature(signature);\n    },\n\n    extend: {\n      smartAccountType: type,\n      getLightAccountVersion: () => version,\n      encodeUpgradeToAndCall,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/light-account/accounts/calldataCodec.d.ts

@@ -1,3 +1,20 @@
 import { type Address, type Call, type Hex } from "viem";
+/**
+ * Encodes an array of calls into LightAccount calldata for `execute` or `executeBatch`.
+ * Used internally by the LightAccount SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Call[]} calls The calls to encode.
+ * @returns {Hex} The encoded calldata.
+ */
 export declare function encodeCallsLA(calls: readonly Call[]): Hex;
+/**
+ * Decodes LightAccount calldata back into an array of calls.
+ * Used internally by the LightAccount SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Hex} data The calldata to decode.
+ * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.
+ * @returns {Call[]} The decoded calls.
+ */
 export declare function decodeCallsLA(data: Hex, accountAddress: Address): Call[];

package/dist/esm/light-account/accounts/calldataCodec.js

@@ -2,6 +2,14 @@ import { decodeFunctionData, encodeFunctionData, } from "viem";
 import { LightAccountAbi_v1 } from "../abis/LightAccountAbi_v1.js";
 import { BaseError } from "@alchemy/common";
 // Conveniently, all variants of LA up to v2.0.0 use the same function signatures for `execute` and `executeBatch`.
+/**
+ * Encodes an array of calls into LightAccount calldata for `execute` or `executeBatch`.
+ * Used internally by the LightAccount SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Call[]} calls The calls to encode.
+ * @returns {Hex} The encoded calldata.
+ */
 export function encodeCallsLA(calls) {
     if (calls.length === 1) {
         return encodeFunctionData({
@@ -23,6 +31,15 @@ export function encodeCallsLA(calls) {
         args: hasValue ? [targets, values, datas] : [targets, datas],
     });
 }
+/**
+ * Decodes LightAccount calldata back into an array of calls.
+ * Used internally by the LightAccount SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Hex} data The calldata to decode.
+ * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.
+ * @returns {Call[]} The decoded calls.
+ */
 export function decodeCallsLA(data, accountAddress) {
     const decoded = decodeFunctionData({
         abi: LightAccountAbi_v1,

package/dist/esm/light-account/accounts/calldataCodec.js.map

@@ -1 +1 @@
-{"version":3,"file":"calldataCodec.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/calldataCodec.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  decodeFunctionData,\n  encodeFunctionData,\n  type Address,\n  type Call,\n  type Hex,\n} from \"viem\";\nimport { LightAccountAbi_v1 } from \"../abis/LightAccountAbi_v1.js\";\nimport { BaseError } from \"@alchemy/common\";\n\n// Conveniently, all variants of LA up to v2.0.0 use the same function signatures for `execute` and `executeBatch`.\n\nexport function encodeCallsLA(calls: readonly Call[]): Hex {\n  if (calls.length === 1) {\n    return encodeFunctionData({\n      abi: LightAccountAbi_v1,\n      functionName: \"execute\",\n      args: [calls[0].to, calls[0].value ?? 0n, calls[0].data ?? \"0x\"],\n    });\n  }\n\n  const [targets, values, datas, hasValue] = calls.reduce(\n    (accum, curr) => {\n      accum[0].push(curr.to);\n      accum[1].push(curr.value ?? 0n);\n      accum[2].push(curr.data ?? \"0x\");\n      accum[3] = accum[3] || (curr.value ?? 0n) !== 0n;\n      return accum;\n    },\n    [[], [], [], false] as [Address[], bigint[], Hex[], boolean],\n  );\n\n  return encodeFunctionData({\n    abi: LightAccountAbi_v1,\n    functionName: \"executeBatch\",\n    args: hasValue ? [targets, values, datas] : [targets, datas],\n  });\n}\n\nexport function decodeCallsLA(data: Hex, accountAddress: Address): Call[] {\n  const decoded = decodeFunctionData({\n    abi: LightAccountAbi_v1,\n    data,\n  });\n\n  if (decoded.functionName === \"execute\") {\n    return [\n      {\n        to: decoded.args[0],\n        data: decoded.args[2],\n        ...(decoded.args[1] !== undefined ? { value: decoded.args[1] } : {}),\n      },\n    ];\n  }\n\n  if (decoded.functionName === \"executeBatch\") {\n    // This function is overloaded - may or may not have an array for values.\n\n    if (isThreeTupleArray(decoded.args)) {\n      const [targets, values, datas] = decoded.args;\n\n      if (targets.length !== values.length || targets.length !== datas.length) {\n        throw new BaseError(\"Invalid arguments for executeBatch\");\n      }\n\n      return targets.map((to, index) => ({\n        to,\n        value: values[index],\n        data: datas[index],\n      }));\n    }\n\n    // Two tuple array (no values)\n    const [targets, datas] = decoded.args;\n\n    if (targets.length !== datas.length) {\n      throw new BaseError(\"Invalid arguments for executeBatch\");\n    }\n\n    return targets.map((to, index) => ({\n      to,\n      data: datas[index],\n    }));\n  }\n\n  // Otherwise, treat the call as a single call to the account itself.\n  return [\n    {\n      to: accountAddress,\n      data,\n    },\n  ];\n}\n\n// Needed to narrow types for LAv1 `executeBatch` function.\nfunction isThreeTupleArray(\n  input:\n    | readonly [readonly Address[], readonly Hex[]]\n    | readonly [readonly Address[], readonly bigint[], readonly Hex[]],\n): input is readonly [readonly Address[], readonly bigint[], readonly Hex[]] {\n  return input.length === 3;\n}\n"]}
+{"version":3,"file":"calldataCodec.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/calldataCodec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,GAInB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,mHAAmH;AAEnH;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,KAAsB;IAClD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;YACxB,GAAG,EAAE,kBAAkB;YACvB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC;SACjE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CACrD,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAChC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;QACjC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAA0C,CAC7D,CAAC;IAEF,OAAO,kBAAkB,CAAC;QACxB,GAAG,EAAE,kBAAkB;QACvB,YAAY,EAAE,cAAc;QAC5B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;KAC7D,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,IAAS,EAAE,cAAuB;IAC9D,MAAM,OAAO,GAAG,kBAAkB,CAAC;QACjC,GAAG,EAAE,kBAAkB;QACvB,IAAI;KACL,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO;YACL;gBACE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrE;SACF,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,KAAK,cAAc,EAAE,CAAC;QAC5C,yEAAyE;QAEzE,IAAI,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAE9C,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;gBACxE,MAAM,IAAI,SAAS,CAAC,oCAAoC,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACjC,EAAE;gBACF,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC,CAAC;QACN,CAAC;QAED,8BAA8B;QAC9B,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;QAEtC,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,IAAI,SAAS,CAAC,oCAAoC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACjC,EAAE;YACF,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC;SACnB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,oEAAoE;IACpE,OAAO;QACL;YACE,EAAE,EAAE,cAAc;YAClB,IAAI;SACL;KACF,CAAC;AACJ,CAAC;AAED,2DAA2D;AAC3D,SAAS,iBAAiB,CACxB,KAEoE;IAEpE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import {\n  decodeFunctionData,\n  encodeFunctionData,\n  type Address,\n  type Call,\n  type Hex,\n} from \"viem\";\nimport { LightAccountAbi_v1 } from \"../abis/LightAccountAbi_v1.js\";\nimport { BaseError } from \"@alchemy/common\";\n\n// Conveniently, all variants of LA up to v2.0.0 use the same function signatures for `execute` and `executeBatch`.\n\n/**\n * Encodes an array of calls into LightAccount calldata for `execute` or `executeBatch`.\n * Used internally by the LightAccount SmartAccount implementation. Typically not needed\n * directly unless you have an advanced use case.\n *\n * @param {Call[]} calls The calls to encode.\n * @returns {Hex} The encoded calldata.\n */\nexport function encodeCallsLA(calls: readonly Call[]): Hex {\n  if (calls.length === 1) {\n    return encodeFunctionData({\n      abi: LightAccountAbi_v1,\n      functionName: \"execute\",\n      args: [calls[0].to, calls[0].value ?? 0n, calls[0].data ?? \"0x\"],\n    });\n  }\n\n  const [targets, values, datas, hasValue] = calls.reduce(\n    (accum, curr) => {\n      accum[0].push(curr.to);\n      accum[1].push(curr.value ?? 0n);\n      accum[2].push(curr.data ?? \"0x\");\n      accum[3] = accum[3] || (curr.value ?? 0n) !== 0n;\n      return accum;\n    },\n    [[], [], [], false] as [Address[], bigint[], Hex[], boolean],\n  );\n\n  return encodeFunctionData({\n    abi: LightAccountAbi_v1,\n    functionName: \"executeBatch\",\n    args: hasValue ? [targets, values, datas] : [targets, datas],\n  });\n}\n\n/**\n * Decodes LightAccount calldata back into an array of calls.\n * Used internally by the LightAccount SmartAccount implementation. Typically not needed\n * directly unless you have an advanced use case.\n *\n * @param {Hex} data The calldata to decode.\n * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.\n * @returns {Call[]} The decoded calls.\n */\nexport function decodeCallsLA(data: Hex, accountAddress: Address): Call[] {\n  const decoded = decodeFunctionData({\n    abi: LightAccountAbi_v1,\n    data,\n  });\n\n  if (decoded.functionName === \"execute\") {\n    return [\n      {\n        to: decoded.args[0],\n        data: decoded.args[2],\n        ...(decoded.args[1] !== undefined ? { value: decoded.args[1] } : {}),\n      },\n    ];\n  }\n\n  if (decoded.functionName === \"executeBatch\") {\n    // This function is overloaded - may or may not have an array for values.\n\n    if (isThreeTupleArray(decoded.args)) {\n      const [targets, values, datas] = decoded.args;\n\n      if (targets.length !== values.length || targets.length !== datas.length) {\n        throw new BaseError(\"Invalid arguments for executeBatch\");\n      }\n\n      return targets.map((to, index) => ({\n        to,\n        value: values[index],\n        data: datas[index],\n      }));\n    }\n\n    // Two tuple array (no values)\n    const [targets, datas] = decoded.args;\n\n    if (targets.length !== datas.length) {\n      throw new BaseError(\"Invalid arguments for executeBatch\");\n    }\n\n    return targets.map((to, index) => ({\n      to,\n      data: datas[index],\n    }));\n  }\n\n  // Otherwise, treat the call as a single call to the account itself.\n  return [\n    {\n      to: accountAddress,\n      data,\n    },\n  ];\n}\n\n// Needed to narrow types for LAv1 `executeBatch` function.\nfunction isThreeTupleArray(\n  input:\n    | readonly [readonly Address[], readonly Hex[]]\n    | readonly [readonly Address[], readonly bigint[], readonly Hex[]],\n): input is readonly [readonly Address[], readonly bigint[], readonly Hex[]] {\n  return input.length === 3;\n}\n"]}

package/dist/esm/light-account/utils.js

@@ -3,11 +3,6 @@ import { hexToNumber, trim } from "viem";
 import { getStorageAt } from "viem/actions";
 import { getAction } from "viem/utils";
 import { AccountVersionRegistry } from "./registry.js";
-// TODO(v5): The pattern of getDefaultXYZAddress(…) doesn’t really make sense as a standalone.
-// We built this expecting lots of diverging addresses per chain, but in practice we have none
-// (and we’ve turned down things that require this). Instead: we could build the
-// default-but-overridable behavior into the consuming functions themselves (i.e.
-// createLightAccount defaulting to a factory address, but make it overridable)
 /**
  * Get the default light account version for the given light account type
  *

package/dist/esm/light-account/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/light-account/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,8FAA8F;AAC9F,8FAA8F;AAC9F,gFAAgF;AAChF,iFAAiF;AACjF,+EAA+E;AAE/E;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAEE,EAAE,CAAC,QAAQ,CAAC;AAExD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,sBAAsB,CAAC,YAAY,CAAC,QAAQ,CAAC;IAC7C,sBAAsB,CAAC,YAAY,CAAC,QAAQ,CAAC;CAC9C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,IAAI,GAAG,CACzD,gCAAgC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CACvE,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAC1C,oEAAoE,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAE9C,OAAiB;IACjB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAEtC,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAC3E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAC/B,CAAC;IAEF,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAE3E,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC;QACvC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,+BAA+B;KACtC,CAAC,CAAC;IAEH,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,SAAS,CACjB,+BAA+B,+BAA+B,EAAE,CACjE,CAAC;IACJ,CAAC;IAED,IACE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1B,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACrE,CAAC;QACD,MAAM,IAAI,SAAS,CACjB,0DAA0D,IAAI,IAAI,MAAM,CACtE,OAAO,CACR,EAAE,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC","sourcesContent":["import { BaseError, ChainNotFoundError, lowerAddress } from \"@alchemy/common\";\nimport { hexToNumber, trim, type Address } from \"viem\";\nimport { getStorageAt } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport type { LightAccountBase } from \"./accounts/base.js\";\nimport type { LightAccountType, LightAccountVersion } from \"./registry.js\";\nimport { AccountVersionRegistry } from \"./registry.js\";\n\n// TODO(v5): The pattern of getDefaultXYZAddress(…) doesn’t really make sense as a standalone.\n// We built this expecting lots of diverging addresses per chain, but in practice we have none\n// (and we’ve turned down things that require this). Instead: we could build the\n// default-but-overridable behavior into the consuming functions themselves (i.e.\n// createLightAccount defaulting to a factory address, but make it overridable)\n\n/**\n * Get the default light account version for the given light account type\n *\n * @template {LightAccountType} TLightAccountType\n * @returns {LightAccountVersion<TLightAccountType>} the default version for the given light account type\n */\nexport const defaultLightAccountVersion = <\n  TLightAccountType extends LightAccountType,\n>(): LightAccountVersion<TLightAccountType> => \"v2.0.0\";\n\n/**\n * Can be used to check if the account with one of the following implementation addresses\n * to not support 1271 signing.\n *\n * Light accounts with versions v1.0.1 and v1.0.2 do not support 1271 signing.\n */\nexport const LightAccountUnsupported1271Impls = [\n  AccountVersionRegistry.LightAccount[\"v1.0.1\"],\n  AccountVersionRegistry.LightAccount[\"v1.0.2\"],\n];\n\n/**\n * Can be used to check if the account with one of the following factory addresses\n * to not support 1271 signing.\n *\n * Light accounts with versions v1.0.1 and v1.0.2 do not support 1271 signing.\n */\nexport const LightAccountUnsupported1271Factories = new Set(\n  LightAccountUnsupported1271Impls.map((x) => [x.factoryAddress]).flat(),\n);\n\nexport const EIP1967_PROXY_IMPL_STORAGE_SLOT =\n  \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\";\n\n/**\n * Get the light account implementation address for the given light account\n *\n * @param {LightAccountBase} account - the light account to get the implementation address for\n * @returns {Promise<Address>} the light account implementation address for the given light account\n */\nexport async function getLightAccountImplAddress<\n  TAccount extends LightAccountBase,\n>(account: TAccount): Promise<Address> {\n  const client = account.client;\n  const chain = client.chain;\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n  const version = account.getLightAccountVersion();\n  const type = account.smartAccountType;\n\n  const expectedImplAddresses = Object.values(AccountVersionRegistry[type]).map(\n    (x) => x.accountImplementation,\n  );\n\n  const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n\n  const storage = await getStorageAtAction({\n    address: account.address,\n    slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n  });\n\n  if (storage == null) {\n    throw new BaseError(\n      `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n    );\n  }\n\n  if (\n    hexToNumber(storage) !== 0 &&\n    !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n  ) {\n    throw new BaseError(\n      `could not determine if smart account implementation is ${type} ${String(\n        version,\n      )}`,\n    );\n  }\n\n  return trim(storage);\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/light-account/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAEE,EAAE,CAAC,QAAQ,CAAC;AAExD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,sBAAsB,CAAC,YAAY,CAAC,QAAQ,CAAC;IAC7C,sBAAsB,CAAC,YAAY,CAAC,QAAQ,CAAC;CAC9C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,IAAI,GAAG,CACzD,gCAAgC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CACvE,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAC1C,oEAAoE,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAE9C,OAAiB;IACjB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAEtC,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAC3E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAC/B,CAAC;IAEF,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAE3E,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC;QACvC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,+BAA+B;KACtC,CAAC,CAAC;IAEH,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,SAAS,CACjB,+BAA+B,+BAA+B,EAAE,CACjE,CAAC;IACJ,CAAC;IAED,IACE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1B,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACrE,CAAC;QACD,MAAM,IAAI,SAAS,CACjB,0DAA0D,IAAI,IAAI,MAAM,CACtE,OAAO,CACR,EAAE,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC","sourcesContent":["import { BaseError, ChainNotFoundError, lowerAddress } from \"@alchemy/common\";\nimport { hexToNumber, trim, type Address } from \"viem\";\nimport { getStorageAt } from \"viem/actions\";\nimport { getAction } from \"viem/utils\";\nimport type { LightAccountBase } from \"./accounts/base.js\";\nimport type { LightAccountType, LightAccountVersion } from \"./registry.js\";\nimport { AccountVersionRegistry } from \"./registry.js\";\n\n/**\n * Get the default light account version for the given light account type\n *\n * @template {LightAccountType} TLightAccountType\n * @returns {LightAccountVersion<TLightAccountType>} the default version for the given light account type\n */\nexport const defaultLightAccountVersion = <\n  TLightAccountType extends LightAccountType,\n>(): LightAccountVersion<TLightAccountType> => \"v2.0.0\";\n\n/**\n * Can be used to check if the account with one of the following implementation addresses\n * to not support 1271 signing.\n *\n * Light accounts with versions v1.0.1 and v1.0.2 do not support 1271 signing.\n */\nexport const LightAccountUnsupported1271Impls = [\n  AccountVersionRegistry.LightAccount[\"v1.0.1\"],\n  AccountVersionRegistry.LightAccount[\"v1.0.2\"],\n];\n\n/**\n * Can be used to check if the account with one of the following factory addresses\n * to not support 1271 signing.\n *\n * Light accounts with versions v1.0.1 and v1.0.2 do not support 1271 signing.\n */\nexport const LightAccountUnsupported1271Factories = new Set(\n  LightAccountUnsupported1271Impls.map((x) => [x.factoryAddress]).flat(),\n);\n\nexport const EIP1967_PROXY_IMPL_STORAGE_SLOT =\n  \"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\";\n\n/**\n * Get the light account implementation address for the given light account\n *\n * @param {LightAccountBase} account - the light account to get the implementation address for\n * @returns {Promise<Address>} the light account implementation address for the given light account\n */\nexport async function getLightAccountImplAddress<\n  TAccount extends LightAccountBase,\n>(account: TAccount): Promise<Address> {\n  const client = account.client;\n  const chain = client.chain;\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n  const version = account.getLightAccountVersion();\n  const type = account.smartAccountType;\n\n  const expectedImplAddresses = Object.values(AccountVersionRegistry[type]).map(\n    (x) => x.accountImplementation,\n  );\n\n  const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n\n  const storage = await getStorageAtAction({\n    address: account.address,\n    slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n  });\n\n  if (storage == null) {\n    throw new BaseError(\n      `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n    );\n  }\n\n  if (\n    hexToNumber(storage) !== 0 &&\n    !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n  ) {\n    throw new BaseError(\n      `could not determine if smart account implementation is ${type} ${String(\n        version,\n      )}`,\n    );\n  }\n\n  return trim(storage);\n}\n"]}

package/dist/esm/ma-v1/accounts/base.js

@@ -1,9 +1,9 @@
-import { encodeFunctionData, } from "viem";
+import {} from "viem";
 import { entryPoint06Abi, toSmartAccount, entryPoint06Address, getUserOperationHash, } from "viem/account-abstraction";
-import { IStandardExecutorAbi } from "../abis/IStandardExecutor.js";
 import { signMessage, signTypedData } from "viem/actions";
-import { decodeFunctionData, getAction, hashMessage, hashTypedData, isAddressEqual, } from "viem/utils";
+import { getAction, hashMessage, hashTypedData, isAddressEqual, } from "viem/utils";
 import { BaseError } from "@alchemy/common";
+import { encodeCallsMAv1, decodeCallsMAv1 } from "./calldataCodec.js";
 /**
  * Creates a ModularAccountV1Base instance.
  *
@@ -36,9 +36,6 @@ export async function toModularAccountV1Base({ client, accountAddress, owner, ge
             return accountAddress;
         },
         async encodeCalls(calls) {
-            if (!calls.length) {
-                throw new BaseError("No calls to encode.");
-            }
             if (calls.length === 1) {
                 const call = calls[0];
                 // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.
@@ -48,53 +45,12 @@ export async function toModularAccountV1Base({ client, accountAddress, owner, ge
                     }
                     return call.data;
                 }
-                return encodeFunctionData({
-                    abi: IStandardExecutorAbi,
-                    functionName: "execute",
-                    args: [call.to, call.value ?? 0n, call.data ?? "0x"],
-                });
             }
-            return encodeFunctionData({
-                abi: IStandardExecutorAbi,
-                functionName: "executeBatch",
-                args: [
-                    calls.map((call) => ({
-                        target: call.to,
-                        value: call.value ?? 0n,
-                        data: call.data ?? "0x",
-                    })),
-                ],
-            });
+            return encodeCallsMAv1(calls);
         },
         // Inverse of `encodeCalls`.
         async decodeCalls(data) {
-            const decoded = decodeFunctionData({
-                abi: IStandardExecutorAbi,
-                data,
-            });
-            if (decoded.functionName === "execute") {
-                return [
-                    {
-                        to: decoded.args[0],
-                        value: decoded.args[1],
-                        data: decoded.args[2],
-                    },
-                ];
-            }
-            if (decoded.functionName === "executeBatch") {
-                return decoded.args[0].map((call) => ({
-                    to: call.target,
-                    value: call.value,
-                    data: call.data,
-                }));
-            }
-            // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.
-            return [
-                {
-                    to: accountAddress,
-                    data,
-                },
-            ];
+            return decodeCallsMAv1(data, accountAddress);
         },
         async getStubSignature() {
             return "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
@@ -115,7 +71,7 @@ export async function toModularAccountV1Base({ client, accountAddress, owner, ge
             const signTypedDataAction = getAction(client, signTypedData, "signTypedData");
             const { type, data } = await prepareSignature({
                 type: "eth_signTypedData_v4",
-                data: params, // TODO(v5): try harder to avoid this cast?
+                data: params,
             });
             return type === "personal_sign"
                 ? signMessageAction({ account: owner, message: data })

package/dist/esm/ma-v1/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type Hash,\n  type TypedDataDefinition,\n  encodeFunctionData,\n} from \"viem\";\nimport {\n  entryPoint06Abi,\n  toSmartAccount,\n  type SmartAccountImplementation,\n  entryPoint06Address,\n  getUserOperationHash,\n} from \"viem/account-abstraction\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { IStandardExecutorAbi } from \"../abis/IStandardExecutor.js\";\nimport { signMessage, signTypedData } from \"viem/actions\";\nimport {\n  decodeFunctionData,\n  getAction,\n  hashMessage,\n  hashTypedData,\n  isAddressEqual,\n} from \"viem/utils\";\nimport { BaseError } from \"@alchemy/common\";\n\ntype MaV1AccountType = \"MultiOwnerModularAccountV1\"; // Currently no SDK v5 support for \"MultiSigModularAccountV1\".\n\nexport type BaseMaV1AccountImplementation = SmartAccountImplementation<\n  typeof entryPoint06Abi,\n  \"0.6\",\n  {\n    smartAccountType: MaV1AccountType;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type ModularAccountV1Base =\n  SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;\n\nexport type ToModularAccountV1BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  get712Wrapper: (msg: Hash) => Promise<TypedDataDefinition>;\n  type: MaV1AccountType;\n};\n\n/**\n * Creates a ModularAccountV1Base instance.\n *\n * @param {ToModularAccountV1BaseParams<TTransport>} params The parameters for creating a ModularAccountV1Base instance\n * @returns {Promise<ModularAccountV1Base>} A promise that resolves to a ModularAccountV1Base instance\n */\nexport async function toModularAccountV1Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  accountAddress,\n  owner,\n  getFactoryArgs,\n  get712Wrapper,\n  type,\n}: ToModularAccountV1BaseParams<TTransport>): Promise<ModularAccountV1Base> {\n  const entryPoint = {\n    abi: entryPoint06Abi,\n    address: entryPoint06Address,\n    version: \"0.6\" as const,\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const data = await get712Wrapper(\n      params.type === \"personal_sign\"\n        ? hashMessage(params.data)\n        : hashTypedData(params.data),\n    );\n    return {\n      type: \"eth_signTypedData_v4\",\n      data,\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return signature;\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (!calls.length) {\n        throw new BaseError(\"No calls to encode.\");\n      }\n\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n        if (isAddressEqual(call.to, accountAddress)) {\n          if (call.data == null) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return call.data;\n        }\n\n        return encodeFunctionData({\n          abi: IStandardExecutorAbi,\n          functionName: \"execute\",\n          args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n        });\n      }\n\n      return encodeFunctionData({\n        abi: IStandardExecutorAbi,\n        functionName: \"executeBatch\",\n        args: [\n          calls.map((call) => ({\n            target: call.to,\n            value: call.value ?? 0n,\n            data: call.data ?? \"0x\",\n          })),\n        ],\n      });\n    },\n\n    // Inverse of `encodeCalls`.\n    async decodeCalls(data) {\n      const decoded = decodeFunctionData({\n        abi: IStandardExecutorAbi,\n        data,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      return \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition, // TODO(v5): try harder to avoid this cast?\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      return signMessageAction({\n        account: owner,\n        message: {\n          raw: userOpHash,\n        },\n      });\n    },\n\n    extend: {\n      smartAccountType: type,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type Hash,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  entryPoint06Abi,\n  toSmartAccount,\n  type SmartAccountImplementation,\n  entryPoint06Address,\n  getUserOperationHash,\n} from \"viem/account-abstraction\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { signMessage, signTypedData } from \"viem/actions\";\nimport {\n  getAction,\n  hashMessage,\n  hashTypedData,\n  isAddressEqual,\n} from \"viem/utils\";\nimport { BaseError } from \"@alchemy/common\";\nimport { encodeCallsMAv1, decodeCallsMAv1 } from \"./calldataCodec.js\";\n\ntype MaV1AccountType = \"MultiOwnerModularAccountV1\"; // Currently no SDK v5 support for \"MultiSigModularAccountV1\".\n\nexport type BaseMaV1AccountImplementation = SmartAccountImplementation<\n  typeof entryPoint06Abi,\n  \"0.6\",\n  {\n    smartAccountType: MaV1AccountType;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type ModularAccountV1Base =\n  SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;\n\nexport type ToModularAccountV1BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  get712Wrapper: (msg: Hash) => Promise<TypedDataDefinition>;\n  type: MaV1AccountType;\n};\n\n/**\n * Creates a ModularAccountV1Base instance.\n *\n * @param {ToModularAccountV1BaseParams<TTransport>} params The parameters for creating a ModularAccountV1Base instance\n * @returns {Promise<ModularAccountV1Base>} A promise that resolves to a ModularAccountV1Base instance\n */\nexport async function toModularAccountV1Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  accountAddress,\n  owner,\n  getFactoryArgs,\n  get712Wrapper,\n  type,\n}: ToModularAccountV1BaseParams<TTransport>): Promise<ModularAccountV1Base> {\n  const entryPoint = {\n    abi: entryPoint06Abi,\n    address: entryPoint06Address,\n    version: \"0.6\" as const,\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const data = await get712Wrapper(\n      params.type === \"personal_sign\"\n        ? hashMessage(params.data)\n        : hashTypedData(params.data),\n    );\n    return {\n      type: \"eth_signTypedData_v4\",\n      data,\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return signature;\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n        if (isAddressEqual(call.to, accountAddress)) {\n          if (call.data == null) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return call.data;\n        }\n      }\n\n      return encodeCallsMAv1(calls);\n    },\n\n    // Inverse of `encodeCalls`.\n    async decodeCalls(data) {\n      return decodeCallsMAv1(data, accountAddress);\n    },\n\n    async getStubSignature() {\n      return \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      return signMessageAction({\n        account: owner,\n        message: {\n          raw: userOpHash,\n        },\n      });\n    },\n\n    extend: {\n      smartAccountType: type,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/ma-v1/accounts/calldataCodec.d.ts

@@ -0,0 +1,20 @@
+import { type Address, type Call, type Hex } from "viem";
+/**
+ * Encodes an array of calls into ModularAccountV1 calldata for `execute` or `executeBatch`.
+ * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Call[]} calls The calls to encode.
+ * @returns {Hex} The encoded calldata.
+ */
+export declare function encodeCallsMAv1(calls: readonly Call[]): Hex;
+/**
+ * Decodes ModularAccountV1 calldata back into an array of calls.
+ * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Hex} data The calldata to decode.
+ * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.
+ * @returns {Call[]} The decoded calls.
+ */
+export declare function decodeCallsMAv1(data: Hex, accountAddress: Address): Call[];

package/dist/esm/ma-v1/accounts/calldataCodec.js

@@ -0,0 +1,69 @@
+import { decodeFunctionData, encodeFunctionData, } from "viem";
+import { IStandardExecutorAbi } from "../abis/IStandardExecutor.js";
+/**
+ * Encodes an array of calls into ModularAccountV1 calldata for `execute` or `executeBatch`.
+ * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Call[]} calls The calls to encode.
+ * @returns {Hex} The encoded calldata.
+ */
+export function encodeCallsMAv1(calls) {
+    if (calls.length === 1) {
+        return encodeFunctionData({
+            abi: IStandardExecutorAbi,
+            functionName: "execute",
+            args: [calls[0].to, calls[0].value ?? 0n, calls[0].data ?? "0x"],
+        });
+    }
+    return encodeFunctionData({
+        abi: IStandardExecutorAbi,
+        functionName: "executeBatch",
+        args: [
+            calls.map((call) => ({
+                target: call.to,
+                value: call.value ?? 0n,
+                data: call.data ?? "0x",
+            })),
+        ],
+    });
+}
+/**
+ * Decodes ModularAccountV1 calldata back into an array of calls.
+ * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed
+ * directly unless you have an advanced use case.
+ *
+ * @param {Hex} data The calldata to decode.
+ * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.
+ * @returns {Call[]} The decoded calls.
+ */
+export function decodeCallsMAv1(data, accountAddress) {
+    const decoded = decodeFunctionData({
+        abi: IStandardExecutorAbi,
+        data,
+    });
+    if (decoded.functionName === "execute") {
+        return [
+            {
+                to: decoded.args[0],
+                value: decoded.args[1],
+                data: decoded.args[2],
+            },
+        ];
+    }
+    if (decoded.functionName === "executeBatch") {
+        return decoded.args[0].map((call) => ({
+            to: call.target,
+            value: call.value,
+            data: call.data,
+        }));
+    }
+    // If the data is not for an `execute` or `executeBatch` call, treat it as a single call to the account itself.
+    return [
+        {
+            to: accountAddress,
+            data,
+        },
+    ];
+}
+//# sourceMappingURL=calldataCodec.js.map

package/dist/esm/ma-v1/accounts/calldataCodec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calldataCodec.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/calldataCodec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,GAInB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,KAAsB;IACpD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;YACxB,GAAG,EAAE,oBAAoB;YACzB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC;SACjE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,kBAAkB,CAAC;QACxB,GAAG,EAAE,oBAAoB;QACzB,YAAY,EAAE,cAAc;QAC5B,IAAI,EAAE;YACJ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACnB,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;gBACvB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;aACxB,CAAC,CAAC;SACJ;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,IAAS,EAAE,cAAuB;IAChE,MAAM,OAAO,GAAG,kBAAkB,CAAC;QACjC,GAAG,EAAE,oBAAoB;QACzB,IAAI;KACL,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO;YACL;gBACE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;aACtB;SACF,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,KAAK,cAAc,EAAE,CAAC;QAC5C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,EAAE,EAAE,IAAI,CAAC,MAAM;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,+GAA+G;IAC/G,OAAO;QACL;YACE,EAAE,EAAE,cAAc;YAClB,IAAI;SACL;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {\n  decodeFunctionData,\n  encodeFunctionData,\n  type Address,\n  type Call,\n  type Hex,\n} from \"viem\";\nimport { IStandardExecutorAbi } from \"../abis/IStandardExecutor.js\";\n\n/**\n * Encodes an array of calls into ModularAccountV1 calldata for `execute` or `executeBatch`.\n * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed\n * directly unless you have an advanced use case.\n *\n * @param {Call[]} calls The calls to encode.\n * @returns {Hex} The encoded calldata.\n */\nexport function encodeCallsMAv1(calls: readonly Call[]): Hex {\n  if (calls.length === 1) {\n    return encodeFunctionData({\n      abi: IStandardExecutorAbi,\n      functionName: \"execute\",\n      args: [calls[0].to, calls[0].value ?? 0n, calls[0].data ?? \"0x\"],\n    });\n  }\n\n  return encodeFunctionData({\n    abi: IStandardExecutorAbi,\n    functionName: \"executeBatch\",\n    args: [\n      calls.map((call) => ({\n        target: call.to,\n        value: call.value ?? 0n,\n        data: call.data ?? \"0x\",\n      })),\n    ],\n  });\n}\n\n/**\n * Decodes ModularAccountV1 calldata back into an array of calls.\n * Used internally by the ModularAccountV1 SmartAccount implementation. Typically not needed\n * directly unless you have an advanced use case.\n *\n * @param {Hex} data The calldata to decode.\n * @param {Address} accountAddress The account address, used as the `to` for unrecognized selectors.\n * @returns {Call[]} The decoded calls.\n */\nexport function decodeCallsMAv1(data: Hex, accountAddress: Address): Call[] {\n  const decoded = decodeFunctionData({\n    abi: IStandardExecutorAbi,\n    data,\n  });\n\n  if (decoded.functionName === \"execute\") {\n    return [\n      {\n        to: decoded.args[0],\n        value: decoded.args[1],\n        data: decoded.args[2],\n      },\n    ];\n  }\n\n  if (decoded.functionName === \"executeBatch\") {\n    return decoded.args[0].map((call) => ({\n      to: call.target,\n      value: call.value,\n      data: call.data,\n    }));\n  }\n\n  // If the data is not for an `execute` or `executeBatch` call, treat it as a single call to the account itself.\n  return [\n    {\n      to: accountAddress,\n      data,\n    },\n  ];\n}\n"]}

package/dist/esm/ma-v1/mav1StaticImpl.d.ts

@@ -9,7 +9,5 @@ export type MultiOwnerModularAccountV1FactoryArgs = {
 };
 /**
  * Static implementation logic for ModularAccountV1.
- *
- * TODO(v5): update JSDoc format when doc-gen supports structs or records.
  */
 export declare const multiOwnerModularAccountStaticImpl: StaticSmartAccountImplementation<false, "0.6", MultiOwnerModularAccountV1FactoryArgs, typeof entryPoint06Abi, typeof UpgradeableModularAccountAbi, typeof MultiOwnerModularAccountFactoryAbi>;

package/dist/esm/ma-v1/mav1StaticImpl.js

@@ -7,8 +7,6 @@ import { DefaultMaV1Address } from "./account.js";
 import { predictMultiOwnerModularAccountV1Address } from "./predictAddress.js";
 /**
  * Static implementation logic for ModularAccountV1.
- *
- * TODO(v5): update JSDoc format when doc-gen supports structs or records.
  */
 export const multiOwnerModularAccountStaticImpl = {
     entryPoint: {