@account-kit/privy-integration 4.73.1-alpha.0 → 4.74.0

package/README.md

@@ -6,7 +6,7 @@ Add gas sponsorship and smart wallet features to your Privy app in under 5 minut
 
 If you're already using [Privy](https://privy.io) for authentication, this package lets you upgrade your users' wallets with:
 
-- **🔄 EIP-7702 Delegation** - Upgrade EOAs to smart accounts without migration
+- **🔄 EIP-7702 Delegation** - Upgrade your wallets to smart accounts without migration
 - **⛽ Gas Sponsorship** - Pay gas fees for your users via Alchemy Gas Manager (EVM & Solana)
 - **💱 Token Swaps** - Execute swaps through Alchemy's swap infrastructure
 - **🚀 Batched Transactions** - Send multiple operations in a single transaction using `sendTransaction([...])`
@@ -253,15 +253,16 @@ function SolanaSendButton() {
 
 ### AlchemyProvider Props
 
-| Prop                 | Type                 | Required      | Description                                                                                              |
-| -------------------- | -------------------- | ------------- | -------------------------------------------------------------------------------------------------------- |
-| `apiKey`             | `string`             | Conditional\* | Your Alchemy API key for @account-kit/infra transport                                                    |
-| `jwt`                | `string`             | Conditional\* | JWT token for authentication (alternative to `apiKey`)                                                   |
-| `rpcUrl`             | `string`             | Conditional\* | Custom RPC URL for EVM chains (can be used alone or with `jwt`)                                          |
-| `solanaRpcUrl`       | `string`             | No            | Custom RPC URL for Solana (separate from EVM `rpcUrl`)                                                   |
-| `policyId`           | `string \| string[]` | No            | Gas Manager policy ID(s) for EVM sponsorship. If array is provided, backend uses first applicable policy |
-| `solanaPolicyId`     | `string \| string[]` | No            | Gas Manager policy ID(s) for Solana sponsorship                                                          |
-| `disableSponsorship` | `boolean`            | No            | Set to `true` to disable gas sponsorship by default (default: `false`)                                   |
+| Prop                 | Type                   | Required      | Description                                                                                              |
+| -------------------- | ---------------------- | ------------- | -------------------------------------------------------------------------------------------------------- |
+| `apiKey`             | `string`               | Conditional\* | Your Alchemy API key for @account-kit/infra transport                                                    |
+| `jwt`                | `string`               | Conditional\* | JWT token for authentication (alternative to `apiKey`)                                                   |
+| `rpcUrl`             | `string`               | Conditional\* | Custom RPC URL for EVM chains (can be used alone or with `jwt`)                                          |
+| `solanaRpcUrl`       | `string`               | No            | Custom RPC URL for Solana (separate from EVM `rpcUrl`)                                                   |
+| `policyId`           | `string \| string[]`   | No            | Gas Manager policy ID(s) for EVM sponsorship. If array is provided, backend uses first applicable policy |
+| `solanaPolicyId`     | `string \| string[]`   | No            | Gas Manager policy ID(s) for Solana sponsorship                                                          |
+| `disableSponsorship` | `boolean`              | No            | Set to `true` to disable gas sponsorship by default (default: `false`)                                   |
+| `accountAuthMode`    | `'eip7702' \| 'owner'` | No            | Authorization mode for EVM smart accounts (default: `'eip7702'`)                                         |
 
 \* **Required configuration (pick one):**
 
@@ -352,21 +353,23 @@ Send Solana transactions with optional gas sponsorship via Alchemy.
 
 #### `useAlchemyClient()`
 
-Get the underlying smart wallet client (advanced use cases).
+Get the underlying smart wallet client and account (advanced use cases).
 
 **Returns:**
 
-- `getClient()` - Async function that returns `SmartWalletClient`
+- `getClient()` - Async function that returns `{ client: SmartWalletClient, account: SmartContractAccount }`
+  - `client` - The smart wallet client instance
+  - `account` - The smart account with address and other account info
 
 ## How It Works
 
-### EIP-7702 Delegation
+### EIP-7702 Delegation (Default)
 
 This package uses [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) to upgrade your users' Privy wallets into smart accounts **without requiring them to deploy new contracts or migrate funds**.
 
 When a user sends their first transaction:
 
-1. Their EOA signs an EIP-7702 authorization
+1. Their wallet signs an EIP-7702 authorization
 2. The authorization delegates to Alchemy's smart account implementation
 3. The transaction is executed with smart account features (batching, sponsorship, etc.)
 4. Gas is optionally sponsored by your Gas Manager policy
@@ -377,10 +380,47 @@ Under the hood, this package:
 
 1. Connects to your user's Privy embedded wallet
 2. Wraps it with `WalletClientSigner` from `@aa-sdk/core`
-3. Creates a `SmartWalletClient` with EIP-7702 support
+3. Creates a `SmartWalletClient` with EIP-7702 support (default) or traditional smart account support
 4. Routes transactions through Alchemy infrastructure
 5. Automatically handles sponsorship via Gas Manager policies
 
+### Authorization Modes
+
+The package supports two authorization modes via the `accountAuthMode` prop:
+
+- **`'eip7702'` (default, recommended)**: Uses EIP-7702 to delegate the Privy wallet to a smart account. No separate deployment needed, funds stay at the wallet address. This is the recommended mode for most applications.
+- **`'owner'`**: Uses a traditional smart account with the Privy wallet as the owner/signer. The smart account has a separate address from the owner wallet. Use this if you need compatibility with environments that don't support EIP-7702 yet.
+
+```tsx
+// Default behavior (EIP-7702)
+<AlchemyProvider apiKey="...">
+  <YourApp />
+</AlchemyProvider>
+
+// Traditional smart account mode
+<AlchemyProvider apiKey="..." accountAuthMode="owner">
+  <YourApp />
+</AlchemyProvider>
+```
+
+**Getting the Smart Account Address:**
+
+When using `owner` mode, the smart account has a different address from your Privy signer. Access it via `useAlchemyClient`:
+
+```tsx
+import { useAlchemyClient } from "@account-kit/privy-integration";
+
+function MyComponent() {
+  const { getClient } = useAlchemyClient();
+
+  const getSmartAccountAddress = async () => {
+    const { account } = await getClient();
+    console.log("Smart account address:", account.address);
+    // This is different from the Privy signer address in owner mode
+  };
+}
+```
+
 ## Get Your API Keys
 
 ### Alchemy API Key
@@ -431,7 +471,7 @@ The API is nearly identical, making migration seamless.
 
 ### Access the Smart Wallet Client
 
-For advanced use cases, access the underlying client directly:
+For advanced use cases, access the underlying client and account directly:
 
 ```tsx
 import { useAlchemyClient } from "@account-kit/privy-integration";
@@ -440,20 +480,20 @@ function AdvancedComponent() {
   const { getClient } = useAlchemyClient();
 
   const doAdvancedOperation = async () => {
-    const client = await getClient();
+    const { client, account } = await getClient();
 
-    // Use any SmartWalletClient method
-    const address = await client.getAddress();
+    // Access the smart account address
+    console.log("Smart account address:", account.address);
 
     // Direct access to sendCalls with full control
     await client.sendCalls({
-      from: address,
+      from: account.address,
       calls: [
         { to: "0x...", data: "0x..." },
         { to: "0x...", data: "0x..." },
       ],
       capabilities: {
-        eip7702Auth: true,
+        eip7702Auth: true, // Set to true for EIP-7702 mode
         paymasterService: { policyId: "your-policy-id" },
       },
     });

package/dist/esm/Provider.d.ts

@@ -1,6 +1,73 @@
+import { type PropsWithChildren } from "react";
+import type { SmartWalletClient } from "@account-kit/wallet-client";
+import type { SmartContractAccount } from "@aa-sdk/core";
+import type { AlchemyProviderConfig } from "./types.js";
 /**
- * Web-specific exports
- * Re-exports the web provider and hooks for React applications
+ * Normalized config with defaults applied
+ *
+ * @internal
  */
-export { AlchemyProvider } from "./providers/WebProvider.js";
-export { useAlchemyConfig } from "./context/AlchemyContext.js";
+export type NormalizedAlchemyConfig = AlchemyProviderConfig & Required<Pick<AlchemyProviderConfig, "accountAuthMode">>;
+/**
+ * Client cache stored in React tree (similar to QueryClient in React Query)
+ *
+ * @internal
+ */
+interface ClientCache {
+    client: SmartWalletClient | null;
+    account: SmartContractAccount | null;
+    cacheKey: string | null;
+}
+/**
+ * Provider component that configures Alchemy infrastructure for transaction handling
+ * Must be nested INSIDE PrivyProvider to access authentication state
+ * Automatically manages client cache lifecycle and resets on logout
+ *
+ * @param {PropsWithChildren<AlchemyProviderConfig>} props - Component props
+ * @param {React.ReactNode} props.children - React children to wrap with Alchemy configuration
+ * @param {string} [props.apiKey] - Your Alchemy API key
+ * @param {string} [props.jwt] - JWT token for authentication
+ * @param {string} [props.rpcUrl] - Custom RPC URL for EVM chains
+ * @param {string} [props.solanaRpcUrl] - Custom RPC URL for Solana
+ * @param {string | string[]} [props.policyId] - Gas Manager policy ID(s) for EVM chains
+ * @param {string | string[]} [props.solanaPolicyId] - Gas Manager policy ID(s) for Solana
+ * @param {boolean} [props.disableSponsorship] - Set to true to disable sponsorship by default (default: false)
+ * @param {'eip7702' | 'owner'} [props.accountAuthMode] - Authorization mode for EVM smart accounts (default: 'eip7702')
+ * @returns {JSX.Element} Provider component
+ *
+ * @example
+ * ```tsx
+ * <PrivyProvider appId="...">
+ *   <AlchemyProvider
+ *     apiKey="your-alchemy-api-key"
+ *     policyId="your-gas-policy-id"
+ *   >
+ *     <YourApp />
+ *   </AlchemyProvider>
+ * </PrivyProvider>
+ * ```
+ */
+export declare function AlchemyProvider({ children, accountAuthMode, ...config }: PropsWithChildren<AlchemyProviderConfig>): import("react/jsx-runtime").JSX.Element;
+/**
+ * Hook to access Alchemy provider configuration
+ * Must be used within an <AlchemyProvider> component
+ *
+ * @returns {NormalizedAlchemyConfig} The current Alchemy configuration with defaults applied
+ * @throws {Error} If used outside of AlchemyProvider
+ *
+ * @example
+ * ```tsx
+ * const config = useAlchemyConfig();
+ * console.log('Policy ID:', config.policyId);
+ * console.log('Auth Mode:', config.accountAuthMode); // Always defined
+ * ```
+ */
+export declare function useAlchemyConfig(): NormalizedAlchemyConfig;
+/**
+ * Hook to access the client cache (internal use only)
+ *
+ * @internal
+ * @returns {ClientCache} The client cache object
+ */
+export declare function useClientCache(): ClientCache;
+export {};

package/dist/esm/Provider.js

@@ -1,7 +1,112 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useContext, useRef, useEffect, } from "react";
+import { usePrivy } from "@privy-io/react-auth";
+const AlchemyContext = createContext(null);
+const ClientCacheContext = createContext(null);
 /**
- * Web-specific exports
- * Re-exports the web provider and hooks for React applications
+ * Provider component that configures Alchemy infrastructure for transaction handling
+ * Must be nested INSIDE PrivyProvider to access authentication state
+ * Automatically manages client cache lifecycle and resets on logout
+ *
+ * @param {PropsWithChildren<AlchemyProviderConfig>} props - Component props
+ * @param {React.ReactNode} props.children - React children to wrap with Alchemy configuration
+ * @param {string} [props.apiKey] - Your Alchemy API key
+ * @param {string} [props.jwt] - JWT token for authentication
+ * @param {string} [props.rpcUrl] - Custom RPC URL for EVM chains
+ * @param {string} [props.solanaRpcUrl] - Custom RPC URL for Solana
+ * @param {string | string[]} [props.policyId] - Gas Manager policy ID(s) for EVM chains
+ * @param {string | string[]} [props.solanaPolicyId] - Gas Manager policy ID(s) for Solana
+ * @param {boolean} [props.disableSponsorship] - Set to true to disable sponsorship by default (default: false)
+ * @param {'eip7702' | 'owner'} [props.accountAuthMode] - Authorization mode for EVM smart accounts (default: 'eip7702')
+ * @returns {JSX.Element} Provider component
+ *
+ * @example
+ * ```tsx
+ * <PrivyProvider appId="...">
+ *   <AlchemyProvider
+ *     apiKey="your-alchemy-api-key"
+ *     policyId="your-gas-policy-id"
+ *   >
+ *     <YourApp />
+ *   </AlchemyProvider>
+ * </PrivyProvider>
+ * ```
  */
-export { AlchemyProvider } from "./providers/WebProvider.js";
-export { useAlchemyConfig } from "./context/AlchemyContext.js";
+export function AlchemyProvider({ children, accountAuthMode = "eip7702", ...config }) {
+    const { authenticated, user } = usePrivy();
+    // Normalize config with default values
+    const normalizedConfig = {
+        ...config,
+        accountAuthMode,
+    };
+    // Store cache in a ref - persists across renders but scoped to this component instance
+    // This makes it SSR-safe (each request gets its own cache) and React StrictMode-safe
+    const cache = useRef({
+        client: null,
+        account: null,
+        cacheKey: null,
+    });
+    // Track previous state to detect logout and wallet changes
+    const prevAuthenticatedRef = useRef(authenticated);
+    const prevWalletAddressRef = useRef(user?.wallet?.address);
+    // Automatically reset cache when user logs out or switches wallets
+    useEffect(() => {
+        const wasAuthenticated = prevAuthenticatedRef.current;
+        const prevWalletAddress = prevWalletAddressRef.current;
+        const currentWalletAddress = user?.wallet?.address;
+        // Reset cache on logout
+        if (wasAuthenticated && !authenticated) {
+            cache.current.client = null;
+            cache.current.account = null;
+            cache.current.cacheKey = null;
+        }
+        // Reset cache on wallet address change (account switching)
+        if (authenticated &&
+            prevWalletAddress &&
+            currentWalletAddress &&
+            prevWalletAddress !== currentWalletAddress) {
+            cache.current.client = null;
+            cache.current.account = null;
+            cache.current.cacheKey = null;
+        }
+        // Update refs for next render
+        prevAuthenticatedRef.current = authenticated;
+        prevWalletAddressRef.current = currentWalletAddress;
+    }, [authenticated, user?.wallet?.address]);
+    return (_jsx(AlchemyContext.Provider, { value: normalizedConfig, children: _jsx(ClientCacheContext.Provider, { value: cache.current, children: children }) }));
+}
+/**
+ * Hook to access Alchemy provider configuration
+ * Must be used within an <AlchemyProvider> component
+ *
+ * @returns {NormalizedAlchemyConfig} The current Alchemy configuration with defaults applied
+ * @throws {Error} If used outside of AlchemyProvider
+ *
+ * @example
+ * ```tsx
+ * const config = useAlchemyConfig();
+ * console.log('Policy ID:', config.policyId);
+ * console.log('Auth Mode:', config.accountAuthMode); // Always defined
+ * ```
+ */
+export function useAlchemyConfig() {
+    const context = useContext(AlchemyContext);
+    if (!context) {
+        throw new Error("useAlchemyConfig must be used within <AlchemyProvider />");
+    }
+    return context;
+}
+/**
+ * Hook to access the client cache (internal use only)
+ *
+ * @internal
+ * @returns {ClientCache} The client cache object
+ */
+export function useClientCache() {
+    const context = useContext(ClientCacheContext);
+    if (!context) {
+        throw new Error("useClientCache must be used within <AlchemyProvider />. Make sure AlchemyProvider is nested inside PrivyProvider.");
+    }
+    return context;
+}
 //# sourceMappingURL=Provider.js.map

package/dist/esm/Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../src/Provider.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC","sourcesContent":["/**\n * Web-specific exports\n * Re-exports the web provider and hooks for React applications\n */\nexport { AlchemyProvider } from \"./providers/WebProvider.js\";\nexport { useAlchemyConfig } from \"./context/AlchemyContext.js\";\n"]}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../src/Provider.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n  type PropsWithChildren,\n  createContext,\n  useContext,\n  useRef,\n  useEffect,\n} from \"react\";\nimport { usePrivy } from \"@privy-io/react-auth\";\nimport type { SmartWalletClient } from \"@account-kit/wallet-client\";\nimport type { SmartContractAccount } from \"@aa-sdk/core\";\nimport type { AlchemyProviderConfig } from \"./types.js\";\n\n/**\n * Normalized config with defaults applied\n *\n * @internal\n */\nexport type NormalizedAlchemyConfig = AlchemyProviderConfig &\n  Required<Pick<AlchemyProviderConfig, \"accountAuthMode\">>;\n\nconst AlchemyContext = createContext<NormalizedAlchemyConfig | null>(null);\n\n/**\n * Client cache stored in React tree (similar to QueryClient in React Query)\n *\n * @internal\n */\ninterface ClientCache {\n  client: SmartWalletClient | null;\n  account: SmartContractAccount | null;\n  cacheKey: string | null;\n}\n\nconst ClientCacheContext = createContext<ClientCache | null>(null);\n\n/**\n * Provider component that configures Alchemy infrastructure for transaction handling\n * Must be nested INSIDE PrivyProvider to access authentication state\n * Automatically manages client cache lifecycle and resets on logout\n *\n * @param {PropsWithChildren<AlchemyProviderConfig>} props - Component props\n * @param {React.ReactNode} props.children - React children to wrap with Alchemy configuration\n * @param {string} [props.apiKey] - Your Alchemy API key\n * @param {string} [props.jwt] - JWT token for authentication\n * @param {string} [props.rpcUrl] - Custom RPC URL for EVM chains\n * @param {string} [props.solanaRpcUrl] - Custom RPC URL for Solana\n * @param {string | string[]} [props.policyId] - Gas Manager policy ID(s) for EVM chains\n * @param {string | string[]} [props.solanaPolicyId] - Gas Manager policy ID(s) for Solana\n * @param {boolean} [props.disableSponsorship] - Set to true to disable sponsorship by default (default: false)\n * @param {'eip7702' | 'owner'} [props.accountAuthMode] - Authorization mode for EVM smart accounts (default: 'eip7702')\n * @returns {JSX.Element} Provider component\n *\n * @example\n * ```tsx\n * <PrivyProvider appId=\"...\">\n *   <AlchemyProvider\n *     apiKey=\"your-alchemy-api-key\"\n *     policyId=\"your-gas-policy-id\"\n *   >\n *     <YourApp />\n *   </AlchemyProvider>\n * </PrivyProvider>\n * ```\n */\nexport function AlchemyProvider({\n  children,\n  accountAuthMode = \"eip7702\",\n  ...config\n}: PropsWithChildren<AlchemyProviderConfig>) {\n  const { authenticated, user } = usePrivy();\n\n  // Normalize config with default values\n  const normalizedConfig: NormalizedAlchemyConfig = {\n    ...config,\n    accountAuthMode,\n  };\n\n  // Store cache in a ref - persists across renders but scoped to this component instance\n  // This makes it SSR-safe (each request gets its own cache) and React StrictMode-safe\n  const cache = useRef<ClientCache>({\n    client: null,\n    account: null,\n    cacheKey: null,\n  });\n\n  // Track previous state to detect logout and wallet changes\n  const prevAuthenticatedRef = useRef(authenticated);\n  const prevWalletAddressRef = useRef(user?.wallet?.address);\n\n  // Automatically reset cache when user logs out or switches wallets\n  useEffect(() => {\n    const wasAuthenticated = prevAuthenticatedRef.current;\n    const prevWalletAddress = prevWalletAddressRef.current;\n    const currentWalletAddress = user?.wallet?.address;\n\n    // Reset cache on logout\n    if (wasAuthenticated && !authenticated) {\n      cache.current.client = null;\n      cache.current.account = null;\n      cache.current.cacheKey = null;\n    }\n\n    // Reset cache on wallet address change (account switching)\n    if (\n      authenticated &&\n      prevWalletAddress &&\n      currentWalletAddress &&\n      prevWalletAddress !== currentWalletAddress\n    ) {\n      cache.current.client = null;\n      cache.current.account = null;\n      cache.current.cacheKey = null;\n    }\n\n    // Update refs for next render\n    prevAuthenticatedRef.current = authenticated;\n    prevWalletAddressRef.current = currentWalletAddress;\n  }, [authenticated, user?.wallet?.address]);\n\n  return (\n    <AlchemyContext.Provider value={normalizedConfig}>\n      <ClientCacheContext.Provider value={cache.current}>\n        {children}\n      </ClientCacheContext.Provider>\n    </AlchemyContext.Provider>\n  );\n}\n\n/**\n * Hook to access Alchemy provider configuration\n * Must be used within an <AlchemyProvider> component\n *\n * @returns {NormalizedAlchemyConfig} The current Alchemy configuration with defaults applied\n * @throws {Error} If used outside of AlchemyProvider\n *\n * @example\n * ```tsx\n * const config = useAlchemyConfig();\n * console.log('Policy ID:', config.policyId);\n * console.log('Auth Mode:', config.accountAuthMode); // Always defined\n * ```\n */\nexport function useAlchemyConfig(): NormalizedAlchemyConfig {\n  const context = useContext(AlchemyContext);\n  if (!context) {\n    throw new Error(\"useAlchemyConfig must be used within <AlchemyProvider />\");\n  }\n  return context;\n}\n\n/**\n * Hook to access the client cache (internal use only)\n *\n * @internal\n * @returns {ClientCache} The client cache object\n */\nexport function useClientCache(): ClientCache {\n  const context = useContext(ClientCacheContext);\n  if (!context) {\n    throw new Error(\n      \"useClientCache must be used within <AlchemyProvider />. Make sure AlchemyProvider is nested inside PrivyProvider.\",\n    );\n  }\n  return context;\n}\n"]}

