@dynamic-labs/bitcoin 3.0.0-alpha.3 → 3.0.0-alpha.30

package/src/connectors/BitcoinWalletConnector.cjs

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
+var satsConnect = require('sats-connect');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
@@ -26,12 +27,20 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.verifiedCredentials = [];
         // this is the key from the wallet book entry so that we don't purely rely on the normalized name
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
-        this.bitcoinProviderHelper = new bitcoinProviderHelper.BitcoinProviderHelper(opts.walletData || walletBook.getWalletBookWallet(this.walletBook, this.key));
+        const walletBookWallet = opts.walletData || walletBook.getWalletBookWallet(this.walletBook, this.key);
+        this.bitcoinProviderHelper = new bitcoinProviderHelper.BitcoinProviderHelper(walletBookWallet);
         this.wallet = this.bitcoinProviderHelper.findWallet();
         if (this.wallet) {
             this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
         }
         this.cache = new BitcoinLocalStorageCache.BitcoinLocalStorageCache(this.overrideKey);
+        this.canFetchConnectedAccounts = walletBook.isWalletMethodSupported(walletBookWallet, 'getConnectedAccounts', 'browserExtension');
+    }
+    isSameAccountChangeRequest(to) {
+        return this.lastAccountChange === to;
+    }
+    setLastAccountChangeRequest(to) {
+        this.lastAccountChange = to;
     }
     clearConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -53,31 +62,17 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.cache.clearLastBalance();
+            yield this.cache.clearConnectedAcccounts();
         });
     }
