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

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -2,18 +2,20 @@
 /// <reference types="node" />
 import { EventEmitter } from 'stream';
 import type { Wallet } from '@wallet-standard/base';
-import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IBitcoinWalletConnector, WalletConnectorBase, GetConnectedAccountsOpts } from '@dynamic-labs/wallet-connector-core';
 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;
@@ -23,23 +25,29 @@ 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[]>;
+    getConnectedAccounts(options?: GetConnectedAccountsOpts): 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>;
+    signMessageWithAddress(messageToSign: string, _address: 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,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,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) {
@@ -93,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();
         });
     }
@@ -113,12 +106,12 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             ];
         });
     }
-    getConnectedAccounts() {
+    getConnectedAccounts(options) {
         return __awaiter(this, void 0, void 0, function* () {
             // some wallets like xverse don't support fetching connected accounts
             // without prompting for a connection
             // to avoid this behavior, we cache the connected accounts
-            if (!this.canFetchConnectedAccounts) {
+            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
@@ -160,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`, {
@@ -190,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) {
@@ -224,18 +230,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);
@@ -258,6 +279,18 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     isLedgerAddress(address) {
         return isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
     }
+    proveOwnership(address, messageToSign) {
+        return __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 __awaiter(this, void 0, void 0, function* () {
+            return this.signMessage(messageToSign);
+        });
+    }
 }
 
 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) {

package/src/connectors/OkxConnector/OkxConnector.cjs

@@ -13,7 +13,6 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -23,7 +22,8 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 utils.isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = utils.template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -78,6 +78,23 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbt = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbt.toHex());
+                psbtOptions.push(createSignPsbtOptions.createPsbtOptions(psbt, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
 }
 
 exports.OkxConnector = OkxConnector;

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

@@ -2,11 +2,11 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
 export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private get walletBookWallet();
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
 }

package/src/connectors/OkxConnector/OkxConnector.js

@@ -9,7 +9,6 @@ class OkxConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -19,7 +18,8 @@ class OkxConnector extends BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -74,6 +74,23 @@ class OkxConnector extends BitcoinWalletConnector {
             return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbt = Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbt.toHex());
+                psbtOptions.push(createPsbtOptions(psbt, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
 }
 
 export { OkxConnector };

package/src/connectors/PhantomConnector/PhantomConnector.cjs

@@ -17,7 +17,6 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -27,7 +26,7 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals
@@ -68,17 +67,13 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign) {
+    signMessageWithAddress(messageToSign, address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
-            }
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: walletAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -88,11 +83,20 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(walletAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });
     }
+    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* () {
             walletConnectorCore.logger.debug('sendBitcoin - function not implemented', transaction);

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

@@ -2,10 +2,10 @@ import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } f
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;
+    signMessageWithAddress(messageToSign: string, address: string): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;

package/src/connectors/PhantomConnector/PhantomConnector.js

@@ -13,7 +13,6 @@ class PhantomConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,7 +22,7 @@ class PhantomConnector extends BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals
@@ -64,17 +63,13 @@ class PhantomConnector extends BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign) {
+    signMessageWithAddress(messageToSign, address) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
-            }
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: walletAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -84,11 +79,20 @@ class PhantomConnector extends BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(walletAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });
     }
+    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* () {
             logger.debug('sendBitcoin - function not implemented', transaction);

package/src/connectors/UnisatConnector/UnisatConnector.cjs

@@ -13,7 +13,6 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -65,6 +64,32 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbtFromBase64.toHex());
+                psbtOptions.push(createSignPsbtOptions.createPsbtOptions(psbtFromBase64, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return [];
+            }
+            return provider.getAccounts();
+        });
+    }
 }
 
 exports.UnisatConnector = UnisatConnector;

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

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

package/src/connectors/UnisatConnector/UnisatConnector.js

@@ -9,7 +9,6 @@ class UnisatConnector extends BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -61,6 +60,32 @@ class UnisatConnector extends BitcoinWalletConnector {
             return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbtFromBase64.toHex());
+                psbtOptions.push(createPsbtOptions(psbtFromBase64, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return [];
+            }
+            return provider.getAccounts();
+        });
+    }
 }
 
 export { UnisatConnector };

package/src/connectors/UnknownInjected/UnknownInjected.cjs

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