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

package/src/client/index.ts

@@ -1,24 +1,34 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
-import type { Address, Chain, Prettify } from "viem";
-import { createLocalClient } from "../local/client.js";
-import { createRemoteClient } from "../remote/client.js";
+import {
+  type Address,
+  type Chain,
+  type Prettify,
+  createClient,
+  custom,
+} from "viem";
 import type { InnerWalletApiClient } from "../types.ts";
 import {
   smartWalletClientActions,
   type SmartWalletActions,
 } from "./decorator.js";
+import { Provider } from "ox";
+import { WalletServerRpcSchema } from "@alchemy/wallet-api-types/rpc";
+import { internalStateDecorator } from "../internal/decorator.js";
 
 export type SmartWalletClientParams<
   TAccount extends Address | undefined = Address | undefined,
-> = Prettify<{
-  transport: AlchemyTransport;
-  chain: Chain;
-  signer: SmartAccountSigner;
-  mode: "local" | "remote";
-  policyId?: string;
-  account?: TAccount | Address | undefined;
-}>;
+> = Prettify<
+  {
+    transport: AlchemyTransport;
+    chain: Chain;
+    signer: SmartAccountSigner;
+    account?: TAccount | Address | undefined;
+  } & (
+    | { policyId?: string; policyIds?: never }
+    | { policyIds?: string[]; policyId?: never }
+  )
+>;
 
 export type SmartWalletClient<
   TAccount extends Address | undefined = Address | undefined,
@@ -31,7 +41,6 @@ export type SmartWalletClient<
  * @param {AlchemyTransport} params.transport - The Alchemy transport to use
  * @param {Chain} params.chain - The chain to use
  * @param {SmartAccountSigner} params.signer - The signer to use for the smart account
- * @param {"local" | "remote"} params.mode - The client's mode (local or remote).
  * @param {string} [params.policyId] - The policy ID for gas sponsorship (optional)
  * @param {Address} [params.account] - The smart account address to use (optional)
  * @returns {SmartWalletClient} - A viem-compatible client
@@ -49,7 +58,6 @@ export type SmartWalletClient<
  * const client = createSmartWalletClient({
  *   transport,
  *   chain: arbitrumSepolia,
- *   mode: "remote",
  *   signer,
  * });
  */
