@coin-voyage/crypto 2.5.0 → 2.5.2-beta.0

package/dist/evm/provider/base-provider.d.ts

@@ -1,5 +1,6 @@
 import { type PropsWithChildren } from "react";
 import { EVMConfiguration } from "../create-default-evm-config";
-export declare function EVMBaseProvider({ children, config, }: PropsWithChildren<{
+export declare function EVMBaseProvider({ children, config, reconnectOnMount, }: PropsWithChildren<{
     config?: EVMConfiguration;
+    reconnectOnMount?: boolean;
 }>): import("react/jsx-runtime").JSX.Element;

package/dist/evm/provider/base-provider.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { WagmiProvider } from "wagmi";
 import { createDefaultEVMConfig } from "../create-default-evm-config";
-export function EVMBaseProvider({ children, config, }) {
+export function EVMBaseProvider({ children, config, reconnectOnMount = false, }) {
     const evmConfig = useMemo(() => createDefaultEVMConfig(config), [config]);
-    return (_jsx(WagmiProvider, { config: evmConfig.config, reconnectOnMount: false, children: children }));
+    return (_jsx(WagmiProvider, { config: evmConfig.config, reconnectOnMount: reconnectOnMount, children: children }));
 }

package/dist/hooks/use-universal-connect.d.ts

@@ -11,6 +11,13 @@ interface UseUniversalConnectProps {
         connector: any;
     }) => void;
 }
+type SolanaConnectAdapter = {
+    connected: boolean;
+    connect: () => Promise<void>;
+    off: (event: "connect" | "error", listener: (value?: unknown) => void) => unknown;
+    once: (event: "connect" | "error", listener: (value?: unknown) => void) => unknown;
+};
+export declare function waitForSolanaWalletConnect(walletAdapter: SolanaConnectAdapter, timeoutMs?: number): Promise<void>;
 export declare const useUniversalConnect: (props?: UseUniversalConnectProps) => {
     connect: ({ walletConnector }: {
         walletConnector: ChainTypeWalletConnector;

package/dist/hooks/use-universal-connect.js

@@ -5,6 +5,36 @@ import { useWallet } from "@solana/wallet-adapter-react";
 import { useCallback } from "react";
 import { useConfig as useWagmiConfig, useConnect as useWagmiConnect } from "wagmi";
 import { useLastConnector } from "./use-last-connector";
+const SOLANA_CONNECT_TIMEOUT_MS = 30000;
+export function waitForSolanaWalletConnect(walletAdapter, timeoutMs = SOLANA_CONNECT_TIMEOUT_MS) {
+    if (walletAdapter.connected)
+        return Promise.resolve();
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        let timeoutId;
+        const cleanup = () => {
+            walletAdapter.off("connect", handleConnect);
+            walletAdapter.off("error", handleError);
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+                timeoutId = undefined;
+            }
+        };
+        const settle = (callback) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            callback();
+        };
+        const handleConnect = () => settle(resolve);
+        const handleError = (err) => settle(() => reject(err));
+        walletAdapter.once("connect", handleConnect);
+        walletAdapter.once("error", handleError);
+        timeoutId = setTimeout(() => settle(() => reject(new Error("Solana wallet connection timed out"))), timeoutMs);
+        walletAdapter.connect().catch(handleError);
+    });
+}
 export const useUniversalConnect = (props) => {
     const utxoConfig = useBigmiConfig();
     const evmConfig = useWagmiConfig();
@@ -63,25 +93,7 @@ export const useUniversalConnect = (props) => {
                     }
                     const walletAdapter = connector;
                     select(walletAdapter.name);
-                    if (!walletAdapter.connected) {
-                        await new Promise((resolve, reject) => {
-                            const handleConnect = () => {
-                                cleanup();
-                                resolve();
-                            };
-                            const handleError = (err) => {
-                                cleanup();
-                                reject(err);
-                            };
-                            const cleanup = () => {
-                                walletAdapter.off("connect", handleConnect);
-                                walletAdapter.off("error", handleError);
-                            };
-                            walletAdapter.once("connect", handleConnect);
-                            walletAdapter.once("error", handleError);
-                            walletAdapter.connect().catch(handleError);
-                        });
-                    }
+                    await waitForSolanaWalletConnect(walletAdapter);
                     updateLastConnectorId(connector, ChainType.SOL);
                     onSuccess?.(undefined, { connector: walletAdapter });
                     break;

package/dist/hooks/use-universal-connect.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/hooks/use-universal-connect.test.js

@@ -0,0 +1,51 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { waitForSolanaWalletConnect } from "./use-universal-connect";
+class FakeSolanaWalletAdapter {
+    constructor() {
+        this.connected = false;
+        this.listeners = new Map();
+        this.connect = vi.fn(() => new Promise(() => { }));
+    }
+    once(event, listener) {
+        this.listeners.set(event, new Set([...(this.listeners.get(event) ?? []), listener]));
+        return this;
+    }
+    off(event, listener) {
+        this.listeners.get(event)?.delete(listener);
+        return this;
+    }
+    emit(event, value) {
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(value);
+        }
+    }
+    listenerCount(event) {
+        return this.listeners.get(event)?.size ?? 0;
+    }
+}
+describe("waitForSolanaWalletConnect", () => {
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+    it("removes listeners when a wallet connect attempt times out", async () => {
+        vi.useFakeTimers();
+        const adapter = new FakeSolanaWalletAdapter();
+        const result = waitForSolanaWalletConnect(adapter, 100);
+        expect(adapter.listenerCount("connect")).toBe(1);
+        expect(adapter.listenerCount("error")).toBe(1);
+        const rejection = expect(result).rejects.toThrow("Solana wallet connection timed out");
+        await vi.advanceTimersByTimeAsync(100);
+        await rejection;
+        expect(adapter.listenerCount("connect")).toBe(0);
+        expect(adapter.listenerCount("error")).toBe(0);
+    });
+    it("removes listeners after a successful wallet connect event", async () => {
+        vi.useFakeTimers();
+        const adapter = new FakeSolanaWalletAdapter();
+        const result = waitForSolanaWalletConnect(adapter, 100);
+        adapter.emit("connect");
+        await expect(result).resolves.toBeUndefined();
+        expect(adapter.listenerCount("connect")).toBe(0);
+        expect(adapter.listenerCount("error")).toBe(0);
+    });
+});