package/dist/esm/hooks/internal/useEmbeddedWallet.d.ts

@@ -1,9 +1,10 @@
+import { type ConnectedWallet as PrivyWallet } from "@privy-io/react-auth";
 /**
  * Internal hook to get the Privy embedded wallet
- * Uses the platform adapter to abstract differences between web and React Native
+ * Shared across multiple hooks to avoid duplication
  *
  * @internal
- * @returns {() => EmbeddedWallet} Function that returns the embedded wallet
+ * @returns {() => PrivyWallet} Function that returns the embedded wallet
  * @throws {Error} If embedded wallet is not found
  */
-export declare function useEmbeddedWallet(): () => import("../../adapters/types.js").EmbeddedWallet;
+export declare function useEmbeddedWallet(): () => PrivyWallet;

package/dist/esm/hooks/internal/useEmbeddedWallet.js

@@ -1,14 +1,22 @@
-import { useAdapter } from "../../context/AlchemyContext.js";
+import { useCallback } from "react";
+import { useWallets, } from "@privy-io/react-auth";
 /**
  * Internal hook to get the Privy embedded wallet
- * Uses the platform adapter to abstract differences between web and React Native
+ * Shared across multiple hooks to avoid duplication
  *
  * @internal
- * @returns {() => EmbeddedWallet} Function that returns the embedded wallet
+ * @returns {() => PrivyWallet} Function that returns the embedded wallet
  * @throws {Error} If embedded wallet is not found
  */
 export function useEmbeddedWallet() {
-    const adapter = useAdapter();
-    return adapter.useEmbeddedWallet();
+    const { wallets } = useWallets();
+    const getEmbeddedWallet = useCallback(() => {
+        const embedded = wallets.find((w) => w.walletClientType === "privy");
+        if (!embedded) {
+            throw new Error("Privy embedded wallet not found. Please ensure the user is authenticated.");
+        }
+        return embedded;
+    }, [wallets]);
+    return getEmbeddedWallet;
 }
 //# sourceMappingURL=useEmbeddedWallet.js.map

