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

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  ChainNotFoundError,\n  type Chain,\n  type Transport,\n  custom,\n  hexToNumber,\n  type Hex,\n  toHex,\n} from \"viem\";\nimport type { wallet_createSession } from \"../../rpc/request\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport { createDummySigner } from \"../utils/createDummySigner\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport { TypePermission } from \"../../capabilities/permissions\";\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  hashTypedData,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport {\n  TypePermission,\n  isGlobalValidation,\n} from \"@alchemy/wallet-api-types/capabilities\";\nimport type {\n  wallet_createSession,\n  WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { supportsFeature } from \"../utils/supportsFeature.js\";\nimport { isDelegated } from \"../utils/7702.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, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.account,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  if (\n    delegation &&\n    !(await isDelegated(client, {\n      address: params.account,\n      delegation,\n    }))\n  ) {\n    throw new InvalidRequestError({\n      message:\n        \"7702 account must be delegated before calling `wallet_createSession`\",\n    });\n  }\n\n  if (!delegation && !counterfactualInfo) {\n    throw new InvalidRequestError({\n      message: \"No counterfactual info found.\",\n    });\n  }\n\n  if (\n    counterfactualInfo &&\n    !supportsFeature(counterfactualInfo, \"permissions\")\n  ) {\n    throw new InvalidRequestError({\n      message: \"Account type does not support createSession\",\n    });\n  }\n\n  // At this point we know the account supports the permission feature\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: {\n        ...params.key,\n        // Alias 'ecdsa' to 'secp256k1'\n        type: params.key.type === \"ecdsa\" ? \"secp256k1\" : params.key.type,\n      },\n      entityId,\n      nonce,\n      deadline: params.expirySec,\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    chainId: toHex(client.chain.id),\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\" as const,\n      data: typedData,\n      rawPayload: hashTypedData(typedData),\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}

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

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

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

@@ -0,0 +1,42 @@
+import { ChainNotFoundError, concat, custom, encodeAbiParameters, parseAbiParameters, } from "viem";
+import { createAccount } from "../utils/createAccount.js";
+import { createDummySigner } from "../utils/createDummySigner.js";
+import { magicBytes } from "ox/erc6492/WrappedSignature";
+export async function formatSign(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,
+    });
+    let formattedSignature = await account.formatSign(params.signature.data);
+    if (counterfactualInfo && !(await account.isAccountDeployed())) {
+        formattedSignature = concat([
+            encodeAbiParameters(parseAbiParameters("address, bytes, bytes"), [
+                counterfactualInfo.factoryAddress,
+                counterfactualInfo.factoryData,
+                formattedSignature,
+            ]),
+            magicBytes,
+        ]);
+    }
+    return {
+        signature: formattedSignature,
+    };
+}
+//# sourceMappingURL=formatSign.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"formatSign.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/formatSign.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,kBAAkB,GAGnB,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAUzD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAMC,EACD,MAAwB;IAExB,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,IAAI,kBAAkB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEzE,IAAI,kBAAkB,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;QAC/D,kBAAkB,GAAG,MAAM,CAAC;YAC1B,mBAAmB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,EAAE;gBAC/D,kBAAkB,CAAC,cAAc;gBACjC,kBAAkB,CAAC,WAAW;gBAC9B,kBAAkB;aACnB,CAAC;YACF,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,SAAS,EAAE,kBAAkB;KAC9B,CAAC;AACJ,CAAC","sourcesContent":["import type { Static } from \"@sinclair/typebox\";\nimport type { wallet_formatSign } from \"@alchemy/wallet-api-types/rpc\";\nimport type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  ChainNotFoundError,\n  concat,\n  custom,\n  encodeAbiParameters,\n  parseAbiParameters,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { magicBytes } from \"ox/erc6492/WrappedSignature\";\n\nexport type FormatSignParams = Static<\n  (typeof wallet_formatSign)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type FormatSignResult = Static<\n  (typeof wallet_formatSign)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function formatSign(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: FormatSignParams,\n): Promise<FormatSignResult> {\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  let formattedSignature = await account.formatSign(params.signature.data);\n\n  if (counterfactualInfo && !(await account.isAccountDeployed())) {\n    formattedSignature = concat([\n      encodeAbiParameters(parseAbiParameters(\"address, bytes, bytes\"), [\n        counterfactualInfo.factoryAddress,\n        counterfactualInfo.factoryData,\n        formattedSignature,\n      ]),\n      magicBytes,\n    ]);\n  }\n\n  return {\n    signature: formattedSignature,\n  };\n}\n"]}

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