@@ -60,22 +68,25 @@ export function createSmartWalletClient<
 export function createSmartWalletClient(
   params: SmartWalletClientParams,
 ): SmartWalletClient {
-  const { transport, chain, policyId, mode, account, signer } = params;
+  const { transport, chain, account, signer } = params;
+
+  const policyIds = params.policyId
+    ? [params.policyId]
+    : params.policyIds
+      ? params.policyIds
+      : undefined;
 
-  const innerClient =
-    mode === "local"
-      ? createLocalClient({
-          transport,
-          chain,
-          policyId,
-          account,
-        })
-      : createRemoteClient({
-          transport,
-          chain,
-          policyId,
-          account,
-        });
+  const innerClient = createClient({
+    transport: (opts) =>
+      custom(Provider.from(transport(opts), { schema: WalletServerRpcSchema }))(
+        opts,
+      ),
+    chain,
+    account,
+  }).extend(() => ({
+    policyIds,
+    internal: internalStateDecorator(),
+  }));
 
   // TODO: we need to do a few things here:
   // 1. decorate the client with the wallet api actions
@@ -90,7 +101,6 @@ export function createSmartWalletClient(
 //   transport: alchemy({ apiKey: "123" }),
 //   chain: baseSepolia,
 //   signer: createDummySigner(zeroAddress),
-//   mode: "local",
 // });
 
 // const account1 = await clientWithoutAccount.requestAccount();
@@ -99,7 +109,6 @@ export function createSmartWalletClient(
 //   transport: alchemy({ apiKey: "123" }),
 //   chain: baseSepolia,
 //   signer: createDummySigner(zeroAddress),
-//   mode: "local",
 //   account: zeroAddress,
 // });
 

package/src/{isomorphic/utils/createAccount.ts → internal/account.ts}

@@ -1,20 +1,16 @@
 import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
 import {
-  createLightAccount,
   createModularAccountV2,
+  createLightAccount,
   createMultiOwnerLightAccount,
   createMultiOwnerModularAccount,
-  type ModularAccountV2,
 } from "@account-kit/smart-contracts";
+import { concatHex, type Chain, type Transport, type Address } from "viem";
 import type { StaticDecode } from "@sinclair/typebox";
-import type { Address, Chain, Transport } from "viem";
-import { concatHex, hexToNumber } from "viem";
-import { parsePermissionsContext } from "./parsePermissionsContext.js";
-import { assertNever } from "../../utils.js";
-import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
 import { SerializedInitcode } from "@alchemy/wallet-api-types";
-import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
 import { InternalError, InvalidRequestError } from "ox/RpcResponse";
+import { assertNever } from "../utils.js";
+import { getAccountTypeForDelegationAddress7702 } from "@alchemy/wallet-api-types/capabilities";
 
 type CreateAccountParams = {
   chain: Chain;
@@ -22,8 +18,7 @@ type CreateAccountParams = {
   signer: SmartAccountSigner;
   accountAddress: Address;
   counterfactualInfo?: StaticDecode<typeof SerializedInitcode>; // undefined for 7702 accounts
-  permissions?: StaticDecode<typeof PermissionsCapability>;
-  delegation?: Address;
+  delegation?: Address; // for 7702 accounts
 };
 
 /**
@@ -36,46 +31,19 @@ export async function createAccount(
 ): Promise<SmartContractAccount> {
   const { counterfactualInfo: ci, ...accountParams } = params;
 
-  // This throws if we pass a permission context and the account is not MA-v2
-  // TODO: test that this edge case is handled correctly
-  const parsedContext = parsePermissionsContext(
-    params.permissions,
-    ci,
-    params.delegation,
-  );
-
-  const signerEntity =
-    parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
-      ? {
-          entityId: hexToNumber(parsedContext.entityId),
-          isGlobalValidation: parsedContext.isGlobalValidation,
-        }
-      : undefined;
-
-  const mode = params.delegation ? "7702" : "default";
-
-  if (mode === "7702") {
+  if (params.delegation) {
     const accountType = getAccountTypeForDelegationAddress7702(
-      params.delegation!,
+      params.delegation,
     );
     if (accountType !== "ModularAccountV2") {
       throw new Error("7702 mode currently only supports ModularAccountV2");
     }
     return createModularAccountV2({
       ...accountParams,
-      signerEntity,
-      deferredAction: parsedContext?.deferredAction,
-      mode,
+      mode: "7702",
     });
   }
 
-  if (mode !== "default") {
-    return assertNever(mode, "Unexpected mode in createAccount");
-  }
-
-  // At this point, we are guaranteed to be in default mode, where ci
-  // (counterfactualInfo) must be defined
-
   if (!ci) {
     throw new InternalError({
       message: "Counterfactual info not found",
@@ -93,9 +61,7 @@ export async function createAccount(
     case "MAv2.0.0-sma-b":
       return createModularAccountV2({
         ...commonParams,
-        signerEntity,
-        deferredAction: parsedContext?.deferredAction,
-        mode,
+        mode: "default",
       });
     case "LightAccountV2.0.0":
       return createLightAccount({
@@ -138,9 +104,3 @@ export async function createAccount(
       return assertNever(factoryType, "Unsupported factory type");
   }
 }
-
-export function isModularAccountV2(
-  account: SmartContractAccount,
-): account is ModularAccountV2 {
-  return account.source === "ModularAccountV2";
-}

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
+import type { SmartContractAccount } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
 import type {
   Address,
@@ -8,10 +8,6 @@ import type {
   JsonRpcAccount,
   Transport,
 } from "viem";
-import type {
-  GrantPermissionsParams,
-  GrantPermissionsResult,
-} from "./client/actions/grantPermissions.ts";
 import type { RequestAccountParams } from "./client/actions/requestAccount.ts";
 import type { WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
 
@@ -20,7 +16,7 @@ export type CreateInnerClientParams<
 > = {
   chain: Chain;
   transport: AlchemyTransport;
-  policyId?: string;
+  policyIds?: string[];
   account?: TAccount | Address | undefined;
 };
 
@@ -33,16 +29,9 @@ export type InnerWalletApiClientBase<
   Chain,
   JsonRpcAccount<Address> | undefined,
   WalletServerViemRpcSchema,
-  { policyId?: string } & TExtend
+  { policyIds?: string[] } & TExtend
 >;
 
-export type InnerClientActions = {
-  grantPermissions: (
-    signer: SmartAccountSigner,
-    params: GrantPermissionsParams & { chainId: Hex },
-  ) => Promise<GrantPermissionsResult>;
-};
-
 export type CachedAccount = {
   account: SmartContractAccount;
   requestParams: RequestAccountParams;
@@ -53,9 +42,9 @@ export type InternalState = {
   getAccount: () => CachedAccount | undefined;
 };
 
-export type InnerWalletApiClient = InnerWalletApiClientBase<
-  InnerClientActions & { internal: InternalState }
->;
+export type InnerWalletApiClient = InnerWalletApiClientBase<{
+  internal: InternalState;
+}>;
 
 export type WithoutChainId<T> = T extends { chainId: Hex }
   ? Omit<T, "chainId">

package/dist/esm/exports/internal.d.ts

@@ -1,4 +0,0 @@
-export type * from "../isomorphic/client.js";
-export { createIsomorphicClient } from "../isomorphic/client.js";
-export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
-export type * from "../types.ts";

package/dist/esm/exports/internal.js

@@ -1,3 +0,0 @@
-export { createIsomorphicClient } from "../isomorphic/client.js";
-export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
-//# sourceMappingURL=internal.js.map

package/dist/esm/exports/internal.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/exports/internal.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC","sourcesContent":["// exports from this file are meant to be imported by our packages in the monorepo\n// we will expose this in the package.json as a named export like `this-pkg/internal`\n// TODO: name `this-pkg`\nexport type * from \"../isomorphic/client.js\";\nexport { createIsomorphicClient } from \"../isomorphic/client.js\";\nexport { createDummySigner } from \"../isomorphic/utils/createDummySigner.js\";\n\nexport type * from \"../types.ts\";\n"]}

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

@@ -1,13 +0,0 @@
-import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
-import type { Static } from "@sinclair/typebox";
-import { type Chain, type Hex, type Transport } from "viem";
-import type { wallet_createSession, WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
-export type CreateSessionParams = Omit<Static<(typeof wallet_createSession)["properties"]["Request"]["properties"]["params"]>[0], "chainId"> & {
-    entityId?: Hex;
-};
-export type CreateSessionResult = Omit<Static<(typeof wallet_createSession)["properties"]["ReturnType"]>, "sessionId"> & {
-    sessionId: Hex | null;
-    entityId: Hex;
-    fullPreSignatureDeferredActionDigest: Hex;
-};
-export declare function createSession(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: CreateSessionParams): Promise<CreateSessionResult>;

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

@@ -1,94 +0,0 @@
-import { createSmartAccountClient, } from "@aa-sdk/core";
-import { deferralActions, PermissionBuilder, } from "@account-kit/smart-contracts/experimental";
-import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, custom, hashTypedData, hexToNumber, toHex, } from "viem";
-import { InvalidRequestError } from "ox/RpcResponse";
-import { Permission, isGlobalValidation, } from "@alchemy/wallet-api-types/capabilities";
-import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
-import { createDummySigner } from "../utils/createDummySigner.js";
-import { supportsFeature } from "../utils/supportsFeature.js";
-import { isDelegated } from "../utils/7702.js";
-export async function createSession(client, params) {
-    if (!client.chain) {
-        throw new ChainNotFoundError();
-    }
-    const { counterfactualInfo, delegation } = await client.request({
-        method: "wallet_requestAccount",
-        params: [
-            {
-                accountAddress: params.account,
-                includeCounterfactualInfo: true,
-            },
-        ],
-    });
-    if (delegation &&
-        !(await isDelegated(client, {
-            address: params.account,
-            delegation,
-        }))) {
-        throw new InvalidRequestError({
-            message: "7702 account must be delegated before calling `wallet_createSession`",
-        });
-    }
-    if (!delegation && !counterfactualInfo) {
-        throw new InvalidRequestError({
-            message: "No counterfactual info found.",
-        });
-    }
-    if (counterfactualInfo &&
-        !supportsFeature(counterfactualInfo, "permissions")) {
-        throw new InvalidRequestError({
-            message: "Account type does not support createSession",
-        });
-    }
-    // At this point we know the account supports the permission feature
-    const account = await createAccount({
-        chain: client.chain,
-        transport: custom(client.transport),
-        signer: createDummySigner(params.account),
-        accountAddress: params.account,
-        counterfactualInfo,
-        delegation,
-    });
-    if (!isModularAccountV2(account)) {
-        throw new InvalidRequestError({
-            message: "Sessions are currently only supported by MAv2 accounts.",
-        });
-    }
-    const _client = createSmartAccountClient({
-        chain: client.chain,
-        transport: custom(client.transport),
-        account,
-    }).extend(deferralActions);
-    const { entityId, nonce } = await _client.getEntityIdAndNonce({
-        entityId: params.entityId ? hexToNumber(params.entityId) : undefined,
-        isGlobalValidation: isGlobalValidation(params),
-    });
-    const { typedData, fullPreSignatureDeferredActionDigest } = await new PermissionBuilder({
-        client: _client,
-        key: {
-            ...params.key,
-            // Alias 'ecdsa' to 'secp256k1'
-            type: params.key.type === "ecdsa" ? "secp256k1" : params.key.type,
-        },
-        entityId,
-        nonce,
-        deadline: params.expirySec,
-    })
-        .addPermissions({
-        permissions: params.permissions.map((permission) => Value.Encode(Permission, permission)),
-    })
-        .compileDeferred();
-    return {
-        sessionId: null, // In remote mode, the server will set this later.
-        chainId: toHex(client.chain.id),
-        entityId: toHex(entityId),
-        signatureRequest: {
-            type: "eth_signTypedData_v4",
-            data: typedData,
-            rawPayload: hashTypedData(typedData),
-        },
-        fullPreSignatureDeferredActionDigest,
-    };
-}
-//# sourceMappingURL=createSession.js.map

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

@@ -1 +0,0 @@
-{"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  Permission,\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(Permission, 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

@@ -1,8 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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,7 +0,0 @@
-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, 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"]>;
-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,71 +0,0 @@
-import {} from "@aa-sdk/core";
-import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, isHex, } from "viem";
-import { BaseError } from "ox/RpcResponse";
-import { CallStatusCode, CallStatusErrorCode, } from "@alchemy/wallet-api-types/rpc";
-import { CallId } 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(CallId, callId);
-    const baseResp = {
-        id: callId,
-        chainId,
-        atomic: true,
-    };
-    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
-        status: isHex(receipt.status)
-            ? receipt.status
-            : ReceiptStatus[receipt.status],
-        blockHash: receipt.blockHash,
-        // viem's type for blockNumber is bigint, but the actual value seems to already be a hex string
-        blockNumber: castToHex(receipt.blockNumber),
-        // viem's type for gasUsed is bigint, but the actual value seems to already be a hex string
-        gasUsed: castToHex(receipt.gasUsed),
-        transactionHash: receipt.transactionHash,
-        logs: receipt.logs.map((log) => ({
-            address: log.address,
-            data: log.data,
-            topics: log.topics,
-        })),
-    };
-}
-//# sourceMappingURL=getCallsStatus.js.map

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

@@ -1 +0,0 @@
-{"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,7 +0,0 @@
-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, 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>;