@dynamic-labs/bitcoin 3.0.0-alpha.8 → 3.0.0

package/src/connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.js

@@ -0,0 +1,212 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { 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 'bitcoinjs-lib';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '@wallet-standard/app';
+import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';
+import { supportsSatsConnect } from '../../utils/supportsSatsConnect.js';
+
+class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
+    constructor() {
+        super(...arguments);
+        this.isLegacy = true;
+    }
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            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
+            // if we're not using xverse, we need to check if there is a wallet and
+            // that it has the satsconnect feature to return the correct provider to use
+            if (!supportsSatsConnect(this)) {
+                return;
+            }
+            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 &&
+                this.mobileExperience === 'in-app-browser') {
+                const inAppBrowserTemplate = template(inAppBrowserUrl);
+                const deepLink = inAppBrowserTemplate({
+                    encodedDappURI: encodeURIComponent(window.location.toString()),
+                });
+                window.location.href = deepLink;
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                getAddress({
+                    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) => __awaiter(this, void 0, void 0, function* () {
+                        var _c;
+                        const { addresses } = response;
+                        const ordinalsAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Ordinals);
+                        const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Payment);
+                        const mainAddress = (_c = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _c !== void 0 ? _c : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+                        yield this.setConnectedAccountWithAddresses({
+                            active: true,
+                            mainAddress,
+                            ordinalsAddress: ordinalsAccount,
+                            paymentAddress: paymentAccount,
+                        });
+                        resolve(mainAddress);
+                    }),
+                    payload: {
+                        message: 'Address for receiving Ordinals and payments',
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                        purposes: [AddressPurpose.Ordinals, AddressPurpose.Payment],
+                    },
+                });
+            });
+        });
+    }
+    signMessage(messageToSign, withAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!supportsSatsConnect(this)) {
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                signMessage({
+                    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) => __awaiter(this, void 0, void 0, function* () {
+                        if (this.isHardwareWalletEnabled) {
+                            return resolve(JSON.stringify({
+                                signedTransaction: {
+                                    data: response,
+                                },
+                            }));
+                        }
+                        resolve(response);
+                    }),
+                    payload: {
+                        address: withAddress,
+                        message: messageToSign,
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                    },
+                });
+            });
+        });
+    }
+    sendBitcoin(transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const mainAddress = yield this.getAddress();
+            const senderAddress = (_a = (yield this.getAdditionalAddresses(mainAddress)).find((address) => address.type === 'payment')) === null || _a === void 0 ? void 0 : _a.address;
+            if (!senderAddress || !supportsSatsConnect(this)) {
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                sendBtcTransaction({
+                    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: {
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                        recipients: [
+                            {
+                                address: transaction.recipientAddress,
+                                amountSats: transaction.amount,
+                            },
+                        ],
+                        senderAddress,
+                    },
+                });
+            });
+        });
+    }
+    signTransaction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { message, psbtBase64, broadcast, inputsToSign } = params;
+            return new Promise((resolve, reject) => {
+                signTransaction({
+                    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: {
+                        broadcast,
+                        inputsToSign,
+                        message: message || 'Sign Transaction',
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                        psbtBase64,
+                    },
+                });
+            });
+        });
+    }
+    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,
+                    },
+                });
+            });
+        });
+    }
+}
+
+export { BitcoinSatsConnectLegacyConnector };

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

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

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,14 @@ 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;
@@ -59,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) {
@@ -103,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();
         });
     }
@@ -142,7 +129,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 connectedAccount = yield this.getAddressPromise;
             }
             catch (error) {
-                walletConnectorCore.logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
+                walletConnectorCore.logger.error(`${this.key} getConnectedAccounts - error fetching connected account`, error);
                 //don't throw error just return empty array after clearing the promise
             }
             this.getAddressPromise = undefined;
