@account-kit/wallet-client 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/esm/isomorphic/actions/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { TypePermission } from \"../../capabilities/permissions/index.js\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_createSession } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        includeCounterfactualInfo: true,\n        accountAddress: params.account,\n      },\n    ],\n  });\n  if (!counterfactualInfo) {\n    throw new Error(\"No counterfactual info found.\");\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new Error(\"Sessions are currently only supported by MAv2 accounts.\");\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: params.key,\n      entityId,\n      nonce,\n      deadline: params.expiry,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\",\n      data: typedData,\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { TypePermission } from \"../../capabilities/permissions/index.js\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_createSession } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorization } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.account,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n    delegation,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new InvalidRequestError({\n      message: \"Sessions are currently only supported by MAv2 accounts.\",\n    });\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: params.key,\n      entityId,\n      nonce,\n      deadline: params.expiry,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorization(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  const signatureRequest = {\n    type: \"eth_signTypedData_v4\" as const,\n    data: typedData,\n  };\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/prepareCalls.js

@@ -1,14 +1,15 @@
-import { deepHexlify, } from "@aa-sdk/core";
-import { ChainNotFoundError, custom, fromHex, toHex, zeroAddress, } from "viem";
+import { deepHexlify, default7702GasEstimator, } from "@aa-sdk/core";
+import { ChainNotFoundError, custom, fromHex, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-// TODO: handle capabilities like permissions and paymaster here
+import { createAuthorization } from "../utils/7702.js";
+import { InvalidRequestError } from "ox/RpcResponse";
 export async function prepareCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
     // in local mode, we probably want some kind of caching for this
-    const { counterfactualInfo } = await client.request({
+    const { counterfactualInfo, delegation } = await client.request({
         method: "wallet_requestAccount",
         params: [
             {
@@ -17,17 +18,31 @@ export async function prepareCalls(client, params) {
             },
         ],
     });
-    if (!counterfactualInfo) {
-        throw new Error("No counterfactual info found.");
+    if (!counterfactualInfo && !delegation) {
+        throw new InvalidRequestError({
+            message: "No counterfactual info or delegated implementation address found.",
+        });
     }
     const account = await createAccount({
         chain: client.chain,
         transport: custom(client.transport),
-        signer: createDummySigner(zeroAddress),
+        signer: createDummySigner(params.from),
         accountAddress: params.from,
         counterfactualInfo,
         capabilities: params.capabilities,
+        delegation,
     });
+    // If using 7702, we need an Authorization (unless it's already authorized).
+    const authorizationRequest = delegation
+        ? await createAuthorization(client, {
+            address: account.address,
+            delegation,
+        })
+        : undefined;
+    if (authorizationRequest) {
+        // @ts-expect-error - this is available but not typed as public
+        client.middleware.gasEstimator = default7702GasEstimator();
+    }
     // TODO: oops we don't actually support setting the policyId as an override here
     // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly
     const builtUo = await client.buildUserOperation({
@@ -39,8 +54,18 @@ export async function prepareCalls(client, params) {
         account,
         overrides: params.capabilities?.gasParamsOverride,
     });
+    // The eip7702Auth field should never be included in the UO sig
+    // request. It's handled by the separate authorization request.
+    if ("eip7702Auth" in builtUo) {
+        builtUo.eip7702Auth = undefined;
+    }
     const uoRequest = deepHexlify(builtUo);
-    const hash = account.getEntryPoint().getUserOperationHash(uoRequest);
+    const signatureRequest = {
+        type: "personal_sign",
+        data: {
+            raw: account.getEntryPoint().getUserOperationHash(uoRequest),
+        },
+    };
     return {
         type: account.getEntryPoint().version === "0.7.0"
             ? "user-operation-v070"
@@ -48,10 +73,8 @@ export async function prepareCalls(client, params) {
         data: uoRequest,
         chainId: toHex(client.chain.id),
         signatureRequest: {
-            type: "personal_sign",
-            data: {
-                raw: hash,
-            },
+            ...signatureRequest,
+            ...(authorizationRequest ? { authorizationRequest } : {}),
         },
     };
 }

package/dist/esm/isomorphic/actions/prepareCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,GAGZ,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,OAAO,EACP,KAAK,EACL,WAAW,GAGZ,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAalE,gEAAgE;AAChE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAMC,EACD,MAA0B;IAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,gEAAgE;IAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClD,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE;YACN;gBACE,cAAc,EAAE,MAAM,CAAC,IAAI;gBAC3B,yBAAyB,EAAE,IAAI;aAChC;SACF;KACF,CAAC,CAAC;IACH,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;QAClC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;QACnC,MAAM,EAAE,iBAAiB,CAAC,WAAW,CAAC;QACtC,cAAc,EAAE,MAAM,CAAC,IAAI;QAC3B,kBAAkB;QAClB,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IAEH,gFAAgF;IAChF,iIAAiI;IACjI,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC;QAC9C,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,CAAC,EAAE;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;YACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC,CAAC;QACH,OAAO;QACP,SAAS,EAAE,MAAM,CAAC,YAAY,EAAE,iBAAiB;KAClD,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAErE,OAAO;QACL,IAAI,EACF,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,KAAK,OAAO;YACzC,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,qBAAqB;QAC3B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,gBAAgB,EAAE;YAChB,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE;gBACJ,GAAG,EAAE,IAAI;aACV;SACF;KACF,CAAC;AACJ,CAAC","sourcesContent":["import {\n  deepHexlify,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  toHex,\n  zeroAddress,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: handle capabilities like permissions and paymaster here\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.from,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n  if (!counterfactualInfo) {\n    throw new Error(\"No counterfactual info found.\");\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(zeroAddress),\n    accountAddress: params.from,\n    counterfactualInfo,\n    capabilities: params.capabilities,\n  });\n\n  // TODO: oops we don't actually support setting the policyId as an override here\n  // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly\n  const builtUo = await client.buildUserOperation({\n    uo: params.calls.map((x) => ({\n      target: x.to,\n      data: x.data ?? \"0x\",\n      value: x.value ? fromHex(x.value, \"bigint\") : undefined,\n    })),\n    account,\n    overrides: params.capabilities?.gasParamsOverride,\n  });\n\n  const uoRequest = deepHexlify(builtUo);\n\n  const hash = account.getEntryPoint().getUserOperationHash(uoRequest);\n\n  return {\n    type:\n      account.getEntryPoint().version === \"0.7.0\"\n        ? \"user-operation-v070\"\n        : \"user-operation-v060\",\n    data: uoRequest,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\",\n      data: {\n        raw: hash,\n      },\n    },\n  };\n}\n"]}
+{"version":3,"file":"prepareCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  deepHexlify,\n  default7702GasEstimator,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport {\n  ChainNotFoundError,\n  custom,\n  fromHex,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { wallet_prepareCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorization } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type PrepareCallsParams = Omit<\n  Static<\n    (typeof wallet_prepareCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type PrepareCallsResult = Static<\n  (typeof wallet_prepareCalls)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareCallsParams,\n): Promise<PrepareCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  // in local mode, we probably want some kind of caching for this\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.from,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  if (!counterfactualInfo && !delegation) {\n    throw new InvalidRequestError({\n      message:\n        \"No counterfactual info or delegated implementation address found.\",\n    });\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    capabilities: params.capabilities,\n    delegation,\n  });\n\n  // If using 7702, we need an Authorization (unless it's already authorized).\n  const authorizationRequest = delegation\n    ? await createAuthorization(client, {\n        address: account.address,\n        delegation,\n      })\n    : undefined;\n\n  if (authorizationRequest) {\n    // @ts-expect-error - this is available but not typed as public\n    client.middleware.gasEstimator = default7702GasEstimator();\n  }\n\n  // TODO: oops we don't actually support setting the policyId as an override here\n  // if we assume that the the isomorphic client is never used directly, then we can assume that this is handled upstream correctly\n  const builtUo = await client.buildUserOperation({\n    uo: params.calls.map((x) => ({\n      target: x.to,\n      data: x.data ?? \"0x\",\n      value: x.value ? fromHex(x.value, \"bigint\") : undefined,\n    })),\n    account,\n    overrides: params.capabilities?.gasParamsOverride,\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by the separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n  const uoRequest = deepHexlify(builtUo);\n\n  const signatureRequest = {\n    type: \"personal_sign\" as const,\n    data: {\n      raw: account.getEntryPoint().getUserOperationHash(uoRequest),\n    },\n  };\n\n  return {\n    type:\n      account.getEntryPoint().version === \"0.7.0\"\n        ? \"user-operation-v070\"\n        : \"user-operation-v060\",\n    data: uoRequest,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      ...signatureRequest,\n      ...(authorizationRequest ? { authorizationRequest } : {}),\n    },\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/sendPreparedCalls.js

@@ -1,27 +1,39 @@
 import { getEntryPoint, } from "@aa-sdk/core";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, concat, concatHex, toHex, } from "viem";
+import { BaseError, ChainNotFoundError, concat, concatHex, toHex, } from "viem";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
 import { TypeCallId } from "../../schemas.js";
+import { isSupportedImplementationAddress7702 } from "../utils/7702.js";
+import { InvalidRequestError } from "ox/RpcResponse";
 // TODO: this only supports MAv2 right now, we need to fix this
 export async function sendPreparedCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
+    // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
+    if (params.signedAuthorization &&
+        !isSupportedImplementationAddress7702(params.signedAuthorization.address)) {
+        throw new InvalidRequestError({
+            message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,
+        });
+    }
     const deferredAction = (() => {
-        if (!params.capabilities?.permissions?.context) {
+        if (!params.capabilities?.permissions) {
             return;
         }
-        const decodedContext = decodePermissionsContext(params.capabilities.permissions.context);
+        const decodedContext = decodePermissionsContext(params.capabilities.permissions);
         if (decodedContext.contextVersion === "REMOTE_MODE_DEFERRED_ACTION") {
-            throw new Error("Remote mode deferred action not supported in isomorphic client");
+            throw new InvalidRequestError({
+                message: "Remote mode deferred action not supported in isomorphic client",
+            });
         }
         return decodedContext.deferredAction;
     })();
     const entryPoint = params.type === "user-operation-v060"
         ? getEntryPoint(client.chain, { version: "0.6.0" })
         : getEntryPoint(client.chain, { version: "0.7.0" });
-    const hash = await client.sendRawUserOperation({
+    const hash = await client
+        .sendRawUserOperation({
         ...params.data,
         signature: deferredAction != null
             ? concatHex([
@@ -31,7 +43,15 @@ export async function sendPreparedCalls(client, params) {
                 params.signature.signature,
             ])
             : concat(["0xFF", "0x00", params.signature.signature]),
-    }, entryPoint.address);
+        eip7702Auth: params.signedAuthorization,
+    }, entryPoint.address)
+        .catch((err) => {
+        if (err instanceof BaseError &&
+            err.details.endsWith("is not a contract and initCode is empty")) {
+            throw new BaseError(`${err.details} (If using 7702, be sure you include the 'signedAuthorization' field in the request parameters)`);
+        }
+        throw err;
+    });
     const callId = Value.Encode(TypeCallId, {
         chainId: toHex(client.chain.id),
         hash,

package/dist/esm/isomorphic/actions/sendPreparedCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,GAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,KAAK,GAIN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa9C,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAMC,EACD,MAA+B;IAE/B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,cAAc,GAAoB,CAAC,GAAG,EAAE;QAC5C,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;YAC/C,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,wBAAwB,CAC7C,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CACxC,CAAC;QAEF,IAAI,cAAc,CAAC,cAAc,KAAK,6BAA6B,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;QACJ,CAAC;QAED,OAAO,cAAc,CAAC,cAAc,CAAC;IACvC,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,UAAU,GACd,MAAM,CAAC,IAAI,KAAK,qBAAqB;QACnC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACnD,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAC5C;QACE,GAAG,MAAM,CAAC,IAAI;QACd,SAAS,EACP,cAAc,IAAI,IAAI;YACpB,CAAC,CAAC,SAAS,CAAC;gBACR,KAAK,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,gFAAgF;gBACjH,MAAM;gBACN,MAAM;gBACN,MAAM,CAAC,SAAS,CAAC,SAAS;aAC3B,CAAC;YACJ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;KAC3D,EACD,UAAU,CAAC,OAAO,CACnB,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;QACtC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,IAAI;KACL,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,CAAC,MAAM,CAAC;KAC1B,CAAC;AACJ,CAAC","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\n\nexport type SendPreparedCallsParams = Omit<\n  StaticDecode<\n    (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions?.context) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions.context,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new Error(\n        \"Remote mode deferred action not supported in isomorphic client\",\n      );\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const entryPoint =\n    params.type === \"user-operation-v060\"\n      ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n      : getEntryPoint(client.chain, { version: \"0.7.0\" });\n\n  const hash = await client.sendRawUserOperation(\n    {\n      ...params.data,\n      signature:\n        deferredAction != null\n          ? concatHex([\n              `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).\n              \"0xff\",\n              \"0x00\",\n              params.signature.signature,\n            ])\n          : concat([\"0xFF\", \"0x00\", params.signature.signature]),\n    },\n    entryPoint.address,\n  );\n\n  const callId = Value.Encode(TypeCallId, {\n    chainId: toHex(client.chain.id),\n    hash,\n  });\n\n  return {\n    preparedCallIds: [callId],\n  };\n}\n"]}
+{"version":3,"file":"sendPreparedCalls.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/sendPreparedCalls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getEntryPoint,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static, StaticDecode } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_sendPreparedCalls } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { isSupportedImplementationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\n\nexport type SendPreparedCallsParams = Omit<\n  StaticDecode<\n    (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n>;\n\nexport type SendPreparedCallsResult = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"ReturnType\"]\n>;\n\n// TODO: this only supports MAv2 right now, we need to fix this\nexport async function sendPreparedCalls(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: SendPreparedCallsParams,\n): Promise<SendPreparedCallsResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    params.signedAuthorization &&\n    !isSupportedImplementationAddress7702(params.signedAuthorization.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${params.signedAuthorization.address}`,\n    });\n  }\n\n  const deferredAction: Hex | undefined = (() => {\n    if (!params.capabilities?.permissions) {\n      return;\n    }\n\n    const decodedContext = decodePermissionsContext(\n      params.capabilities.permissions,\n    );\n\n    if (decodedContext.contextVersion === \"REMOTE_MODE_DEFERRED_ACTION\") {\n      throw new InvalidRequestError({\n        message:\n          \"Remote mode deferred action not supported in isomorphic client\",\n      });\n    }\n\n    return decodedContext.deferredAction;\n  })();\n\n  const entryPoint =\n    params.type === \"user-operation-v060\"\n      ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n      : getEntryPoint(client.chain, { version: \"0.7.0\" });\n\n  const hash = await client\n    .sendRawUserOperation(\n      {\n        ...params.data,\n        signature:\n          deferredAction != null\n            ? concatHex([\n                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).\n                \"0xff\",\n                \"0x00\",\n                params.signature.signature,\n              ])\n            : concat([\"0xFF\", \"0x00\", params.signature.signature]),\n        eip7702Auth: params.signedAuthorization,\n      },\n      entryPoint.address,\n    )\n    .catch((err) => {\n      if (\n        err instanceof BaseError &&\n        err.details.endsWith(\"is not a contract and initCode is empty\")\n      ) {\n        throw new BaseError(\n          `${err.details} (If using 7702, be sure you include the 'signedAuthorization' field in the request parameters)`,\n        );\n      }\n      throw err;\n    });\n\n  const callId = Value.Encode(TypeCallId, {\n    chainId: toHex(client.chain.id),\n    hash,\n  });\n\n  return {\n    preparedCallIds: [callId],\n  };\n}\n"]}

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

@@ -13,7 +13,7 @@ type ClientParams = {
 };
 export declare function isomorphicClientActions(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>): {
     prepareCalls: (params: PrepareCallsParams) => Promise<{
-        type: "user-operation-v060" | "user-operation-v070";
+        type: "user-operation-v070" | "user-operation-v060";
         chainId: `0x${string}`;
         data: {
             sender: `0x${string}`;
@@ -42,7 +42,7 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             maxFeePerGas: `0x${string}`;
             maxPriorityFeePerGas: `0x${string}`;
         };
-        signatureRequest: {
+        signatureRequest: ({
             type: "personal_sign";
             data: string | {
                 raw: `0x${string}`;
@@ -51,8 +51,8 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
             type: "eth_signTypedData_v4";
             data: {
                 domain?: {
-                    salt?: `0x${string}` | undefined;
                     chainId?: number | undefined;
+                    salt?: `0x${string}` | undefined;
                     name?: string | undefined;
                     verifyingContract?: `0x${string}` | undefined;
                     version?: string | undefined;
@@ -68,6 +68,12 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
                     [x: string]: unknown;
                 };
             };
+        }) & {
+            authorizationRequest?: {
+                nonce: number;
+                chainId: number;
+                address: `0x${string}`;
+            } | undefined;
         };
     }>;
     sendPreparedCalls: (params: SendPreparedCallsParams) => Promise<{
@@ -77,8 +83,8 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
         receipts?: {
             status: `0x${string}`;
             logs: {
-                data: `0x${string}`;
                 address: `0x${string}`;
+                data: `0x${string}`;
                 topics: `0x${string}`[];
             }[];
             blockHash: `0x${string}`;
@@ -89,7 +95,7 @@ export declare function isomorphicClientActions(client: SmartAccountClient<Trans
         chainId: `0x${string}`;
         id: `0x${string}`;
         atomic: boolean;
-        status: 100 | 200 | 400 | 500 | 600;
+        status: 200 | 100 | 400 | 500 | 600;
     }>;
     createSession: (params: CreateSessionParams) => Promise<import("./actions/createSession.js").CreateSessionResult>;
 };

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

@@ -0,0 +1,11 @@
+import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
+import { type Authorization, 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: {
+    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;
+export {};

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

@@ -0,0 +1,26 @@
+import { concatHex, } from "viem";
+export const createAuthorization = 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,
+        address: params.delegation,
+        nonce: await client.getTransactionCount({
+            address: params.address,
+        }),
+    };
+};
+const IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE = {
+    "0x69007702764179f14F51cdce752f4f775d74E139": "ModularAccountV2",
+};
+export const getAccountTypeForImplementationAddress7702 = (address) => {
+    return IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE[address];
+};
+const SUPPORTED_IMPLEMENTATION_ADDRESSES = Object.keys(IMPLEMENTATION_ADDRESS_TO_ACCOUNT_TYPE);
+export const isSupportedImplementationAddress7702 = (address) => {
+    return SUPPORTED_IMPLEMENTATION_ADDRESSES.includes(address);
+};
+//# 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,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"]}

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

@@ -9,7 +9,8 @@ type CreateAccountParams = {
     transport: Transport;
     signer: SmartAccountSigner;
     accountAddress: Address;
-    counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>;
+    counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>;
+    delegation?: Address;
     capabilities?: StaticDecode<typeof Capabilities>;
 };
 /**

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

@@ -1,6 +1,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 { InternalError } from "ox/RpcResponse";
 /**
  * Creates a smart account instance from the given parameters.
  * @param params - The parameters for creating a smart account.
@@ -8,22 +11,44 @@ import { parsePermissionsContext } from "./parsePermissionsContext.js";
  */
 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 mode = params.delegation ? "7702" : "default";
+    if (mode === "default") {
+        if (!ci) {
+            throw new InternalError({
+                message: "Counterfactual info not found",
+            });
+        }
+        if (ci.factoryType !== "MAv2.0.0-sma-b") {
+            throw new InternalError({
+                message: `Factory type ${ci.factoryType} is not currently supported.`,
+            });
+        }
+    }
+    else if (mode === "7702") {
+        const accountType = getAccountTypeForImplementationAddress7702(params.delegation);
+        if (accountType !== "ModularAccountV2") {
+            throw new InternalError({
+                message: "7702 mode currently only supports ModularAccountV2",
+            });
+        }
+    }
+    else {
+        assertNever(mode, "Unexpected mode in createAccount");
     }
-    const parsedContext = parsePermissionsContext(params.capabilities, ci);
+    const parsedContext = parsePermissionsContext(params.capabilities, ci, params.delegation);
     const signerEntity = parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
         ? {
             entityId: hexToNumber(parsedContext.entityId),
             isGlobalValidation: parsedContext.isGlobalValidation,
         }
         : undefined;
+    // TODO: clean this up to support different account types.
     return createModularAccountV2({
         ...accountParams,
         signerEntity,
         deferredAction: parsedContext?.deferredAction,
-        initCode: concatHex([ci.factoryAddress, ci.factoryData]),
+        initCode: ci ? concatHex([ci.factoryAddress, ci.factoryData]) : undefined,
+        mode,
     });
 }
 export function isModularAccountV2(account) {

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;AAWvE;;;;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 { Capabilities } from \"../../capabilities/index.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport { parsePermissionsContext } from \"./parsePermissionsContext.js\";\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":"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"]}

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/parsePermissionsContext.d.ts

@@ -1,7 +1,8 @@
 import type { StaticDecode } from "@sinclair/typebox";
 import type { TypeSerializedInitcode } from "../../schemas.js";
 import type { PrepareCallsParams } from "../actions/prepareCalls.js";
-export declare function parsePermissionsContext(capabilities: PrepareCallsParams["capabilities"], parsedCi: StaticDecode<typeof TypeSerializedInitcode>): ({
+import type { Address } from "viem";
+export declare function parsePermissionsContext(capabilities: PrepareCallsParams["capabilities"], 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,16 +1,28 @@
 import { InvalidRequestError } from "ox/RpcResponse";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
-export function parsePermissionsContext(capabilities, parsedCi) {
-    if (!capabilities?.permissions?.context) {
+import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
+export function parsePermissionsContext(capabilities, parsedCi, delegation7702) {
+    if (!capabilities?.permissions) {
         return undefined;
     }
-    if (capabilities?.permissions?.context &&
-        parsedCi.factoryType !== "MAv2.0.0-sma-b") {
+    if ("sessionId" in capabilities.permissions) {
+        throw new InvalidRequestError({
+            message: "Remote permissions are not supported in isomorphic client",
+        });
+    }
+    if (!("context" in capabilities.permissions)) {
+        return undefined;
+    }
+    const isMAV2 = (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
+        (delegation7702 &&
+            getAccountTypeForImplementationAddress7702(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(capabilities.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,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 { InvalidRequestError } from \"ox/RpcResponse\";\nimport { decodePermissionsContext } from \"../../capabilities/permissions/mav2.js\";\nimport type { TypeSerializedInitcode } from \"../../schemas.js\";\nimport type { PrepareCallsParams } from \"../actions/prepareCalls.js\";\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;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"]}

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

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

package/dist/esm/local/client.js

@@ -3,6 +3,7 @@ import { buildDeferredActionDigest } from "@account-kit/smart-contracts/experime
 import { createClient, custom } from "viem";
 import { encodePermissionsContext, prefixSignatureKeyType, } from "../capabilities/permissions/mav2.js";
 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 = [
@@ -56,6 +57,8 @@ export function createLocalClient(params) {
                                 return assertNever(args.method, `Unexpected method: ${args.method}`);
                         }
                     },
+                }, {
+                    retryCount: 0,
                 }),
             },
         ],
@@ -65,16 +68,20 @@ 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 { signedAuthorization, signature } = await signSignatureRequest(signer, signatureRequest);
             return {
                 context: encodePermissionsContext({
                     contextVersion: "LOCAL_MODE_DEFERRED_ACTION",
@@ -83,6 +90,7 @@ const innerClientActions = (isomorphicClient) => {
                         sig: prefixSignatureKeyType(signature, "secp256k1"),
                     }),
                 }),
+                signedAuthorization,
             };
         },
     };