@account-kit/wallet-client 0.1.0-alpha.0 → 0.1.0-alpha.10

package/dist/esm/isomorphic/utils/7702.js

@@ -0,0 +1,70 @@
+import { concatHex, numberToHex, isAddress, hexToNumber, } from "viem";
+import { Eip7702AccountTypeToDelegationAddress, SUPPORTED_DELEGATION_ADDRESSES, } from "@alchemy/wallet-api-types/capabilities";
+import { InvalidRequestError } from "ox/RpcResponse";
+import { hashAuthorization } from "viem/utils";
+/** Checks if an address is actively delegated on-chain. */
+export const isDelegated = async (client, params) => {
+    const expectedCode = concatHex(["0xef0100", params.delegation]);
+    const code = (await client.getCode({ address: params.address })) ?? "0x";
+    return code.toLowerCase() === expectedCode.toLowerCase();
+};
+export const createAuthorizationRequest = async (client, params) => {
+    const data = {
+        address: params.delegation,
+        nonce: numberToHex(await client.getTransactionCount({
+            address: params.address,
+        })),
+    };
+    return {
+        type: "authorization",
+        data,
+        chainId: numberToHex(client.chain.id),
+        signatureRequest: {
+            type: "eip7702Auth",
+            rawPayload: hashAuthorization({
+                chainId: client.chain.id,
+                nonce: hexToNumber(data.nonce),
+                address: params.delegation,
+            }),
+        },
+    };
+};
+export const DelegationAddressToAccountType = Object.fromEntries(Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [
+    value,
+    key,
+]));
+export const isSupportedDelegationAddress7702 = (address) => {
+    return SUPPORTED_DELEGATION_ADDRESSES.includes(address);
+};
+export const getAccountTypeForDelegationAddress7702 = (address) => {
+    return DelegationAddressToAccountType[address];
+};
+const getDelegationAddressForAccountType7702 = (accountType) => {
+    return Eip7702AccountTypeToDelegationAddress[accountType];
+};
+const DEFAULT_7702_DELEGATION_ADDR = Eip7702AccountTypeToDelegationAddress["ModularAccountV2"];
+export const parseDelegation = (eip7702AuthCapability) => {
+    return eip7702AuthCapability === true
+        ? DEFAULT_7702_DELEGATION_ADDR
+        : isAddress(eip7702AuthCapability.delegation)
+            ? eip7702AuthCapability.delegation
+            : getDelegationAddressForAccountType7702(eip7702AuthCapability.delegation);
+};
+export const assertValid7702AccountAddress = (fromAddress, eip7702AuthCapability) => {
+    if (eip7702AuthCapability) {
+        if (typeof eip7702AuthCapability === "object" &&
+            "account" in eip7702AuthCapability &&
+            eip7702AuthCapability?.account !== fromAddress) {
+            throw new InvalidRequestError({
+                message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,
+            });
+        }
+        const delegation = parseDelegation(eip7702AuthCapability);
+        if (!isSupportedDelegationAddress7702(delegation)) {
+            throw new InvalidRequestError({
+                message: `Unsupported 7702 delegation address: ${delegation}`,
+            });
+        }
+    }
+};
+//# sourceMappingURL=7702.js.map

package/dist/esm/isomorphic/utils/7702.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,WAAW,EAIX,SAAS,EACT,WAAW,GACZ,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,qCAAqC,EACrC,8BAA8B,GAG/B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,2DAA2D;AAC3D,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,MAMC,EACD,MAAiD,EAC/B,EAAE;IACpB,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;IACzE,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,MAMC,EACD,MAAiD,EACZ,EAAE;IACvC,MAAM,IAAI,GAAG;QACX,OAAO,EAAE,MAAM,CAAC,UAAU;QAC1B,KAAK,EAAE,WAAW,CAChB,MAAM,MAAM,CAAC,mBAAmB,CAAC;YAC/B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CACH;KACF,CAAC;IACF,OAAO;QACL,IAAI,EAAE,eAAwB;QAC9B,IAAI;QACJ,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,gBAAgB,EAAE;YAChB,IAAI,EAAE,aAAsB;YAC5B,UAAU,EAAE,iBAAiB,CAAC;gBAC5B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxB,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC9B,OAAO,EAAE,MAAM,CAAC,UAAU;aAC3B,CAAC;SACH;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAGvC,MAAM,CAAC,WAAW,CACpB,MAAM,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1E,KAAK;IACL,GAAG;CACJ,CAAC,CAC0C,CAAC;AAE/C,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,OAAgB,EAAW,EAAE;IAC5E,OAAQ,8BAA4C,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,OAAgB,EACsB,EAAE;IACxC,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,sCAAsC,GAAG,CAC7C,WAAqC,EACY,EAAE;IACnD,OAAO,qCAAqC,CAAC,WAAW,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAChC,qCAAqC,CAAC,kBAAkB,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,qBAA4C,EAC5C,EAAE;IACF,OAAO,qBAAqB,KAAK,IAAI;QACnC,CAAC,CAAC,4BAA4B;QAC9B,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC;YAC3C,CAAC,CAAC,qBAAqB,CAAC,UAAU;YAClC,CAAC,CAAC,sCAAsC,CACpC,qBAAqB,CAAC,UAAU,CACjC,CAAC;AACV,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,WAAoB,EACpB,qBAAwD,EACxD,EAAE;IACF,IAAI,qBAAqB,EAAE,CAAC;QAC1B,IACE,OAAO,qBAAqB,KAAK,QAAQ;YACzC,SAAS,IAAI,qBAAqB;YAClC,qBAAqB,EAAE,OAAO,KAAK,WAAW,EAC9C,CAAC;YACD,MAAM,IAAI,mBAAmB,CAAC;gBAC5B,OAAO,EAAE,+BAA+B,qBAAqB,CAAC,OAAO,8BAA8B,WAAW,GAAG;aAClH,CAAC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC;QAE1D,IAAI,CAAC,gCAAgC,CAAC,UAAU,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,mBAAmB,CAAC;gBAC5B,OAAO,EAAE,wCAAwC,UAAU,EAAE;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  numberToHex,\n  type Address,\n  type Chain,\n  type Transport,\n  isAddress,\n  hexToNumber,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport {\n  Eip7702AccountTypeToDelegationAddress,\n  SUPPORTED_DELEGATION_ADDRESSES,\n  type Supported7702AccountType,\n  type Eip7702AuthCapability,\n} from \"@alchemy/wallet-api-types/capabilities\";\nimport type { PreparedCall_Authorization } from \"@alchemy/wallet-api-types\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { hashAuthorization } from \"viem/utils\";\n\n/** Checks if an address is actively delegated on-chain. */\nexport const isDelegated = async (\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: { address: Address; delegation: Address },\n): Promise<boolean> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  return code.toLowerCase() === expectedCode.toLowerCase();\n};\n\nexport const createAuthorizationRequest = async (\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: { address: Address; delegation: Address },\n): Promise<PreparedCall_Authorization> => {\n  const data = {\n    address: params.delegation,\n    nonce: numberToHex(\n      await client.getTransactionCount({\n        address: params.address,\n      }),\n    ),\n  };\n  return {\n    type: \"authorization\" as const,\n    data,\n    chainId: numberToHex(client.chain.id),\n    signatureRequest: {\n      type: \"eip7702Auth\" as const,\n      rawPayload: hashAuthorization({\n        chainId: client.chain.id,\n        nonce: hexToNumber(data.nonce),\n        address: params.delegation,\n      }),\n    },\n  };\n};\n\nexport const DelegationAddressToAccountType: Record<\n  Address,\n  Supported7702AccountType\n> = Object.fromEntries(\n  Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [\n    value,\n    key,\n  ]),\n) as Record<Address, Supported7702AccountType>;\n\nexport const isSupportedDelegationAddress7702 = (address: Address): boolean => {\n  return (SUPPORTED_DELEGATION_ADDRESSES as Address[]).includes(address);\n};\n\nexport const getAccountTypeForDelegationAddress7702 = (\n  address: Address,\n): Supported7702AccountType | undefined => {\n  return DelegationAddressToAccountType[address];\n};\n\nconst getDelegationAddressForAccountType7702 = (\n  accountType: Supported7702AccountType,\n): (typeof SUPPORTED_DELEGATION_ADDRESSES)[number] => {\n  return Eip7702AccountTypeToDelegationAddress[accountType];\n};\n\nconst DEFAULT_7702_DELEGATION_ADDR =\n  Eip7702AccountTypeToDelegationAddress[\"ModularAccountV2\"];\n\nexport const parseDelegation = (\n  eip7702AuthCapability: Eip7702AuthCapability,\n) => {\n  return eip7702AuthCapability === true\n    ? DEFAULT_7702_DELEGATION_ADDR\n    : isAddress(eip7702AuthCapability.delegation)\n      ? eip7702AuthCapability.delegation\n      : getDelegationAddressForAccountType7702(\n          eip7702AuthCapability.delegation,\n        );\n};\n\nexport const assertValid7702AccountAddress = (\n  fromAddress: Address,\n  eip7702AuthCapability: Eip7702AuthCapability | undefined,\n) => {\n  if (eip7702AuthCapability) {\n    if (\n      typeof eip7702AuthCapability === \"object\" &&\n      \"account\" in eip7702AuthCapability &&\n      eip7702AuthCapability?.account !== fromAddress\n    ) {\n      throw new InvalidRequestError({\n        message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,\n      });\n    }\n\n    const delegation = parseDelegation(eip7702AuthCapability);\n\n    if (!isSupportedDelegationAddress7702(delegation)) {\n      throw new InvalidRequestError({\n        message: `Unsupported 7702 delegation address: ${delegation}`,\n      });\n    }\n  }\n};\n"]}

