@dynamic-labs/bitcoin 3.0.0-alpha.6 → 3.0.0-alpha.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.0-alpha.60",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,14 +27,14 @@
   },
   "dependencies": {
     "@btckit/types": "0.0.19",
-    "@dynamic-labs/sdk-api-core": "0.0.470",
+    "@dynamic-labs/sdk-api-core": "0.0.526",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.0.0",
-    "@dynamic-labs/utils": "3.0.0-alpha.6",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.6",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.6",
+    "@dynamic-labs/utils": "3.0.0-alpha.60",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.60",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.60",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/BitcoinLocalStorageCache.cjs

@@ -9,7 +9,6 @@ var utils = require('@dynamic-labs/utils');
 class BitcoinLocalStorageCache {
     constructor(key) {
         this.CONNECTED_ACCOUNTS_KEY = `bitcoin_${key}_connectedAccounts`;
-        this.LAST_BALANCE_KEY = `bitcoin_${key}_lastBalance`;
     }
     getActiveAccount() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -63,21 +62,6 @@ class BitcoinLocalStorageCache {
             return utils.removeItemAsync(this.CONNECTED_ACCOUNTS_KEY);
         });
     }
-    getLastBalance() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.getItemAsync(this.LAST_BALANCE_KEY);
-        });
-    }
-    setLastBalance(balance) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.setItemAsync(this.LAST_BALANCE_KEY, balance);
-        });
-    }
-    clearLastBalance() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.removeItemAsync(this.LAST_BALANCE_KEY);
-        });
-    }
 }
 
 exports.BitcoinLocalStorageCache = BitcoinLocalStorageCache;

package/src/BitcoinLocalStorageCache.d.ts

@@ -9,16 +9,12 @@ type BitcoinActiveAccount = {
 };
 export declare class BitcoinLocalStorageCache implements IBitcoinSessionCache {
     private readonly CONNECTED_ACCOUNTS_KEY;
-    private readonly LAST_BALANCE_KEY;
     constructor(key: string);
     getActiveAccount(): Promise<BitcoinActiveAccount | undefined>;
     getConnectedAccounts(): Promise<BitcoinConnectedAccounts | undefined>;
     getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
     setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
     clearConnectedAcccounts(): Promise<void>;
-    getLastBalance(): Promise<string | undefined>;
-    setLastBalance(balance: string): Promise<void>;
-    clearLastBalance(): Promise<void>;
 }
 export interface IBitcoinSessionCache {
     clearConnectedAcccounts(): Promise<void>;
@@ -26,8 +22,5 @@ export interface IBitcoinSessionCache {
     getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
     getConnectedAccounts(): Promise<BitcoinConnectedAccounts | undefined>;
     setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
-    clearLastBalance(): Promise<void>;
-    getLastBalance(): Promise<string | undefined>;
-    setLastBalance(balance: string): Promise<void>;
 }
 export {};

package/src/BitcoinLocalStorageCache.js

@@ -5,7 +5,6 @@ import { getItemAsync, setItemAsync, removeItemAsync } from '@dynamic-labs/utils
 class BitcoinLocalStorageCache {
     constructor(key) {
         this.CONNECTED_ACCOUNTS_KEY = `bitcoin_${key}_connectedAccounts`;
-        this.LAST_BALANCE_KEY = `bitcoin_${key}_lastBalance`;
     }
     getActiveAccount() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -59,21 +58,6 @@ class BitcoinLocalStorageCache {
             return removeItemAsync(this.CONNECTED_ACCOUNTS_KEY);
         });
     }
-    getLastBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return getItemAsync(this.LAST_BALANCE_KEY);
-        });
-    }
-    setLastBalance(balance) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return setItemAsync(this.LAST_BALANCE_KEY, balance);
-        });
-    }
-    clearLastBalance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return removeItemAsync(this.LAST_BALANCE_KEY);
-        });
-    }
 }
 
 export { BitcoinLocalStorageCache };

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -11,18 +11,14 @@ 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;
-        // satsconnect wallets don't support fetching connected accounts without prompting
-        // for a connection, so we handle getConnectedAccounts differently.
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -37,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()),
@@ -81,10 +80,9 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             });
         });
     }
