@coin-voyage/crypto 2.2.2 → 2.2.3-beta.0

package/dist/evm/utils.d.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@coin-voyage/shared/common";
+import { ChainId } from "@coin-voyage/shared/types";
 import type { Connector, CreateConnectorFn } from "wagmi";
 import { BaseConnector } from "../types/base-connector";
 import type { CreateConnectorFnExtended } from "./types";

package/dist/evm/utils.js

@@ -1,4 +1,4 @@
-import { ChainId } from "@coin-voyage/shared/common";
+import { ChainId } from "@coin-voyage/shared/types";
 import { getWalletIcon } from "../assets/icons";
 export const ALCHEMY_KEY = "kikl1LthkvlPnpk8Y2eY3vqGSKVoRGFj";
 export const extendConnector = (connector, id, name) => {

package/dist/hooks/use-account-disconnect.js

@@ -1,6 +1,6 @@
 import { disconnect as utxoDisconnect } from "@bigmi/client";
 import { useConfig as useBigmiConfig } from "@bigmi/react";
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import { useDisconnectWallet } from "@mysten/dapp-kit";
 import { useWallet } from "@solana/wallet-adapter-react";
 import { useDisconnect } from "wagmi";
@@ -26,13 +26,14 @@ export const useAccountDisconnect = () => {
         }
     };
     return async (account) => {
-        if (account) {
+        if (account?.isConnected) {
             return disconnect(account.chainType);
         }
         // Disconnect all accounts if no specific account is provided
         for (const acc of accounts) {
+            if (!acc.isConnected)
+                continue;
             await disconnect(acc.chainType);
-            console.log(`Disconnected account on ${acc.chainType}`);
         }
     };
 };

package/dist/hooks/use-account.d.ts

@@ -1,6 +1,6 @@
 import { Connector as UTXOConnector } from "@bigmi/client";
 import { Account as BTCAccount } from "@bigmi/core";
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import type { Connector } from "wagmi";
 import type { WalletAdapterExtended } from "../solana/types";
 import type { WalletProps } from "../types/wallet";

package/dist/hooks/use-account.js

@@ -1,7 +1,9 @@
-import { useConfig as useBigmiConfig, useAccount as useBtcAccount } from "@bigmi/react";
-import { ChainId, ChainType } from "@coin-voyage/shared/common";
+import { getAccount as getBtcAccount, watchAccount as watchBtcAccount, } from "@bigmi/client";
+import { useConfig as useBigmiConfig } from "@bigmi/react";
+import { ChainId, ChainType } from "@coin-voyage/shared/types";
 import { useCurrentAccount, useCurrentWallet } from "@mysten/dapp-kit";
 import { useWallet } from "@solana/wallet-adapter-react";
+import { useCallback, useRef, useSyncExternalStore } from "react";
 import { useAccount as useAccountInternal } from "wagmi";
 import { getConnector } from "../lib/utils/connector";
 import { extendsWalletAdapter } from "../solana/utils";