-    getBalance() {
+    getBalance(address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const [connectedAddress] = yield this.getConnectedAccounts();
-            if (!connectedAddress) {
-                throw new utils.DynamicError('getBalance - No connected address found!');
-            }
-            const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
-            const ordinalsAdditionalAddress = (_a = additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Ordinals)) === null || _a === void 0 ? void 0 : _a.address;
-            const paymentAdditionalAddress = (_b = additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Payment)) === null || _b === void 0 ? void 0 : _b.address;
-            // Some BTC wallet connectors only have 1 address type. when this is the case, it would always be `ordinals`
-            // if a BTC walletConnector does NOT have a payment address, just use the ordinal address
-            const paymentAddress = paymentAdditionalAddress !== null && paymentAdditionalAddress !== void 0 ? paymentAdditionalAddress : ordinalsAdditionalAddress;
-            if (!paymentAddress) {
-                throw new utils.DynamicError('getBalance - No payment address found!');
-            }
-            const API_URL = getMempoolApiUrl.getMempoolApiUrl(paymentAddress);
-            const response = yield fetch(`${API_URL}/address/${paymentAddress}`);
+            const API_URL = getMempoolApiUrl.getMempoolApiUrl(address);
+            const response = yield fetch(`${API_URL}/address/${address}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === _const.HTTP_STATUS_TOO_MANY_REQUESTS) {
-                    return this.cache.getLastBalance();
+                    return '0';
                 }
                 // new accounts not yet indexed will return a 404
                 if (response.status === _const.HTTP_STATUS_NOT_FOUND) {
@@ -94,7 +89,6 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             const unconfirmedBalanceInSats = Number(addressInfo.mempool_stats.funded_txo_sum) -
                 Number(addressInfo.mempool_stats.spent_txo_sum);
             const balance = satoshisToBtc.satoshisToBtc(confirmedBalanceInSats + unconfirmedBalanceInSats);
-            yield this.cache.setLastBalance(balance.toString());
             return balance.toString();
         });
     }
@@ -116,31 +110,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            // some wallets like xverse don't support fetching connected accounts
-            // without prompting for a connection
-            // to avoid this behavior, we cache the connected accounts
-            if (!this.canFetchConnectedAccounts) {
-                return this.getConnectedAccountsFromCache();
-            }
-            // if we decide that is ok to prompt for a connection when fetching connected accounts
-            // we shouldn't prompt every time we call this method (which is a lot of times)
-            // so we just store in a promise and return the same promise every time
-            if (!this.getAddressPromise) {
-                this.getAddressPromise = this.getAddress();
-            }
-            let connectedAccount;
-            try {
-                connectedAccount = yield this.getAddressPromise;
-            }
-            catch (error) {
-                walletConnectorCore.logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
-                //don't throw error just return empty array after clearing the promise
-            }
-            this.getAddressPromise = undefined;
-            if (!connectedAccount) {
-                return [];
-            }
-            return [connectedAccount];
+            return this.getConnectedAccountsFromCache();
         });
     }
     getAdditionalAddresses(mainAddress) {
@@ -223,25 +193,47 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return;
         }
         const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
+        const handleBitcoinDisconnect = (error) => _tslib.__awaiter(this, void 0, void 0, function* () {
+            this.cache.clearConnectedAcccounts();
+            handleDisconnect(error);
+        });
         const handleBitcoinAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (accounts.length === 0) {
+                this.cache.clearConnectedAcccounts();
+            }
             let connectedAccounts = accounts;
+            let ordinalsAccount, paymentAccount;
             // if accounts is an array of objects, we need to parse them to return only addresses
             // since ordinals is the main address we use, we should return it as the first address
             if (typeof accounts[0] === 'object') {
                 connectedAccounts = accounts
-                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .sort((account) => account.purpose === satsConnect.AddressPurpose.Ordinals ? -1 : 1)
                     .map((account) => account.address);
+                [ordinalsAccount, paymentAccount] = connectedAccounts;
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
-            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+            // or if the account change request is the same as previous request
+            if (currentConnectedAccounts[0] === connectedAccounts[0] ||
+                this.isSameAccountChangeRequest(connectedAccounts[0])) {
                 return;
             }
+            // set the last account change request with the from and to addresses
+            // to ensure that the requests are not duplicated
+            this.setLastAccountChangeRequest(connectedAccounts[0]);
+            if (ordinalsAccount || paymentAccount) {
+                this.setConnectedAccountWithAddresses({
+                    active: true,
+                    mainAddress: ordinalsAccount !== null && ordinalsAccount !== void 0 ? ordinalsAccount : paymentAccount,
+                    ordinalsAddress: ordinalsAccount,
+                    paymentAddress: paymentAccount,
+                });
+            }
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);
         provider.on('networkChanged', handleChainChange);
-        provider.on('disconnect', handleDisconnect);
+        provider.on('disconnect', handleBitcoinDisconnect);
         const tearDownEventListeners = () => {
             const provider = this.getProvider();
             if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
@@ -249,7 +241,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             }
             provider.removeListener('accountsChanged', handleBitcoinAccountChange);
             provider.removeListener('networkChanged', handleChainChange);
-            provider.removeListener('disconnect', handleDisconnect);
+            provider.removeListener('disconnect', handleBitcoinDisconnect);
         };
         this.teardownEventListeners = tearDownEventListeners;
     }

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -23,13 +23,16 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     canFetchConnectedAccounts: boolean;
     isHardwareWalletEnabled: boolean;
     verifiedCredentials: JwtVerifiedCredential[];
+    private lastAccountChange;
     constructor(opts: BitcoinWalletConnectorOpts);
+    private isSameAccountChangeRequest;
+    private setLastAccountChangeRequest;
     clearConnectedAccounts(): Promise<void>;
     canConnectWithHardwareWallet(): boolean;
     isInstalledOnBrowser(): boolean;
     getDeepLink(): string | undefined;
     endSession(): Promise<void>;
-    getBalance(): Promise<string | undefined>;
+    getBalance(address: string): Promise<string | undefined>;
     getConnectedAccountsFromCache(): Promise<string[]>;
     getConnectedAccounts(): Promise<string[]>;
     getAdditionalAddresses(mainAddress?: string): Promise<WalletAdditionalAddress[]>;

package/src/connectors/BitcoinWalletConnector.js

@@ -1,7 +1,8 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
+import { AddressPurpose } from 'sats-connect';
 import { WalletConnectorBase, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
-import { getWalletBookWallet, findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { getWalletBookWallet, isWalletMethodSupported, findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isLedgerAddressViaVerifiedCredentials, DynamicError } from '@dynamic-labs/utils';
 import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
 import { BitcoinLocalStorageCache } from '../BitcoinLocalStorageCache.js';
@@ -22,12 +23,20 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         this.verifiedCredentials = [];
         // this is the key from the wallet book entry so that we don't purely rely on the normalized name
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
-        this.bitcoinProviderHelper = new BitcoinProviderHelper(opts.walletData || getWalletBookWallet(this.walletBook, this.key));
+        const walletBookWallet = opts.walletData || getWalletBookWallet(this.walletBook, this.key);
+        this.bitcoinProviderHelper = new BitcoinProviderHelper(walletBookWallet);
         this.wallet = this.bitcoinProviderHelper.findWallet();
         if (this.wallet) {
             this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
         }
         this.cache = new BitcoinLocalStorageCache(this.overrideKey);
+        this.canFetchConnectedAccounts = isWalletMethodSupported(walletBookWallet, 'getConnectedAccounts', 'browserExtension');
+    }
+    isSameAccountChangeRequest(to) {
+        return this.lastAccountChange === to;
+    }
+    setLastAccountChangeRequest(to) {
+        this.lastAccountChange = to;
     }
     clearConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -49,31 +58,17 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.cache.clearLastBalance();
+            yield this.cache.clearConnectedAcccounts();
         });
     }
-    getBalance() {
+    getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const [connectedAddress] = yield this.getConnectedAccounts();
-            if (!connectedAddress) {
-                throw new DynamicError('getBalance - No connected address found!');
-            }
-            const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
-            const ordinalsAdditionalAddress = (_a = additionalAddresses.find((address) => address.type === WalletAddressType.Ordinals)) === null || _a === void 0 ? void 0 : _a.address;
-            const paymentAdditionalAddress = (_b = additionalAddresses.find((address) => address.type === WalletAddressType.Payment)) === null || _b === void 0 ? void 0 : _b.address;
-            // Some BTC wallet connectors only have 1 address type. when this is the case, it would always be `ordinals`
-            // if a BTC walletConnector does NOT have a payment address, just use the ordinal address
-            const paymentAddress = paymentAdditionalAddress !== null && paymentAdditionalAddress !== void 0 ? paymentAdditionalAddress : ordinalsAdditionalAddress;
-            if (!paymentAddress) {
-                throw new DynamicError('getBalance - No payment address found!');
-            }
-            const API_URL = getMempoolApiUrl(paymentAddress);
-            const response = yield fetch(`${API_URL}/address/${paymentAddress}`);
+            const API_URL = getMempoolApiUrl(address);
+            const response = yield fetch(`${API_URL}/address/${address}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === HTTP_STATUS_TOO_MANY_REQUESTS) {
-                    return this.cache.getLastBalance();
+                    return '0';
                 }
                 // new accounts not yet indexed will return a 404
                 if (response.status === HTTP_STATUS_NOT_FOUND) {
@@ -90,7 +85,6 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             const unconfirmedBalanceInSats = Number(addressInfo.mempool_stats.funded_txo_sum) -
                 Number(addressInfo.mempool_stats.spent_txo_sum);
             const balance = satoshisToBtc(confirmedBalanceInSats + unconfirmedBalanceInSats);
-            yield this.cache.setLastBalance(balance.toString());
             return balance.toString();
         });
     }