package/dist/esm/isomorphic/utils/createAccount.d.ts

@@ -2,15 +2,16 @@ import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
 import { type ModularAccountV2 } from "@account-kit/smart-contracts";
 import type { StaticDecode } from "@sinclair/typebox";
 import type { Address, Chain, Transport } from "viem";
-import type { TypeSerializedInitcode } from "../../schemas";
-import type { Capabilities } from "../../capabilities";
+import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
+import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
 type CreateAccountParams = {
     chain: Chain;
     transport: Transport;
     signer: SmartAccountSigner;
     accountAddress: Address;
-    counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>;
-    capabilities?: StaticDecode<typeof Capabilities>;
+    counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>;
+    permissions?: StaticDecode<typeof PermissionsCapability>;
+    delegation?: Address;
 };
 /**
  * Creates a smart account instance from the given parameters.

package/dist/esm/isomorphic/utils/createAccount.js

@@ -1,6 +1,11 @@
-import { createModularAccountV2, } from "@account-kit/smart-contracts";
+import { createLightAccount, createModularAccountV2, createMultiOwnerLightAccount, createMultiOwnerModularAccount, } from "@account-kit/smart-contracts";
 import { concatHex, hexToNumber } from "viem";
-import { parsePermissionsContext } from "./parsePermissionsContext";
+import { parsePermissionsContext } from "./parsePermissionsContext.js";
+import { assertNever } from "../../utils.js";
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
+import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
+import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
+import { InternalError, InvalidRequestError } from "ox/RpcResponse";
 /**
  * Creates a smart account instance from the given parameters.
  * @param params - The parameters for creating a smart account.
@@ -8,23 +13,92 @@ import { parsePermissionsContext } from "./parsePermissionsContext";
  */
 export async function createAccount(params) {
     const { counterfactualInfo: ci, ...accountParams } = params;
-    // TODO: Implement support for other account types.
-    if (ci.factoryType !== "MAv2.0.0-sma-b") {
-        throw new Error("Only MAv2 SMA-B accounts are currently supported");
-    }
-    const parsedContext = parsePermissionsContext(params.capabilities, ci);
+    // This throws if we pass a permission context and the account is not MA-v2
+    // TODO: test that this edge case is handled correctly
+    const parsedContext = parsePermissionsContext(params.permissions, ci, params.delegation);
     const signerEntity = parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
         ? {
             entityId: hexToNumber(parsedContext.entityId),
             isGlobalValidation: parsedContext.isGlobalValidation,
         }
         : undefined;
-    return createModularAccountV2({
+    const mode = params.delegation ? "7702" : "default";
+    if (mode === "7702") {
+        const accountType = getAccountTypeForDelegationAddress7702(params.delegation);
+        if (accountType !== "ModularAccountV2") {
+            throw new Error("7702 mode currently only supports ModularAccountV2");
+        }
+        return createModularAccountV2({
+            ...accountParams,
+            signerEntity,
+            deferredAction: parsedContext?.deferredAction,
+            mode,
+        });
+    }
+    if (mode !== "default") {
+        return assertNever(mode, "Unexpected mode in createAccount");
+    }
+    // At this point, we are guaranteed to be in default mode, where ci
+    // (counterfactualInfo) must be defined
+    if (!ci) {
+        throw new InternalError({
+            message: "Counterfactual info not found",
+        });
+    }
+    const factoryType = ci.factoryType;
+    const commonParams = {
         ...accountParams,
-        signerEntity,
-        deferredAction: parsedContext?.deferredAction,
         initCode: concatHex([ci.factoryAddress, ci.factoryData]),
-    });
+    };
+    // Return the account created based on the factory type
+    switch (factoryType) {
+        case "MAv2.0.0-sma-b":
+            return createModularAccountV2({
+                ...commonParams,
+                signerEntity,
+                deferredAction: parsedContext?.deferredAction,
+                mode,
+            });
+        case "LightAccountV2.0.0":
+            return createLightAccount({
+                ...commonParams,
+                version: "v2.0.0",
+            });
+        case "LightAccountV1.0.1":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.0.1",
+            });
+        case "LightAccountV1.0.2":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.0.2",
+            });
+        case "LightAccountV1.1.0":
+            return createLightAccount({
+                ...commonParams,
+                version: "v1.1.0",
+            });
+        case "MAv1.0.0-MultiOwner":
+            return createMultiOwnerModularAccount({
+                ...commonParams,
+            });
+        case "LightAccountV2.0.0-MultiOwner":
+            return createMultiOwnerLightAccount({
+                ...commonParams,
+                version: "v2.0.0",
+            });
+        case "MAv1.0.0-MultiSig":
+        case "MAv2.0.0-ma-ssv":
+        case "MAv2.0.0-ma-webauthn":
+        case "unknown":
+        case undefined:
+            throw new InvalidRequestError({
+                message: `Account type currently unsupported: ${factoryType}`,
+            });
+        default:
+            return assertNever(factoryType, "Unsupported factory type");
+    }
 }
 export function isModularAccountV2(account) {
     return account.source === "ModularAccountV2";

package/dist/esm/isomorphic/utils/createAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAccount.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createAccount.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,GAEvB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAWpE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B;IAE3B,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC;IAC5D,mDAAmD;IACnD,IAAI,EAAE,CAAC,WAAW,KAAK,gBAAgB,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAEvE,MAAM,YAAY,GAChB,aAAa,EAAE,cAAc,KAAK,qBAAqB;QACrD,CAAC,CAAC;YACE,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC;YAC7C,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;SACrD;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,OAAO,sBAAsB,CAAC;QAC5B,GAAG,aAAa;QAChB,YAAY;QACZ,cAAc,EAAE,aAAa,EAAE,cAAc;QAC7C,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;KACzD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAA6B;IAE7B,OAAO,OAAO,CAAC,MAAM,KAAK,kBAAkB,CAAC;AAC/C,CAAC","sourcesContent":["import type { SmartAccountSigner, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  createModularAccountV2,\n  type ModularAccountV2,\n} from \"@account-kit/smart-contracts\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport type { Address, Chain, Transport } from \"viem\";\nimport { concatHex, hexToNumber } from \"viem\";\nimport type { TypeSerializedInitcode } from \"../../schemas\";\nimport type { Capabilities } from \"../../capabilities\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext\";\n\ntype CreateAccountParams = {\n  chain: Chain;\n  transport: Transport;\n  signer: SmartAccountSigner;\n  accountAddress: Address;\n  counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>;\n  capabilities?: StaticDecode<typeof Capabilities>;\n};\n\n/**\n * Creates a smart account instance from the given parameters.\n * @param params - The parameters for creating a smart account.\n * @returns A promise that resolves to the created smart account.\n */\nexport async function createAccount(\n  params: CreateAccountParams,\n): Promise<SmartContractAccount> {\n  const { counterfactualInfo: ci, ...accountParams } = params;\n  // TODO: Implement support for other account types.\n  if (ci.factoryType !== \"MAv2.0.0-sma-b\") {\n    throw new Error(\"Only MAv2 SMA-B accounts are currently supported\");\n  }\n\n  const parsedContext = parsePermissionsContext(params.capabilities, ci);\n\n  const signerEntity =\n    parsedContext?.contextVersion === \"NON_DEFERRED_ACTION\"\n      ? {\n          entityId: hexToNumber(parsedContext.entityId),\n          isGlobalValidation: parsedContext.isGlobalValidation,\n        }\n      : undefined;\n\n  return createModularAccountV2({\n    ...accountParams,\n    signerEntity,\n    deferredAction: parsedContext?.deferredAction,\n    initCode: concatHex([ci.factoryAddress, ci.factoryData]),\n  });\n}\n\nexport function isModularAccountV2(\n  account: SmartContractAccount,\n): account is ModularAccountV2 {\n  return account.source === \"ModularAccountV2\";\n}\n"]}
+{"version":3,"file":"createAccount.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createAccount.ts"],"names":[],"mappings":"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","sourcesContent":["import type { SmartAccountSigner, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  createLightAccount,\n  createModularAccountV2,\n  createMultiOwnerLightAccount,\n  createMultiOwnerModularAccount,\n  type ModularAccountV2,\n} from \"@account-kit/smart-contracts\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport type { Address, Chain, Transport } from \"viem\";\nimport { concatHex, hexToNumber } from \"viem\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { TypeSerializedInitcode } from \"@alchemy/wallet-api-types\";\nimport { PermissionsCapability } from \"@alchemy/wallet-api-types/capabilities\";\nimport { InternalError, InvalidRequestError } from \"ox/RpcResponse\";\n\ntype CreateAccountParams = {\n  chain: Chain;\n  transport: Transport;\n  signer: SmartAccountSigner;\n  accountAddress: Address;\n  counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>; // undefined for 7702 accounts\n  permissions?: StaticDecode<typeof PermissionsCapability>;\n  delegation?: Address;\n};\n\n/**\n * Creates a smart account instance from the given parameters.\n * @param params - The parameters for creating a smart account.\n * @returns A promise that resolves to the created smart account.\n */\nexport async function createAccount(\n  params: CreateAccountParams,\n): Promise<SmartContractAccount> {\n  const { counterfactualInfo: ci, ...accountParams } = params;\n\n  // This throws if we pass a permission context and the account is not MA-v2\n  // TODO: test that this edge case is handled correctly\n  const parsedContext = parsePermissionsContext(\n    params.permissions,\n    ci,\n    params.delegation,\n  );\n\n  const signerEntity =\n    parsedContext?.contextVersion === \"NON_DEFERRED_ACTION\"\n      ? {\n          entityId: hexToNumber(parsedContext.entityId),\n          isGlobalValidation: parsedContext.isGlobalValidation,\n        }\n      : undefined;\n\n  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"7702\") {\n    const accountType = getAccountTypeForDelegationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new Error(\"7702 mode currently only supports ModularAccountV2\");\n    }\n    return createModularAccountV2({\n      ...accountParams,\n      signerEntity,\n      deferredAction: parsedContext?.deferredAction,\n      mode,\n    });\n  }\n\n  if (mode !== \"default\") {\n    return assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\n  // At this point, we are guaranteed to be in default mode, where ci\n  // (counterfactualInfo) must be defined\n\n  if (!ci) {\n    throw new InternalError({\n      message: \"Counterfactual info not found\",\n    });\n  }\n\n  const factoryType = ci.factoryType;\n  const commonParams = {\n    ...accountParams,\n    initCode: concatHex([ci.factoryAddress, ci.factoryData]),\n  };\n\n  // Return the account created based on the factory type\n  switch (factoryType) {\n    case \"MAv2.0.0-sma-b\":\n      return createModularAccountV2({\n        ...commonParams,\n        signerEntity,\n        deferredAction: parsedContext?.deferredAction,\n        mode,\n      });\n    case \"LightAccountV2.0.0\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v2.0.0\",\n      });\n    case \"LightAccountV1.0.1\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.0.1\",\n      });\n    case \"LightAccountV1.0.2\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.0.2\",\n      });\n    case \"LightAccountV1.1.0\":\n      return createLightAccount({\n        ...commonParams,\n        version: \"v1.1.0\",\n      });\n    case \"MAv1.0.0-MultiOwner\":\n      return createMultiOwnerModularAccount({\n        ...commonParams,\n      });\n    case \"LightAccountV2.0.0-MultiOwner\":\n      return createMultiOwnerLightAccount({\n        ...commonParams,\n        version: \"v2.0.0\",\n      });\n    case \"MAv1.0.0-MultiSig\":\n    case \"MAv2.0.0-ma-ssv\":\n    case \"MAv2.0.0-ma-webauthn\":\n    case \"unknown\":\n    case undefined:\n      throw new InvalidRequestError({\n        message: `Account type currently unsupported: ${factoryType}`,\n      });\n    default:\n      return assertNever(factoryType, \"Unsupported factory type\");\n  }\n}\n\nexport function isModularAccountV2(\n  account: SmartContractAccount,\n): account is ModularAccountV2 {\n  return account.source === \"ModularAccountV2\";\n}\n"]}

