refactor: use alchemy transport in createConfig

.eslintignore

@@ -1,6 +1,9 @@
 **/dist/*
-examples/**/*
 site/.vitepress/cache/**/*
 .nx/*
 .github/*
-/.nx/cache
+/.nx/cache
+
+/examples/*
+!/examples/ui-demo
+/examples/ui-demo/.next/*

account-kit/core/setupTests.ts

@@ -0,0 +1,3 @@
+beforeEach(() => {
+  localStorage.clear();
+});

account-kit/core/src/actions/getAlchemyTransport.ts

@@ -1,8 +1,14 @@
-import type { AlchemyTransport } from "@account-kit/infra";
+import { alchemy, type AlchemyTransport } from "@account-kit/infra";
+import { ChainNotFoundError } from "../errors.js";
 import type { AlchemyAccountsConfig } from "../types";
 
 export function getAlchemyTransport(
   config: AlchemyAccountsConfig
 ): AlchemyTransport {
-  return config.store.getState().transport;
+  const { chain, connections } = config.store.getState();
+  if (!connections.has(chain.id)) {
+    throw new ChainNotFoundError(chain);
+  }
+
+  return alchemy(connections.get(chain.id)!.transport);
 }

account-kit/core/src/actions/getBundlerClient.ts

@@ -1,4 +1,4 @@
-import type { ClientWithAlchemyMethods } from "@account-kit/infra";
+import { type ClientWithAlchemyMethods } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 /**
@@ -18,5 +18,7 @@ import type { AlchemyAccountsConfig } from "../types";
 export const getBundlerClient = (
   config: AlchemyAccountsConfig
 ): ClientWithAlchemyMethods => {
-  return config.store.getState().bundlerClient;
+  const { bundlerClient } = config.store.getState();
+
+  return bundlerClient;
 };

account-kit/core/src/actions/setChain.ts

@@ -27,14 +27,13 @@ export async function setChain(config: AlchemyAccountsConfig, chain: Chain) {
   }
 
   await switchChain(config._internal.wagmiConfig, { chainId: chain.id });
-  const transport = alchemy(connection);
+  const transport = connection.transport;
 
   config.store.setState(() => ({
     chain,
-    transport,
     bundlerClient: createAlchemyPublicRpcClient({
-      transport,
       chain,
+      transport: alchemy(transport),
     }),
   }));
 }

account-kit/core/src/actions/watchBundlerClient.test.ts

@@ -0,0 +1,62 @@
+import { alchemy, arbitrumSepolia, sepolia } from "@account-kit/infra";
+import { AlchemySignerStatus } from "@account-kit/signer";
+import { createConfig } from "../createConfig.js";
+import {
+  convertSignerStatusToState,
+  createDefaultAccountState,
+} from "../store/store.js";
+import { setChain } from "./setChain.js";
+import { watchBundlerClient } from "./watchBundlerClient.js";
+
+describe("watchBundlerClient", () => {
+  it("should not fire the callback if transport or chain didn't change", () => {
+    const config = givenConfig();
+    const onChange = vi.fn();
+
+    watchBundlerClient(config)(onChange);
+
+    config.store.setState({
+      signerStatus: convertSignerStatusToState(
+        AlchemySignerStatus.AWAITING_EMAIL_AUTH
+      ),
+    });
+
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
+  it("should fire the callback if chain changed", async () => {
+    const config = givenConfig();
+    const onChange = vi.fn();
+
+    watchBundlerClient(config)(onChange);
+
+    await setChain(config, arbitrumSepolia);
+
+    expect(onChange).toHaveBeenCalled();
+  });
+
+  it("should not fire if the chain id is the same", async () => {
+    const config = givenConfig();
+    const onChange = vi.fn();
+
+    watchBundlerClient(config)(onChange);
+
+    await setChain(config, sepolia);
+
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
+  const givenConfig = () => {
+    const config = createConfig({
+      chain: sepolia,
+      chains: [{ chain: sepolia }, { chain: arbitrumSepolia }],
+      transport: alchemy({ apiKey: "AN_API_KEY" }),
+    });
+
+    config.store.setState({
+      accounts: createDefaultAccountState([sepolia, arbitrumSepolia]),
+    });
+
+    return config;
+  };
+});

account-kit/core/src/actions/watchBundlerClient.ts

@@ -1,4 +1,4 @@
-import type { ClientWithAlchemyMethods } from "@account-kit/infra";
+import { type ClientWithAlchemyMethods } from "@account-kit/infra";
 import type { AlchemyAccountsConfig } from "../types";
 
 /**
@@ -21,6 +21,11 @@ export const watchBundlerClient =
   (onChange: (bundlerClient: ClientWithAlchemyMethods) => void) => {
     return config.store.subscribe(
       ({ bundlerClient }) => bundlerClient,
-      onChange
+      onChange,
+      {
+        equalityFn(a, b) {
+          return a.chain.id === b.chain.id;
+        },
+      }
     );
   };

account-kit/core/src/actions/watchSmartAccountClient.test.ts

@@ -1,4 +1,4 @@
-import { arbitrumSepolia, sepolia } from "@account-kit/infra";
+import { alchemy, arbitrumSepolia, sepolia } from "@account-kit/infra";
 import { AlchemySignerStatus } from "@account-kit/signer";
 import { createConfig } from "../createConfig.js";
 import {
@@ -10,8 +10,6 @@ import { setChain } from "./setChain.js";
 import { watchSmartAccountClient } from "./watchSmartAccountClient.js";
 
 describe("watchSmartAccountClient", () => {
-  beforeEach(() => localStorage.clear());
-
   it("should fire the on subscribe callback if signer status changes", () => {
     const config = givenConfig();
     const onChange = vi.fn();
@@ -101,7 +99,7 @@ describe("watchSmartAccountClient", () => {
     const config = createConfig({
       chain: sepolia,
       chains: [{ chain: sepolia }, { chain: arbitrumSepolia }],
-      apiKey: "AN_API_KEY",
+      transport: alchemy({ apiKey: "AN_API_KEY" }),
     });
 
     config.store.setState({

account-kit/core/src/actions/watchSmartAccountClient.ts

@@ -48,10 +48,10 @@ import {
     }
 
     return config.store.subscribe(
-      ({ signerStatus, accounts, bundlerClient, chain }) => ({
+      ({ signerStatus, accounts, chain }) => ({
         signerStatus,
         account: accounts![chain.id][params.type],
-        bundlerClient,
+        chain,
       }),
       () => {
         onChange(getSmartAccountClient(params, config));
@@ -61,7 +61,7 @@ import {
           return (
             a.signerStatus === b.signerStatus &&
             a.account === b.account &&
-            a.bundlerClient === b.bundlerClient
+            a.chain === b.chain
           );
         },
       }

account-kit/core/src/createConfig.ts

@@ -1,6 +1,6 @@
-import { ConnectionConfigSchema } from "@aa-sdk/core";
 import { DEFAULT_SESSION_MS } from "@account-kit/signer";
 import { createStorage, createConfig as createWagmiConfig } from "@wagmi/core";
+import { getBundlerClient } from "./actions/getBundlerClient.js";
 import { createAccountKitStore } from "./store/store.js";
 import { DEFAULT_STORAGE_KEY } from "./store/types.js";
 import type {
@@ -25,7 +25,7 @@ export const DEFAULT_IFRAME_CONTAINER_ID = "alchemy-signer-iframe-container";
  *
  * const config = createConfig({
  *  chain: sepolia,
- *  apiKey: "your-api-key",
+ *  transport: alchemy({ apiKey: "your-api-key" }),
  * });
  * ```
  *
@@ -51,35 +51,31 @@ export const createConfig = (
   } = params;
 
   const connections: Connection[] = [];
-  if (connectionConfig.connections != null) {
-    connectionConfig.connections.forEach(({ chain, ...config }) => {
-      connections.push({
-        ...ConnectionConfigSchema.parse(config),
-        policyId: config.policyId,
-        chain,
-      });
+  if (connectionConfig.chains == null) {
+    connections.push({
+      transport: connectionConfig.transport.config,
+      policyId: connectionConfig.policyId,
+      chain,
     });
-  } else if (connectionConfig.chains != null) {
-    connectionConfig.chains.forEach(({ chain, ...config }) => {
+  } else {
+    connectionConfig.chains.forEach(({ chain, policyId, transport }) => {
       connections.push({
-        apiKey: connectionConfig.apiKey,
-        policyId: config.policyId,
+        transport: transport?.config ?? connectionConfig.transport!.config,
         chain,
+        policyId,
       });
     });
-  } else {
-    connections.push({
-      ...ConnectionConfigSchema.parse(connectionConfig),
-      policyId: connectionConfig.policyId,
-      chain,
-    });
   }
 
+  const defaultConnection = connections[0].transport;
   const store = createAccountKitStore({
     connections,
     chain,
     client: {
-      connection: signerConnection ?? connections[0],
+      connection:
+        signerConnection ??
+        defaultConnection.alchemyConnection ??
+        defaultConnection,
       iframeConfig,
       rootOrgId,
       rpId,
@@ -98,7 +94,7 @@ export const createConfig = (
   const wagmiConfig = createWagmiConfig({
     connectors,
     chains: [chain, ...connections.map((c) => c.chain)],
-    client: () => config.store.getState().bundlerClient,
+    client: () => getBundlerClient(config),
     storage: createStorage({
       key: `${DEFAULT_STORAGE_KEY}:wagmi`,
       storage: storage