@@ -1,21 +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_getCallsStatus } from "../../rpc/request";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
+import { type wallet_getCallsStatus, type WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
 export type GetCallsStatusParams = Static<(typeof wallet_getCallsStatus)["properties"]["Request"]["properties"]["params"]>[0];
 export type GetCallsStatusResponse = Static<(typeof wallet_getCallsStatus)["properties"]["ReturnType"]>;
-/** EIP-5792 call status codes */
-export declare const CallStatusCode: {
-    /** Batch has been received by the wallet but has not completed execution onchain */
-    readonly PENDING: 100;
-    /** Batch has been included onchain without reverts, receipts array contains info of all calls */
-    readonly CONFIRMED: 200;
-    /** Batch has not been included onchain and wallet will not retry */
-    readonly OFFCHAIN_FAILURE: 400;
-    /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */
-    readonly CHAIN_RULES_FAILURE: 500;
-    /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */
-    readonly PARTIAL_CHAIN_RULES_FAILURE: 600;
-};
 export declare function getCallsStatus(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, callId: GetCallsStatusParams): Promise<GetCallsStatusResponse>;

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

@@ -1,43 +1,54 @@
 import {} from "@aa-sdk/core";
-import { ChainNotFoundError, isHex, } from "viem";
-import { TypeCallId } from "../../schemas";
-import { castToHex } from "../../utils";
 import { Value } from "@sinclair/typebox/value";
-const ReceiptStatus = {
-    reverted: "0x0",
-    success: "0x1",
-};
-/** EIP-5792 call status codes */
-export const CallStatusCode = {
-    /** Batch has been received by the wallet but has not completed execution onchain */
-    PENDING: 100,
-    /** Batch has been included onchain without reverts, receipts array contains info of all calls */
-    CONFIRMED: 200,
-    /** Batch has not been included onchain and wallet will not retry */
-    OFFCHAIN_FAILURE: 400,
-    /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */
-    CHAIN_RULES_FAILURE: 500,
-    /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */
-    PARTIAL_CHAIN_RULES_FAILURE: 600,
-};
+import { ChainNotFoundError, isHex, } from "viem";
+import { BaseError } from "ox/RpcResponse";
+import { CallStatusCode, CallStatusErrorCode, } from "@alchemy/wallet-api-types/rpc";
+import { TypeCallId } from "@alchemy/wallet-api-types";
+import { castToHex } from "../../utils.js";
 export async function getCallsStatus(client, callId) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
     const { chainId, hash } = Value.Decode(TypeCallId, callId);
-    const result = await client.getUserOperationReceipt(hash);
-    return {
+    const baseResp = {
         id: callId,
         chainId,
         atomic: true,
-        status: !result?.receipt
-            ? CallStatusCode.PENDING
-            : result.success
-                ? CallStatusCode.CONFIRMED
-                : CallStatusCode.CHAIN_RULES_FAILURE,
-        receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],
+    };
+    const result = await client.getUserOperationByHash(hash);
+    if (!result) {
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    if (result && !result.transactionHash) {
+        // A result but no txn hash means it's valid but pending.
+        return {
+            ...baseResp,
+            status: CallStatusCode.PENDING,
+        };
+    }
+    const receipt = await client.getUserOperationReceipt(hash);
+    if (!receipt) {
+        // Handles edge case of hash being retrieved immediately before the 150 block limit falloff.
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    return {
+        ...baseResp,
+        status: receipt.success
+            ? CallStatusCode.CONFIRMED
+            : CallStatusCode.CHAIN_RULES_FAILURE,
+        receipts: [transformReceipt(receipt.receipt)],
     };
 }
+const ReceiptStatus = {
+    reverted: "0x0",
+    success: "0x1",
+};
 function transformReceipt(receipt) {
     return {
         // viem's type for status is "success" | "reverted", but the actual value seems to already be 0x0 or 0x1

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,EACL,kBAAkB,EAKlB,KAAK,GACN,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAUhD,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 {\n  ChainNotFoundError,\n  type Chain,\n  type Hex,\n  type TransactionReceipt,\n  type Transport,\n  isHex,\n} from \"viem\";\nimport type { wallet_getCallsStatus } from \"../../rpc/request\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema\";\nimport { TypeCallId } from \"../../schemas\";\nimport { castToHex } from \"../../utils\";\nimport { Value } from \"@sinclair/typebox/value\";\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":"AAAA,OAAO,EAGN,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,KAAK,GAKN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,mBAAmB,GAGpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAU3C,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;IACD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,MAAM;QACV,OAAO;QACP,MAAM,EAAE,IAAI;KACb,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,SAAS,CAAC;YAClB,OAAO,EAAE,UAAU,MAAM,YAAY;YACrC,IAAI,EAAE,mBAAmB,CAAC,iBAAiB;SAC5C,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QACtC,yDAAyD;QACzD,OAAO;YACL,GAAG,QAAQ;YACX,MAAM,EAAE,cAAc,CAAC,OAAO;SAC/B,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,4FAA4F;QAC5F,MAAM,IAAI,SAAS,CAAC;YAClB,OAAO,EAAE,UAAU,MAAM,YAAY;YACrC,IAAI,EAAE,mBAAmB,CAAC,iBAAiB;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,GAAG,QAAQ;QACX,MAAM,EAAE,OAAO,CAAC,OAAO;YACrB,CAAC,CAAC,cAAc,CAAC,SAAS;YAC1B,CAAC,CAAC,cAAc,CAAC,mBAAmB;QACtC,QAAQ,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAA8C;IAC/D,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,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 { BaseError } from \"ox/RpcResponse\";\nimport {\n  CallStatusCode,\n  CallStatusErrorCode,\n  type wallet_getCallsStatus,\n  type WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { TypeCallId } 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(TypeCallId, 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";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
+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 { createAccount } from "../utils/createAccount";
-import { createDummySigner } from "../utils/createDummySigner";
-// TODO: handle capabilities like permissions and paymaster here
+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";
+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,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAa/D,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\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema\";\nimport { createAccount } from \"../utils/createAccount\";\nimport { createDummySigner } from \"../utils/createDummySigner\";\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 { TypeSignableMessage, 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(TypeSignableMessage, 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,EACL,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,2BAA2B,CAAC;AACnC,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,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,CAAC;aAC/D;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 {\n  TypeSignableMessage,\n  jsonSafeTypedData,\n} 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(TypeSignableMessage, 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";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
-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>;