package/dist/esm/hooks/internal/useEmbeddedWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEmbeddedWallet.js","sourceRoot":"","sources":["../../../../src/hooks/internal/useEmbeddedWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,iBAAiB,EAAE,CAAC;AACrC,CAAC","sourcesContent":["import { useAdapter } from \"../../context/AlchemyContext.js\";\n\n/**\n * Internal hook to get the Privy embedded wallet\n * Uses the platform adapter to abstract differences between web and React Native\n *\n * @internal\n * @returns {() => EmbeddedWallet} Function that returns the embedded wallet\n * @throws {Error} If embedded wallet is not found\n */\nexport function useEmbeddedWallet() {\n  const adapter = useAdapter();\n  return adapter.useEmbeddedWallet();\n}\n"]}
+{"version":3,"file":"useEmbeddedWallet.js","sourceRoot":"","sources":["../../../../src/hooks/internal/useEmbeddedWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,UAAU,GAEX,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAC;IAEjC,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAgB,EAAE;QACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,KAAK,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,iBAAiB,CAAC;AAC3B,CAAC","sourcesContent":["import { useCallback } from \"react\";\nimport {\n  useWallets,\n  type ConnectedWallet as PrivyWallet,\n} from \"@privy-io/react-auth\";\n\n/**\n * Internal hook to get the Privy embedded wallet\n * Shared across multiple hooks to avoid duplication\n *\n * @internal\n * @returns {() => PrivyWallet} Function that returns the embedded wallet\n * @throws {Error} If embedded wallet is not found\n */\nexport function useEmbeddedWallet() {\n  const { wallets } = useWallets();\n\n  const getEmbeddedWallet = useCallback((): PrivyWallet => {\n    const embedded = wallets.find((w) => w.walletClientType === \"privy\");\n    if (!embedded) {\n      throw new Error(\n        \"Privy embedded wallet not found. Please ensure the user is authenticated.\",\n      );\n    }\n    return embedded;\n  }, [wallets]);\n\n  return getEmbeddedWallet;\n}\n"]}

package/dist/esm/hooks/useAlchemyClient.d.ts

@@ -1,17 +1,22 @@
+import { type SmartContractAccount } from "@aa-sdk/core";
 import { type SmartWalletClient } from "@account-kit/wallet-client";
+export type AlchemyClientResult = {
+    client: SmartWalletClient;
+    account: SmartContractAccount;
+};
 /**
- * Hook to get and memoize a SmartWalletClient instance
- * The client is cached in the AlchemyProvider context (React tree scoped)
+ * Hook to get and memoize a SmartWalletClient instance with its associated account
+ * The client and account are cached in the AlchemyProvider context (React tree scoped)
  * Automatically clears cache on logout via the provider
  *
- * @returns {{ getClient: () => Promise<SmartWalletClient> }} Object containing the smart wallet client getter
+ * @returns {{ getClient: () => Promise<AlchemyClientResult> }} Object containing the smart wallet client and account getter
  *
  * @example
  * ```tsx
  * const { getClient } = useAlchemyClient();
- * const smartWalletClient = await getClient();
+ * const { client, account } = await getClient();
  * ```
  */
 export declare function useAlchemyClient(): {
-    getClient: () => Promise<SmartWalletClient>;
+    getClient: () => Promise<AlchemyClientResult>;
 };

package/dist/esm/hooks/useAlchemyClient.js

@@ -1,27 +1,27 @@
 import { useCallback } from "react";
-import { WalletClientSigner, ConnectionConfigSchema } from "@aa-sdk/core";
-import { createWalletClient, custom } from "viem";
+import { WalletClientSigner, ConnectionConfigSchema, } from "@aa-sdk/core";
+import { createWalletClient, custom, } from "viem";
+import { useSign7702Authorization } from "@privy-io/react-auth";
 import { createSmartWalletClient, } from "@account-kit/wallet-client";
 import { alchemy } from "@account-kit/infra";
-import { useAlchemyConfig, useClientCache, useAdapter, } from "../context/AlchemyContext.js";
+import { useAlchemyConfig, useClientCache } from "../Provider.js";
 import { getChain } from "../util/getChain.js";
 import { useEmbeddedWallet } from "./internal/useEmbeddedWallet.js";
 /**
- * Hook to get and memoize a SmartWalletClient instance
- * The client is cached in the AlchemyProvider context (React tree scoped)
+ * Hook to get and memoize a SmartWalletClient instance with its associated account
+ * The client and account are cached in the AlchemyProvider context (React tree scoped)
  * Automatically clears cache on logout via the provider
  *
- * @returns {{ getClient: () => Promise<SmartWalletClient> }} Object containing the smart wallet client getter
+ * @returns {{ getClient: () => Promise<AlchemyClientResult> }} Object containing the smart wallet client and account getter
  *
  * @example
  * ```tsx
  * const { getClient } = useAlchemyClient();
- * const smartWalletClient = await getClient();
+ * const { client, account } = await getClient();
  * ```
  */
 export function useAlchemyClient() {
-    const adapter = useAdapter();
-    const signAuthorizationFn = adapter.useAuthorizationSigner?.() || null;
+    const { signAuthorization } = useSign7702Authorization();
     const config = useAlchemyConfig();
     const cache = useClientCache();
     const getEmbeddedWallet = useEmbeddedWallet();
@@ -52,10 +52,11 @@ export function useAlchemyClient() {
             jwt: config.jwt,
             rpcUrl: config.rpcUrl,
             policyId: config.policyId,
+            accountAuthMode: config.accountAuthMode,
         });
-        // Return cached client if configuration hasn't changed
-        if (cache.client && cache.cacheKey === currentCacheKey) {
-            return cache.client;
+        // Return cached client and account if configuration hasn't changed
+        if (cache.client && cache.account && cache.cacheKey === currentCacheKey) {
+            return { client: cache.client, account: cache.account };
         }
         // Configuration changed or no cache exists, create new client
         const provider = await embeddedWallet.getEthereumProvider();
@@ -65,11 +66,17 @@ export function useAlchemyClient() {
             chain,
             transport: custom(provider),
         }), "privy");