package/dist/esm/isomorphic/utils/createDummySigner.js

@@ -1,5 +1,5 @@
 import {} from "@aa-sdk/core";
-import {} from "viem";
+import { BaseError, } from "viem";
 export const createDummySigner = (address) => ({
     signerType: "",
     inner: undefined,
@@ -8,10 +8,10 @@ export const createDummySigner = (address) => ({
     },
     // Not supported on the server
     signMessage: function (_message) {
-        throw new Error("Function not implemented.");
+        throw new BaseError("signMessage not implemented by dummy signer.");
     },
     signTypedData: function (_params) {
-        throw new Error("Function not implemented.");
+        throw new BaseError("signTypedData not implemented by dummy signer.");
     },
 });
 //# sourceMappingURL=createDummySigner.js.map

package/dist/esm/isomorphic/utils/createDummySigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDummySigner.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createDummySigner.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,MAAM,cAAc,CAAC;AAEvD,OAAO,EAKN,MAAM,MAAM,CAAC;AAEd,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAsB,EAAE,CAAC,CAAC;IAC1E,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,SAAS;IAChB,UAAU,EAAE,KAAK;QACf,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,8BAA8B;IAC9B,WAAW,EAAE,UAAU,QAAyB;QAC9C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,aAAa,EAAE,UAGb,OAAsD;QACtD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;CACF,CAAC,CAAC","sourcesContent":["import { type SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { TypedData } from \"abitype\";\nimport {\n  type Address,\n  type Hex,\n  type SignableMessage,\n  type TypedDataDefinition,\n} from \"viem\";\n\nexport const createDummySigner = (address: Address): SmartAccountSigner => ({\n  signerType: \"\",\n  inner: undefined,\n  getAddress: async function (): Promise<`0x${string}`> {\n    return address;\n  },\n  // Not supported on the server\n  signMessage: function (_message: SignableMessage): Promise<Hex> {\n    throw new Error(\"Function not implemented.\");\n  },\n  signTypedData: function <\n    const TTypedData extends TypedData | Record<string, unknown>,\n    TPrimaryType extends keyof TTypedData | \"EIP712Domain\" = keyof TTypedData,\n  >(_params: TypedDataDefinition<TTypedData, TPrimaryType>): Promise<Hex> {\n    throw new Error(\"Function not implemented.\");\n  },\n});\n"]}
+{"version":3,"file":"createDummySigner.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/createDummySigner.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,MAAM,cAAc,CAAC;AAEvD,OAAO,EACL,SAAS,GAKV,MAAM,MAAM,CAAC;AAEd,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAsB,EAAE,CAAC,CAAC;IAC1E,UAAU,EAAE,EAAE;IACd,KAAK,EAAE,SAAS;IAChB,UAAU,EAAE,KAAK;QACf,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,8BAA8B;IAC9B,WAAW,EAAE,UAAU,QAAyB;QAC9C,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;IACtE,CAAC;IACD,aAAa,EAAE,UAGb,OAAsD;QACtD,MAAM,IAAI,SAAS,CAAC,gDAAgD,CAAC,CAAC;IACxE,CAAC;CACF,CAAC,CAAC","sourcesContent":["import { type SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { TypedData } from \"abitype\";\nimport {\n  BaseError,\n  type Address,\n  type Hex,\n  type SignableMessage,\n  type TypedDataDefinition,\n} from \"viem\";\n\nexport const createDummySigner = (address: Address): SmartAccountSigner => ({\n  signerType: \"\",\n  inner: undefined,\n  getAddress: async function (): Promise<`0x${string}`> {\n    return address;\n  },\n  // Not supported on the server\n  signMessage: function (_message: SignableMessage): Promise<Hex> {\n    throw new BaseError(\"signMessage not implemented by dummy signer.\");\n  },\n  signTypedData: function <\n    const TTypedData extends TypedData | Record<string, unknown>,\n    TPrimaryType extends keyof TTypedData | \"EIP712Domain\" = keyof TTypedData,\n  >(_params: TypedDataDefinition<TTypedData, TPrimaryType>): Promise<Hex> {\n    throw new BaseError(\"signTypedData not implemented by dummy signer.\");\n  },\n});\n"]}