@@ -109,7 +111,19 @@ const buildUtxoAccount = (btcAccount) => {
  */
 export const useAccount = (args) => {
     const btcConfig = useBigmiConfig();
-    const btcAccount = useBtcAccount({ config: btcConfig });
+    // Use @bigmi/client primitives directly instead of @bigmi/react's useAccount
+    // to fix "getServerSnapshot should be cached" error. The upstream hook passes
+    // an uncached getServerSnapshot to useSyncExternalStore, causing infinite loops
+    // during SSR/hydration in Next.js.
+    const btcSnapshotCache = useRef(getBtcAccount(btcConfig));
+    const btcSubscribe = useCallback((onChange) => watchBtcAccount(btcConfig, {
+        onChange: () => {
+            btcSnapshotCache.current = getBtcAccount(btcConfig);
+            onChange();
+        },
+    }), [btcConfig]);
+    const btcGetSnapshot = useCallback(() => btcSnapshotCache.current, []);
+    const btcAccount = useSyncExternalStore(btcSubscribe, btcGetSnapshot, btcGetSnapshot);
     const wagmiAccount = useAccountInternal();
     const { wallet } = useWallet();
     const suiWallet = useCurrentWallet();

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

@@ -1,9 +1,9 @@
-import { ChainId, ChainType } from "@coin-voyage/shared/common";
+import { ChainId, ChainType } from "@coin-voyage/shared/types";
 import React from "react";
 export type useConnectCallbackProps = {
     onConnect?: ({ address, chainId, connectorId, type, }: {
         address: string;
-        chainId?: number;
+        chainId?: ChainId;
         connectorId?: string;
         type: ChainType;
     }) => void;

package/dist/hooks/use-installed-wallets.d.ts

@@ -1,4 +1,4 @@
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import type { ChainTypeWalletConnector } from "../types/wallet";
 export type Wallet = {
     id: string;

package/dist/hooks/use-installed-wallets.js

@@ -1,5 +1,5 @@
 import { useConfig as useBigmiConfig } from "@bigmi/react";
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import { useWallets } from "@mysten/dapp-kit";
 import { WalletReadyState } from "@solana/wallet-adapter-base";
 import { useWallet } from "@solana/wallet-adapter-react";
@@ -9,7 +9,6 @@ import { getConnectorIcon } from "../lib/utils/get-connector-icon";
 import { getWalletPriority } from "../lib/utils/get-wallet-priority";
 import { isWalletInstalled } from "../lib/utils/is-wallet-installed";
 import { extendsWalletAdapter } from "../solana/utils";
-const normalizeName = (name) => name.split(" ")[0].toLowerCase().trim();
 export const useInstalledWallets = (filterChainType) => {
     const bigmiConfig = useBigmiConfig?.() ?? null;
     const wagmiConfig = useContext(WagmiContext) ?? null;
@@ -31,58 +30,51 @@ export const useInstalledWallets = (filterChainType) => {
     }, [bigmiConfig?.connectors, wagmiConfig?.connectors, solanaWallets, suiWallets, filterChainType]);
 };
 const combineWalletLists = (utxoConnectorList, evmConnectorList, solanaWalletList, suiWalletList) => {
-    const walletMap = new Map();
+    const allConnectors = [];
     utxoConnectorList.forEach((utxo) => {
-        const utxoName = utxo.name;
-        const normalizedName = normalizeName(utxoName);
-        const existing = walletMap.get(normalizedName) || {
+        allConnectors.push({
             id: utxo.id,
-            name: utxoName,
+            name: utxo.name,
             icon: getConnectorIcon(utxo),
-            connectors: [],
-        };
-        existing.connectors.push({ connector: utxo, chainType: ChainType.UTXO });
-        walletMap.set(normalizedName, existing);
+            connector: { connector: utxo, chainType: ChainType.UTXO },
+        });
     });
     evmConnectorList.forEach((evm) => {
-        const evmName = evm?.displayName || evm?.name;
-        const normalizedName = normalizeName(evmName);
-        const existing = walletMap.get(normalizedName) || {
+        allConnectors.push({
             id: evm.id,
-            name: evmName,
+            name: evm?.displayName || evm?.name,
             icon: getConnectorIcon(evm),
-            connectors: [],
-        };
-        existing.connectors.push({ connector: evm, chainType: ChainType.EVM });
-        walletMap.set(normalizedName, existing);
+            connector: { connector: evm, chainType: ChainType.EVM },
+        });
     });
     solanaWalletList.forEach((svm) => {
-        const normalizedName = normalizeName(svm.adapter.name);
-        const existing = walletMap.get(normalizedName) || {
+        allConnectors.push({
             id: svm.adapter.name,
             name: svm.adapter.name,
             icon: svm.adapter.icon,
-            connectors: [],
-        };
-        existing.connectors.push({
-            connector: extendsWalletAdapter(svm.adapter, svm.adapter.name),
-            chainType: ChainType.SOL,
+            connector: {
+                connector: extendsWalletAdapter(svm.adapter, svm.adapter.name),
+                chainType: ChainType.SOL,
+            },
         });
-        walletMap.set(normalizedName, existing);
     });
     suiWalletList.forEach((moveVM) => {
-        const normalizedName = normalizeName(moveVM.name);
-        const existing = walletMap.get(normalizedName) || {
+        allConnectors.push({
             id: moveVM.name,
             name: moveVM.name,
             icon: moveVM.icon,
-            connectors: [],
-        };
-        existing.connectors.push({
-            connector: moveVM,
-            chainType: ChainType.SUI,
+            connector: { connector: moveVM, chainType: ChainType.SUI },
         });
-        walletMap.set(normalizedName, existing);
+    });
+    const walletMap = new Map();
+    allConnectors.forEach(({ id, name, icon, connector }) => {
+        const existing = walletMap.get(id);
+        if (existing) {
+            existing.connectors.push(connector);
+        }
+        else {
+            walletMap.set(id, { id, name, icon, connectors: [connector] });
+        }
     });
     const combinedWallets = Array.from(walletMap.values());
     combinedWallets.sort(walletComparator);

package/dist/hooks/use-prepare-transaction.d.ts

@@ -1,4 +1,4 @@
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import { ExecuteTransaction } from "../types/transaction";
 export declare function usePrepareTransaction(chainType?: ChainType): {
     execute: (params: ExecuteTransaction) => Promise<string | undefined>;

package/dist/hooks/use-prepare-transaction.js

@@ -1,4 +1,4 @@
-import { ChainType } from "@coin-voyage/shared/common";
+import { ChainType } from "@coin-voyage/shared/types";
 import { useEVMTransaction } from "../evm/use-evm-transaction";
 import { useSolanaTransaction } from "../solana/use-solana-transaction";
 import { useSUITransaction } from "../sui/use-sui-transaction";

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

@@ -1,17 +1,18 @@
 import { useConfig as useBigmiConfig, useConnect as useUTXOConnect } from "@bigmi/react";
-import { ChainId, ChainType } from "@coin-voyage/shared/common";
+import { ChainId, ChainType } from "@coin-voyage/shared/types";
 import { useConnectWallet } from "@mysten/dapp-kit";
 import { useWallet } from "@solana/wallet-adapter-react";
+import { useCallback } from "react";
 import { useConfig as useWagmiConfig, useConnect as useWagmiConnect } from "wagmi";
 import { getConnectorId } from "../lib/utils/connector";
 import { useLastConnector } from "./use-last-connector";
-import { useCallback } from "react";
 export const useUniversalConnect = (props) => {
     const utxoConfig = useBigmiConfig();
     const evmConfig = useWagmiConfig();
     const { updateLastConnectorId } = useLastConnector();
     const { select, disconnect, connected } = useWallet();
     const { mutateAsync: suiConnectAsync } = useConnectWallet();
+    const { onError, onSuccess, onSettled, onMutate } = props || {};
     const { connectAsync } = useWagmiConnect({
         config: evmConfig,
         mutation: {
@@ -19,12 +20,12 @@ export const useUniversalConnect = (props) => {
             onSuccess(data, variables) {
                 const connector = variables.connector || variables.connector;
                 updateLastConnectorId(getConnectorId(connector));
-                props?.onSuccess?.(data, {
+                onSuccess?.(data, {
                     chainId: variables?.chainId,
                     connector,
                 });
             },
-            onError: props?.onError,
+            onError,
         },
     });
     const { connectAsync: utxoConnectAsync } = useUTXOConnect({
@@ -34,17 +35,17 @@ export const useUniversalConnect = (props) => {
             onSuccess(data, variables) {
                 const connector = variables.connector;
                 updateLastConnectorId(getConnectorId(connector));
-                props?.onSuccess?.(data, {
+                onSuccess?.(data, {
                     chainId: ChainId.BTC,
                     connector,
                 });
             },
-            onError: props?.onError,
+            onError,
         },
     });
     const connect = useCallback(async ({ walletConnector }) => {
         const { connector, chainType } = walletConnector;
-        props?.onMutate?.({ connector });
+        onMutate?.({ connector });
         try {
             switch (chainType) {
                 case ChainType.EVM:
@@ -83,19 +84,19 @@ export const useUniversalConnect = (props) => {
                         });
                     }
                     updateLastConnectorId(getConnectorId(connector));
-                    props?.onSuccess?.(undefined, { connector: walletAdapter });
+                    onSuccess?.(undefined, { connector: walletAdapter });
                     break;
                 }
                 case ChainType.SUI:
                     await suiConnectAsync({
                         wallet: connector,
                     }, {
-                        onError: props?.onError,
+                        onError,
                         onSuccess: async (data) => {
                             updateLastConnectorId(getConnectorId(connector));
-                            props?.onSuccess?.(data, { connector });
+                            onSuccess?.(data, { connector });
                         },
-                        onSettled: props?.onSettled,
+                        onSettled: onSettled,
                     });
                     break;
                 default:
@@ -103,7 +104,7 @@ export const useUniversalConnect = (props) => {
             }
         }
         catch (err) {
-            props?.onError?.(err);
+            onError?.(err);
         }
     }, [
         connectAsync,
@@ -113,10 +114,10 @@ export const useUniversalConnect = (props) => {
         disconnect,
         select,
         updateLastConnectorId,
-        props?.onError,
-        props?.onSuccess,
-        props?.onSettled,
-        props?.onMutate,
+        onError,
+        onSuccess,
+        onSettled,
+        onMutate,
     ]);
     return { connect };
 };

package/dist/lib/utils/connector.d.ts

@@ -1,4 +1,4 @@
-import type { ChainType } from "@coin-voyage/shared/common";
+import type { ChainType } from "@coin-voyage/shared/types";
 import type { ChainTypeWalletConnector } from "../../types/wallet";
 import type { WalletConnector } from "../../types/wallet-connector";
 export declare const getConnectorId: (connector: WalletConnector) => string;

package/dist/lib/utils/get-wallet-priority.js

@@ -3,9 +3,9 @@ const walletPriority = {
     metamask: 1,
     "io.metamask": 1,
     "io.metamask.mobile": 1,
+    slush: 1,
     phantom: 1,
     "app.phantom": 1,
-    slush: 1,
     coinbasewalletsdk: 2,
     "com.coinbase.wallet": 2,
     walletconnect: 1001,

package/dist/types/wallet.d.ts

@@ -1,4 +1,4 @@
-import type { ChainId, ChainType } from "@coin-voyage/shared/common";
+import type { ChainId, ChainType } from "@coin-voyage/shared/types";
 import type { WalletProviderProps as SuiWalletProviderProps } from "@mysten/dapp-kit";
 import type { WalletProviderProps } from "@solana/wallet-adapter-react";
 import type { EVMConfiguration } from "../evm/create-default-evm-config";

package/dist/utxo/send-btc.js

@@ -1,5 +1,5 @@
 import { sendUTXOTransaction } from "@bigmi/core";
-import { ChainId } from "@coin-voyage/shared/common";
+import { ChainId } from "@coin-voyage/shared/types";
 import { Psbt } from "bitcoinjs-lib";
 import { createUnsecuredToken } from "jsontokens";
 import { withTimeout } from "viem";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "2.2.2",
+  "version": "2.2.3-beta.0",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -50,7 +50,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.2.0"
+    "@coin-voyage/shared": "2.2.5-beta.8"
   },
   "devDependencies": {
     "@types/elliptic": "6.4.18"