-        // Extend signer with EIP-7702 authorization support (if available)
-        const signer = signAuthorizationFn
+        // Optionally extend signer with EIP-7702 authorization support
+        const signer = config.accountAuthMode === "eip7702"
             ? {
                 ...baseSigner,
-                signAuthorization: signAuthorizationFn,
+                signAuthorization: async (unsignedAuth) => {
+                    const signature = await signAuthorization({
+                        ...unsignedAuth,
+                        contractAddress: unsignedAuth.address ?? unsignedAuth.contractAddress,
+                    });
+                    return { ...unsignedAuth, ...signature };
+                },
             }
             : baseSigner;
         // Determine transport configuration using schema validation
@@ -94,18 +101,30 @@ export function useAlchemyClient() {
                     : [config.policyId]
                 : undefined,
         });
+        // Request the account to properly initialize the smart wallet
+        // Pass a creation hint based on auth mode to ensure different accounts for different modes
+        // This prevents 7702 accounts from being reused in owner mode and vice versa
+        cache.account =
+            config.accountAuthMode === "eip7702"
+                ? await cache.client.requestAccount({
+                    creationHint: { accountType: "7702" },
+                })
+                : await cache.client.requestAccount({
+                    creationHint: { accountType: "sma-b" },
+                });
         // Store the cache key
         cache.cacheKey = currentCacheKey;
