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

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

@@ -1 +1 @@
-{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,KAAK,GAKN,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAU3C,MAAM,aAAa,GAA8C;IAC/D,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,iCAAiC;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,oFAAoF;IACpF,OAAO,EAAE,GAAG;IACZ,iGAAiG;IACjG,SAAS,EAAE,GAAG;IACd,oEAAoE;IACpE,gBAAgB,EAAE,GAAG;IACrB,wGAAwG;IACxG,mBAAmB,EAAE,GAAG;IACxB,wGAAwG;IACxG,2BAA2B,EAAE,GAAG;CACxB,CAAC;AAEX,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAMC,EACD,MAA4B;IAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO;QACL,EAAE,EAAE,MAAM;QACV,OAAO;QACP,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO;YACtB,CAAC,CAAC,cAAc,CAAC,OAAO;YACxB,CAAC,CAAC,MAAM,CAAC,OAAO;gBACd,CAAC,CAAC,cAAc,CAAC,SAAS;gBAC1B,CAAC,CAAC,cAAc,CAAC,mBAAmB;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC5E,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA2B;IAE3B,OAAO;QACL,wGAAwG;QACxG,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,MAAM;YAChB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,+FAA+F;QAC/F,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAC3C,2FAA2F;QAC3F,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACnC,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC/B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  isHex,\n  type Chain,\n  type Hex,\n  type TransactionReceipt,\n  type Transport,\n} from \"viem\";\nimport type { wallet_getCallsStatus } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { TypeCallId } from \"../../schemas.js\";\nimport { castToHex } from \"../../utils.js\";\n\nexport type GetCallsStatusParams = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type GetCallsStatusResponse = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"ReturnType\"]\n>;\n\nconst ReceiptStatus: Record<TransactionReceipt[\"status\"], Hex> = {\n  reverted: \"0x0\",\n  success: \"0x1\",\n};\n\n/** EIP-5792 call status codes */\nexport const CallStatusCode = {\n  /** Batch has been received by the wallet but has not completed execution onchain */\n  PENDING: 100,\n  /** Batch has been included onchain without reverts, receipts array contains info of all calls */\n  CONFIRMED: 200,\n  /** Batch has not been included onchain and wallet will not retry */\n  OFFCHAIN_FAILURE: 400,\n  /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */\n  CHAIN_RULES_FAILURE: 500,\n  /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */\n  PARTIAL_CHAIN_RULES_FAILURE: 600,\n} as const;\n\nexport async function getCallsStatus(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  callId: GetCallsStatusParams,\n): Promise<GetCallsStatusResponse> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { chainId, hash } = Value.Decode(TypeCallId, callId);\n\n  const result = await client.getUserOperationReceipt(hash);\n\n  return {\n    id: callId,\n    chainId,\n    atomic: true,\n    status: !result?.receipt\n      ? CallStatusCode.PENDING\n      : result.success\n        ? CallStatusCode.CONFIRMED\n        : CallStatusCode.CHAIN_RULES_FAILURE,\n    receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],\n  };\n}\n\nfunction transformReceipt(\n  receipt: TransactionReceipt,\n): NonNullable<GetCallsStatusResponse[\"receipts\"]>[number] {\n  return {\n    // viem's type for status is \"success\" | \"reverted\", but the actual value seems to already be 0x0 or 0x1\n    status: isHex(receipt.status)\n      ? receipt.status\n      : ReceiptStatus[receipt.status],\n    blockHash: receipt.blockHash,\n    // viem's type for blockNumber is bigint, but the actual value seems to already be a hex string\n    blockNumber: castToHex(receipt.blockNumber),\n    // viem's type for gasUsed is bigint, but the actual value seems to already be a hex string\n    gasUsed: castToHex(receipt.gasUsed),\n    transactionHash: receipt.transactionHash,\n    logs: receipt.logs.map((log) => ({\n      address: log.address,\n      data: log.data,\n      topics: log.topics,\n    })),\n  };\n}\n"]}
+{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/getCallsStatus.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  isHex,\n  type Chain,\n  type Hex,\n  type TransactionReceipt,\n  type Transport,\n} from \"viem\";\nimport { BaseError } from \"ox/RpcResponse\";\nimport {\n  CallStatusCode,\n  CallStatusErrorCode,\n  type wallet_getCallsStatus,\n  type WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { CallId } from \"@alchemy/wallet-api-types\";\nimport { castToHex } from \"../../utils.js\";\n\nexport type GetCallsStatusParams = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type GetCallsStatusResponse = Static<\n  (typeof wallet_getCallsStatus)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function getCallsStatus(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  callId: GetCallsStatusParams,\n): Promise<GetCallsStatusResponse> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n  const { chainId, hash } = Value.Decode(CallId, callId);\n\n  const baseResp = {\n    id: callId,\n    chainId,\n    atomic: true,\n  };\n\n  const result = await client.getUserOperationByHash(hash);\n  if (!result) {\n    throw new BaseError({\n      message: `callId ${callId} not found`,\n      code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,\n    });\n  }\n  if (result && !result.transactionHash) {\n    // A result but no txn hash means it's valid but pending.\n    return {\n      ...baseResp,\n      status: CallStatusCode.PENDING,\n    };\n  }\n\n  const receipt = await client.getUserOperationReceipt(hash);\n  if (!receipt) {\n    // Handles edge case of hash being retrieved immediately before the 150 block limit falloff.\n    throw new BaseError({\n      message: `callId ${callId} not found`,\n      code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,\n    });\n  }\n\n  return {\n    ...baseResp,\n    status: receipt.success\n      ? CallStatusCode.CONFIRMED\n      : CallStatusCode.CHAIN_RULES_FAILURE,\n    receipts: [transformReceipt(receipt.receipt)],\n  };\n}\n\nconst ReceiptStatus: Record<TransactionReceipt[\"status\"], Hex> = {\n  reverted: \"0x0\",\n  success: \"0x1\",\n};\n\nfunction transformReceipt(\n  receipt: TransactionReceipt,\n): NonNullable<GetCallsStatusResponse[\"receipts\"]>[number] {\n  return {\n    // viem's type for status is \"success\" | \"reverted\", but the actual value seems to already be 0x0 or 0x1\n    status: isHex(receipt.status)\n      ? receipt.status\n      : ReceiptStatus[receipt.status],\n    blockHash: receipt.blockHash,\n    // viem's type for blockNumber is bigint, but the actual value seems to already be a hex string\n    blockNumber: castToHex(receipt.blockNumber),\n    // viem's type for gasUsed is bigint, but the actual value seems to already be a hex string\n    gasUsed: castToHex(receipt.gasUsed),\n    transactionHash: receipt.transactionHash,\n    logs: receipt.logs.map((log) => ({\n      address: log.address,\n      data: log.data,\n      topics: log.topics,\n    })),\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/prepareCalls.d.ts

