@account-kit/wallet-client 0.1.0-alpha.4 → 0.1.0-alpha.6

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

@@ -13,7 +13,108 @@ type ClientParams = {
 };
 export declare function isomorphicClientActions(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>): {
     prepareCalls: (params: PrepareCallsParams) => Promise<{
-        type: "user-operation-v070" | "user-operation-v060";
+        type: "array";
+        data: ({
+            type: "user-operation-v060";
+            chainId: `0x${string}`;
+            data: {
+                sender: `0x${string}`;
+                nonce: `0x${string}`;
+                initCode: `0x${string}`;
+                callData: `0x${string}`;
+                callGasLimit: `0x${string}`;
+                verificationGasLimit: `0x${string}`;
+                preVerificationGas: `0x${string}`;
+                maxFeePerGas: `0x${string}`;
+                maxPriorityFeePerGas: `0x${string}`;
+                paymasterAndData: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eth_signTypedData_v4";
+                data: {
+                    domain?: {
+                        chainId?: number | undefined;
+                        salt?: `0x${string}` | undefined;
+                        name?: string | undefined;
+                        verifyingContract?: `0x${string}` | undefined;
+                        version?: string | undefined;
+                    } | undefined;
+                    types: {
+                        [x: string]: {
+                            type: string;
+                            name: string;
+                        }[];
+                    };
+                    primaryType: string;
+                    message: {
+                        [x: string]: unknown;
+                    };
+                };
+            } | {
+                type: "personal_sign";
+                data: string | {
+                    raw: `0x${string}`;
+                };
+            };
+        } | {
+            type: "user-operation-v070";
+            chainId: `0x${string}`;
+            data: {
+                factory?: `0x${string}` | undefined;
+                factoryData?: `0x${string}` | undefined;
+                paymaster?: `0x${string}` | undefined;
+                paymasterData?: `0x${string}` | undefined;
+                paymasterVerificationGasLimit?: `0x${string}` | undefined;
+                paymasterPostOpGasLimit?: `0x${string}` | undefined;
+                sender: `0x${string}`;
+                nonce: `0x${string}`;
+                callData: `0x${string}`;
+                callGasLimit: `0x${string}`;
+                verificationGasLimit: `0x${string}`;
+                preVerificationGas: `0x${string}`;
+                maxFeePerGas: `0x${string}`;
+                maxPriorityFeePerGas: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eth_signTypedData_v4";
+                data: {
+                    domain?: {
+                        chainId?: number | undefined;
+                        salt?: `0x${string}` | undefined;
+                        name?: string | undefined;
+                        verifyingContract?: `0x${string}` | undefined;
+                        version?: string | undefined;
+                    } | undefined;
+                    types: {
+                        [x: string]: {
+                            type: string;
+                            name: string;
+                        }[];
+                    };
+                    primaryType: string;
+                    message: {
+                        [x: string]: unknown;
+                    };
+                };
+            } | {
+                type: "personal_sign";
+                data: string | {
+                    raw: `0x${string}`;
+                };
+            };
+        } | {
+            type: "authorization";
+            chainId: `0x${string}`;
+            data: {
+                nonce: `0x${string}`;
+                address: `0x${string}`;
+            };
+            signatureRequest: {
+                type: "eip7702Auth";
+            };
+        })[];
+    } | {
+        type: "user-operation-v060";
         chainId: `0x${string}`;
         data: {
             sender: `0x${string}`;
@@ -26,7 +127,38 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             maxFeePerGas: `0x${string}`;
             maxPriorityFeePerGas: `0x${string}`;
             paymasterAndData: `0x${string}`;
+        };
+        signatureRequest: {
+            type: "eth_signTypedData_v4";
+            data: {
+                domain?: {
+                    chainId?: number | undefined;
+                    salt?: `0x${string}` | undefined;
+                    name?: string | undefined;
+                    verifyingContract?: `0x${string}` | undefined;
+                    version?: string | undefined;
+                } | undefined;
+                types: {
+                    [x: string]: {
+                        type: string;
+                        name: string;
+                    }[];
+                };
+                primaryType: string;
+                message: {
+                    [x: string]: unknown;
+                };
+            };
         } | {
+            type: "personal_sign";
+            data: string | {
+                raw: `0x${string}`;
+            };
+        };
+    } | {
+        type: "user-operation-v070";
+        chainId: `0x${string}`;
+        data: {
             factory?: `0x${string}` | undefined;
             factoryData?: `0x${string}` | undefined;
             paymaster?: `0x${string}` | undefined;
@@ -42,12 +174,7 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             maxFeePerGas: `0x${string}`;
             maxPriorityFeePerGas: `0x${string}`;
         };
-        signatureRequest: ({
-            type: "personal_sign";
-            data: string | {
-                raw: `0x${string}`;
-            };
-        } | {
+        signatureRequest: {
             type: "eth_signTypedData_v4";
             data: {
                 domain?: {
@@ -68,12 +195,11 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                     [x: string]: unknown;
                 };
             };
-        }) & {
-            authorizationRequest?: {
-                nonce: number;
-                chainId: number;
-                address: `0x${string}`;
-            } | undefined;
+        } | {
+            type: "personal_sign";
+            data: string | {
+                raw: `0x${string}`;
+            };
         };
     }>;
     sendPreparedCalls: (params: SendPreparedCallsParams) => Promise<{

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

@@ -1,11 +1,18 @@
 import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
-import { type Authorization, type Address, type Chain, type Transport } from "viem";
+import { type Address, type Chain, type Transport } from "viem";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
-export declare const createAuthorization: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
+import { PreparedCall_Authorization } from "../../schemas.js";
+import type { Eip7702AuthCapability } from "../../capabilities/eip7702Auth.ts";
+import type { Static } from "@sinclair/typebox";
+export declare const createAuthorizationRequest: (client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: {
     address: Address;
     delegation: Address;
-}) => Promise<Authorization<number, false> | undefined>;
-type Supported7702AccountType = "ModularAccountV2";
-export declare const getAccountTypeForImplementationAddress7702: (address: Address) => Supported7702AccountType | undefined;
-export declare const isSupportedImplementationAddress7702: (address: string) => boolean;
+}) => Promise<Static<typeof PreparedCall_Authorization> | undefined>;
+export declare const EIP_7702_ACCOUNT_TYPE: readonly ["ModularAccountV2"];
+type Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];
+export declare const SUPPORTED_DELEGATION_ADDRESSES: "0x69007702764179f14F51cdce752f4f775d74E139"[];
+export declare const isSupportedDelegationAddress7702: (address: Address) => boolean;
+export declare const getAccountTypeForDelegationAddress7702: (address: Address) => Supported7702AccountType | undefined;
+export declare const parseDelegation: (eip7702AuthCapability: Static<typeof Eip7702AuthCapability>) => "0x69007702764179f14F51cdce752f4f775d74E139";
+export declare const assertValid7702AccountAddress: (fromAddress: Address, eip7702AuthCapability: Static<typeof Eip7702AuthCapability> | undefined) => void;
 export {};

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