-        return cache.client;
+        return { client: cache.client, account: cache.account };
     }, [
         getEmbeddedWallet,
         getEmbeddedWalletChain,
-        signAuthorizationFn,
+        signAuthorization,
         config.apiKey,
         config.jwt,
         config.rpcUrl,
         config.policyId,
         cache,
+        config.accountAuthMode,
     ]);
     return { getClient };
 }

package/dist/esm/hooks/useAlchemyClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAlchemyClient.js","sourceRoot":"","sources":["../../../src/hooks/useAlchemyClient.ts"],"names":[],"mappings":"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","sourcesContent":["import { useCallback } from \"react\";\nimport { WalletClientSigner, ConnectionConfigSchema } from \"@aa-sdk/core\";\nimport { createWalletClient, custom, type Address } from \"viem\";\nimport {\n  createSmartWalletClient,\n  type SmartWalletClient,\n} from \"@account-kit/wallet-client\";\nimport { alchemy } from \"@account-kit/infra\";\nimport {\n  useAlchemyConfig,\n  useClientCache,\n  useAdapter,\n} from \"../context/AlchemyContext.js\";\nimport { getChain } from \"../util/getChain.js\";\nimport { useEmbeddedWallet } from \"./internal/useEmbeddedWallet.js\";\n\n/**\n * Hook to get and memoize a SmartWalletClient instance\n * The client is cached in the AlchemyProvider context (React tree scoped)\n * Automatically clears cache on logout via the provider\n *\n * @returns {{ getClient: () => Promise<SmartWalletClient> }} Object containing the smart wallet client getter\n *\n * @example\n * ```tsx\n * const { getClient } = useAlchemyClient();\n * const smartWalletClient = await getClient();\n * ```\n */\nexport function useAlchemyClient() {\n  const adapter = useAdapter();\n  const signAuthorizationFn = adapter.useAuthorizationSigner?.() || null;\n  const config = useAlchemyConfig();\n  const cache = useClientCache();\n  const getEmbeddedWallet = useEmbeddedWallet();\n\n  const getEmbeddedWalletChain = useCallback(() => {\n    const embedded = getEmbeddedWallet();\n    // Handle CAIP-2 format like \"eip155:1\"\n    const chainIdStr = embedded.chainId?.toString();\n\n    if (!chainIdStr) {\n      throw new Error(\n        \"Embedded wallet chainId is not set. Please ensure the wallet is connected to a network.\",\n      );\n    }\n\n    const numericChainId = chainIdStr.includes(\":\")\n      ? chainIdStr.split(\":\")[1]\n      : chainIdStr;\n\n    const parsedChainId = Number(numericChainId);\n\n    if (isNaN(parsedChainId)) {\n      throw new Error(\n        `Failed to parse chainId from embedded wallet. Received: ${chainIdStr}`,\n      );\n    }\n\n    return getChain(parsedChainId);\n  }, [getEmbeddedWallet]);\n\n  const getClient = useCallback(async (): Promise<SmartWalletClient> => {\n    const embeddedWallet = getEmbeddedWallet();\n    const chain = getEmbeddedWalletChain();\n\n    // Generate a cache key based on configuration and wallet address\n    const currentCacheKey = JSON.stringify({\n      address: embeddedWallet.address,\n      chainId: chain.id,\n      apiKey: config.apiKey,\n      jwt: config.jwt,\n      rpcUrl: config.rpcUrl,\n      policyId: config.policyId,\n    });\n\n    // Return cached client if configuration hasn't changed\n    if (cache.client && cache.cacheKey === currentCacheKey) {\n      return cache.client;\n    }\n\n    // Configuration changed or no cache exists, create new client\n    const provider = await embeddedWallet.getEthereumProvider();\n\n    // Create base signer from Privy wallet\n    const baseSigner = new WalletClientSigner(\n      createWalletClient({\n        account: embeddedWallet.address as Address,\n        chain,\n        transport: custom(provider),\n      }),\n      \"privy\",\n    );\n\n    // Extend signer with EIP-7702 authorization support (if available)\n    const signer = signAuthorizationFn\n      ? {\n          ...baseSigner,\n          signAuthorization: signAuthorizationFn,\n        }\n      : baseSigner;\n\n    // Determine transport configuration using schema validation\n    // This properly handles combinations like rpcUrl + jwt together\n    const transportConfig = ConnectionConfigSchema.parse({\n      rpcUrl: config.rpcUrl,\n      apiKey: config.apiKey,\n      jwt: config.jwt,\n    });\n\n    const transport = alchemy(transportConfig);\n\n    transport.updateHeaders({\n      \"X-Alchemy-Client-Breadcrumb\": \"privyIntegrationSdk\",\n    });\n\n    // Create and cache the smart wallet client in provider context\n    cache.client = createSmartWalletClient({\n      chain,\n      transport,\n      signer,\n      policyIds: config.policyId\n        ? Array.isArray(config.policyId)\n          ? config.policyId\n          : [config.policyId]\n        : undefined,\n    });\n\n    // Store the cache key\n    cache.cacheKey = currentCacheKey;\n\n    return cache.client;\n  }, [\n    getEmbeddedWallet,\n    getEmbeddedWalletChain,\n    signAuthorizationFn,\n    config.apiKey,\n    config.jwt,\n    config.rpcUrl,\n    config.policyId,\n    cache,\n  ]);\n\n  return { getClient };\n}\n"]}
+{"version":3,"file":"useAlchemyClient.js","sourceRoot":"","sources":["../../../src/hooks/useAlchemyClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,kBAAkB,EAElB,sBAAsB,GAEvB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,kBAAkB,EAClB,MAAM,GAGP,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,uBAAuB,GAExB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAOpE;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,iBAAiB,EAAE,GAAG,wBAAwB,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,iBAAiB,GAAG,iBAAiB,EAAE,CAAC;IAE9C,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9C,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;QACrC,uCAAuC;QACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;QAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7C,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,UAAU,CAAC;QAEf,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;QAE7C,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,2DAA2D,UAAU,EAAE,CACxE,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,IAAkC,EAAE;QACrE,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,sBAAsB,EAAE,CAAC;QAEvC,iEAAiE;QACjE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC;YACrC,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QAEH,mEAAmE;QACnE,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,KAAK,eAAe,EAAE,CAAC;YACxE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAC1D,CAAC;QAED,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAE5D,uCAAuC;QACvC,MAAM,UAAU,GAAG,IAAI,kBAAkB,CACvC,kBAAkB,CAAC;YACjB,OAAO,EAAE,cAAc,CAAC,OAAkB;YAC1C,KAAK;YACL,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC;SAC5B,CAAC,EACF,OAAO,CACR,CAAC;QAEF,+DAA+D;QAC/D,MAAM,MAAM,GACV,MAAM,CAAC,eAAe,KAAK,SAAS;YAClC,CAAC,CAAC;gBACE,GAAG,UAAU;gBACb,iBAAiB,EAAE,KAAK,EACtB,YAA0C,EACJ,EAAE;oBACxC,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC;wBACxC,GAAG,YAAY;wBACf,eAAe,EACb,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,eAAe;qBACvD,CAAC,CAAC;oBACH,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS,EAAE,CAAC;gBAC3C,CAAC;aACF;YACH,CAAC,CAAC,UAAU,CAAC;QAEjB,4DAA4D;QAC5D,gEAAgE;QAChE,MAAM,eAAe,GAAG,sBAAsB,CAAC,KAAK,CAAC;YACnD,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,GAAG,EAAE,MAAM,CAAC,GAAG;SAChB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAE3C,SAAS,CAAC,aAAa,CAAC;YACtB,6BAA6B,EAAE,qBAAqB;SACrD,CAAC,CAAC;QAEH,+DAA+D;QAC/D,KAAK,CAAC,MAAM,GAAG,uBAAuB,CAAC;YACrC,KAAK;YACL,SAAS;YACT,MAAM;YACN,SAAS,EAAE,MAAM,CAAC,QAAQ;gBACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAC9B,CAAC,CAAC,MAAM,CAAC,QAAQ;oBACjB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACrB,CAAC,CAAC,SAAS;SACd,CAAC,CAAC;QAEH,8DAA8D;QAC9D,2FAA2F;QAC3F,6EAA6E;QAC7E,KAAK,CAAC,OAAO;YACX,MAAM,CAAC,eAAe,KAAK,SAAS;gBAClC,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,YAAY,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;iBACtC,CAAC;gBACJ,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,YAAY,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE;iBACvC,CAAC,CAAC;QAET,sBAAsB;QACtB,KAAK,CAAC,QAAQ,GAAG,eAAe,CAAC;QAEjC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC,EAAE;QACD,iBAAiB;QACjB,sBAAsB;QACtB,iBAAiB;QACjB,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,GAAG;QACV,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,QAAQ;QACf,KAAK;QACL,MAAM,CAAC,eAAe;KACvB,CAAC,CAAC;IAEH,OAAO,EAAE,SAAS,EAAE,CAAC;AACvB,CAAC","sourcesContent":["import { useCallback } from \"react\";\nimport {\n  WalletClientSigner,\n  type AuthorizationRequest,\n  ConnectionConfigSchema,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  createWalletClient,\n  custom,\n  type Address,\n  type Authorization,\n} from \"viem\";\nimport { useSign7702Authorization } from \"@privy-io/react-auth\";\nimport {\n  createSmartWalletClient,\n  type SmartWalletClient,\n} from \"@account-kit/wallet-client\";\nimport { alchemy } from \"@account-kit/infra\";\nimport { useAlchemyConfig, useClientCache } from \"../Provider.js\";\nimport { getChain } from \"../util/getChain.js\";\nimport { useEmbeddedWallet } from \"./internal/useEmbeddedWallet.js\";\n\nexport type AlchemyClientResult = {\n  client: SmartWalletClient;\n  account: SmartContractAccount;\n};\n\n/**\n * Hook to get and memoize a SmartWalletClient instance with its associated account\n * The client and account are cached in the AlchemyProvider context (React tree scoped)\n * Automatically clears cache on logout via the provider\n *\n * @returns {{ getClient: () => Promise<AlchemyClientResult> }} Object containing the smart wallet client and account getter\n *\n * @example\n * ```tsx\n * const { getClient } = useAlchemyClient();\n * const { client, account } = await getClient();\n * ```\n */\nexport function useAlchemyClient() {\n  const { signAuthorization } = useSign7702Authorization();\n  const config = useAlchemyConfig();\n  const cache = useClientCache();\n  const getEmbeddedWallet = useEmbeddedWallet();\n\n  const getEmbeddedWalletChain = useCallback(() => {\n    const embedded = getEmbeddedWallet();\n    // Handle CAIP-2 format like \"eip155:1\"\n    const chainIdStr = embedded.chainId?.toString();\n\n    if (!chainIdStr) {\n      throw new Error(\n        \"Embedded wallet chainId is not set. Please ensure the wallet is connected to a network.\",\n      );\n    }\n\n    const numericChainId = chainIdStr.includes(\":\")\n      ? chainIdStr.split(\":\")[1]\n      : chainIdStr;\n\n    const parsedChainId = Number(numericChainId);\n\n    if (isNaN(parsedChainId)) {\n      throw new Error(\n        `Failed to parse chainId from embedded wallet. Received: ${chainIdStr}`,\n      );\n    }\n\n    return getChain(parsedChainId);\n  }, [getEmbeddedWallet]);\n\n  const getClient = useCallback(async (): Promise<AlchemyClientResult> => {\n    const embeddedWallet = getEmbeddedWallet();\n    const chain = getEmbeddedWalletChain();\n\n    // Generate a cache key based on configuration and wallet address\n    const currentCacheKey = JSON.stringify({\n      address: embeddedWallet.address,\n      chainId: chain.id,\n      apiKey: config.apiKey,\n      jwt: config.jwt,\n      rpcUrl: config.rpcUrl,\n      policyId: config.policyId,\n      accountAuthMode: config.accountAuthMode,\n    });\n\n    // Return cached client and account if configuration hasn't changed\n    if (cache.client && cache.account && cache.cacheKey === currentCacheKey) {\n      return { client: cache.client, account: cache.account };\n    }\n\n    // Configuration changed or no cache exists, create new client\n    const provider = await embeddedWallet.getEthereumProvider();\n\n    // Create base signer from Privy wallet\n    const baseSigner = new WalletClientSigner(\n      createWalletClient({\n        account: embeddedWallet.address as Address,\n        chain,\n        transport: custom(provider),\n      }),\n      \"privy\",\n    );\n\n    // Optionally extend signer with EIP-7702 authorization support\n    const signer =\n      config.accountAuthMode === \"eip7702\"\n        ? {\n            ...baseSigner,\n            signAuthorization: async (\n              unsignedAuth: AuthorizationRequest<number>,\n            ): Promise<Authorization<number, true>> => {\n              const signature = await signAuthorization({\n                ...unsignedAuth,\n                contractAddress:\n                  unsignedAuth.address ?? unsignedAuth.contractAddress,\n              });\n              return { ...unsignedAuth, ...signature };\n            },\n          }\n        : baseSigner;\n\n    // Determine transport configuration using schema validation\n    // This properly handles combinations like rpcUrl + jwt together\n    const transportConfig = ConnectionConfigSchema.parse({\n      rpcUrl: config.rpcUrl,\n      apiKey: config.apiKey,\n      jwt: config.jwt,\n    });\n\n    const transport = alchemy(transportConfig);\n\n    transport.updateHeaders({\n      \"X-Alchemy-Client-Breadcrumb\": \"privyIntegrationSdk\",\n    });\n\n    // Create and cache the smart wallet client in provider context\n    cache.client = createSmartWalletClient({\n      chain,\n      transport,\n      signer,\n      policyIds: config.policyId\n        ? Array.isArray(config.policyId)\n          ? config.policyId\n          : [config.policyId]\n        : undefined,\n    });\n\n    // Request the account to properly initialize the smart wallet\n    // Pass a creation hint based on auth mode to ensure different accounts for different modes\n    // This prevents 7702 accounts from being reused in owner mode and vice versa\n    cache.account =\n      config.accountAuthMode === \"eip7702\"\n        ? await cache.client.requestAccount({\n            creationHint: { accountType: \"7702\" },\n          })\n        : await cache.client.requestAccount({\n            creationHint: { accountType: \"sma-b\" },\n          });\n\n    // Store the cache key\n    cache.cacheKey = currentCacheKey;\n\n    return { client: cache.client, account: cache.account };\n  }, [\n    getEmbeddedWallet,\n    getEmbeddedWalletChain,\n    signAuthorization,\n    config.apiKey,\n    config.jwt,\n    config.rpcUrl,\n    config.policyId,\n    cache,\n    config.accountAuthMode,\n  ]);\n\n  return { getClient };\n}\n"]}

package/dist/esm/hooks/useAlchemyPrepareSwap.js

@@ -2,7 +2,6 @@ import { useCallback, useState } from "react";
 import {} from "viem";
 import { swapActions } from "@account-kit/wallet-client/experimental";
 import { useAlchemyClient } from "./useAlchemyClient.js";
-import { useEmbeddedWallet } from "./internal/useEmbeddedWallet.js";
 /**
  * Hook to request swap quotes and prepare swap calls
  * Part of the two-step swap process: prepare → submit
@@ -45,7 +44,6 @@ import { useEmbeddedWallet } from "./internal/useEmbeddedWallet.js";
  */
 export function useAlchemyPrepareSwap() {
     const { getClient } = useAlchemyClient();
-    const getEmbeddedWallet = useEmbeddedWallet();
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
     const [data, setData] = useState(null);
@@ -53,15 +51,14 @@ export function useAlchemyPrepareSwap() {
         setIsLoading(true);
         setError(null);
         try {
-            const client = await getClient();
-            const embeddedWallet = getEmbeddedWallet();
+            const { client, account } = await getClient();
             // Extend client with swap actions
             const swapClient = client.extend(swapActions);
             // Request the swap quote
             // Note: Gas sponsorship capabilities are configured on the client itself
             const response = await swapClient.requestQuoteV0({
                 ...request,
-                from: request.from || embeddedWallet.address,
+                from: request.from || account.address,
             });
             // Validate that we got prepared calls, not raw calls
             if (response.rawCalls) {
@@ -78,7 +75,7 @@ export function useAlchemyPrepareSwap() {
         finally {
             setIsLoading(false);
         }
-    }, [getClient, getEmbeddedWallet]);
+    }, [getClient]);
     const reset = useCallback(() => {
         setError(null);
         setData(null);