@dynamic-labs/bitcoin 3.0.0-alpha.5 → 3.0.0-alpha.50

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -6,29 +6,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
 var satsConnect = require('sats-connect');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
 var _const = require('../../const.cjs');
 require('@dynamic-labs/wallet-connector-core');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
-var validatePsbt = require('../../utils/psbt/validator/validatePsbt.cjs');
-var getSigHashType = require('../../utils/psbt/getSigHashType.cjs');
 var bitcoinNetworkTypeToNetworks = require('../../utils/psbt/bitcoinNetworkTypeToNetworks.cjs');
+var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
-        this.canFetchConnectedAccounts = true;
-        // xverse does't support fetching connected accounts without prompting
-        // for a connection, so we handle getConnectedAccounts differently
-        this.canFetchConnectedAccounts = this.key !== 'xverse';
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             // xverse doesn't support wallet standard, so we won't have a wallet object,
             // but it's already the default provider for sats-connect, so it's ok
             // for getProvider in getAddress to return undefined
@@ -39,7 +33,10 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             }
             const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
             const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (utils.isMobile() && !this.isInstalledOnBrowser() && inAppBrowserUrl) {
+            if (utils.isMobile() &&
+                !this.isInstalledOnBrowser() &&
+                inAppBrowserUrl &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
                 const deepLink = inAppBrowserTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -47,12 +44,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                 window.location.href = deepLink;
                 return;
             }
-            const cachedActiveAccount = yield this.cache.getActiveAccount();
-            if (cachedActiveAccount) {
-                const ordinalsAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Ordinals);
-                const paymentAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Payment);
-                return (_b = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _b !== void 0 ? _b : paymentAddress === null || paymentAddress === void 0 ? void 0 : paymentAddress.address;
-            }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -195,29 +186,44 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             });
         });
     }
+    signTransactions(transactions) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { message, psbts, network } = transactions;
+            return new Promise((resolve, reject) => {
+                satsConnect.signMultipleTransactions({
+                    getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[_const.SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
+                    }),
+                    onCancel: () => {
+                        const error = new Error();
+                        error.code = '-32000'; // error code for user cancelled
+                        reject(error);
+                    },
+                    onFinish: (response) => {
+                        resolve(response);
+                    },
+                    payload: {
+                        message: message || 'Sign Transaction',
+                        network,
+                        psbts,
+                    },
+                });
+            });
+        });
+    }
     signPsbt(request) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a;
             if (!((_a = request.allowedSighash) === null || _a === void 0 ? void 0 : _a.length))
                 throw new Error('allowedSighash cannot be an empty array');
             const network = bitcoinNetworkTypeToNetworks.convertNetworkTypeForPsbt(this.currentNetwork);
             const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64, {
                 network,
             });
-            if ((_b = request.signature) === null || _b === void 0 ? void 0 : _b.length) {
-                validatePsbt.validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
-            }
-            const inputsToSign = ((_d = (_c = request.signature) === null || _c === void 0 ? void 0 : _c.map((sig) => {
-                var _a;
-                return ((_a = sig.signingIndexes) !== null && _a !== void 0 ? _a : []).map((inputIndex) => ({
-                    address: sig.address,
-                    sigHash: getSigHashType.getSigHashType(psbtFromBase64.data.inputs[inputIndex]),
-                    signingIndexes: [inputIndex],
-                }));
-            })) !== null && _d !== void 0 ? _d : []).flat();
             const signedPsbt = yield this.signTransaction({
                 broadcast: false,
-                inputsToSign,
+                inputsToSign: createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request),
                 psbtBase64: request.unsignedPsbtBase64,
             });
             if (!signedPsbt) {
@@ -226,6 +232,31 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             return { signedPsbt: signedPsbt.psbtBase64 };
         });
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const network = bitcoinNetworkTypeToNetworks.convertNetworkTypeForPsbt(this.currentNetwork);
+            const signMultipleTransactionPayload = {
+                message: 'Sign Transaction',
+                network: {
+                    type: this.currentNetwork,
+                },
+                psbts: [],
+            };
+            for (const request of requests) {
+                const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64, {
+                    network,
+                });
+                const inputsToSign = createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request);
+                signMultipleTransactionPayload.psbts.push({
+                    inputsToSign,
+                    psbtBase64: request.unsignedPsbtBase64,
+                });
+            }
+            const signedPsbts = yield this.signTransactions(signMultipleTransactionPayload);
+            return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
+        });
+    }
 }
 
 exports.BitcoinSatsConnectConnector = BitcoinSatsConnectConnector;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.d.ts

