@btc-vision/walletconnect 1.5.1 → 1.5.3

package/browser/index.js.LICENSE.txt

@@ -1,3 +1,5 @@
+/*! For license information please see index.js.LICENSE.txt */
+
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
 
 /**

package/browser/wallets/controller.d.ts

@@ -2,13 +2,15 @@ import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import { WalletConnectNetwork } from '../types';
 import { SupportedWallets } from './index';
 import type { ControllerConnectAccounts, ControllerErrorResponse, ControllerResponse, WalletConnectWallet } from './types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class WalletController {
     private static wallets;
     private static currentWallet;
     static getWallets: () => WalletConnectWallet[];
     static isWalletInstalled(wallet: string): boolean;
     static getWalletType(): SupportedWallets | null;
-    static getProvider(): Unisat | null;
+    static getWalletInstance(): Unisat | null;
+    static getProvider(): Promise<AbstractRpcProvider | null>;
     static getSigner(): Promise<UnisatSigner | null>;
     static convertChainTypeToNetwork(chainType: UnisatChainType): WalletConnectNetwork;
     static getNetwork(): Promise<WalletConnectNetwork>;

package/browser/wallets/opwallet/controller.d.ts

@@ -1,5 +1,6 @@
 import { Unisat, UnisatChainType } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class OPWallet implements WalletBase {
     private walletBase;
     private accountsChangedHookWrapper?;
@@ -12,7 +13,8 @@ declare class OPWallet implements WalletBase {
     getChainId(): void;
     connect(): Promise<string[]>;
     disconnect(): Promise<void>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<null>;
     getPublicKey(): Promise<string>;
     getNetwork(): Promise<UnisatChainType>;

package/browser/wallets/types.d.ts

@@ -1,11 +1,13 @@
 import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import { SupportedWallets } from './index';
+import { AbstractRpcProvider } from 'opnet';
 export type { AbstractRpcProvider } from 'opnet';
 export interface WalletBase {
     isInstalled(): boolean;
     isConnected(): boolean;
     canAutoConnect(): Promise<boolean>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<UnisatSigner | null>;
     connect(): Promise<string[] | undefined>;
     disconnect(): Promise<void>;

package/browser/wallets/unisat/controller.d.ts

@@ -1,5 +1,6 @@
 import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class UnisatWallet implements WalletBase {
     private walletBase;
     private accountsChangedHookWrapper?;
@@ -9,7 +10,8 @@ declare class UnisatWallet implements WalletBase {
     isInstalled(): boolean;
     isConnected(): boolean;
     canAutoConnect(): Promise<boolean>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<UnisatSigner>;
     getChainId(): void;
     connect(): Promise<string[]>;

package/build/context/WalletConnectContext.d.ts

@@ -1,10 +1,12 @@
 import { Address, Unisat, UnisatSigner } from '@btc-vision/transaction';
 import type { WalletConnectNetwork, WalletInformation } from '../types.ts';
 import { SupportedWallets } from '../wallets';
+import { AbstractRpcProvider } from 'opnet';
 export type WalletConnectContextType = {
     allWallets: WalletInformation[];
     walletType: string | null;
     walletAddress: string | null;
+    walletInstance: Unisat | null;
     network: WalletConnectNetwork;
     publicKey: string | null;
     address: Address | null;
@@ -12,7 +14,7 @@ export type WalletConnectContextType = {
     connectToWallet: (wallet: SupportedWallets) => void;
     connecting: boolean;
     disconnect: () => void;
-    provider: Unisat | null;
+    provider: AbstractRpcProvider | null;
     signer: UnisatSigner | null;
 };
 export declare const WalletConnectContext: import("react").Context<WalletConnectContextType | undefined>;

package/build/provider/WalletConnectProvider.js

@@ -18,6 +18,7 @@ const WalletConnectProvider = ({ theme, children }) => {
     const [walletAddress, setWalletAddress] = useState(null);
     const [publicKey, setPublicKey] = useState(null);
     const [walletType, setWalletType] = useState(null);
+    const [walletInstance, setWalletInstance] = useState(null);
     const [provider, setProvider] = useState(null);
     const [signer, setSigner] = useState(null);
     const clearConnectError = useCallback(() => {
@@ -141,9 +142,16 @@ const WalletConnectProvider = ({ theme, children }) => {
     useEffect(() => {
         const walletType = walletAddress ? WalletController.getWalletType() : null;
         setWalletType(walletType);
-        const provider = walletAddress ? WalletController.getProvider() : null;
-        setProvider(provider);
+        const walletInstance = walletAddress ? WalletController.getWalletInstance() : null;
+        setWalletInstance(walletInstance);
     }, [walletAddress]);
+    useEffect(() => {
+        const updateWalletInfo = async () => {
+            const provider = walletAddress ? (await WalletController.getProvider()) : null;
+            setProvider(provider);
+        };
+        void updateWalletInfo();
+    }, [walletAddress, network]);
     useEffect(() => {
         const updateSigner = async () => {
             const signer = publicKey ? await WalletController.getSigner() : null;
@@ -168,6 +176,7 @@ const WalletConnectProvider = ({ theme, children }) => {
             openConnectModal,
             network,
             allWallets,
+            walletInstance,
             provider,
             signer,
             walletType,

package/build/wallets/controller.d.ts

@@ -2,13 +2,15 @@ import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import { WalletConnectNetwork } from '../types';
 import { SupportedWallets } from './index';
 import type { ControllerConnectAccounts, ControllerErrorResponse, ControllerResponse, WalletConnectWallet } from './types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class WalletController {
     private static wallets;
     private static currentWallet;
     static getWallets: () => WalletConnectWallet[];
     static isWalletInstalled(wallet: string): boolean;
     static getWalletType(): SupportedWallets | null;
-    static getProvider(): Unisat | null;
+    static getWalletInstance(): Unisat | null;
+    static getProvider(): Promise<AbstractRpcProvider | null>;
     static getSigner(): Promise<UnisatSigner | null>;
     static convertChainTypeToNetwork(chainType: UnisatChainType): WalletConnectNetwork;
     static getNetwork(): Promise<WalletConnectNetwork>;

package/build/wallets/controller.js

@@ -10,12 +10,20 @@ class WalletController {
     static getWalletType() {
         return _a.currentWallet?.name || null;
     }
-    static getProvider() {
+    static getWalletInstance() {
         const wallet = this.currentWallet;
         if (!wallet) {
             return null;
         }
-        const provider = wallet.controller.getProvider();
+        const walletInstance = wallet.controller.getWalletInstance();
+        return walletInstance ? new Proxy(walletInstance, {}) : null;
+    }
+    static async getProvider() {
+        const wallet = this.currentWallet;
+        if (!wallet) {
+            return null;
+        }
+        const provider = await wallet.controller.getProvider();
         return provider ? new Proxy(provider, {}) : null;
     }
     static async getSigner() {

package/build/wallets/opwallet/controller.d.ts

@@ -1,5 +1,6 @@
 import { Unisat, UnisatChainType } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class OPWallet implements WalletBase {
     private walletBase;
     private accountsChangedHookWrapper?;
@@ -12,7 +13,8 @@ declare class OPWallet implements WalletBase {
     getChainId(): void;
     connect(): Promise<string[]>;
     disconnect(): Promise<void>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<null>;
     getPublicKey(): Promise<string>;
     getNetwork(): Promise<UnisatChainType>;

package/build/wallets/opwallet/controller.js

@@ -1,3 +1,6 @@
+import { UnisatChainType } from '@btc-vision/transaction';
+import { JSONRpcProvider } from 'opnet';
+import { networks } from '@btc-vision/bitcoin';
 const notInstalledError = 'OP_WALLET is not installed';
 class OPWallet {
     constructor() {
@@ -36,9 +39,24 @@ class OPWallet {
             })
             : undefined;
     }
-    getProvider() {
+    getWalletInstance() {
         return (this._isConnected && this.walletBase) || null;
     }
+    async getProvider() {
+        if (!this._isConnected || !this.walletBase)
+            return null;
+        const chain = await this.walletBase.getChain();
+        switch (chain.enum) {
+            case UnisatChainType.BITCOIN_MAINNET:
+                return new JSONRpcProvider('https://api.opnet.org', networks.bitcoin);
+            case UnisatChainType.BITCOIN_TESTNET:
+                return new JSONRpcProvider('https://testnet.opnet.org', networks.testnet);
+            case UnisatChainType.BITCOIN_REGTEST:
+                return new JSONRpcProvider('https://regtest.opnet.org', networks.regtest);
+            default:
+                return null;
+        }
+    }
     async getSigner() {
         return Promise.resolve(null);
     }

package/build/wallets/types.d.ts

@@ -1,11 +1,13 @@
 import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import { SupportedWallets } from './index';
+import { AbstractRpcProvider } from 'opnet';
 export type { AbstractRpcProvider } from 'opnet';
 export interface WalletBase {
     isInstalled(): boolean;
     isConnected(): boolean;
     canAutoConnect(): Promise<boolean>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<UnisatSigner | null>;
     connect(): Promise<string[] | undefined>;
     disconnect(): Promise<void>;

package/build/wallets/unisat/controller.d.ts

@@ -1,5 +1,6 @@
 import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
+import { AbstractRpcProvider } from 'opnet';
 declare class UnisatWallet implements WalletBase {
     private walletBase;
     private accountsChangedHookWrapper?;
@@ -9,7 +10,8 @@ declare class UnisatWallet implements WalletBase {
     isInstalled(): boolean;
     isConnected(): boolean;
     canAutoConnect(): Promise<boolean>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<UnisatSigner>;
     getChainId(): void;
     connect(): Promise<string[]>;

package/build/wallets/unisat/controller.js

@@ -1,4 +1,6 @@
-import { UnisatSigner } from '@btc-vision/transaction';
+import { UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
+import { JSONRpcProvider } from 'opnet';
+import { networks } from '@btc-vision/bitcoin';
 const notInstalledError = 'UNISAT is not installed';
 class UnisatWallet {
     constructor() {
@@ -15,9 +17,24 @@ class UnisatWallet {
         const accounts = (await this.walletBase?.getAccounts()) || [];
         return accounts.length > 0;
     }
-    getProvider() {
+    getWalletInstance() {
         return (this._isConnected && this.walletBase) || null;
     }
+    async getProvider() {
+        if (!this._isConnected || !this.walletBase)
+            return null;
+        const chain = await this.walletBase.getChain();
+        switch (chain.enum) {
+            case UnisatChainType.BITCOIN_MAINNET:
+                return new JSONRpcProvider('https://api.opnet.org', networks.bitcoin);
+            case UnisatChainType.BITCOIN_TESTNET:
+                return new JSONRpcProvider('https://testnet.opnet.org', networks.testnet);
+            case UnisatChainType.BITCOIN_REGTEST:
+                return new JSONRpcProvider('https://regtest.opnet.org', networks.regtest);
+            default:
+                return null;
+        }
+    }
     async getSigner() {
         const signer = new UnisatSigner();
         await signer.init();

package/eslint.config.js

@@ -6,7 +6,7 @@ import reactRefresh from 'eslint-plugin-react-refresh';
 import tseslint from 'typescript-eslint';
 
 export default tseslint.config(
-    { ignores: ['dist'] },
+    { ignores: ['dist', 'browser', 'build'] },
     {
         extends: [
             eslint.configs.recommended,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/walletconnect",
     "type": "module",
-    "version": "1.5.1",
+    "version": "1.5.3",
     "author": "impredmet",
     "description": "The OP_NET Wallet Connect library helps your dApp connect to any compatible wallet.",
     "engines": {
@@ -87,14 +87,14 @@
     },
     "dependencies": {
         "@btc-vision/bitcoin": "^6.4.8",
-        "@btc-vision/transaction": "^1.6.8",
+        "@btc-vision/transaction": "^1.6.9",
         "@eslint/js": "^9.34.0",
         "css-loader": "^7.1.2",
         "eslint-plugin-react-hooks": "^5.2.0",
         "gulp-clean": "^0.4.0",
         "gulp-eslint-new": "^2.4.0",
         "gulp-logger-new": "^1.0.1",
-        "opnet": "^1.6.17",
+        "opnet": "^1.6.18",
         "style-loader": "^4.0.0",
         "webpack": "^5.101.3"
     }

package/src/context/WalletConnectContext.ts

@@ -2,11 +2,13 @@ import { Address, Unisat, UnisatSigner } from '@btc-vision/transaction';
 import { createContext } from 'react';
 import type { WalletConnectNetwork, WalletInformation } from '../types.ts';
 import { SupportedWallets } from '../wallets';
+import { AbstractRpcProvider } from 'opnet';
 
 export type WalletConnectContextType = {
     allWallets: WalletInformation[];
     walletType: string | null;
     walletAddress: string | null;
+    walletInstance: Unisat | null;
     network: WalletConnectNetwork;
     publicKey: string | null;
     address: Address | null;
@@ -14,7 +16,7 @@ export type WalletConnectContextType = {
     connectToWallet: (wallet: SupportedWallets) => void;
     connecting: boolean;
     disconnect: () => void;
-    provider: Unisat | null;
+    provider: AbstractRpcProvider | null;
     signer: UnisatSigner | null;
 };
 

package/src/provider/WalletConnectProvider.tsx

@@ -12,6 +12,7 @@ import type {
     ControllerResponse,
     WalletConnectWallet,
 } from '../wallets/types.ts';
+import { AbstractRpcProvider } from 'opnet';
 
 const AUTO_RECONNECT_RETRIES = 5;
 
@@ -36,7 +37,8 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
     const [walletAddress, setWalletAddress] = useState<string | null>(null);
     const [publicKey, setPublicKey] = useState<string | null>(null);
     const [walletType, setWalletType] = useState<SupportedWallets | null>(null);
-    const [provider, setProvider] = useState<Unisat | null>(null);
+    const [walletInstance, setWalletInstance] = useState<Unisat | null>(null);
+    const [provider, setProvider] = useState<AbstractRpcProvider | null>(null);
     const [signer, setSigner] = useState<UnisatSigner | null>(null);
 
     const clearConnectError = useCallback(() => {
@@ -193,10 +195,18 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
     useEffect(() => {
         const walletType = walletAddress ? WalletController.getWalletType() : null;
         setWalletType(walletType);
-        const provider = walletAddress ? WalletController.getProvider() : null;
-        setProvider(provider);
+        const walletInstance = walletAddress ? WalletController.getWalletInstance() : null;
+        setWalletInstance(walletInstance);
     }, [walletAddress]);
 
+    useEffect(() => {
+        const updateWalletInfo = async () => {
+            const provider = walletAddress ? (await WalletController.getProvider()) : null;
+            setProvider(provider);
+        }
+        void updateWalletInfo();
+    }, [walletAddress,network]);
+
     useEffect(() => {
         const updateSigner = async () => {
             const signer = publicKey ? await WalletController.getSigner() : null;
@@ -226,6 +236,7 @@ const WalletConnectProvider: React.FC<WalletConnectProviderProps> = ({ theme, ch
                 openConnectModal,
                 network,
                 allWallets,
+                walletInstance,
                 provider,
                 signer,
                 walletType,

package/src/wallets/controller.ts

@@ -10,6 +10,7 @@ import type {
     ControllerResponse,
     WalletConnectWallet,
 } from './types.ts';
+import { AbstractRpcProvider } from 'opnet';
 
 class WalletController {
     private static wallets: Map<string, WalletConnectWallet> = new Map();
@@ -25,13 +26,23 @@ class WalletController {
         return WalletController.currentWallet?.name || null;
     }
 
-    static getProvider(): Unisat | null {
+    static getWalletInstance(): Unisat | null {
         const wallet = this.currentWallet;
         if (!wallet) {
             return null;
         }
         // Needs to return a Proxy to be sure useEffects are triggered
-        const provider = wallet.controller.getProvider();
+        const walletInstance = wallet.controller.getWalletInstance();
+        return walletInstance ? new Proxy(walletInstance, {}) : null;
+    }
+
+    static async getProvider(): Promise<AbstractRpcProvider | null> {
+        const wallet = this.currentWallet;
+        if (!wallet) {
+            return null;
+        }
+        // Needs to return a Proxy to be sure useEffects are triggered
+        const provider = await wallet.controller.getProvider()
         return provider ? new Proxy(provider, {}) : null;
     }
 

package/src/wallets/opwallet/controller.ts

@@ -1,6 +1,8 @@
 import { Unisat, UnisatChainInfo, UnisatChainType } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
 import type { OPWalletInterface } from './interface';
+import { AbstractRpcProvider, JSONRpcProvider } from 'opnet';
+import { networks } from '@btc-vision/bitcoin';
 
 interface OPWalletWindow extends Window {
     opnet?: OPWalletInterface;
@@ -54,10 +56,27 @@ class OPWallet implements WalletBase {
             : undefined;
     }
 
-    getProvider(): Unisat | null {
+    getWalletInstance(): Unisat | null {
         return (this._isConnected && this.walletBase) || null;
     }
 
+    public async getProvider(): Promise<AbstractRpcProvider | null> {
+        if (!this._isConnected || !this.walletBase) return null;
+
+        const chain = await this.walletBase.getChain();
+        switch (chain.enum) {
+            case UnisatChainType.BITCOIN_MAINNET:
+                return new JSONRpcProvider('https://api.opnet.org', networks.bitcoin);
+            case UnisatChainType.BITCOIN_TESTNET:
+                return new JSONRpcProvider('https://testnet.opnet.org', networks.testnet);
+            case UnisatChainType.BITCOIN_REGTEST:
+                return new JSONRpcProvider('https://regtest.opnet.org', networks.regtest);
+            // TODO: Add Fractal Mainnet & Testnet when available
+            default:
+                return null;
+        }
+    }
+
     async getSigner(): Promise<null> {
         return Promise.resolve(null);
     }

package/src/wallets/types.ts

@@ -1,12 +1,14 @@
 import { Unisat, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import { SupportedWallets } from './index';
+import { AbstractRpcProvider } from 'opnet'
 export type { AbstractRpcProvider } from 'opnet';
 
 export interface WalletBase {
     isInstalled(): boolean;
     isConnected(): boolean;
     canAutoConnect(): Promise<boolean>;
-    getProvider(): Unisat | null;
+    getWalletInstance(): Unisat | null;
+    getProvider(): Promise<AbstractRpcProvider | null>;
     getSigner(): Promise<UnisatSigner | null>;
     connect(): Promise<string[] | undefined>;
     disconnect(): Promise<void>;

package/src/wallets/unisat/controller.ts

@@ -1,6 +1,8 @@
 import { Unisat, UnisatChainInfo, UnisatChainType, UnisatSigner } from '@btc-vision/transaction';
 import type { WalletBase } from '../types.ts';
 import type { UnisatWalletInterface } from './interface';
+import { AbstractRpcProvider, JSONRpcProvider } from 'opnet';
+import { networks } from '@btc-vision/bitcoin';
 
 interface UnisatWalletWindow extends Window {
     unisat?: UnisatWalletInterface;
@@ -29,10 +31,27 @@ class UnisatWallet implements WalletBase {
         return accounts.length > 0;
     }
 
-    getProvider(): Unisat | null {
+    getWalletInstance(): Unisat | null {
         return (this._isConnected && this.walletBase) || null;
     }
 
+    public async getProvider(): Promise<AbstractRpcProvider | null> {
+        if (!this._isConnected || !this.walletBase) return null;
+
+        const chain = await this.walletBase.getChain();
+        switch (chain.enum) {
+            case UnisatChainType.BITCOIN_MAINNET:
+                return new JSONRpcProvider('https://api.opnet.org', networks.bitcoin);
+            case UnisatChainType.BITCOIN_TESTNET:
+                return new JSONRpcProvider('https://testnet.opnet.org', networks.testnet);
+            case UnisatChainType.BITCOIN_REGTEST:
+                return new JSONRpcProvider('https://regtest.opnet.org', networks.regtest);
+            // TODO: Add Fractal Mainnet & Testnet when available
+            default:
+                return null;
+        }
+    }
+
     async getSigner(): Promise<UnisatSigner> {
         const signer = new UnisatSigner();
         await signer.init();