@@ -112,31 +106,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // some wallets like xverse don't support fetching connected accounts
-            // without prompting for a connection
-            // to avoid this behavior, we cache the connected accounts
-            if (!this.canFetchConnectedAccounts) {
-                return this.getConnectedAccountsFromCache();
-            }
-            // if we decide that is ok to prompt for a connection when fetching connected accounts
-            // we shouldn't prompt every time we call this method (which is a lot of times)
-            // so we just store in a promise and return the same promise every time
-            if (!this.getAddressPromise) {
-                this.getAddressPromise = this.getAddress();
-            }
-            let connectedAccount;
-            try {
-                connectedAccount = yield this.getAddressPromise;
-            }
-            catch (error) {
-                logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
-                //don't throw error just return empty array after clearing the promise
-            }
-            this.getAddressPromise = undefined;
-            if (!connectedAccount) {
-                return [];
-            }
-            return [connectedAccount];
+            return this.getConnectedAccountsFromCache();
         });
     }
     getAdditionalAddresses(mainAddress) {
@@ -219,25 +189,47 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             return;
         }
         const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
+        const handleBitcoinDisconnect = (error) => __awaiter(this, void 0, void 0, function* () {
+            this.cache.clearConnectedAcccounts();
+            handleDisconnect(error);
+        });
         const handleBitcoinAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
+            if (accounts.length === 0) {
+                this.cache.clearConnectedAcccounts();
+            }
             let connectedAccounts = accounts;
+            let ordinalsAccount, paymentAccount;
             // if accounts is an array of objects, we need to parse them to return only addresses
             // since ordinals is the main address we use, we should return it as the first address
             if (typeof accounts[0] === 'object') {
                 connectedAccounts = accounts
-                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .sort((account) => account.purpose === AddressPurpose.Ordinals ? -1 : 1)
                     .map((account) => account.address);
+                [ordinalsAccount, paymentAccount] = connectedAccounts;
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
-            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+            // or if the account change request is the same as previous request
+            if (currentConnectedAccounts[0] === connectedAccounts[0] ||
+                this.isSameAccountChangeRequest(connectedAccounts[0])) {
                 return;
             }
+            // set the last account change request with the from and to addresses
+            // to ensure that the requests are not duplicated
+            this.setLastAccountChangeRequest(connectedAccounts[0]);
+            if (ordinalsAccount || paymentAccount) {
+                this.setConnectedAccountWithAddresses({
+                    active: true,
+                    mainAddress: ordinalsAccount !== null && ordinalsAccount !== void 0 ? ordinalsAccount : paymentAccount,
+                    ordinalsAddress: ordinalsAccount,
+                    paymentAddress: paymentAccount,
+                });
+            }
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);
         provider.on('networkChanged', handleChainChange);