@@ -1,13 +1,14 @@
-import { BitcoinNetworkType, SignTransactionResponse } from 'sats-connect';
+import { BitcoinNetworkType, SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
 import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     currentNetwork: BitcoinNetworkType;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signTransaction(params: SatsConnectSignTransactionInput): Promise<SignTransactionResponse | undefined>;
+    signTransactions(transactions: SignMultipleTransactionsPayload): Promise<SignTransactionResponse[] | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
 }

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -1,30 +1,24 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
-import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
-import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
+import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction, signMultipleTransactions } from 'sats-connect';
 import { isMobile, template } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import '@dynamic-labs/wallet-connector-core';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
-import { validatePsbt } from '../../utils/psbt/validator/validatePsbt.js';
-import { getSigHashType } from '../../utils/psbt/getSigHashType.js';
 import { convertNetworkTypeForPsbt } from '../../utils/psbt/bitcoinNetworkTypeToNetworks.js';
+import { createSignPsbtOptionsForSatsConnect } from '../../utils/psbt/createSignPsbtOptions.js';
 import { supportsSatsConnect } from '../../utils/supportsSatsConnect.js';
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
         this.currentNetwork = BitcoinNetworkType.Mainnet;
-        this.canFetchConnectedAccounts = true;
-        // xverse does't support fetching connected accounts without prompting
-        // for a connection, so we handle getConnectedAccounts differently
-        this.canFetchConnectedAccounts = this.key !== 'xverse';
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             // xverse doesn't support wallet standard, so we won't have a wallet object,
             // but it's already the default provider for sats-connect, so it's ok
             // for getProvider in getAddress to return undefined
@@ -35,7 +29,10 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             }
             const wallet = findWalletBookWallet(this.walletBook, this.key);
             const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (isMobile() && !this.isInstalledOnBrowser() && inAppBrowserUrl) {
+            if (isMobile() &&
+                !this.isInstalledOnBrowser() &&
+                inAppBrowserUrl &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserTemplate = template(inAppBrowserUrl);
                 const deepLink = inAppBrowserTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -43,12 +40,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                 window.location.href = deepLink;
                 return;
             }
-            const cachedActiveAccount = yield this.cache.getActiveAccount();
-            if (cachedActiveAccount) {
-                const ordinalsAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === WalletAddressType.Ordinals);
-                const paymentAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === WalletAddressType.Payment);
-                return (_b = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _b !== void 0 ? _b : paymentAddress === null || paymentAddress === void 0 ? void 0 : paymentAddress.address;
-            }
             return new Promise((resolve, reject) => {
                 getAddress({
                     getProvider: () => __awaiter(this, void 0, void 0, function* () {
@@ -191,29 +182,44 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             });
         });
     }
+    signTransactions(transactions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { message, psbts, network } = transactions;
+            return new Promise((resolve, reject) => {
+                signMultipleTransactions({
+                    getProvider: () => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
+                    }),
+                    onCancel: () => {
+                        const error = new Error();
+                        error.code = '-32000'; // error code for user cancelled
+                        reject(error);
+                    },
+                    onFinish: (response) => {
+                        resolve(response);
+                    },
+                    payload: {
+                        message: message || 'Sign Transaction',
+                        network,
+                        psbts,
+                    },
+                });
+            });
+        });
+    }
     signPsbt(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a;
             if (!((_a = request.allowedSighash) === null || _a === void 0 ? void 0 : _a.length))
                 throw new Error('allowedSighash cannot be an empty array');
             const network = convertNetworkTypeForPsbt(this.currentNetwork);
             const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64, {
                 network,
             });