@@ -1,8 +1,7 @@
 import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
 import type { Static } from "@sinclair/typebox";
 import { type Chain, type Transport } from "viem";
-import type { wallet_prepareCalls } from "../../rpc/request.js";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import type { wallet_prepareCalls, WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
 export type PrepareCallsParams = Omit<Static<(typeof wallet_prepareCalls)["properties"]["Request"]["properties"]["params"]>[0], "chainId">;
 export type PrepareCallsResult = Static<(typeof wallet_prepareCalls)["properties"]["ReturnType"]>;
 export declare function prepareCalls(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: PrepareCallsParams): Promise<PrepareCallsResult>;

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

@@ -1,33 +1,69 @@
-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, hashMessage, toHex, } from "viem";
 import { createAccount } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-// TODO: handle capabilities like permissions and paymaster here
+import { createAuthorizationRequest, isDelegated } from "../utils/7702.js";
+import { InvalidRequestError } from "ox/RpcResponse";
+import { assertNever } from "../../utils.js";
+import { assertValid7702AccountAddress } from "../utils/7702.js";
 export async function prepareCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
+    assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);
     // 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: [
-            {
-                accountAddress: params.from,
-                includeCounterfactualInfo: true,
-            },
+            params.capabilities?.eip7702Auth
+                ? {
+                    signerAddress: params.from,
+                    creationHint: {
+                        accountType: "7702",
+                    },
+                    includeCounterfactualInfo: true,
+                }
+                : {
+                    accountAddress: params.from,
+                    includeCounterfactualInfo: true,
+                },
         ],
     });