package/dist/esm/isomorphic/utils/decodeSignature.d.ts

@@ -0,0 +1,3 @@
+import type { StaticDecode } from "@sinclair/typebox";
+import { TypeEcdsaSig, type TypeEcdsaSig as TypeEcdsaSigType } from "@alchemy/wallet-api-types";
+export declare const decodeSignature: (signature: TypeEcdsaSigType["signature"]) => StaticDecode<typeof TypeEcdsaSig>["signature"];

package/dist/esm/isomorphic/utils/decodeSignature.js

@@ -0,0 +1,15 @@
+import { Value } from "@sinclair/typebox/value";
+import { TypeEcdsaSig, } from "@alchemy/wallet-api-types";
+import { assertNever } from "../../utils.js";
+export const decodeSignature = (signature) => {
+    switch (signature.type) {
+        case "ecdsa":
+        case "secp256k1":
+            return Value.Decode(TypeEcdsaSig, {
+                signature,
+            }).signature;
+        default:
+            return assertNever(signature, "Unexpected signature type");
+    }
+};
+//# sourceMappingURL=decodeSignature.js.map

package/dist/esm/isomorphic/utils/decodeSignature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decodeSignature.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/decodeSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEhD,OAAO,EACL,YAAY,GAEb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAwC,EACQ,EAAE;IAClD,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW;YACd,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE;gBAChC,SAAS;aACiB,CAAC,CAAC,SAAS,CAAC;QAC1C;YACE,OAAO,WAAW,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { Value } from \"@sinclair/typebox/value\";\nimport type { StaticDecode } from \"@sinclair/typebox\";\nimport {\n  TypeEcdsaSig,\n  type TypeEcdsaSig as TypeEcdsaSigType,\n} from \"@alchemy/wallet-api-types\";\nimport { assertNever } from \"../../utils.js\";\n\nexport const decodeSignature = (\n  signature: TypeEcdsaSigType[\"signature\"],\n): StaticDecode<typeof TypeEcdsaSig>[\"signature\"] => {\n  switch (signature.type) {\n    case \"ecdsa\":\n    case \"secp256k1\":\n      return Value.Decode(TypeEcdsaSig, {\n        signature,\n      } satisfies TypeEcdsaSigType).signature;\n    default:\n      return assertNever(signature, \"Unexpected signature type\");\n  }\n};\n"]}