-        provider.on('disconnect', handleDisconnect);
+        provider.on('disconnect', handleBitcoinDisconnect);
         const tearDownEventListeners = () => {
             const provider = this.getProvider();
             if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
@@ -245,7 +237,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             }
             provider.removeListener('accountsChanged', handleBitcoinAccountChange);
             provider.removeListener('networkChanged', handleChainChange);
-            provider.removeListener('disconnect', handleDisconnect);
+            provider.removeListener('disconnect', handleBitcoinDisconnect);
         };
         this.teardownEventListeners = tearDownEventListeners;
     }

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs

@@ -0,0 +1,37 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
+
+class FallbackBitcoinConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'fallbackconnector' }));
+        this.name = 'Fallback Connector';
+        this.overrideKey = 'fallbackconnector';
+        this.isAvailable = false;
+    }
+    getAddress() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    signPsbt(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _request) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    sendBitcoin(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+}
+
+exports.FallbackBitcoinConnector = FallbackBitcoinConnector;

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.d.ts

@@ -0,0 +1,11 @@
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction } from '../../types';
+import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
+export declare class FallbackBitcoinConnector extends BitcoinWalletConnector {
+    name: string;
+    overrideKey: string;
+    isAvailable: boolean;
+    constructor(opts: BitcoinWalletConnectorOpts);
+    getAddress(): Promise<string | undefined>;
+    signPsbt(_request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    sendBitcoin(_transaction: BitcoinTransaction): Promise<string | undefined>;
+}

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js

@@ -0,0 +1,33 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
+
+class FallbackBitcoinConnector extends BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'fallbackconnector' }));
+        this.name = 'Fallback Connector';
+        this.overrideKey = 'fallbackconnector';
+        this.isAvailable = false;
+    }
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    signPsbt(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    sendBitcoin(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+}
+
+export { FallbackBitcoinConnector };

package/src/connectors/FallbackBitcoinConnector/index.d.ts

@@ -0,0 +1 @@
+export { FallbackBitcoinConnector } from './FallbackBitcoinConnector';

package/src/connectors/OkxConnector/OkxConnector.cjs

@@ -13,7 +13,6 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -23,7 +22,8 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 utils.isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = utils.template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),

package/src/connectors/OkxConnector/OkxConnector.d.ts

@@ -2,7 +2,6 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
 export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private get walletBookWallet();
     getAddress(): Promise<string | undefined>;

package/src/connectors/OkxConnector/OkxConnector.js

@@ -9,7 +9,6 @@ class OkxConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -19,7 +18,8 @@ class OkxConnector extends BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),

package/src/connectors/PhantomConnector/PhantomConnector.cjs

@@ -17,7 +17,6 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -27,7 +26,7 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals

package/src/connectors/PhantomConnector/PhantomConnector.d.ts

@@ -2,7 +2,6 @@ import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } f
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;

package/src/connectors/PhantomConnector/PhantomConnector.js

@@ -13,7 +13,6 @@ class PhantomConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,7 +22,7 @@ class PhantomConnector extends BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals

package/src/connectors/UnisatConnector/UnisatConnector.cjs

@@ -13,7 +13,6 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -65,6 +64,15 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return [];
+            }
+            return provider.getAccounts();
+        });
+    }
 }
 
 exports.UnisatConnector = UnisatConnector;

package/src/connectors/UnisatConnector/UnisatConnector.d.ts

@@ -3,10 +3,10 @@ import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } f
 export declare class UnisatConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    getConnectedAccounts(): Promise<string[]>;
 }

package/src/connectors/UnisatConnector/UnisatConnector.js

@@ -9,7 +9,6 @@ class UnisatConnector extends BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -61,6 +60,15 @@ class UnisatConnector extends BitcoinWalletConnector {
             return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return [];
+            }
+            return provider.getAccounts();
+        });
+    }
 }
 
 export { UnisatConnector };

package/src/connectors/UnknownInjected/UnknownInjected.cjs

@@ -11,7 +11,6 @@ class UnknownInjectedConnector extends BitcoinWalletConnector.BitcoinWalletConne
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unknown' }));
         this.name = 'Unknown';
         this.overrideKey = 'unknown';
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/connectors/UnknownInjected/UnknownInjected.d.ts

@@ -3,7 +3,6 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 export declare class UnknownInjectedConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signPsbt(_request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;

package/src/connectors/UnknownInjected/UnknownInjected.js

@@ -7,7 +7,6 @@ class UnknownInjectedConnector extends BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unknown' }));
         this.name = 'Unknown';
         this.overrideKey = 'unknown';
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/connectors/index.d.ts

@@ -5,3 +5,4 @@ export * from './PhantomConnector';
 export * from './OkxConnector';
 export * from './UnisatConnector';
 export * from './UnknownInjected';
+export * from './FallbackBitcoinConnector';