-    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,
+        permissions: params.capabilities?.permissions,
+        delegation,
     });
+    const authorizationRequest = delegation &&
+        !(await isDelegated(client, {
+            address: account.address,
+            delegation,
+        }))
+        ? await createAuthorizationRequest(client, {
+            address: account.address,
+            delegation,
+        })
+        : undefined;
+    if (params.capabilities?.permissions && authorizationRequest) {
+        // The user shouldn't see this in most cases since we require
+        // the account to be delegated before creating the session.
+        throw new InvalidRequestError({
+            message: "When using a 7702 account with a session key, the account must be delegated before preparing calls.",
+        });
+    }
+    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({
@@ -37,22 +73,44 @@ export async function prepareCalls(client, params) {
             value: x.value ? fromHex(x.value, "bigint") : undefined,
         })),
         account,
-        overrides: params.capabilities?.gasParamsOverride,
+        overrides: {
+            ...params.capabilities?.gasParamsOverride,
+            nonceKey: params.capabilities?.nonceOverride?.nonceKey
+                ? fromHex(params.capabilities.nonceOverride.nonceKey, "bigint")
+                : undefined,
+        },
     });
-    const uoRequest = deepHexlify(builtUo);
-    const hash = account.getEntryPoint().getUserOperationHash(uoRequest);
-    return {
-        type: account.getEntryPoint().version === "0.7.0"
+    // The eip7702Auth field should never be included in the UO sig
+    // request. It's handled by a separate authorization request.
+    if ("eip7702Auth" in builtUo) {
+        builtUo.eip7702Auth = undefined;
+    }
+    const hexlifiedUo = deepHexlify(builtUo);
+    const ep = account.getEntryPoint();
+    const uoHash = ep.getUserOperationHash(hexlifiedUo);
+    const uoRequest = {
+        type: ep.version === "0.7.0"
             ? "user-operation-v070"
-            : "user-operation-v060",
-        data: uoRequest,
+            : ep.version === "0.6.0"
+                ? "user-operation-v060"
+                : assertNever(ep.version, "Unexpected entry point version"),
+        data: hexlifiedUo,
         chainId: toHex(client.chain.id),
         signatureRequest: {
             type: "personal_sign",
             data: {
-                raw: hash,
+                raw: uoHash,
             },
+            rawPayload: hashMessage({
+                raw: uoHash,
+            }),
         },
     };
+    return authorizationRequest
+        ? {
+            type: "array",
+            data: [authorizationRequest, uoRequest],
+        }
+        : uoRequest;
 }
 //# sourceMappingURL=prepareCalls.js.map

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  hashMessage,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type {\n  wallet_prepareCalls,\n  WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { createAuthorizationRequest, isDelegated } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport { assertValid7702AccountAddress } from \"../utils/7702.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\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  assertValid7702AccountAddress(params.from, params.capabilities?.eip7702Auth);\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      params.capabilities?.eip7702Auth\n        ? {\n            signerAddress: params.from,\n            creationHint: {\n              accountType: \"7702\",\n            },\n            includeCounterfactualInfo: true,\n          }\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    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  const authorizationRequest =\n    delegation &&\n    !(await isDelegated(client, {\n      address: account.address,\n      delegation,\n    }))\n      ? await createAuthorizationRequest(client, {\n          address: account.address,\n          delegation,\n        })\n      : undefined;\n\n  if (params.capabilities?.permissions && authorizationRequest) {\n    // The user shouldn't see this in most cases since we require\n    // the account to be delegated before creating the session.\n    throw new InvalidRequestError({\n      message:\n        \"When using a 7702 account with a session key, the account must be delegated before preparing calls.\",\n    });\n  }\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: {\n      ...params.capabilities?.gasParamsOverride,\n      nonceKey: params.capabilities?.nonceOverride?.nonceKey\n        ? fromHex(params.capabilities.nonceOverride.nonceKey, \"bigint\")\n        : undefined,\n    },\n  });\n\n  // The eip7702Auth field should never be included in the UO sig\n  // request. It's handled by a separate authorization request.\n  if (\"eip7702Auth\" in builtUo) {\n    builtUo.eip7702Auth = undefined;\n  }\n\n  const hexlifiedUo = deepHexlify(builtUo);\n\n  const ep = account.getEntryPoint();\n\n  const uoHash = ep.getUserOperationHash(hexlifiedUo);\n\n  const uoRequest = {\n    type:\n      ep.version === \"0.7.0\"\n        ? (\"user-operation-v070\" as const)\n        : ep.version === \"0.6.0\"\n          ? (\"user-operation-v060\" as const)\n          : assertNever(ep.version, \"Unexpected entry point version\"),\n    data: hexlifiedUo,\n    chainId: toHex(client.chain.id),\n    signatureRequest: {\n      type: \"personal_sign\" as const,\n      data: {\n        raw: uoHash,\n      },\n      rawPayload: hashMessage({\n        raw: uoHash,\n      }),\n    },\n  };\n\n  return authorizationRequest\n    ? {\n        type: \"array\" as const,\n        data: [authorizationRequest, uoRequest],\n      }\n    : uoRequest;\n}\n"]}