@@ -170,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`, {
@@ -200,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) {
@@ -234,12 +234,14 @@ 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
@@ -251,6 +253,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             // 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);
@@ -273,6 +283,11 @@ 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.signMessage(messageToSign, address);
+        });
+    }
 }
 
 exports.BitcoinWalletConnector = BitcoinWalletConnector;

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -7,13 +7,15 @@ import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential, WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
 import { IBitcoinSessionCache } from '../BitcoinLocalStorageCache';
 import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinWalletStandardMethods, ConnectedAccountWithAddressesProps } from '../types';
+import { BitcoinWallet } from '../wallet';
 export type BitcoinWalletConnectorOpts = {
     walletBook: WalletBookSchema;
     walletData: WalletSchema;
     overrideKey?: string;
 };
-export declare abstract class BitcoinWalletConnector extends WalletConnectorBase implements IBitcoinWalletConnector {
+export declare abstract class BitcoinWalletConnector extends WalletConnectorBase<typeof BitcoinWallet> implements IBitcoinWalletConnector {
     cache: IBitcoinSessionCache;
+    ChainWallet: typeof BitcoinWallet;
     connectedChain: Chain;
     supportedChains: Chain[];
     private getAddressPromise;
@@ -32,17 +34,19 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     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[]>;
     setAdditionalAddresses(mainAddress: string, additionalAddresses: WalletAdditionalAddress[]): Promise<void>;
-    sendRawTransaction(rawTransaction: string): Promise<string | undefined>;
+    sendRawTransaction(rawTransaction: string): Promise<string>;
     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;
     isLedgerAddress(address: string): boolean;
+    proveOwnership(address: string, messageToSign: string): Promise<string | undefined>;
 }

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';
@@ -9,11 +10,13 @@ import { BitcoinProviderHelper } from '../bitcoinProviderHelper.js';
 import { getMempoolApiUrl } from '../utils/getMempoolApiUrl.js';
 import { HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_NOT_FOUND } from '../const.js';
 import { satoshisToBtc } from '../utils/satoshisToBtc/satoshisToBtc.js';
+import { BitcoinWallet } from '../wallet/BitcoinWallet.js';
 
 class BitcoinWalletConnector extends WalletConnectorBase {
     constructor(opts) {
         var _a;
         super(opts);
+        this.ChainWallet = BitcoinWallet;
         this.connectedChain = 'BTC';
         this.supportedChains = ['BTC'];
         // some wallets don't support fetching connected accounts without prompting for a connection
@@ -22,12 +25,14 @@ 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;
@@ -55,34 +60,17 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearConnectedAcccounts(),
-                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) {
@@ -99,7 +87,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();
         });
     }
@@ -138,7 +125,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
                 connectedAccount = yield this.getAddressPromise;
             }
             catch (error) {
-                logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
+                logger.error(`${this.key} getConnectedAccounts - error fetching connected account`, error);
                 //don't throw error just return empty array after clearing the promise
             }
             this.getAddressPromise = undefined;
@@ -166,11 +153,12 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     sendRawTransaction(rawTransaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!rawTransaction)
-                return;
+            if (!rawTransaction) {
+                throw new DynamicError('No transaction specified!');
+            }
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
-                throw new DynamicError('sendRawTransaction - No connected address found!');
+                throw new DynamicError('No connected address found!');
             }
             const API_URL = getMempoolApiUrl(connectedAddress);
             const response = yield fetch(`${API_URL}/tx`, {
@@ -196,6 +184,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) {
@@ -230,12 +230,14 @@ 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
@@ -247,6 +249,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             // 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);
@@ -269,6 +279,11 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     isLedgerAddress(address) {
         return isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
     }
+    proveOwnership(address, messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.signMessage(messageToSign, address);
+        });
+    }
 }
 
 export { BitcoinWalletConnector };

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs

@@ -12,7 +12,6 @@ class FallbackBitcoinConnector extends BitcoinWalletConnector.BitcoinWalletConne
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -26,6 +25,13 @@ class FallbackBitcoinConnector extends BitcoinWalletConnector.BitcoinWalletConne
             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) {

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

@@ -4,9 +4,9 @@ export declare class FallbackBitcoinConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
     isAvailable: boolean;
-    canFetchConnectedAccounts: 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>;
 }

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js

@@ -8,7 +8,6 @@ class FallbackBitcoinConnector extends BitcoinWalletConnector {
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -22,6 +21,13 @@ class FallbackBitcoinConnector extends BitcoinWalletConnector {
             return;
         });
     }
+    signPsbts(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
     sendBitcoin(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _transaction) {