-    signMessage(messageToSign) {
+    signMessageWithAddress(messageToSign, address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress || !supportsSatsConnect.supportsSatsConnect(this)) {
+            if (!supportsSatsConnect.supportsSatsConnect(this)) {
                 return;
             }
             return new Promise((resolve, reject) => {
@@ -109,7 +107,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                         resolve(response);
                     }),
                     payload: {
-                        address: walletAddress,
+                        address,
                         message: messageToSign,
                         network: {
                             type: this.currentNetwork,
@@ -119,6 +117,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             });
         });
     }
+    signMessage(messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const [walletAddress] = yield this.getConnectedAccounts();
+            if (!walletAddress) {
+                return;
+            }
+            return this.signMessageWithAddress(messageToSign, walletAddress);
+        });
+    }
     sendBitcoin(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -187,29 +194,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) {
@@ -218,6 +240,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,15 @@
-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>;
+    signMessageWithAddress(messageToSign: string, address: string): 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,24 +1,20 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
-import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
+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;
-        // satsconnect wallets don't support fetching connected accounts without prompting
-        // for a connection, so we handle getConnectedAccounts differently.
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -33,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()),
@@ -77,10 +76,9 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             });
         });
     }
-    signMessage(messageToSign) {
+    signMessageWithAddress(messageToSign, address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress || !supportsSatsConnect(this)) {
+            if (!supportsSatsConnect(this)) {
                 return;
             }
             return new Promise((resolve, reject) => {
@@ -105,7 +103,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                         resolve(response);
                     }),
                     payload: {
-                        address: walletAddress,
+                        address,
                         message: messageToSign,
                         network: {
                             type: this.currentNetwork,
@@ -115,6 +113,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             });
         });
     }
+    signMessage(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [walletAddress] = yield this.getConnectedAccounts();
+            if (!walletAddress) {
+                return;
+            }
+            return this.signMessageWithAddress(messageToSign, walletAddress);
+        });
+    }
     sendBitcoin(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -183,29 +190,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) {
@@ -214,6 +236,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');
@@ -13,11 +14,13 @@ var bitcoinProviderHelper = require('../bitcoinProviderHelper.cjs');
 var getMempoolApiUrl = require('../utils/getMempoolApiUrl.cjs');
 var _const = require('../const.cjs');
 var satoshisToBtc = require('../utils/satoshisToBtc/satoshisToBtc.cjs');
+var BitcoinWallet = require('../wallet/BitcoinWallet.cjs');
 
 class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
         var _a;
         super(opts);
+        this.ChainWallet = BitcoinWallet.BitcoinWallet;
         this.connectedChain = 'BTC';
         this.supportedChains = ['BTC'];
         // some wallets don't support fetching connected accounts without prompting for a connection
@@ -26,12 +29,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,34 +64,17 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearConnectedAcccounts(),
-                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) {
@@ -97,7 +91,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();
         });
     }
@@ -117,12 +110,12 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             ];
         });
     }
-    getConnectedAccounts() {
+    getConnectedAccounts(options) {
         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) {
+            if (!this.canFetchConnectedAccounts && !(options === null || options === void 0 ? void 0 : options.forceFetch)) {
                 return this.getConnectedAccountsFromCache();
             }
             // if we decide that is ok to prompt for a connection when fetching connected accounts
@@ -164,11 +157,12 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     sendRawTransaction(rawTransaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!rawTransaction)
-                return;
+            if (!rawTransaction) {
+                throw new utils.DynamicError('No transaction specified!');
+            }
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
-                throw new utils.DynamicError('sendRawTransaction - No connected address found!');
+                throw new utils.DynamicError('No connected address found!');
             }
             const API_URL = getMempoolApiUrl.getMempoolApiUrl(connectedAddress);
             const response = yield fetch(`${API_URL}/tx`, {
@@ -194,6 +188,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) {
@@ -228,18 +234,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);
@@ -262,6 +283,18 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     isLedgerAddress(address) {
         return utils.isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
     }
+    proveOwnership(address, messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return this.signMessageWithAddress(messageToSign, address);
+        });
+    }
+    signMessageWithAddress(messageToSign, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _address) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return this.signMessage(messageToSign);
+        });
+    }
 }
 
 exports.BitcoinWalletConnector = BitcoinWalletConnector;