package/dist/esm/isomorphic/actions/prepareSign.d.ts

@@ -0,0 +1,7 @@
+import type { Static } from "@sinclair/typebox";
+import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
+import { type Chain, type Transport } from "viem";
+import type { wallet_prepareSign, WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
+export type PrepareSignParams = Static<(typeof wallet_prepareSign)["properties"]["Request"]["properties"]["params"]>[0];
+export type PrepareSignResult = Static<(typeof wallet_prepareSign)["properties"]["ReturnType"]>;
+export declare function prepareSign(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: PrepareSignParams): Promise<PrepareSignResult>;

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

@@ -0,0 +1,49 @@
+import { ChainNotFoundError, custom, toHex, } from "viem";
+import { SignableMessage, jsonSafeTypedData } from "@alchemy/wallet-api-types";
+import { createAccount } from "../utils/createAccount.js";
+import { createDummySigner } from "../utils/createDummySigner.js";
+import { Value } from "@sinclair/typebox/value";
+export async function prepareSign(client, params) {
+    if (!client.chain) {
+        throw new ChainNotFoundError();
+    }
+    const { counterfactualInfo, delegation } = await client.request({
+        method: "wallet_requestAccount",
+        params: [
+            {
+                accountAddress: params.from,
+                includeCounterfactualInfo: true,
+            },
+        ],
+    });
+    const account = await createAccount({
+        chain: client.chain,
+        transport: custom(client.transport),
+        signer: createDummySigner(params.from),
+        accountAddress: params.from,
+        counterfactualInfo,
+        permissions: params.capabilities?.permissions,
+        delegation,
+    });
+    const signatureRequest = await account.prepareSign(params.signatureRequest);
+    if (signatureRequest.type === "personal_sign") {
+        return {
+            chainId: toHex(client.chain.id),
+            signatureRequest: {
+                type: signatureRequest.type,
+                data: Value.Encode(SignableMessage, signatureRequest.data),
+            },
+        };
+    }
+    else {
+        const typedData = signatureRequest.data;
+        return {
+            chainId: toHex(client.chain.id),
+            signatureRequest: {
+                type: signatureRequest.type,
+                data: jsonSafeTypedData(typedData),
+            },
+        };
+    }
+}
+//# sourceMappingURL=prepareSign.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prepareSign.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/prepareSign.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,KAAK,GAGN,MAAM,MAAM,CAAC;AAKd,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAUhD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAMC,EACD,MAAyB;IAEzB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC9D,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE;YACN;gBACE,cAAc,EAAE,MAAM,CAAC,IAAI;gBAC3B,yBAAyB,EAAE,IAAI;aAChC;SACF;KACF,CAAC,CAAC;IAEH,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,MAAM,CAAC,IAAI,CAAC;QACtC,cAAc,EAAE,MAAM,CAAC,IAAI;QAC3B,kBAAkB;QAClB,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW;QAC7C,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,WAAW,CAChD,MAAM,CAAC,gBAAoC,CAC5C,CAAC;IAEF,IAAI,gBAAgB,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC9C,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,gBAAgB,EAAE;gBAChB,IAAI,EAAE,gBAAgB,CAAC,IAAI;gBAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,IAAI,CAAC;aAC3D;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC;QAExC,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,gBAAgB,EAAE;gBAChB,IAAI,EAAE,gBAAgB,CAAC,IAAI;gBAC3B,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC;aACnC;SACF,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["import type { Static } from \"@sinclair/typebox\";\nimport type {\n  SignatureRequest,\n  SmartAccountClient,\n  SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  ChainNotFoundError,\n  custom,\n  toHex,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type {\n  wallet_prepareSign,\n  WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { SignableMessage, jsonSafeTypedData } from \"@alchemy/wallet-api-types\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { Value } from \"@sinclair/typebox/value\";\n\nexport type PrepareSignParams = Static<\n  (typeof wallet_prepareSign)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type PrepareSignResult = Static<\n  (typeof wallet_prepareSign)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function prepareSign(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: PrepareSignParams,\n): Promise<PrepareSignResult> {\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.from,\n        includeCounterfactualInfo: true,\n      },\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    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  const signatureRequest = await account.prepareSign(\n    params.signatureRequest as SignatureRequest,\n  );\n\n  if (signatureRequest.type === \"personal_sign\") {\n    return {\n      chainId: toHex(client.chain.id),\n      signatureRequest: {\n        type: signatureRequest.type,\n        data: Value.Encode(SignableMessage, signatureRequest.data),\n      },\n    };\n  } else {\n    const typedData = signatureRequest.data;\n\n    return {\n      chainId: toHex(client.chain.id),\n      signatureRequest: {\n        type: signatureRequest.type,\n        data: jsonSafeTypedData(typedData),\n      },\n    };\n  }\n}\n"]}

package/dist/esm/isomorphic/actions/sendPreparedCalls.d.ts

@@ -1,8 +1,7 @@
 import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
-import type { Static, StaticDecode } from "@sinclair/typebox";
 import { type Chain, type Transport } from "viem";
-import type { wallet_sendPreparedCalls } from "../../rpc/request.js";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
-export type SendPreparedCallsParams = Omit<StaticDecode<(typeof wallet_sendPreparedCalls)["properties"]["Request"]["properties"]["params"]>[0], "chainId">;
+import type { wallet_sendPreparedCalls, WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
+import type { Static } from "@sinclair/typebox";
+export type SendPreparedCallsParams = Static<(typeof wallet_sendPreparedCalls)["properties"]["Request"]["properties"]["params"]>[0];
 export type SendPreparedCallsResult = Static<(typeof wallet_sendPreparedCalls)["properties"]["ReturnType"]>;
 export declare function sendPreparedCalls(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: SendPreparedCallsParams): Promise<SendPreparedCallsResult>;

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

@@ -1,43 +1,183 @@
 import { getEntryPoint, } from "@aa-sdk/core";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, concat, concatHex, toHex, } from "viem";
-import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
-import { TypeCallId } from "../../schemas.js";
+import { BaseError, ChainNotFoundError, concat, concatHex, getContract, numberToHex, parseSignature, toHex, } from "viem";
+import { decodePermissionsContext } from "@alchemy/wallet-api-types/capabilities";
+import { CallId } from "@alchemy/wallet-api-types";
+import { isSupportedDelegationAddress7702 } from "../utils/7702.js";
+import { InvalidRequestError } from "ox/RpcResponse";
+import { assertNever } from "../../utils.js";
+import { decodeSignature } from "../utils/decodeSignature.js";
 // TODO: this only supports MAv2 right now, we need to fix this
 export async function sendPreparedCalls(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
     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({
-        ...params.data,
-        signature: deferredAction != null
-            ? concatHex([
-                `0x${deferredAction.slice(68)}`, // Cuts off stuff preprended to the digest (nonce, etc. that we had previously).
-                "0xff",
-                "0x00",
-                params.signature.signature,
-            ])
-            : concat(["0xFF", "0x00", params.signature.signature]),
-    }, entryPoint.address);
-    const callId = Value.Encode(TypeCallId, {
-        chainId: toHex(client.chain.id),
-        hash,
-    });
+    const userOps = params.type === "array"
+        ? params.data.filter((it) => {
+            const isUserOp = it.type === "user-operation-v060" ||
+                it.type === "user-operation-v070";
+            if (isUserOp && it.chainId !== toHex(client.chain.id)) {
+                throw new InvalidRequestError({
+                    message: "Multiple chain IDs in a single request are not currently supported.",
+                });
+            }
+            return isUserOp;
+        })
+        : [params];
+    if (!userOps.length) {
+        throw new InvalidRequestError({
+            message: "Calls must include at least one user operation",
+        });
+    }
+    const authorizations = params.type === "array"
+        ? params.data.filter((it) => it.type === "authorization")
+        : [];
+    if (authorizations.length > 1) {
+        throw new InvalidRequestError({
+            message: "Multiple authorizations in a single request are not currently supported",
+        });
+    }
+    const [authorization] = authorizations;
+    // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.
+    if (authorization &&
+        !isSupportedDelegationAddress7702(authorization.data.address)) {
+        throw new InvalidRequestError({
+            message: `Unsupported 7702 delegation address: ${authorization.data.address}`,
+        });
+    }
+    const hashes = await Promise.all(userOps.map(async (userOp, idx) => {
+        const ep = userOp.type === "user-operation-v060"
+            ? getEntryPoint(client.chain, { version: "0.6.0" })
+            : userOp.type === "user-operation-v070"
+                ? getEntryPoint(client.chain, { version: "0.7.0" })
+                : assertNever(userOp, "Unexpected user op type");
+        const authSig = authorization
+            ? parseSignature(decodeSignature(authorization.signature).data)
+            : undefined;
+        const uoSigHex = decodeSignature(userOp.signature).data;
+        const { counterfactualInfo, delegation } = await client.request({
+            method: "wallet_requestAccount",
+            params: [
+                {
+                    accountAddress: userOp.data.sender,
+                    includeCounterfactualInfo: true,
+                },
+            ],
+        });
+        if (!counterfactualInfo && !delegation) {
+            throw new InvalidRequestError({
+                message: "No counterfactual info or delegated implementation address found.",
+            });
+        }
+        const deferredActionData = deferredAction
+            ? await (async () => {
+                // determine whether the data should be appended to the signature.
+                // logic ported from @account-kit/smart-contracts `modularAccountV2Base.ts`
+                const deferredActionNonce = BigInt(`0x${deferredAction.slice(4, 68)}`);
+                const entryPoint = getEntryPoint(client.chain, {
+                    version: "0.7.0",
+                });
+                const entryPointContract = getContract({
+                    address: entryPoint.address,
+                    abi: entryPoint.abi,
+                    client,
+                });
+                // Set these values if the deferred action has not been consumed. We check this with the EP
+                const nextNonceForDeferredAction = (await entryPointContract.read.getNonce([
+                    userOp.data.sender,
+                    deferredActionNonce >> 64n,
+                ]));
+                if (deferredActionNonce === nextNonceForDeferredAction) {
+                    return `0x${deferredAction.slice(68)}`;
+                }
+                else if (deferredActionNonce > nextNonceForDeferredAction) {
+                    // if nonce is greater than the next nonce, its invalid, so we throw
+                    throw new InvalidRequestError({
+                        message: "Invalid session nonce",
+                    });
+                }
+                // In this case, the deferred action has already been consumed, so no data should be appended to the signature.
+                // The signer entity should already be accounted for in `userOp.nonce`.
+                return undefined;
+            })()
+            : undefined;
+        const factoryType = counterfactualInfo?.factoryType;
+        // build signature based on account type
+        const signature = (() => {
+            switch (factoryType) {
+                // light accounts
+                case "LightAccountV1.0.1":
+                case "LightAccountV1.0.2":
+                case "LightAccountV1.1.0":
+                case "MAv1.0.0-MultiOwner":
+                    // For LAv1 and MAv1-MultiOwner, we always just pass the signature.
+                    return uoSigHex;
+                case "LightAccountV2.0.0":
+                    // for LAv2, we need to prepend the "SignatureType.EOA" byte.
+                    // TODO: Once we support nested smart accounts, switch this byte depending on the signature type.
+                    return concat(["0x00", uoSigHex]);
+                case undefined: // undefined defaults to sma-b
+                case "MAv2.0.0-sma-b":
+                    // For sma-b, we need to handle deferred actions if needed and prepend the "Reserved
+                    // Signature Segment" and "SignatureType.EOA" bytes
+                    return deferredActionData != null
+                        ? concatHex([deferredActionData, "0xFF", "0x00", uoSigHex])
+                        : concat(["0xFF", "0x00", uoSigHex]);
+                case "LightAccountV2.0.0-MultiOwner":
+                    // for LAv2-MultiOwner, we need to prepend the "SignatureType.EOA" byte
+                    // TODO: Once we support nested smart accounts, switch this byte depending on the signature type, and add the smart account signer's address.
+                    return concat(["0x00", uoSigHex]);
+                case "MAv2.0.0-ma-ssv":
+                case "MAv2.0.0-ma-webauthn":
+                case "MAv1.0.0-MultiSig":
+                case "unknown":
+                    throw new InvalidRequestError({
+                        message: `Unsupported factory type: ${factoryType}`,
+                    });
+                default:
+                    return assertNever(factoryType, "Unsupported factory type");
+            }
+        })();
+        return client
+            .sendRawUserOperation({
+            ...userOp.data,
+            signature,
+            eip7702Auth: idx === 0 && authorization && authSig
+                ? {
+                    ...authorization.data,
+                    chainId: authorization.chainId,
+                    ...{
+                        ...authSig,
+                        yParity: numberToHex(authSig.yParity),
+                    },
+                }
+                : undefined,
+        }, ep.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 signed authorization in the request parameters)`);
+            }
+            throw err;
+        });
+    }));
     return {
-        preparedCallIds: [callId],
+        preparedCallIds: hashes.map((hash) => Value.Encode(CallId, {
+            chainId: toHex(client.chain.id),
+            hash,
+        })),
     };
 }
 //# sourceMappingURL=sendPreparedCalls.js.map

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 { Value } from \"@sinclair/typebox/value\";\nimport {\n  BaseError,\n  ChainNotFoundError,\n  concat,\n  concatHex,\n  getContract,\n  numberToHex,\n  parseSignature,\n  toHex,\n  type Address,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport type {\n  wallet_sendPreparedCalls,\n  WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { decodePermissionsContext } from \"@alchemy/wallet-api-types/capabilities\";\nimport { CallId } from \"@alchemy/wallet-api-types\";\nimport { isSupportedDelegationAddress7702 } from \"../utils/7702.js\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport { assertNever } from \"../../utils.js\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { decodeSignature } from \"../utils/decodeSignature.js\";\n\nexport type SendPreparedCallsParams = Static<\n  (typeof wallet_sendPreparedCalls)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\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) {\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 userOps =\n    params.type === \"array\"\n      ? params.data.filter((it) => {\n          const isUserOp =\n            it.type === \"user-operation-v060\" ||\n            it.type === \"user-operation-v070\";\n          if (isUserOp && it.chainId !== toHex(client.chain.id)) {\n            throw new InvalidRequestError({\n              message:\n                \"Multiple chain IDs in a single request are not currently supported.\",\n            });\n          }\n          return isUserOp;\n        })\n      : [params];\n\n  if (!userOps.length) {\n    throw new InvalidRequestError({\n      message: \"Calls must include at least one user operation\",\n    });\n  }\n\n  const authorizations =\n    params.type === \"array\"\n      ? params.data.filter((it) => it.type === \"authorization\")\n      : [];\n\n  if (authorizations.length > 1) {\n    throw new InvalidRequestError({\n      message:\n        \"Multiple authorizations in a single request are not currently supported\",\n    });\n  }\n  const [authorization] = authorizations;\n\n  // One last safety check to be sure the UO wasn't modified to include an unsupported 7702 delegation address.\n  if (\n    authorization &&\n    !isSupportedDelegationAddress7702(authorization.data.address)\n  ) {\n    throw new InvalidRequestError({\n      message: `Unsupported 7702 delegation address: ${authorization.data.address}`,\n    });\n  }\n\n  const hashes = await Promise.all(\n    userOps.map(async (userOp, idx) => {\n      const ep: { address: Address } =\n        userOp.type === \"user-operation-v060\"\n          ? getEntryPoint(client.chain, { version: \"0.6.0\" })\n          : userOp.type === \"user-operation-v070\"\n            ? getEntryPoint(client.chain, { version: \"0.7.0\" })\n            : assertNever(userOp, \"Unexpected user op type\");\n      const authSig = authorization\n        ? parseSignature(decodeSignature(authorization.signature).data)\n        : undefined;\n      const uoSigHex = decodeSignature(userOp.signature).data;\n\n      const { counterfactualInfo, delegation } = await client.request({\n        method: \"wallet_requestAccount\",\n        params: [\n          {\n            accountAddress: userOp.data.sender,\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 deferredActionData: Hex | undefined = deferredAction\n        ? await (async () => {\n            // determine whether the data should be appended to the signature.\n            // logic ported from @account-kit/smart-contracts `modularAccountV2Base.ts`\n\n            const deferredActionNonce = BigInt(\n              `0x${deferredAction.slice(4, 68)}`,\n            );\n\n            const entryPoint = getEntryPoint(client.chain, {\n              version: \"0.7.0\",\n            });\n\n            const entryPointContract = getContract({\n              address: entryPoint.address,\n              abi: entryPoint.abi,\n              client,\n            });\n\n            // Set these values if the deferred action has not been consumed. We check this with the EP\n            const nextNonceForDeferredAction: bigint =\n              (await entryPointContract.read.getNonce([\n                userOp.data.sender,\n                deferredActionNonce >> 64n,\n              ])) as bigint;\n\n            if (deferredActionNonce === nextNonceForDeferredAction) {\n              return `0x${deferredAction.slice(68)}`;\n            } else if (deferredActionNonce > nextNonceForDeferredAction) {\n              // if nonce is greater than the next nonce, its invalid, so we throw\n              throw new InvalidRequestError({\n                message: \"Invalid session nonce\",\n              });\n            }\n\n            // In this case, the deferred action has already been consumed, so no data should be appended to the signature.\n            // The signer entity should already be accounted for in `userOp.nonce`.\n            return undefined;\n          })()\n        : undefined;\n\n      const factoryType = counterfactualInfo?.factoryType;\n\n      // build signature based on account type\n      const signature = (() => {\n        switch (factoryType) {\n          // light accounts\n          case \"LightAccountV1.0.1\":\n          case \"LightAccountV1.0.2\":\n          case \"LightAccountV1.1.0\":\n          case \"MAv1.0.0-MultiOwner\":\n            // For LAv1 and MAv1-MultiOwner, we always just pass the signature.\n            return uoSigHex;\n          case \"LightAccountV2.0.0\":\n            // for LAv2, we need to prepend the \"SignatureType.EOA\" byte.\n            // TODO: Once we support nested smart accounts, switch this byte depending on the signature type.\n            return concat([\"0x00\", uoSigHex]);\n          case undefined: // undefined defaults to sma-b\n          case \"MAv2.0.0-sma-b\":\n            // For sma-b, we need to handle deferred actions if needed and prepend the \"Reserved\n            // Signature Segment\" and \"SignatureType.EOA\" bytes\n            return deferredActionData != null\n              ? concatHex([deferredActionData, \"0xFF\", \"0x00\", uoSigHex])\n              : concat([\"0xFF\", \"0x00\", uoSigHex]);\n          case \"LightAccountV2.0.0-MultiOwner\":\n            // for LAv2-MultiOwner, we need to prepend the \"SignatureType.EOA\" byte\n            // TODO: Once we support nested smart accounts, switch this byte depending on the signature type, and add the smart account signer's address.\n            return concat([\"0x00\", uoSigHex]);\n          case \"MAv2.0.0-ma-ssv\":\n          case \"MAv2.0.0-ma-webauthn\":\n          case \"MAv1.0.0-MultiSig\":\n          case \"unknown\":\n            throw new InvalidRequestError({\n              message: `Unsupported factory type: ${factoryType}`,\n            });\n          default:\n            return assertNever(factoryType, \"Unsupported factory type\");\n        }\n      })();\n\n      return client\n        .sendRawUserOperation(\n          {\n            ...userOp.data,\n            signature,\n            eip7702Auth:\n              idx === 0 && authorization && authSig\n                ? {\n                    ...authorization.data,\n                    chainId: authorization.chainId,\n                    ...{\n                      ...authSig,\n                      yParity: numberToHex(authSig.yParity),\n                    },\n                  }\n                : undefined,\n          },\n          ep.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 signed authorization in the request parameters)`,\n            );\n          }\n          throw err;\n        });\n    }),\n  );\n\n  return {\n    preparedCallIds: hashes.map((hash) =>\n      Value.Encode(CallId, {\n        chainId: toHex(client.chain.id),\n        hash,\n      }),\n    ),\n  };\n}\n"]}