package/dist/solana/provider/base-provider.d.ts

@@ -1,8 +1,13 @@
+import { type Adapter } from "@solana/wallet-adapter-base";
 import { type PropsWithChildren } from "react";
-import { WalletConnectParameters } from "wagmi/connectors";
 import { SolanaConfiguration } from "../../types/wallet";
-export declare function SolanaBaseProvider({ children, config, }: PropsWithChildren<{
-    config?: SolanaConfiguration & {
-        walletConnect?: WalletConnectParameters;
-    };
+interface BuildSolanaWalletsOptions {
+    configuredWallets?: Adapter[];
+    defaultWallets?: readonly Adapter[];
+    walletConnectWallet: Adapter;
+}
+export declare function buildSolanaWallets({ configuredWallets, defaultWallets, walletConnectWallet, }: BuildSolanaWalletsOptions): Adapter[];
+export declare function SolanaBaseProvider({ children, config }: PropsWithChildren<{
+    config?: SolanaConfiguration;
 }>): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/solana/provider/base-provider.js

@@ -5,11 +5,17 @@ import { ConnectionProvider, WalletProvider } from "@solana/wallet-adapter-react
 import { WalletConnectWalletAdapter } from "@solana/wallet-adapter-walletconnect";
 import { useMemo } from "react";
 const DEFAULT_SOLANA_RPC = "https://solana-mainnet.g.alchemy.com/v2/vPIG6RGK7rUDSwR1MHfEgXlZ2acwA4MG";
-const wallets = [new CoinbaseWalletAdapter()];
-export function SolanaBaseProvider({ children, config, }) {
-    const solanaConfig = useMemo(() => config, [config]);
-    wallets.push(getWalletConnectConnector(solanaConfig?.walletConnect));
-    return (_jsx(ConnectionProvider, { endpoint: solanaConfig?.rpcUrl ?? DEFAULT_SOLANA_RPC, children: _jsx(WalletProvider, { ...solanaConfig?.walletConfiguration, localStorageKey: solanaConfig?.walletConfiguration?.localStorageKey || "@coin-voyage/solana-wallet", autoConnect: solanaConfig?.walletConfiguration?.autoConnect, wallets: [...(solanaConfig?.walletConfiguration?.wallets || []), ...wallets], children: children }) }));
+const DEFAULT_WALLETS = [new CoinbaseWalletAdapter()];
+export function buildSolanaWallets({ configuredWallets = [], defaultWallets = DEFAULT_WALLETS, walletConnectWallet, }) {
+    return [...configuredWallets, ...defaultWallets, walletConnectWallet];
+}
+export function SolanaBaseProvider({ children, config }) {
+    const walletConnectWallet = useMemo(() => getWalletConnectConnector(config?.walletConnect), [config?.walletConnect]);
+    const wallets = useMemo(() => buildSolanaWallets({
+        configuredWallets: config?.walletConfiguration?.wallets,
+        walletConnectWallet,
+    }), [config?.walletConfiguration?.wallets, walletConnectWallet]);
+    return (_jsx(ConnectionProvider, { endpoint: config?.rpcUrl ?? DEFAULT_SOLANA_RPC, children: _jsx(WalletProvider, { ...config?.walletConfiguration, localStorageKey: config?.walletConfiguration?.localStorageKey || "@coin-voyage/solana-wallet", autoConnect: config?.walletConfiguration?.autoConnect, wallets: wallets, children: children }) }));
 }
 function getWalletConnectConnector(params) {
     return new WalletConnectWalletAdapter({

package/dist/solana/provider/base-provider.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/solana/provider/base-provider.test.js

@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { buildSolanaWallets } from "./base-provider";
+const createAdapter = (name) => ({ name });
+describe("buildSolanaWallets", () => {
+    it("does not mutate the default wallet list across repeated builds", () => {
+        const configuredWallet = createAdapter("Configured");
+        const coinbaseWallet = createAdapter("Coinbase");
+        const walletConnectWallet = createAdapter("WalletConnect");
+        const defaultWallets = [coinbaseWallet];
+        const firstWallets = buildSolanaWallets({
+            configuredWallets: [configuredWallet],
+            defaultWallets,
+            walletConnectWallet,
+        });
+        const secondWallets = buildSolanaWallets({
+            configuredWallets: [configuredWallet],
+            defaultWallets,
+            walletConnectWallet,
+        });
+        expect(firstWallets).toEqual([configuredWallet, coinbaseWallet, walletConnectWallet]);
+        expect(secondWallets).toEqual(firstWallets);
+        expect(defaultWallets).toEqual([coinbaseWallet]);
+    });
+});

package/dist/types/wallet.d.ts

@@ -1,6 +1,8 @@
 import type { ChainId, ChainType } from "@coin-voyage/shared/types";
 import type { createDAppKit } from "@mysten/dapp-kit-react";
+import { Adapter } from "@solana/wallet-adapter-base";
 import type { WalletProviderProps } from "@solana/wallet-adapter-react";
+import { WalletConnectParameters } from "wagmi/connectors";
 import type { EVMConfiguration } from "../evm/create-default-evm-config";
 import type { UTXOConfiguration } from "../utxo/create-default-utxo-config";
 import type { WalletConnector } from "./wallet-connector";
@@ -24,7 +26,10 @@ export type WalletConfiguration = {
  */
 export type SolanaConfiguration = {
     rpcUrl?: string;
-    walletConfiguration?: Omit<WalletProviderProps, "children">;
+    walletConfiguration?: Omit<WalletProviderProps, "children" | "wallets"> & {
+        wallets?: Adapter[];
+    };
+    walletConnect?: WalletConnectParameters;
 };
 type SuiDAppKitOptions = Parameters<typeof createDAppKit>[0];
 export type SuiDAppKitConfiguration = Pick<SuiDAppKitOptions, "autoConnect" | "enableBurnerWallet" | "slushWalletConfig" | "storage" | "storageKey" | "walletInitializers">;

package/dist/wallets/wallet-provider.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo } from "react";
 import { EVMProvider } from "../evm/provider/provider";
 import { QueryProvider } from "../query/provider";
 import { SolanaProvider } from "../solana/provider/provider";
 import { SuiProvider } from "../sui/provider/provider";
 import { UTXOProvider } from "../utxo/provider/provider";
 export function WalletProvider({ children, config, }) {
-    return (_jsx(QueryProvider, { children: _jsx(EVMProvider, { config: config?.evm, children: _jsx(SolanaProvider, { config: {
-                    ...config?.solana,
-                    walletConnect: config?.evm?.walletConnect,
-                }, children: _jsx(UTXOProvider, { config: config?.utxo, children: _jsx(SuiProvider, { config: config?.sui, children: children }) }) }) }) }));
+    const solanaConfig = useMemo(() => ({
+        ...config?.solana,
+        walletConnect: config?.evm?.walletConnect,
+    }), [config?.solana, config?.evm?.walletConnect]);
+    return (_jsx(QueryProvider, { children: _jsx(EVMProvider, { config: config?.evm, children: _jsx(SolanaProvider, { config: solanaConfig, children: _jsx(UTXOProvider, { config: config?.utxo, children: _jsx(SuiProvider, { config: config?.sui, children: children }) }) }) }) }));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "2.5.0",
+  "version": "2.5.2-beta.0",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -112,7 +112,7 @@
     "@solana/wallet-adapter-walletconnect": "0.1.21",
     "@solana/wallet-adapter-base": "0.9.27",
     "@solana/wallet-adapter-coinbase": "0.1.23",
-    "@coin-voyage/shared": "2.5.0"
+    "@coin-voyage/shared": "2.5.1-beta.3"
   },
   "devDependencies": {
     "@types/elliptic": "6.4.18"