-            if ((_b = request.signature) === null || _b === void 0 ? void 0 : _b.length) {
-                validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
-            }
-            const inputsToSign = ((_d = (_c = request.signature) === null || _c === void 0 ? void 0 : _c.map((sig) => {
-                var _a;
-                return ((_a = sig.signingIndexes) !== null && _a !== void 0 ? _a : []).map((inputIndex) => ({
-                    address: sig.address,
-                    sigHash: getSigHashType(psbtFromBase64.data.inputs[inputIndex]),
-                    signingIndexes: [inputIndex],
-                }));
-            })) !== null && _d !== void 0 ? _d : []).flat();
             const signedPsbt = yield this.signTransaction({
                 broadcast: false,
-                inputsToSign,
+                inputsToSign: createSignPsbtOptionsForSatsConnect(psbtFromBase64, request),
                 psbtBase64: request.unsignedPsbtBase64,
             });
             if (!signedPsbt) {
@@ -222,6 +228,31 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             return { signedPsbt: signedPsbt.psbtBase64 };
         });
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const network = convertNetworkTypeForPsbt(this.currentNetwork);
+            const signMultipleTransactionPayload = {
+                message: 'Sign Transaction',
+                network: {
+                    type: this.currentNetwork,
+                },
+                psbts: [],
+            };
+            for (const request of requests) {
+                const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64, {
+                    network,
+                });
+                const inputsToSign = createSignPsbtOptionsForSatsConnect(psbtFromBase64, request);
+                signMultipleTransactionPayload.psbts.push({
+                    inputsToSign,
+                    psbtBase64: request.unsignedPsbtBase64,
+                });
+            }
+            const signedPsbts = yield this.signTransactions(signMultipleTransactionPayload);
+            return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
+        });
+    }
 }
 
 export { BitcoinSatsConnectConnector };

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();
         });
     }
@@ -191,6 +185,18 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const signedPsbtResponses = [];
+            for (const request of requests) {
+                const signedPsbtResponse = yield this.signPsbt(request);
+                if (signedPsbtResponse) {
+                    signedPsbtResponses.push(signedPsbtResponse);
+                }
+            }
+            return signedPsbtResponses.map((response) => response.signedPsbt);
+        });
+    }
     setConnectedAccountWithAddresses(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ mainAddress, ordinalsAddress, paymentAddress, active, }) {
             if (!mainAddress) {
@@ -225,18 +231,33 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
         const handleBitcoinAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
             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);

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[]>;
@@ -38,6 +41,7 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     abstract sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     getProvider<T>(): T & EventEmitter;
     abstract signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
     setConnectedAccountWithAddresses({ mainAddress, ordinalsAddress, paymentAddress, active, }: ConnectedAccountWithAddressesProps): Promise<void>;
     setupEventListeners(): void;
     setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;

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();
         });
     }
@@ -187,6 +181,18 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const signedPsbtResponses = [];
+            for (const request of requests) {
+                const signedPsbtResponse = yield this.signPsbt(request);
+                if (signedPsbtResponse) {
+                    signedPsbtResponses.push(signedPsbtResponse);
+                }
+            }
+            return signedPsbtResponses.map((response) => response.signedPsbt);
+        });
+    }
     setConnectedAccountWithAddresses(_a) {
         return __awaiter(this, arguments, void 0, function* ({ mainAddress, ordinalsAddress, paymentAddress, active, }) {
             if (!mainAddress) {
@@ -221,18 +227,33 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
         const handleBitcoinAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
             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);

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs

@@ -0,0 +1,44 @@
+'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;
+        });
+    }
+    signPsbts(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _requests) {
+        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,12 @@
+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>;
+    signPsbts(_requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
+    sendBitcoin(_transaction: BitcoinTransaction): Promise<string | undefined>;
+}