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

package/src/client/client.e2e-test.ts

@@ -1,8 +1,9 @@
 import { LocalAccountSigner } from "@aa-sdk/core";
 import { alchemy, arbitrumSepolia } from "@account-kit/infra";
 import { describe, expect, it } from "bun:test";
-import { createPublicClient, zeroAddress, type Address } from "viem";
-import { createSmartWalletClient } from "./index.js";
+import { createPublicClient, zeroAddress, type Address, type Hex } from "viem";
+import { createSmartWalletClient, type SmartWalletClient } from "./index.js";
+import { sleep } from "bun";
 
 describe("Client E2E Tests", () => {
   const transport = alchemy(
@@ -14,319 +15,114 @@ describe("Client E2E Tests", () => {
           apiKey: process.env.TEST_ALCHEMY_API_KEY!,
         },
   );
-  describe("Local Mode Tests", () => {
-    const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xbaca22d9b6846ec09a4da378ffa07e2f14ce7d65675d135911b6fd281416bb03",
-    );
-
-    const client = createSmartWalletClient({
-      transport,
-      chain: arbitrumSepolia,
-      mode: "local",
-      signer,
-    });
-
-    const publicClient = createPublicClient({
-      chain: arbitrumSepolia,
-      transport,
-    });
-
-    it("should successfully get a counterfactual address", async () => {
-      const account = await client.requestAccount();
-      expect(account.address).toMatchInlineSnapshot(
-        `"0xa46944b7a39c35d931D514ACAc3ac77c226a81ff"`,
-      );
-    });
-
-    it("should successfully request account with different salt", async () => {
-      const account = await client.requestAccount({
-        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
-        creationHint: { salt: "0x1" },
-      });
-
-      expect(account.address).toMatchInlineSnapshot(
-        `"0xA692f0E5AfAD20F771443D89C635146C6A592f06"`,
-      );
-    });
-
-    it("should not cache account if different inputs provided", async () => {
-      const account = await client.requestAccount();
-      const account2 = await client.requestAccount({
-        id: "52ab44be-b03e-47ed-ad65-43014ea5fbfc",
-        creationHint: { salt: "0x2" },
-      });
-
-      expect(account.address).not.toEqual(account2.address);
-    });
-
-    it("can correctly sign a message", async () => {
-      const account = await client.requestAccount();
-      const message = "hello world";
-      const signature = await client.signMessage({ message });
-      const isValid = await publicClient.verifyMessage({
-        address: account.address,
-        message,
-        signature,
-      });
-      expect(isValid).toBeTrue();
-    });
 
-    it("can correctly sign typed data", async () => {
-      const account = await client.requestAccount();
-      const signature = await client.signTypedData(givenTypedData);
-      const isValid = await publicClient.verifyTypedData({
-        ...givenTypedData,
-        signature,
-        address: account.address,
-      });
-      expect(isValid).toBeTrue();
-    });
-
-    it("can correctly sign a message with a different account", async () => {
-      const account = await client.requestAccount({
-        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
-        creationHint: { salt: "0x1" },
-      });
-      const message = "hello world";
-
-      const signature = await client.signMessage({
-        message,
-        account: account.address,
-      });
-      const isValid = await publicClient.verifyMessage({
-        address: account.address,
-        message,
-        signature,
-      });
-      expect(isValid).toBeTrue();
-    });
-
-    it("can correctly sign typed data with a different account", async () => {
-      const account = await client.requestAccount({
-        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
-        creationHint: { salt: "0x1" },
-      });
-
-      const signature = await client.signTypedData({
-        ...givenTypedData,
-        account: account.address,
-      });
-      const isValid = await publicClient.verifyTypedData({
-        ...givenTypedData,
-        signature,
-        address: account.address,
-      });
-      expect(isValid).toBeTrue();
-    });
-
-    it("should successfully send a UO with paymaster using 7702", async () => {
-      const _signer = LocalAccountSigner.privateKeyToAccountSigner(
-        "0x49daf21e92c997093e9ffdf7e7ddbf8970e9eadc5d4847d0f690db25d5128e1f",
-      );
-
-      const _client = createSmartWalletClient({
-        transport,
-        chain: arbitrumSepolia,
-        mode: "local",
-        signer: _signer,
-      });
-
-      const account = await _client.requestAccount({
-        creationHint: {
-          accountType: "7702",
-        },
-      });
+  const signer = LocalAccountSigner.privateKeyToAccountSigner(
+    "0xd7b061ef04d29cf68b3c89356678eccec9988de8d5ed892c19461c4a9d65925d",
+  );
 
-      const preparedCalls = await _client.prepareCalls({
-        calls: [{ to: zeroAddress, value: "0x0" }],
-        from: account.address,
-        capabilities: {
-          paymasterService: {
-            policyId: process.env.TEST_PAYMASTER_POLICY_ID!,
-          },
-        },
-      });
+  const client = createSmartWalletClient({
+    transport,
+    chain: arbitrumSepolia,
+    signer,
+  });
 
-      const signedCalls = await _client.signPreparedCalls(preparedCalls);
+  const publicClient = createPublicClient({
+    chain: arbitrumSepolia,
+    transport,
+  });
 
-      const result = await _client.sendPreparedCalls(signedCalls);
+  it("should successfully get a counterfactual address", async () => {
+    const account = await client.requestAccount();
+    expect(account.address).toMatchInlineSnapshot(
+      `"0x76E765e80FFAC96ac10Aa8908a8267A3B80d606D"`,
+    );
+  });
 
-      expect(result.preparedCallIds).toBeArrayOfSize(1);
+  it("should successfully request account with different salt", async () => {
+    const account = await client.requestAccount({
+      id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
+      creationHint: { salt: "0x1" },
     });
 
-    it("should successfully send a UO with paymaster", async () => {
-      const account = await client.requestAccount();
-      const preparedCalls = await client.prepareCalls({
-        calls: [{ to: zeroAddress, value: "0x0" }],
-        from: account.address,
-        capabilities: {
-          paymasterService: {
-            policyId: process.env.TEST_PAYMASTER_POLICY_ID!,
-          },
-        },
-      });
-
-      const signedCalls = await client.signPreparedCalls(preparedCalls);
-
-      const result = await client.sendPreparedCalls(signedCalls);
+    expect(account.address).toMatchInlineSnapshot(
+      `"0xdfdd407b9569D40BEFa503208753E59cAc9713fA"`,
+    );
+  });
 
-      expect(result.preparedCallIds).toBeArrayOfSize(1);
+  it("should not cache account if different inputs provided", async () => {
+    const account = await client.requestAccount();
+    const account2 = await client.requestAccount({
+      id: "2a3320b4-6ed2-4833-a488-5188e9bdd9d2",
+      creationHint: { salt: "0x2" },
     });
 
-    it("should successfully create a session with grantPermissions and send a UO", async () => {
-      const account = await client.requestAccount();
-
-      const sessionKey = LocalAccountSigner.generatePrivateKeySigner();
-
-      const permissions = await client.grantPermissions({
-        account: account.address,
-        expirySec: Math.floor(Date.now() / 1000) + 60 * 60,
-        key: {
-          publicKey: await sessionKey.getAddress(),
-          type: "secp256k1",
-        },
-        permissions: [{ type: "root" }],
-      });
-
-      const sessionKeyClient = createSmartWalletClient({
-        transport,
-        chain: arbitrumSepolia,
-        mode: "local",
-        signer: sessionKey,
-      });
-
-      const preparedCalls = await sessionKeyClient.prepareCalls({
-        calls: [{ to: zeroAddress, value: "0x0" }],
-        from: account.address,
-        capabilities: {
-          paymasterService: {
-            policyId: process.env.TEST_PAYMASTER_POLICY_ID!,
-          },
-          permissions,
-        },
-      });
-
-      const signedCalls =
-        await sessionKeyClient.signPreparedCalls(preparedCalls);
-
-      const result = await sessionKeyClient.sendPreparedCalls({
-        ...signedCalls,
-        capabilities: {
-          permissions,
-        },
-      });
-
-      expect(result.preparedCallIds).toBeArrayOfSize(1);
-    });
+    expect(account.address).not.toEqual(account2.address);
   });
 
-  describe("Remote Mode Tests", () => {
-    const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xd7b061ef04d29cf68b3c89356678eccec9988de8d5ed892c19461c4a9d65925d",
-    );
-
-    const client = createSmartWalletClient({
-      transport,
-      chain: arbitrumSepolia,
-      mode: "remote",
-      signer,
-    });
-
-    const publicClient = createPublicClient({
-      chain: arbitrumSepolia,
-      transport,
+  it("can correctly sign a message", async () => {
+    const account = await client.requestAccount();
+    const message = "hello world";
+    const signature = await client.signMessage({ message });
+    const isValid = await publicClient.verifyMessage({
+      address: account.address,
+      message: "hello world",
+      signature,
     });
+    expect(isValid).toBeTrue();
+  });
 
-    it("should successfully get a counterfactual address", async () => {
-      const account = await client.requestAccount();
-      expect(account.address).toMatchInlineSnapshot(
-        `"0x76E765e80FFAC96ac10Aa8908a8267A3B80d606D"`,
-      );
+  it("can correctly sign typed data", async () => {
+    const account = await client.requestAccount();
+    const signature = await client.signTypedData(givenTypedData);
+    const isValid = await publicClient.verifyTypedData({
+      ...givenTypedData,
+      signature,
+      address: account.address,
     });
+    expect(isValid).toBeTrue();
+  });
 
-    it("should successfully request account with different salt", async () => {
-      const account = await client.requestAccount({
-        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
-        creationHint: { salt: "0x1" },
-      });
-
-      expect(account.address).toMatchInlineSnapshot(
-        `"0xdfdd407b9569D40BEFa503208753E59cAc9713fA"`,
-      );
+  it("can correctly sign a message with a different account", async () => {
+    const account = await client.requestAccount({
+      id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
+      creationHint: { salt: "0x1" },
     });
 
-    it("should not cache account if different inputs provided", async () => {
-      const account = await client.requestAccount();
-      const account2 = await client.requestAccount({
-        id: "2a3320b4-6ed2-4833-a488-5188e9bdd9d2",
-        creationHint: { salt: "0x2" },
-      });
-
-      expect(account.address).not.toEqual(account2.address);
+    const message = "hello world";
+    const signature = await client.signMessage({
+      message,
+      account: account.address,
     });
-
-    it("can correctly sign a message", async () => {
-      const account = await client.requestAccount();
-      const message = "hello world";
-      const signature = await client.signMessage({ message });
-      const isValid = await publicClient.verifyMessage({
-        address: account.address,
-        message: "hello world",
-        signature,
-      });
-      expect(isValid).toBeTrue();
+    const isValid = await publicClient.verifyMessage({
+      address: account.address,
+      message: "hello world",
+      signature,
     });
+    expect(isValid).toBeTrue();
+  });
 
-    it("can correctly sign typed data", async () => {
-      const account = await client.requestAccount();
-      const signature = await client.signTypedData(givenTypedData);
-      const isValid = await publicClient.verifyTypedData({
-        ...givenTypedData,
-        signature,
-        address: account.address,
-      });
-      expect(isValid).toBeTrue();
+  it("can correctly sign typed data with a different account", async () => {
+    const account = await client.requestAccount({
+      id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
+      creationHint: { salt: "0x1" },
     });
 
-    it("can correctly sign a message with a different account", async () => {
-      const account = await client.requestAccount({
-        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
-        creationHint: { salt: "0x1" },
-      });
-
-      const message = "hello world";
-      const signature = await client.signMessage({
-        message,
-        account: account.address,
-      });
-      const isValid = await publicClient.verifyMessage({
-        address: account.address,
-        message: "hello world",
-        signature,
-      });
-      expect(isValid).toBeTrue();
+    const signature = await client.signTypedData({
+      ...givenTypedData,
+      account: account.address,
     });
 
-    it("can correctly sign typed data with a different account", async () => {
-      const account = await client.requestAccount({
-        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
-        creationHint: { salt: "0x1" },
-      });
-
-      const signature = await client.signTypedData({
-        ...givenTypedData,
-        account: account.address,
-      });
-
-      const isValid = await publicClient.verifyTypedData({
-        ...givenTypedData,
-        signature,
-        address: account.address,
-      });
-      expect(isValid).toBeTrue();
+    const isValid = await publicClient.verifyTypedData({
+      ...givenTypedData,
+      signature,
+      address: account.address,
     });
+    expect(isValid).toBeTrue();
+  });
 
-    it("should successfully send a UO with paymaster", async () => {
+  it(
+    "should successfully send a UO with paymaster",
+    async () => {
       const account = await client.requestAccount();
       const preparedCalls = await client.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
@@ -343,9 +139,17 @@ describe("Client E2E Tests", () => {
       const result = await client.sendPreparedCalls(signedCalls);
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
-    });
 
-    it("should successfully drop and replace a UO with repeat calls", async () => {
+      await waitForUserOpSuccess(client, result.preparedCallIds[0]);
+    },
+    {
+      timeout: 45_000,
+    },
+  );
+
+  it(
+    "should successfully drop and replace a UO with repeat calls",
+    async () => {
       const account = await client.requestAccount();
       const preparedCalls = await client.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
@@ -362,6 +166,8 @@ describe("Client E2E Tests", () => {
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
 
+      await waitForUserOpSuccess(client, result.preparedCallIds[0]);
+
       const prepareCalls2 = await client.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
         from: account.address,
@@ -375,9 +181,17 @@ describe("Client E2E Tests", () => {
       const result2 = await client.sendPreparedCalls(signedCalls2);
 
       expect(result2.preparedCallIds).toBeArrayOfSize(1);
-    });
 
-    it("should successfully send a UO with paymaster using 7702", async () => {
+      await waitForUserOpSuccess(client, result2.preparedCallIds[0]);
+    },
+    {
+      timeout: 90_000,
+    },
+  );
+
+  it(
+    "should successfully send a UO with paymaster using 7702",
+    async () => {
       const _signer = LocalAccountSigner.privateKeyToAccountSigner(
         "0x00d35c6d307b5cddeb70aeed96ee27a551fee58bf1a43858477e6c11f9172ba8",
       );
@@ -385,7 +199,6 @@ describe("Client E2E Tests", () => {
       const _client = createSmartWalletClient({
         transport,
         chain: arbitrumSepolia,
-        mode: "remote",
         signer: _signer,
       });
 
@@ -411,9 +224,15 @@ describe("Client E2E Tests", () => {
       const result = await _client.sendPreparedCalls(signedCalls);
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
-    });
 
-    it("should successfully create a session with grantPermissions and send a UO", async () => {
+      await waitForUserOpSuccess(client, result.preparedCallIds[0]);
+    },
+    { timeout: 45_000 },
+  );
+
+  it(
+    "should successfully create a session with grantPermissions and send a UO",
+    async () => {
       const account = await client.requestAccount();
 
       const sessionKey = LocalAccountSigner.generatePrivateKeySigner();
@@ -431,7 +250,6 @@ describe("Client E2E Tests", () => {
       const sessionKeyClient = createSmartWalletClient({
         transport,
         chain: arbitrumSepolia,
-        mode: "remote",
         signer: sessionKey,
       });
 
@@ -457,8 +275,13 @@ describe("Client E2E Tests", () => {
       });
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
-    });
-  });
+
+      await waitForUserOpSuccess(client, result.preparedCallIds[0]);
+    },
+    {
+      timeout: 45_000,
+    },
+  );
 
   const givenTypedData = {
     types: {
@@ -493,3 +316,25 @@ describe("Client E2E Tests", () => {
     },
   } as const;
 });
+
+const waitForUserOpSuccess = async (
+  client: SmartWalletClient,
+  preparedCallId: Hex,
+) => {
+  const maxTimeoutMs = 1000 * 30;
+  const deadline = Date.now() + maxTimeoutMs;
+  while (Date.now() < deadline) {
+    const status = (await client.getCallsStatus(preparedCallId)).status;
+    if (status === 200) {
+      // Success.
+      return;
+    }
+    if (status !== 100) {
+      // Error.
+      throw new Error(`Get call status failed with status ${status}.`);
+    }
+    // Pending.
+    await sleep(5000);
+  }
+  throw new Error("Timed out waiting for successful call status.");
+};

package/src/client/index.ts

@@ -1,13 +1,20 @@
 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,
@@ -15,7 +22,6 @@ export type SmartWalletClientParams<
   transport: AlchemyTransport;
   chain: Chain;
   signer: SmartAccountSigner;
-  mode: "local" | "remote";
   policyId?: string;
   account?: TAccount | Address | undefined;
 }>;
@@ -31,7 +37,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 +54,6 @@ export type SmartWalletClient<
  * const client = createSmartWalletClient({
  *   transport,
  *   chain: arbitrumSepolia,
- *   mode: "remote",
  *   signer,
  * });
  */
@@ -60,22 +64,19 @@ export function createSmartWalletClient<
 export function createSmartWalletClient(
   params: SmartWalletClientParams,
 ): SmartWalletClient {
-  const { transport, chain, policyId, mode, account, signer } = params;
+  const { transport, chain, policyId, account, signer } = params;
 
-  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(() => ({
+    policyId,
+    internal: internalStateDecorator(),
+  }));
 
   // TODO: we need to do a few things here:
   // 1. decorate the client with the wallet api actions
@@ -90,7 +91,6 @@ export function createSmartWalletClient(
 //   transport: alchemy({ apiKey: "123" }),
 //   chain: baseSepolia,
 //   signer: createDummySigner(zeroAddress),
-//   mode: "local",
 // });
 
 // const account1 = await clientWithoutAccount.requestAccount();
@@ -99,7 +99,6 @@ export function createSmartWalletClient(
 //   transport: alchemy({ apiKey: "123" }),
 //   chain: baseSepolia,
 //   signer: createDummySigner(zeroAddress),
-//   mode: "local",
 //   account: zeroAddress,
 // });