package/dist/esm/isomorphic/utils/parsePermissionsContext.d.ts

@@ -1,15 +1,16 @@
 import type { StaticDecode } from "@sinclair/typebox";
-import type { PrepareCallsParams } from "../actions/prepareCalls";
-import type { TypeSerializedInitcode } from "../../schemas";
-export declare function parsePermissionsContext(capabilities: PrepareCallsParams["capabilities"], parsedCi: StaticDecode<typeof TypeSerializedInitcode>): ({
-    contextVersion: keyof typeof import("../../exports/internal").PermissionsContextVersion;
+import type { Address } from "viem";
+import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
+import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
+export declare function parsePermissionsContext(permissions?: StaticDecode<typeof PermissionsCapability>, parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined, delegation7702?: Address): ({
+    contextVersion: keyof typeof import("@alchemy/wallet-api-types/capabilities").PermissionsContextVersion;
 } & {
     contextVersion: "LOCAL_MODE_DEFERRED_ACTION";
     deferredAction: import("viem").Hex;
     sessionId?: never;
     signature?: never;
 }) | ({
-    contextVersion: keyof typeof import("../../exports/internal").PermissionsContextVersion;
+    contextVersion: keyof typeof import("@alchemy/wallet-api-types/capabilities").PermissionsContextVersion;
 } & {
     contextVersion: "NON_DEFERRED_ACTION";
     deferredAction?: never;

package/dist/esm/isomorphic/utils/parsePermissionsContext.js

@@ -1,16 +1,29 @@
 import { InvalidRequestError } from "ox/RpcResponse";
-import { decodePermissionsContext } from "../../capabilities/permissions/mav2";
-export function parsePermissionsContext(capabilities, parsedCi) {
-    if (!capabilities?.permissions?.context) {
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
+import { decodePermissionsContext, PermissionsCapability, } from "@alchemy/wallet-api-types/capabilities";
+import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
+export function parsePermissionsContext(permissions, parsedCi, delegation7702) {
+    if (!permissions) {
         return undefined;
     }
-    if (capabilities?.permissions?.context &&
-        parsedCi.factoryType !== "MAv2.0.0-sma-b") {
+    if ("sessionId" in permissions) {
+        throw new InvalidRequestError({
+            message: "Remote permissions are not supported in isomorphic client",
+        });
+    }
+    if (!("context" in permissions)) {
+        return undefined;
+    }
+    const isMAV2 = (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
+        (delegation7702 &&
+            getAccountTypeForDelegationAddress7702(delegation7702) ===
+                "ModularAccountV2");
+    if (!isMAV2) {
         throw new InvalidRequestError({
             message: "Permissions are currently only supported by MAv2 accounts",
         });
     }
-    const context = decodePermissionsContext(capabilities.permissions.context);
+    const context = decodePermissionsContext(permissions);
     if (context?.contextVersion === "REMOTE_MODE_DEFERRED_ACTION") {
         throw new InvalidRequestError({
             message: "Remote mode deferred action not supported in isomorphic client",

package/dist/esm/isomorphic/utils/parsePermissionsContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"parsePermissionsContext.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/parsePermissionsContext.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,MAAM,UAAU,uBAAuB,CACrC,YAAgD,EAChD,QAAqD;IAErD,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IACE,YAAY,EAAE,WAAW,EAAE,OAAO;QAClC,QAAQ,CAAC,WAAW,KAAK,gBAAgB,EACzC,CAAC;QACD,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAE3E,IAAI,OAAO,EAAE,cAAc,KAAK,6BAA6B,EAAE,CAAC;QAC9D,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport type { PrepareCallsParams } from \"../actions/prepareCalls\";\nimport type { TypeSerializedInitcode } from \"../../schemas\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2\";\n\nexport function parsePermissionsContext(\n  capabilities: PrepareCallsParams[\"capabilities\"],\n  parsedCi: StaticDecode<typeof TypeSerializedInitcode>,\n) {\n  if (!capabilities?.permissions?.context) {\n    return undefined;\n  }\n\n  if (\n    capabilities?.permissions?.context &&\n    parsedCi.factoryType !== \"MAv2.0.0-sma-b\"\n  ) {\n    throw new InvalidRequestError({\n      message: \"Permissions are currently only supported by MAv2 accounts\",\n    });\n  }\n\n  const context = decodePermissionsContext(capabilities.permissions.context);\n\n  if (context?.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n    throw new InvalidRequestError({\n      message: \"Remote mode deferred action not supported in isomorphic client\",\n    });\n  }\n\n  return context;\n}\n"]}
+{"version":3,"file":"parsePermissionsContext.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/parsePermissionsContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,UAAU,uBAAuB,CACrC,WAAwD,EACxD,QAAkE,EAClE,cAAwB;IAExB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GACV,CAAC,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC;QACvD,CAAC,cAAc;YACb,sCAAsC,CAAC,cAAc,CAAC;gBACpD,kBAAkB,CAAC,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAEtD,IAAI,OAAO,EAAE,cAAc,KAAK,6BAA6B,EAAE,CAAC;QAC9D,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport type { Address } from \"viem\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport {\n  decodePermissionsContext,\n  PermissionsCapability,\n} from \"@alchemy/wallet-api-types/capabilities\";\nimport { TypeSerializedInitcode } from \"@alchemy/wallet-api-types\";\n\nexport function parsePermissionsContext(\n  permissions?: StaticDecode<typeof PermissionsCapability>,\n  parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined,\n  delegation7702?: Address,\n) {\n  if (!permissions) {\n    return undefined;\n  }\n\n  if (\"sessionId\" in permissions) {\n    throw new InvalidRequestError({\n      message: \"Remote permissions are not supported in isomorphic client\",\n    });\n  }\n\n  if (!(\"context\" in permissions)) {\n    return undefined;\n  }\n\n  const isMAV2 =\n    (parsedCi && parsedCi.factoryType === \"MAv2.0.0-sma-b\") ||\n    (delegation7702 &&\n      getAccountTypeForDelegationAddress7702(delegation7702) ===\n        \"ModularAccountV2\");\n\n  if (!isMAV2) {\n    throw new InvalidRequestError({\n      message: \"Permissions are currently only supported by MAv2 accounts\",\n    });\n  }\n\n  const context = decodePermissionsContext(permissions);\n\n  if (context?.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n    throw new InvalidRequestError({\n      message: \"Remote mode deferred action not supported in isomorphic client\",\n    });\n  }\n\n  return context;\n}\n"]}

package/dist/esm/isomorphic/utils/supportsFeature.d.ts

@@ -0,0 +1,4 @@
+import type { StaticDecode } from "@sinclair/typebox";
+import type { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
+export type Feature = "permissions";
+export declare function supportsFeature(counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>, feature: Feature): boolean;

package/dist/esm/isomorphic/utils/supportsFeature.js

@@ -0,0 +1,21 @@
+const supportedFeatures = {
+    "LightAccountV1.0.1": [],
+    "LightAccountV1.0.2": [],
+    "LightAccountV1.1.0": [],
+    "LightAccountV2.0.0": [],
+    "LightAccountV2.0.0-MultiOwner": [],
+    "MAv1.0.0-MultiOwner": [],
+    "MAv1.0.0-MultiSig": [],
+    "MAv2.0.0-sma-b": ["permissions"],
+    "MAv2.0.0-ma-ssv": ["permissions"],
+    "MAv2.0.0-ma-webauthn": [],
+    unknown: [],
+};
+export function supportsFeature(counterfactualInfo, feature) {
+    const factorySupportedFeatures = supportedFeatures[counterfactualInfo.factoryType];
+    if (factorySupportedFeatures === undefined) {
+        throw new Error("Unsupported FactoryType: " + counterfactualInfo.factoryType);
+    }
+    return factorySupportedFeatures.includes(feature);
+}
+//# sourceMappingURL=supportsFeature.js.map

package/dist/esm/isomorphic/utils/supportsFeature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supportsFeature.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/supportsFeature.ts"],"names":[],"mappings":"AAOA,MAAM,iBAAiB,GAAmC;IACxD,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,oBAAoB,EAAE,EAAE;IACxB,+BAA+B,EAAE,EAAE;IACnC,qBAAqB,EAAE,EAAE;IACzB,mBAAmB,EAAE,EAAE;IACvB,gBAAgB,EAAE,CAAC,aAAa,CAAC;IACjC,iBAAiB,EAAE,CAAC,aAAa,CAAC;IAClC,sBAAsB,EAAE,EAAE;IAC1B,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,UAAU,eAAe,CAC7B,kBAA+D,EAC/D,OAAgB;IAEhB,MAAM,wBAAwB,GAC5B,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,2BAA2B,GAAG,kBAAkB,CAAC,WAAW,CAC7D,CAAC;IACJ,CAAC;IACD,OAAO,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpD,CAAC","sourcesContent":["import type { StaticDecode } from \"@sinclair/typebox\";\nimport type { TypeSerializedInitcode } from \"@alchemy/wallet-api-types\";\n\nexport type Feature = \"permissions\";\n\ntype FactoryType = StaticDecode<typeof TypeSerializedInitcode>[\"factoryType\"];\n\nconst supportedFeatures: Record<FactoryType, Feature[]> = {\n  \"LightAccountV1.0.1\": [],\n  \"LightAccountV1.0.2\": [],\n  \"LightAccountV1.1.0\": [],\n  \"LightAccountV2.0.0\": [],\n  \"LightAccountV2.0.0-MultiOwner\": [],\n  \"MAv1.0.0-MultiOwner\": [],\n  \"MAv1.0.0-MultiSig\": [],\n  \"MAv2.0.0-sma-b\": [\"permissions\"],\n  \"MAv2.0.0-ma-ssv\": [\"permissions\"],\n  \"MAv2.0.0-ma-webauthn\": [],\n  unknown: [],\n};\n\nexport function supportsFeature(\n  counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>,\n  feature: Feature,\n): boolean {\n  const factorySupportedFeatures =\n    supportedFeatures[counterfactualInfo.factoryType];\n  if (factorySupportedFeatures === undefined) {\n    throw new Error(\n      \"Unsupported FactoryType: \" + counterfactualInfo.factoryType,\n    );\n  }\n  return factorySupportedFeatures.includes(feature);\n}\n"]}

package/dist/esm/local/client.d.ts

@@ -1,3 +1,3 @@
-import { type Address, type JsonRpcAccount } from "viem";
-import type { CreateInnerClientParams, InnerWalletApiClient } from "../types";
-export declare function createLocalClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
+import { type Address } from "viem";
+import type { CreateInnerClientParams, InnerWalletApiClient } from "../types.ts";
+export declare function createLocalClient<TAccount extends Address | undefined = Address | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;

package/dist/esm/local/client.js

@@ -1,10 +1,11 @@
 import { split } from "@aa-sdk/core";
 import { buildDeferredActionDigest } from "@account-kit/smart-contracts/experimental";
 import { createClient, custom } from "viem";
-import { encodePermissionsContext, prefixSignatureKeyType, } from "../capabilities/permissions/mav2";
-import { signSignatureRequest } from "../client/actions/signSignatureRequest";
-import { createIsomorphicClient, } from "../isomorphic/client";
-import { assertNever } from "../utils";
+import { encodePermissionsContext, prefixSignatureKeyType, } from "@alchemy/wallet-api-types/capabilities";
+import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
+import { internalStateDecorator } from "../internal/decorator.js";
+import { createIsomorphicClient, } from "../isomorphic/client.js";
+import { assertNever } from "../utils.js";
 const localMethods = [
     "wallet_prepareCalls",
     "wallet_sendPreparedCalls",
@@ -56,6 +57,8 @@ export function createLocalClient(params) {
                                 return assertNever(args.method, `Unexpected method: ${args.method}`);
                         }
                     },
+                }, {
+                    retryCount: 0,
                 }),
             },
         ],
@@ -65,22 +68,26 @@ export function createLocalClient(params) {
         transport: innerTransport,
         chain,
         account,
-    }).extend(() => ({
+    })
+        .extend(() => ({
         policyId,
         ...innerClientActions(isomorphicClient),
+    }))
+        .extend(() => ({
+        internal: internalStateDecorator(),
     }));
 }
 const innerClientActions = (isomorphicClient) => {
     return {
         grantPermissions: async (signer, params) => {
             const { signatureRequest, fullPreSignatureDeferredActionDigest } = await isomorphicClient.createSession(params);
-            const { signature } = await signSignatureRequest(signer, signatureRequest);
+            const signature = await signSignatureRequest(signer, signatureRequest);
             return {
                 context: encodePermissionsContext({
                     contextVersion: "LOCAL_MODE_DEFERRED_ACTION",
                     deferredAction: buildDeferredActionDigest({
                         fullPreSignatureDeferredActionDigest,
-                        sig: prefixSignatureKeyType(signature, "secp256k1"),
+                        sig: prefixSignatureKeyType(signature.data, signature.type),
                     }),
                 }),
             };

package/dist/esm/local/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/local/client.ts"],"names":[],"mappings":"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","sourcesContent":["import { split } from \"@aa-sdk/core\";\nimport { buildDeferredActionDigest } from \"@account-kit/smart-contracts/experimental\";\nimport { createClient, custom, type Address, type JsonRpcAccount } from \"viem\";\nimport {\n  encodePermissionsContext,\n  prefixSignatureKeyType,\n} from \"../capabilities/permissions/mav2\";\nimport { signSignatureRequest } from \"../client/actions/signSignatureRequest\";\nimport type { PrepareCallsParams } from \"../isomorphic/actions/prepareCalls\";\nimport {\n  createIsomorphicClient,\n  type IsomorphicClient,\n} from \"../isomorphic/client\";\nimport type {\n  CreateInnerClientParams,\n  InnerClientActions,\n  InnerWalletApiClient,\n} from \"../types\";\nimport { assertNever } from \"../utils\";\n\nconst localMethods = [\n  \"wallet_prepareCalls\",\n  \"wallet_sendPreparedCalls\",\n  \"wallet_getCallsStatus\",\n  \"wallet_createSession\",\n] as const satisfies string[];\ntype LocalMethod = (typeof localMethods)[number];\n\nexport function createLocalClient<\n  TAccount extends JsonRpcAccount<Address> | undefined =\n    | JsonRpcAccount<Address>\n    | undefined,\n>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;\n\nexport function createLocalClient(\n  params: CreateInnerClientParams,\n): InnerWalletApiClient {\n  const { chain, transport, policyId, account } = params;\n  const isomorphicClient = createIsomorphicClient({\n    transport,\n    chain,\n    policyId,\n    useErc7677middleware: false,\n  });\n\n  const clientMap: Record<string, ReturnType<typeof createIsomorphicClient>> = {\n    [policyId ?? \"default\"]: isomorphicClient,\n  };\n\n  const innerTransport = split({\n    overrides: [\n      {\n        methods: localMethods,\n        transport: custom({\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          async request(args: { method: LocalMethod; params: any }) {\n            switch (args.method) {\n              case \"wallet_prepareCalls\": {\n                const params = args.params[0] as PrepareCallsParams;\n                const capabilityPolicyId =\n                  params.capabilities?.paymasterService?.policyId;\n\n                if (\n                  capabilityPolicyId != null &&\n                  policyId !== capabilityPolicyId &&\n                  !clientMap[capabilityPolicyId]\n                ) {\n                  clientMap[capabilityPolicyId] = createIsomorphicClient({\n                    transport,\n                    chain,\n                    policyId: capabilityPolicyId,\n                  });\n                }\n\n                const client =\n                  clientMap[capabilityPolicyId ?? policyId ?? \"default\"];\n                return client.prepareCalls(params);\n              }\n              case \"wallet_sendPreparedCalls\":\n                return isomorphicClient.sendPreparedCalls(args.params[0]);\n              case \"wallet_getCallsStatus\":\n                return isomorphicClient.getCallsStatus(args.params[0]);\n              case \"wallet_createSession\": {\n                return isomorphicClient.createSession(args.params[0]);\n              }\n              default:\n                return assertNever(\n                  args.method,\n                  `Unexpected method: ${args.method}`,\n                );\n            }\n          },\n        }),\n      },\n    ],\n    fallback: transport,\n  });\n\n  return createClient({\n    transport: innerTransport,\n    chain,\n    account,\n  }).extend(() => ({\n    policyId,\n    ...innerClientActions(isomorphicClient),\n  }));\n}\n\nconst innerClientActions = (\n  isomorphicClient: IsomorphicClient,\n): InnerClientActions => {\n  return {\n    grantPermissions: async (signer, params) => {\n      const { signatureRequest, fullPreSignatureDeferredActionDigest } =\n        await isomorphicClient.createSession(params);\n\n      const { signature } = await signSignatureRequest(\n        signer,\n        signatureRequest,\n      );\n\n      return {\n        context: encodePermissionsContext({\n          contextVersion: \"LOCAL_MODE_DEFERRED_ACTION\",\n          deferredAction: buildDeferredActionDigest({\n            fullPreSignatureDeferredActionDigest,\n            sig: prefixSignatureKeyType(signature, \"secp256k1\"),\n          }),\n        }),\n      };\n    },\n  };\n};\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/local/client.ts"],"names":[],"mappings":"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","sourcesContent":["import { split } from \"@aa-sdk/core\";\nimport { buildDeferredActionDigest } from \"@account-kit/smart-contracts/experimental\";\nimport { createClient, custom, type Address } from \"viem\";\nimport {\n  encodePermissionsContext,\n  prefixSignatureKeyType,\n} from \"@alchemy/wallet-api-types/capabilities\";\nimport { signSignatureRequest } from \"../client/actions/signSignatureRequest.js\";\nimport { internalStateDecorator } from \"../internal/decorator.js\";\nimport type { PrepareCallsParams } from \"../isomorphic/actions/prepareCalls.ts\";\nimport {\n  createIsomorphicClient,\n  type IsomorphicClient,\n} from \"../isomorphic/client.js\";\nimport type {\n  CreateInnerClientParams,\n  InnerClientActions,\n  InnerWalletApiClient,\n} from \"../types.ts\";\nimport { assertNever } from \"../utils.js\";\n\nconst localMethods = [\n  \"wallet_prepareCalls\",\n  \"wallet_sendPreparedCalls\",\n  \"wallet_getCallsStatus\",\n  \"wallet_createSession\",\n] as const satisfies string[];\ntype LocalMethod = (typeof localMethods)[number];\n\nexport function createLocalClient<\n  TAccount extends Address | undefined = Address | undefined,\n>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;\n\nexport function createLocalClient(\n  params: CreateInnerClientParams,\n): InnerWalletApiClient {\n  const { chain, transport, policyId, account } = params;\n  const isomorphicClient = createIsomorphicClient({\n    transport,\n    chain,\n    policyId,\n    useErc7677middleware: false,\n  });\n\n  const clientMap: Record<string, ReturnType<typeof createIsomorphicClient>> = {\n    [policyId ?? \"default\"]: isomorphicClient,\n  };\n\n  const innerTransport = split({\n    overrides: [\n      {\n        methods: localMethods,\n        transport: custom(\n          {\n            // eslint-disable-next-line @typescript-eslint/no-explicit-any\n            async request(args: { method: LocalMethod; params: any }) {\n              switch (args.method) {\n                case \"wallet_prepareCalls\": {\n                  const params = args.params[0] as PrepareCallsParams;\n                  const capabilityPolicyId =\n                    params.capabilities?.paymasterService?.policyId;\n\n                  if (\n                    capabilityPolicyId != null &&\n                    policyId !== capabilityPolicyId &&\n                    !clientMap[capabilityPolicyId]\n                  ) {\n                    clientMap[capabilityPolicyId] = createIsomorphicClient({\n                      transport,\n                      chain,\n                      policyId: capabilityPolicyId,\n                    });\n                  }\n\n                  const client =\n                    clientMap[capabilityPolicyId ?? policyId ?? \"default\"];\n                  return client.prepareCalls(params);\n                }\n                case \"wallet_sendPreparedCalls\":\n                  return isomorphicClient.sendPreparedCalls(args.params[0]);\n                case \"wallet_getCallsStatus\":\n                  return isomorphicClient.getCallsStatus(args.params[0]);\n                case \"wallet_createSession\": {\n                  return isomorphicClient.createSession(args.params[0]);\n                }\n                default:\n                  return assertNever(\n                    args.method,\n                    `Unexpected method: ${args.method}`,\n                  );\n              }\n            },\n          },\n          {\n            retryCount: 0,\n          },\n        ),\n      },\n    ],\n    fallback: transport,\n  });\n\n  return createClient({\n    transport: innerTransport,\n    chain,\n    account,\n  })\n    .extend(() => ({\n      policyId,\n      ...innerClientActions(isomorphicClient),\n    }))\n    .extend(() => ({\n      internal: internalStateDecorator(),\n    }));\n}\n\nconst innerClientActions = (\n  isomorphicClient: IsomorphicClient,\n): InnerClientActions => {\n  return {\n    grantPermissions: async (signer, params) => {\n      const { signatureRequest, fullPreSignatureDeferredActionDigest } =\n        await isomorphicClient.createSession(params);\n      const signature = await signSignatureRequest(signer, signatureRequest);\n      return {\n        context: encodePermissionsContext({\n          contextVersion: \"LOCAL_MODE_DEFERRED_ACTION\",\n          deferredAction: buildDeferredActionDigest({\n            fullPreSignatureDeferredActionDigest,\n            sig: prefixSignatureKeyType(signature.data, signature.type),\n          }),\n        }),\n      };\n    },\n  };\n};\n"]}

package/dist/esm/remote/client.d.ts

@@ -1,3 +1,9 @@
-import { type Address, type JsonRpcAccount } from "viem";
-import type { CreateInnerClientParams, InnerWalletApiClient } from "../types";
-export declare function createRemoteClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
+import { type Address } from "viem";
+import type { CreateInnerClientParams, InnerWalletApiClient } from "../types.ts";
+/**
+ * This is a low-level client just used to make RPC requests in remote mode
+ * This should be wrapped by a higher-level smart account client that provides actions
+ * that uses this client under the hood
+ * @returns
+ */
+export declare function createRemoteClient<TAccount extends Address | undefined = Address | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;

package/dist/esm/remote/client.js

@@ -1,23 +1,22 @@
 import { Provider } from "ox";
 import { createClient, custom } from "viem";
-import { WalletServerRpcSchema } from "../rpc/schema";
-import { signSignatureRequest } from "../client/actions/signSignatureRequest";
-import { encodePermissionsContext } from "../capabilities/permissions/mav2";
-/**
- * This is a low-level client just used to make RPC requests in remote mode
- * This should be wrapped by a higher-level smart account client that provides actions
- * that uses this client under the hood
- * @returns
- */
+import { encodePermissionsContext } from "@alchemy/wallet-api-types/capabilities";
+import { WalletServerRpcSchema } from "@alchemy/wallet-api-types/rpc";
+import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
+import { internalStateDecorator } from "../internal/decorator.js";
 export function createRemoteClient(params) {
     const { transport, chain, account } = params;
     const client = createClient({
         transport: (opts) => custom(Provider.from(transport(opts), { schema: WalletServerRpcSchema }))(opts),
         chain,
         account,
-    }).extend((_client) => ({
+    })
+        .extend((_client) => ({
         policyId: params.policyId,
         ...innerClientActions(_client),
+    }))
+        .extend(() => ({
+        internal: internalStateDecorator(),
     }));
     return client;
 }
@@ -28,12 +27,12 @@ const innerClientActions = (apiClient) => {
                 method: "wallet_createSession",
                 params: [params],
             });
-            const { signature } = await signSignatureRequest(signer, signatureRequest);
+            const signature = await signSignatureRequest(signer, signatureRequest);
             return {
                 context: encodePermissionsContext({
                     contextVersion: "REMOTE_MODE_DEFERRED_ACTION",
                     sessionId,
-                    signature,
+                    signature: signature.data,
                 }),
             };
         },