@btc-vision/walletconnect 1.9.1 → 1.9.3

package/browser/types.d.ts

@@ -10,3 +10,17 @@ export interface WalletInformation {
     isInstalled: boolean;
     isConnected: boolean;
 }
+export interface WalletBalance {
+    total: number;
+    confirmed: number;
+    unconfirmed: number;
+    csv75_total: number;
+    csv75_unlocked: number;
+    csv75_locked: number;
+    csv1_total: number;
+    csv1_unlocked: number;
+    csv1_locked: number;
+    p2wda_total_amount: number;
+    p2wda_pending_amount: number;
+    usd_value: string;
+}

package/build/context/WalletConnectContext.d.ts

@@ -1,6 +1,6 @@
 import { Address, type Unisat, UnisatSigner } from '@btc-vision/transaction';
 import { AbstractRpcProvider } from 'opnet';
-import type { WalletConnectNetwork, WalletInformation } from '../types.ts';
+import type { WalletBalance, WalletConnectNetwork, WalletInformation } from '../types.ts';
 import { type SupportedWallets } from '../wallets';
 export type WalletConnectContextType = {
     allWallets: WalletInformation[];
@@ -16,5 +16,6 @@ export type WalletConnectContextType = {
     disconnect: () => void;
     provider: AbstractRpcProvider | null;
     signer: UnisatSigner | null;
+    walletBalance: WalletBalance | null;
 };
 export declare const WalletConnectContext: import("react").Context<WalletConnectContextType | undefined>;

package/build/provider/WalletConnectProvider.js

@@ -22,6 +22,7 @@ const WalletConnectProvider = ({ theme, children }) => {
     const [walletInstance, setWalletInstance] = useState(null);
     const [provider, setProvider] = useState(null);
     const [signer, setSigner] = useState(null);
+    const [walletBalance, setWalletBalance] = useState(null);
     const clearConnectError = useCallback(() => {
         if (timeoutRef.current)
             clearTimeout(timeoutRef.current);
@@ -88,6 +89,7 @@ const WalletConnectProvider = ({ theme, children }) => {
                 WalletController.setChainChangedHook(chainChanged);
                 WalletController.setDisconnectHook(disconnect);
                 closeConnectModal();
+                console.log('Connected to wallet:', wallet);
                 setSelectedWallet(wallet);
                 localStorage.setItem('WC_SelectedWallet', wallet);
             }
@@ -132,14 +134,12 @@ const WalletConnectProvider = ({ theme, children }) => {
         void attemptReconnect();
     }, [attemptReconnect]);
     const accountsChanged = useCallback(async (accounts) => {
-        console.log('Accounts', accounts);
-        if (selectedWallet) {
-            const account = accounts.length > 0 ? accounts[0] : null;
-            setWalletAddress(account);
-            const publicKey = account ? await WalletController.getPublicKey() : null;
-            setPublicKey(publicKey);
-        }
-    }, [selectedWallet, setWalletAddress, setPublicKey]);
+        console.log('Account changed, updating address');
+        const account = accounts.length > 0 ? accounts[0] : null;
+        setWalletAddress(account);
+        const publicKey = account ? await WalletController.getPublicKey() : null;
+        setPublicKey(publicKey);
+    }, [setWalletAddress, setPublicKey]);
     const chainChanged = useCallback((network) => {
         if (selectedWallet) {
             setNetwork(network);
@@ -178,6 +178,24 @@ const WalletConnectProvider = ({ theme, children }) => {
         };
         void updateSigner();
     }, [network, publicKey]);
+    useEffect(() => {
+        const fetchBalance = async () => {
+            if (walletAddress && walletInstance) {
+                try {
+                    const balance = (await walletInstance.getBalance());
+                    setWalletBalance(balance);
+                }
+                catch (error) {
+                    console.error('Error fetching balance:', error);
+                    setWalletBalance(null);
+                }
+            }
+            else {
+                setWalletBalance(null);
+            }
+        };
+        void fetchBalance();
+    }, [walletAddress, walletInstance]);
     const currentTheme = useMemo(() => {
         const currentTheme = theme || 'light';
         return `wallet-connect-${currentTheme}-theme`;
@@ -198,6 +216,7 @@ const WalletConnectProvider = ({ theme, children }) => {
             walletInstance,
             provider,
             signer,
+            walletBalance,
             walletType,
         }, children: [children, modalOpen && (_jsx("div", { className: `wallet-connect-modal-backdrop ${currentTheme}`, children: _jsxs("div", { className: "wallet-connect-modal", role: "dialog", "aria-modal": "true", "aria-labelledby": "wallet-connect-modal-title", children: [_jsxs("div", { className: "wallet-connect-header", children: [_jsx("span", { children: "Connect Wallet" }), _jsx("button", { className: "close", onClick: () => closeConnectModal(), children: _jsx("span", { className: "close-icon", children: _jsx("svg", { width: "30px", height: "30px", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", children: _jsx("path", { className: "close-x-path", d: "M16 8L8 16M8.00001 8L16 16", stroke: "#fff", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" }) }) }) })] }), connectError && (_jsx("div", { className: "wallet-connect-error", children: _jsx("p", { className: "error-message", children: connectError }) })), availableWallets.length > 0 ? (_jsx("div", { className: "wallet-list", children: availableWallets.map((wallet) => (_jsxs("button", { onClick: () => connectToWallet(wallet.name), disabled: connecting || !wallet.controller.isInstalled(), className: `wallet-button ${wallet.controller.isInstalled()
                                     ? 'wallet-installed'

package/build/types.d.ts

@@ -10,3 +10,17 @@ export interface WalletInformation {
     isInstalled: boolean;
     isConnected: boolean;
 }
+export interface WalletBalance {
+    total: number;
+    confirmed: number;
+    unconfirmed: number;
+    csv75_total: number;
+    csv75_unlocked: number;
+    csv75_locked: number;
+    csv1_total: number;
+    csv1_unlocked: number;
+    csv1_locked: number;
+    p2wda_total_amount: number;
+    p2wda_pending_amount: number;
+    usd_value: string;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/walletconnect",
     "type": "module",
-    "version": "1.9.1",
+    "version": "1.9.3",
     "author": "impredmet",
     "description": "The OP_NET Wallet Connect library helps your dApp connect to any compatible wallet.",
     "engines": {
@@ -82,7 +82,7 @@
         "react-dom": "^19.1.1",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
-        "typescript-eslint": "^8.43.0",
+        "typescript-eslint": "^8.44.0",
         "webpack-cli": "^6.0.1"
     },
     "dependencies": {
@@ -94,7 +94,7 @@
         "gulp-clean": "^0.4.0",
         "gulp-eslint-new": "^2.5.0",
         "gulp-logger-new": "^1.0.1",
-        "opnet": "^1.6.34",
+        "opnet": "^1.6.35",
         "style-loader": "^4.0.0",
         "webpack": "^5.101.3"
     }

package/src/context/WalletConnectContext.ts

@@ -1,7 +1,7 @@
 import { Address, type Unisat, UnisatSigner } from '@btc-vision/transaction';
 import { AbstractRpcProvider } from 'opnet';
 import { createContext } from 'react';
-import type { WalletConnectNetwork, WalletInformation } from '../types.ts';
+import type { WalletBalance, WalletConnectNetwork, WalletInformation } from '../types.ts';
 import { type SupportedWallets } from '../wallets';
 
 export type WalletConnectContextType = {
@@ -18,6 +18,7 @@ export type WalletConnectContextType = {
     disconnect: () => void;
     provider: AbstractRpcProvider | null;
     signer: UnisatSigner | null;
+    walletBalance: WalletBalance | null;
 };
 
 export const WalletConnectContext = createContext<WalletConnectContextType | undefined>(undefined);

package/src/provider/WalletConnectProvider.tsx

@@ -2,7 +2,7 @@ import { Address, type Unisat, UnisatSigner } from '@btc-vision/transaction';
 import { AbstractRpcProvider } from 'opnet';
 import React, { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { WalletConnectContext } from '../context/WalletConnectContext';
-import type { WalletConnectNetwork, WalletInformation } from '../types.ts';
+import type { WalletBalance, WalletConnectNetwork, WalletInformation } from '../types.ts';
 import '../utils/style.css';
 import '../utils/theme.css';
 import { type SupportedWallets, WalletController } from '../wallets';
@@ -38,6 +38,7 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
     const [walletInstance, setWalletInstance] = useState<Unisat | null>(null);
     const [provider, setProvider] = useState<AbstractRpcProvider | null>(null);
     const [signer, setSigner] = useState<UnisatSigner | null>(null);
+    const [walletBalance, setWalletBalance] = useState<WalletBalance | null>(null);
 
     const clearConnectError = useCallback(() => {
         if (timeoutRef.current) clearTimeout(timeoutRef.current);
@@ -119,6 +120,7 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
                     WalletController.setDisconnectHook(disconnect);
 
                     closeConnectModal();
+                    console.log('Connected to wallet:', wallet);
                     setSelectedWallet(wallet);
                     localStorage.setItem('WC_SelectedWallet', wallet);
                 } else if (response.data && 'message' in response.data) {
@@ -172,15 +174,13 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
 
     const accountsChanged = useCallback(
         async (accounts: string[]) => {
-            console.log('Accounts', accounts);
-            if (selectedWallet) {
-                const account = accounts.length > 0 ? accounts[0] : null;
-                setWalletAddress(account);
-                const publicKey = account ? await WalletController.getPublicKey() : null;
-                setPublicKey(publicKey);
-            }
+            console.log('Account changed, updating address');
+            const account = accounts.length > 0 ? accounts[0] : null;
+            setWalletAddress(account);
+            const publicKey = account ? await WalletController.getPublicKey() : null;
+            setPublicKey(publicKey);
         },
-        [selectedWallet, setWalletAddress, setPublicKey],
+        [setWalletAddress, setPublicKey],
     );
 
     const chainChanged = useCallback(
@@ -235,6 +235,23 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
         void updateSigner();
     }, [network, publicKey]);
 
+    useEffect(() => {
+        const fetchBalance = async () => {
+            if (walletAddress && walletInstance) {
+                try {
+                    const balance = (await walletInstance.getBalance()) as WalletBalance | null;
+                    setWalletBalance(balance);
+                } catch (error) {
+                    console.error('Error fetching balance:', error);
+                    setWalletBalance(null);
+                }
+            } else {
+                setWalletBalance(null);
+            }
+        };
+        void fetchBalance();
+    }, [walletAddress, walletInstance]);
+
     const currentTheme = useMemo(() => {
         const currentTheme = theme || 'light';
         return `wallet-connect-${currentTheme}-theme`;
@@ -259,6 +276,7 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
                 walletInstance,
                 provider,
                 signer,
+                walletBalance,
                 walletType,
             }}>
             {children}

package/src/types.ts

@@ -12,3 +12,18 @@ export interface WalletInformation {
     isInstalled: boolean;
     isConnected: boolean;
 }
+
+export interface WalletBalance {
+    total: number;
+    confirmed: number;
+    unconfirmed: number;
+    csv75_total: number;
+    csv75_unlocked: number;
+    csv75_locked: number;
+    csv1_total: number;
+    csv1_unlocked: number;
+    csv1_locked: number;
+    p2wda_total_amount: number;
+    p2wda_pending_amount: number;
+    usd_value: string;
+}