@@ -1,26 +1,61 @@
-import { concatHex, } from "viem";
-export const createAuthorization = async (client, params) => {
+import { concatHex, numberToHex, isAddress, } from "viem";
+import { PreparedCall_Authorization } from "../../schemas.js";
+import { InvalidRequestError } from "ox/RpcResponse";
+export const createAuthorizationRequest = async (client, params) => {
     const expectedCode = concatHex(["0xef0100", params.delegation]);
     const code = (await client.getCode({ address: params.address })) ?? "0x";
     if (code.toLowerCase() === expectedCode.toLowerCase()) {
         return undefined; // Already authorized.
     }
-    return {
-        chainId: client.chain.id,
+    const data = {
         address: params.delegation,
-        nonce: await client.getTransactionCount({
+        nonce: numberToHex(await client.getTransactionCount({
             address: params.address,
-        }),
+        })),
+    };
+    return {
+        type: "authorization",
+        data,
+        chainId: numberToHex(client.chain.id),
+        signatureRequest: {
+            type: "eip7702Auth",
+        },
     };
 };
-const IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE = {
-    "0x69007702764179f14F51cdce752f4f775d74E139": "ModularAccountV2",
+export const EIP_7702_ACCOUNT_TYPE = ["ModularAccountV2"];
+const Eip7702AccountTypeToDelegationAddress = {
+    ModularAccountV2: "0x69007702764179f14F51cdce752f4f775d74E139",
+};
+const DelegationAddressToAccountType = Object.fromEntries(Object.entries(Eip7702AccountTypeToDelegationAddress).map(([key, value]) => [
+    value,
+    key,
+]));
+export const SUPPORTED_DELEGATION_ADDRESSES = Object.values(Eip7702AccountTypeToDelegationAddress);
+export const isSupportedDelegationAddress7702 = (address) => {
+    return SUPPORTED_DELEGATION_ADDRESSES.includes(address);
 };
-export const getAccountTypeForImplementationAddress7702 = (address) => {
-    return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];
+export const getAccountTypeForDelegationAddress7702 = (address) => {
+    return DelegationAddressToAccountType[address];
 };
-const SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE);
-export const isSupportedImplementationAddress7702 = (address) => {
-    return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(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 &&
+        typeof eip7702AuthCapability === "object" &&
+        "account" in eip7702AuthCapability &&
+        eip7702AuthCapability?.account !== fromAddress) {
+        throw new InvalidRequestError({
+            message: `EIP-7702 delegation account ${eip7702AuthCapability.account} must match 'from' address ${fromAddress}.`,
+        });
+    }
 };
 //# sourceMappingURL=7702.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,GAKV,MAAM,MAAM,CAAC;AAGd,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAMC,EACD,MAAiD,EACE,EAAE;IACrD,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,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC,CAAC,sBAAsB;IAC1C,CAAC;IACD,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,UAAU;QAC1B,KAAK,EAAE,MAAM,MAAM,CAAC,mBAAmB,CAAC;YACtC,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAIF,MAAM,sCAAsC,GAGxC;IACF,4CAA4C,EAAE,kBAAkB;CACjE,CAAC;AAEF,MAAM,CAAC,MAAM,0CAA0C,GAAG,CACxD,OAAgB,EACsB,EAAE;IACxC,OAAO,sCAAsC,CAAC,OAAO,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,kCAAkC,GAAG,MAAM,CAAC,IAAI,CACpD,sCAAsC,CACvC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAClD,OAAe,EACN,EAAE;IACX,OAAO,kCAAkC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC","sourcesContent":["import type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  concatHex,\n  type Authorization,\n  type Address,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\n\nexport const createAuthorization = 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<Authorization<number, false> | undefined> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  if (code.toLowerCase() === expectedCode.toLowerCase()) {\n    return undefined; // Already authorized.\n  }\n  return {\n    chainId: client.chain.id,\n    address: params.delegation,\n    nonce: await client.getTransactionCount({\n      address: params.address,\n    }),\n  };\n};\n\ntype Supported7702AccountType = \"ModularAccountV2\";\n\nconst IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE: Record<\n  Address,\n  Supported7702AccountType\n> = {\n  \"0x69007702764179f14F51cdce752f4f775d74E139\": \"ModularAccountV2\",\n};\n\nexport const getAccountTypeForImplementationAddress7702 = (\n  address: Address,\n): Supported7702AccountType | undefined => {\n  return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];\n};\n\nconst SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(\n  IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE,\n);\n\nexport const isSupportedImplementationAddress7702 = (\n  address: string,\n): boolean => {\n  return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(address);\n};\n"]}
+{"version":3,"file":"7702.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/7702.ts"],"names":[],"mappings":"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","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} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { PreparedCall_Authorization } from \"../../schemas.js\";\nimport type { Eip7702AuthCapability } from \"../../capabilities/eip7702Auth.ts\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\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<Static<typeof PreparedCall_Authorization> | undefined> => {\n  const expectedCode = concatHex([\"0xef0100\", params.delegation]);\n  const code = (await client.getCode({ address: params.address })) ?? \"0x\";\n  if (code.toLowerCase() === expectedCode.toLowerCase()) {\n    return undefined; // Already authorized.\n  }\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    },\n  };\n};\n\nexport const EIP_7702_ACCOUNT_TYPE = [\"ModularAccountV2\"] as const;\n\ntype Supported7702AccountType = (typeof EIP_7702_ACCOUNT_TYPE)[number];\n\nconst Eip7702AccountTypeToDelegationAddress = {\n  ModularAccountV2: \"0x69007702764179f14F51cdce752f4f775d74E139\",\n} as const satisfies Record<Supported7702AccountType, Address>;\n\nconst 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 SUPPORTED_DELEGATION_ADDRESSES = Object.values(\n  Eip7702AccountTypeToDelegationAddress,\n);\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: Static<typeof 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: Static<typeof Eip7702AuthCapability> | undefined,\n) => {\n  if (\n    eip7702AuthCapability &&\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"]}

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

@@ -2,16 +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 { Capabilities } from "../../capabilities/index.js";
 import type { TypeSerializedInitcode } from "../../schemas.js";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 type CreateAccountParams = {
     chain: Chain;
     transport: Transport;
     signer: SmartAccountSigner;
     accountAddress: Address;
     counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>;
+    permissions?: StaticDecode<typeof PermissionsCapability>;
     delegation?: Address;
-    capabilities?: StaticDecode<typeof Capabilities>;
 };
 /**
  * Creates a smart account instance from the given parameters.

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

@@ -2,8 +2,9 @@ import { createModularAccountV2, } from "@account-kit/smart-contracts";
 import { concatHex, hexToNumber } from "viem";
 import { parsePermissionsContext } from "./parsePermissionsContext.js";
 import { assertNever } from "../../utils.js";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
 import { InternalError } from "ox/RpcResponse";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 /**
  * Creates a smart account instance from the given parameters.
  * @param params - The parameters for creating a smart account.
@@ -25,7 +26,7 @@ export async function createAccount(params) {
         }
     }
     else if (mode === "7702") {
-        const accountType = getAccountTypeForImplementationAddress7702(params.delegation);
+        const accountType = getAccountTypeForDelegationAddress7702(params.delegation);
         if (accountType !== "ModularAccountV2") {
             throw new InternalError({
                 message: "7702 mode currently only supports ModularAccountV2",
@@ -35,7 +36,7 @@ export async function createAccount(params) {
     else {
         assertNever(mode, "Unexpected mode in createAccount");
     }
-    const parsedContext = parsePermissionsContext(params.capabilities, ci, params.delegation);
+    const parsedContext = parsePermissionsContext(params.permissions, ci, params.delegation);
     const signerEntity = parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
         ? {
             entityId: hexToNumber(parsedContext.entityId),

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,8BAA8B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,0CAA0C,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAY/C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B;IAE3B,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC;IAE5D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,WAAW,KAAK,gBAAgB,EAAE,CAAC;YACxC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,8BAA8B;aACtE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,0CAA0C,CAC5D,MAAM,CAAC,UAAW,CACnB,CAAC;QACF,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACvC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,oDAAoD;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,MAAM,CAAC,YAAY,EACnB,EAAE,EACF,MAAM,CAAC,UAAU,CAClB,CAAC;IAEF,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,0DAA0D;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,GAAG,aAAa;QAChB,YAAY;QACZ,cAAc,EAAE,aAAa,EAAE,cAAc;QAC7C,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,IAAI;KACL,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 { Capabilities } from \"../../capabilities/index.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForImplementationAddress7702 } from \"./7702.js\";\nimport { InternalError } 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  delegation?: Address;\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\n  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"default\") {\n    if (!ci) {\n      throw new InternalError({\n        message: \"Counterfactual info not found\",\n      });\n    }\n    if (ci.factoryType !== \"MAv2.0.0-sma-b\") {\n      throw new InternalError({\n        message: `Factory type ${ci.factoryType} is not currently supported.`,\n      });\n    }\n  } else if (mode === \"7702\") {\n    const accountType = getAccountTypeForImplementationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new InternalError({\n        message: \"7702 mode currently only supports ModularAccountV2\",\n      });\n    }\n  } else {\n    assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\n  const parsedContext = parsePermissionsContext(\n    params.capabilities,\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  // TODO: clean this up to support different account types.\n  return createModularAccountV2({\n    ...accountParams,\n    signerEntity,\n    deferredAction: parsedContext?.deferredAction,\n    initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,\n    mode,\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":"AACA,OAAO,EACL,sBAAsB,GAEvB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAYhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B;IAE3B,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC;IAE5D,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,WAAW,KAAK,gBAAgB,EAAE,CAAC;YACxC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,8BAA8B;aACtE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,sCAAsC,CACxD,MAAM,CAAC,UAAW,CACnB,CAAC;QACF,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACvC,MAAM,IAAI,aAAa,CAAC;gBACtB,OAAO,EAAE,oDAAoD;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,aAAa,GAAG,uBAAuB,CAC3C,MAAM,CAAC,WAAW,EAClB,EAAE,EACF,MAAM,CAAC,UAAU,CAClB,CAAC;IAEF,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,0DAA0D;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,GAAG,aAAa;QAChB,YAAY;QACZ,cAAc,EAAE,aAAa,EAAE,cAAc;QAC7C,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,IAAI;KACL,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.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\nimport { assertNever } from \"../../utils.js\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { InternalError } from \"ox/RpcResponse\";\nimport { PermissionsCapability } from \"../../capabilities/permissions/index.js\";\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  const mode = params.delegation ? \"7702\" : \"default\";\n\n  if (mode === \"default\") {\n    if (!ci) {\n      throw new InternalError({\n        message: \"Counterfactual info not found\",\n      });\n    }\n    if (ci.factoryType !== \"MAv2.0.0-sma-b\") {\n      throw new InternalError({\n        message: `Factory type ${ci.factoryType} is not currently supported.`,\n      });\n    }\n  } else if (mode === \"7702\") {\n    const accountType = getAccountTypeForDelegationAddress7702(\n      params.delegation!,\n    );\n    if (accountType !== \"ModularAccountV2\") {\n      throw new InternalError({\n        message: \"7702 mode currently only supports ModularAccountV2\",\n      });\n    }\n  } else {\n    assertNever(mode, \"Unexpected mode in createAccount\");\n  }\n\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  // TODO: clean this up to support different account types.\n  return createModularAccountV2({\n    ...accountParams,\n    signerEntity,\n    deferredAction: parsedContext?.deferredAction,\n    initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,\n    mode,\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/decodeSignature.d.ts

@@ -0,0 +1,3 @@
+import type { Static, StaticDecode } from "@sinclair/typebox";
+import { TypeEcdsaSig } from "../../schemas.js";
+export declare const decodeSignature: (signature: Static<typeof TypeEcdsaSig>["signature"]) => StaticDecode<typeof TypeEcdsaSig>["signature"];

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

@@ -0,0 +1,13 @@
+import { Value } from "@sinclair/typebox/value";
+import { TypeEcdsaSig } from "../../schemas.js";
+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,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAAmD,EACH,EAAE;IAClD,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,OAAO,CAAC;QACb,KAAK,WAAW;YACd,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,EAE5C,CAAC,CAAC,SAAS,CAAC;QACf;YACE,OAAO,WAAW,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC","sourcesContent":["import { Value } from \"@sinclair/typebox/value\";\nimport type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { TypeEcdsaSig } from \"../../schemas.js\";\nimport { assertNever } from \"../../utils.js\";\n\nexport const decodeSignature = (\n  signature: Static<typeof TypeEcdsaSig>[\"signature\"],\n): StaticDecode<typeof TypeEcdsaSig>[\"signature\"] => {\n  switch (signature.type) {\n    case \"ecdsa\":\n    case \"secp256k1\":\n      return Value.Decode(TypeEcdsaSig, { signature } satisfies Static<\n        typeof TypeEcdsaSig\n      >).signature;\n    default:\n      return assertNever(signature, \"Unexpected signature type\");\n  }\n};\n"]}

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

@@ -1,8 +1,8 @@
 import type { StaticDecode } from "@sinclair/typebox";
 import type { TypeSerializedInitcode } from "../../schemas.js";
-import type { PrepareCallsParams } from "../actions/prepareCalls.js";
 import type { Address } from "viem";
-export declare function parsePermissionsContext(capabilities: PrepareCallsParams["capabilities"], parsedCi: StaticDecode<typeof TypeSerializedInitcode> | undefined, delegation7702?: Address): ({
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
+export declare function parsePermissionsContext(permissions?: StaticDecode<typeof PermissionsCapability>, parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined, delegation7702?: Address): ({
     contextVersion: keyof typeof import("../../exports/internal.js").PermissionsContextVersion;
 } & {
     contextVersion: "LOCAL_MODE_DEFERRED_ACTION";

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

@@ -1,28 +1,29 @@
 import { InvalidRequestError } from "ox/RpcResponse";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
-export function parsePermissionsContext(capabilities, parsedCi, delegation7702) {
-    if (!capabilities?.permissions) {
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
+export function parsePermissionsContext(permissions, parsedCi, delegation7702) {
+    if (!permissions) {
         return undefined;
     }
-    if ("sessionId" in capabilities.permissions) {
+    if ("sessionId" in permissions) {
         throw new InvalidRequestError({
             message: "Remote permissions are not supported in isomorphic client",
         });
     }
-    if (!("context" in capabilities.permissions)) {
+    if (!("context" in permissions)) {
         return undefined;
     }
     const isMAV2 = (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
         (delegation7702 &&
-            getAccountTypeForImplementationAddress7702(delegation7702) ===
+            getAccountTypeForDelegationAddress7702(delegation7702) ===
                 "ModularAccountV2");
     if (!isMAV2) {
         throw new InvalidRequestError({
             message: "Permissions are currently only supported by MAv2 accounts",
         });
     }
-    const context = decodePermissionsContext(capabilities.permissions);
+    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":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAIlF,OAAO,EAAE,0CAA0C,EAAE,MAAM,WAAW,CAAC;AAEvE,MAAM,UAAU,uBAAuB,CACrC,YAAgD,EAChD,QAAiE,EACjE,cAAwB;IAExB,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,WAAW,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,IAAI,mBAAmB,CAAC;YAC5B,OAAO,EAAE,2DAA2D;SACrE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,CAAC,SAAS,IAAI,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GACV,CAAC,QAAQ,IAAI,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC;QACvD,CAAC,cAAc;YACb,0CAA0C,CAAC,cAAc,CAAC;gBACxD,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,YAAY,CAAC,WAAW,CAAC,CAAC;IAEnE,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 { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport type { PrepareCallsParams } from \"../actions/prepareCalls.js\";\nimport type { Address } from \"viem\";\nimport { getAccountTypeForImplementationAddress7702 } from \"./7702.js\";\n\nexport function parsePermissionsContext(\n  capabilities: PrepareCallsParams[\"capabilities\"],\n  parsedCi: StaticDecode<typeof TypeSerializedInitcode> | undefined,\n  delegation7702?: Address,\n) {\n  if (!capabilities?.permissions) {\n    return undefined;\n  }\n\n  if (\"sessionId\" in capabilities.permissions) {\n    throw new InvalidRequestError({\n      message: \"Remote permissions are not supported in isomorphic client\",\n    });\n  }\n\n  if (!(\"context\" in capabilities.permissions)) {\n    return undefined;\n  }\n\n  const isMAV2 =\n    (parsedCi && parsedCi.factoryType === \"MAv2.0.0-sma-b\") ||\n    (delegation7702 &&\n      getAccountTypeForImplementationAddress7702(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(capabilities.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"]}
+{"version":3,"file":"parsePermissionsContext.js","sourceRoot":"","sources":["../../../../src/isomorphic/utils/parsePermissionsContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,OAAO,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,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 { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport type { Address } from \"viem\";\nimport { getAccountTypeForDelegationAddress7702 } from \"./7702.js\";\nimport { PermissionsCapability } from \"../../capabilities/permissions/index.js\";\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/local/client.d.ts

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

package/dist/esm/local/client.js

@@ -81,16 +81,15 @@ const innerClientActions = (isomorphicClient) => {
     return {
         grantPermissions: async (signer, params) => {
             const { signatureRequest, fullPreSignatureDeferredActionDigest } = await isomorphicClient.createSession(params);
-            const { signedAuthorization, 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),
                     }),
                 }),
-                signedAuthorization,
             };
         },
     };

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.js\";\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 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          {\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 { signedAuthorization, signature } = await signSignatureRequest(\n        signer,\n        signatureRequest,\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        signedAuthorization,\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 \"../capabilities/permissions/mav2.js\";\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 Address } from "viem";
 import type { CreateInnerClientParams, InnerWalletApiClient } from "../types.ts";
-export declare function createRemoteClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
+/**
+ * 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,15 +1,9 @@
 import { Provider } from "ox";
-import { BaseError, createClient, custom, } from "viem";
+import { createClient, custom } from "viem";
 import { encodePermissionsContext } from "../capabilities/permissions/mav2.js";
 import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
 import { internalStateDecorator } from "../internal/decorator.js";
 import { WalletServerRpcSchema } from "../rpc/schema.js";
-/**
- * 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 function createRemoteClient(params) {
     const { transport, chain, account } = params;
     const client = createClient({
@@ -33,17 +27,13 @@ const innerClientActions = (apiClient) => {
                 method: "wallet_createSession",
                 params: [params],
             });
-            if (signatureRequest.type !== "eth_signTypedData_v4") {
-                throw new BaseError("Unexpected signature request type");
-            }
-            const { signedAuthorization, signature } = await signSignatureRequest(signer, signatureRequest);
+            const signature = await signSignatureRequest(signer, signatureRequest);
             return {
                 context: encodePermissionsContext({
                     contextVersion: "REMOTE_MODE_DEFERRED_ACTION",
                     sessionId,
-                    signature,
+                    signature: signature.data,
                 }),
-                signedAuthorization,
             };
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/remote/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EACL,SAAS,EACT,YAAY,EACZ,MAAM,GAGP,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAczD;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA+B;IAE/B,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC,CACvE,IAAI,CACL;QACH,KAAK;QACL,OAAO;KACR,CAAC;SACC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,GAAG,kBAAkB,CAAC,OAAO,CAAC;KAC/B,CAAC,CAAC;SACF,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACb,QAAQ,EAAE,sBAAsB,EAAE;KACnC,CAAC,CAAC,CAAC;IAEN,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,kBAAkB,GAAG,CACzB,SAAmC,EACf,EAAE;IACtB,OAAO;QACL,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACzC,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC;gBAC9D,MAAM,EAAE,sBAAsB;gBAC9B,MAAM,EAAE,CAAC,MAAM,CAAC;aACjB,CAAC,CAAC;YACH,IAAI,gBAAgB,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;gBACrD,MAAM,IAAI,SAAS,CAAC,mCAAmC,CAAC,CAAC;YAC3D,CAAC;YACD,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,GAAG,MAAM,oBAAoB,CACnE,MAAM,EACN,gBAAgB,CACjB,CAAC;YACF,OAAO;gBACL,OAAO,EAAE,wBAAwB,CAAC;oBAChC,cAAc,EAAE,6BAA6B;oBAC7C,SAAS;oBACT,SAAS;iBACV,CAAC;gBACF,mBAAmB;aACpB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { Provider } from \"ox\";\nimport {\n  BaseError,\n  createClient,\n  custom,\n  type Address,\n  type JsonRpcAccount,\n} from \"viem\";\nimport { encodePermissionsContext } from \"../capabilities/permissions/mav2.js\";\nimport { signSignatureRequest } from \"../client/actions/signSignatureRequest.js\";\nimport { internalStateDecorator } from \"../internal/decorator.js\";\nimport { WalletServerRpcSchema } from \"../rpc/schema.js\";\nimport type {\n  CreateInnerClientParams,\n  InnerClientActions,\n  InnerWalletApiClient,\n  InnerWalletApiClientBase,\n} from \"../types.ts\";\n\nexport function createRemoteClient<\n  TAccount extends JsonRpcAccount<Address> | undefined =\n    | JsonRpcAccount<Address>\n    | undefined,\n>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;\n\n/**\n * This is a low-level client just used to make RPC requests in remote mode\n * This should be wrapped by a higher-level smart account client that provides actions\n * that uses this client under the hood\n * @returns\n */\nexport function createRemoteClient(\n  params: CreateInnerClientParams,\n): InnerWalletApiClient {\n  const { transport, chain, account } = params;\n\n  const client = createClient({\n    transport: (opts) =>\n      custom(Provider.from(transport(opts), { schema: WalletServerRpcSchema }))(\n        opts,\n      ),\n    chain,\n    account,\n  })\n    .extend((_client) => ({\n      policyId: params.policyId,\n      ...innerClientActions(_client),\n    }))\n    .extend(() => ({\n      internal: internalStateDecorator(),\n    }));\n\n  return client;\n}\n\nconst innerClientActions = (\n  apiClient: InnerWalletApiClientBase,\n): InnerClientActions => {\n  return {\n    grantPermissions: async (signer, params) => {\n      const { sessionId, signatureRequest } = await apiClient.request({\n        method: \"wallet_createSession\",\n        params: [params],\n      });\n      if (signatureRequest.type !== \"eth_signTypedData_v4\") {\n        throw new BaseError(\"Unexpected signature request type\");\n      }\n      const { signedAuthorization, signature } = await signSignatureRequest(\n        signer,\n        signatureRequest,\n      );\n      return {\n        context: encodePermissionsContext({\n          contextVersion: \"REMOTE_MODE_DEFERRED_ACTION\",\n          sessionId,\n          signature,\n        }),\n        signedAuthorization,\n      };\n    },\n  };\n};\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/remote/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,EAAgB,MAAM,MAAM,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAkBzD,MAAM,UAAU,kBAAkB,CAChC,MAA+B;IAE/B,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAE7C,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC,CACvE,IAAI,CACL;QACH,KAAK;QACL,OAAO;KACR,CAAC;SACC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,GAAG,kBAAkB,CAAC,OAAO,CAAC;KAC/B,CAAC,CAAC;SACF,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACb,QAAQ,EAAE,sBAAsB,EAAE;KACnC,CAAC,CAAC,CAAC;IAEN,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,kBAAkB,GAAG,CACzB,SAAmC,EACf,EAAE;IACtB,OAAO;QACL,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACzC,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC;gBAC9D,MAAM,EAAE,sBAAsB;gBAC9B,MAAM,EAAE,CAAC,MAAM,CAAC;aACjB,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YACvE,OAAO;gBACL,OAAO,EAAE,wBAAwB,CAAC;oBAChC,cAAc,EAAE,6BAA6B;oBAC7C,SAAS;oBACT,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC;aACH,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import { Provider } from \"ox\";\nimport { createClient, custom, type Address } from \"viem\";\nimport { encodePermissionsContext } from \"../capabilities/permissions/mav2.js\";\nimport { signSignatureRequest } from \"../client/actions/signSignatureRequest.js\";\nimport { internalStateDecorator } from \"../internal/decorator.js\";\nimport { WalletServerRpcSchema } from \"../rpc/schema.js\";\nimport type {\n  CreateInnerClientParams,\n  InnerClientActions,\n  InnerWalletApiClient,\n  InnerWalletApiClientBase,\n} from \"../types.ts\";\n\n/**\n * This is a low-level client just used to make RPC requests in remote mode\n * This should be wrapped by a higher-level smart account client that provides actions\n * that uses this client under the hood\n * @returns\n */\nexport function createRemoteClient<\n  TAccount extends Address | undefined = Address | undefined,\n>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;\n\nexport function createRemoteClient(\n  params: CreateInnerClientParams,\n): InnerWalletApiClient {\n  const { transport, chain, account } = params;\n\n  const client = createClient({\n    transport: (opts) =>\n      custom(Provider.from(transport(opts), { schema: WalletServerRpcSchema }))(\n        opts,\n      ),\n    chain,\n    account,\n  })\n    .extend((_client) => ({\n      policyId: params.policyId,\n      ...innerClientActions(_client),\n    }))\n    .extend(() => ({\n      internal: internalStateDecorator(),\n    }));\n\n  return client;\n}\n\nconst innerClientActions = (\n  apiClient: InnerWalletApiClientBase,\n): InnerClientActions => {\n  return {\n    grantPermissions: async (signer, params) => {\n      const { sessionId, signatureRequest } = await apiClient.request({\n        method: \"wallet_createSession\",\n        params: [params],\n      });\n      const signature = await signSignatureRequest(signer, signatureRequest);\n      return {\n        context: encodePermissionsContext({\n          contextVersion: \"REMOTE_MODE_DEFERRED_ACTION\",\n          sessionId,\n          signature: signature.data,\n        }),\n      };\n    },\n  };\n};\n"]}