@dynamic-labs/bitcoin 3.0.0-alpha.64 → 3.0.0-alpha.66

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -1,32 +1,49 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
-import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction, signMultipleTransactions } from 'sats-connect';
+import { BitcoinNetworkType, request, AddressPurpose, 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 { logger } from '@dynamic-labs/wallet-connector-core';
 import { convertNetworkTypeForPsbt } from '../../utils/psbt/bitcoinNetworkTypeToNetworks.js';
+import { BitcoinWalletConnector } from '../BitcoinWalletConnector.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;
     }
-    getAddress() {
+    getGenericUserCancelledError() {
+        const error = new Error();
+        error.code = '-32000'; // error code for user cancelled
+        return error;
+    }
+    getAddresses() {
         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 getAddressResponse = yield request('getAddresses', {
+                purposes: [AddressPurpose.Payment, AddressPurpose.Ordinals],
+            });
+            if (getAddressResponse.status !== 'success') {
+                throw getAddressResponse.error;
             }
+            const { addresses } = getAddressResponse.result;
+            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 = (_a = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _a !== void 0 ? _a : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+            yield this.setConnectedAccountWithAddresses({
+                active: true,
+                mainAddress,
+                ordinalsAddress: ordinalsAccount,
+                paymentAddress: paymentAccount,
+            });
+            return mainAddress;
+        });
+    }
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             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() &&
@@ -40,154 +57,87 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                 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],
-                    },
-                });
-            });
-        });
-    }
-    signMessageWithAddress(messageToSign, address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!supportsSatsConnect(this)) {
-                return;
+            try {
+                // requesting permissions on initial connect will avoid connection prompt for other requests
+                const permissionResponse = yield request('wallet_requestPermissions', undefined);
+                if (permissionResponse.status !== 'success') {
+                    throw permissionResponse.error;
+                }
+                const address = yield this.getAddresses();
+                return address;
+            }
+            catch (_) {
+                const error = this.getGenericUserCancelledError();
+                throw error;
             }
-            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,
-                        message: messageToSign,
-                        network: {
-                            type: this.currentNetwork,
-                        },
-                    },
-                });
-            });
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
+            try {
+                const response = yield request('signMessage', {
+                    address: withAddress,
+                    message: messageToSign,
+                });
+                if (response.status !== 'success') {
+                    throw response.error;
+                }
+                if (this.isHardwareWalletEnabled) {
+                    return JSON.stringify({
+                        signedTransaction: {
+                            data: response.result.signature,
+                        },
+                    });
+                }
+                return response.result.signature;
+            }
+            catch (_) {
+                const error = this.getGenericUserCancelledError();
+                throw error;
             }
-            return this.signMessageWithAddress(messageToSign, walletAddress);
         });
     }
     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,
+            try {
+                const response = yield request('sendTransfer', {
+                    recipients: [
+                        {
+                            address: transaction.recipientAddress,
+                            amount: Number(transaction.amount),
                         },
-                        recipients: [
-                            {
-                                address: transaction.recipientAddress,
-                                amountSats: transaction.amount,
-                            },
-                        ],
-                        senderAddress,
-                    },
+                    ],
                 });
-            });
+                if (response.status !== 'success') {
+                    throw response.error;
+                }
+                return response.result.txid;
+            }
+            catch (_) {
+                const error = this.getGenericUserCancelledError();
+                throw error;
+            }
         });
     }
     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,
-                    },
+            const { allowedSignHash, psbtBase64, broadcast, inputsToSign } = params;
+            try {
+                const response = yield request('signPsbt', {
+                    allowedSignHash,
+                    broadcast,
+                    psbt: psbtBase64,
+                    signInputs: Object.fromEntries(inputsToSign.map((input) => [input.address, input.signingIndexes])),
                 });
-            });
+                if (response.status !== 'success') {
+                    throw response.error;
+                }
+                return { psbtBase64: response.result.psbt, txId: response.result.txid };
+            }
+            catch (_) {
+                const error = this.getGenericUserCancelledError();
+                throw error;
+            }
         });
     }
     signTransactions(transactions) {
@@ -195,13 +145,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             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
+                        const error = this.getGenericUserCancelledError();
                         reject(error);
                     },
                     onFinish: (response) => {
@@ -261,6 +206,16 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
         });
     }
+    validateActiveWallet(expectedAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // TODO: this is a workaround to avoid extra connecting prompt for xverse
+            // we should revisit it once xverse releases a new version with bug fixes
+            logger.debug('validateActiveWallet - skipping validation for xverse', {
+                expectedAddress,
+            });
+            return;
+        });
+    }
 }
 
 export { BitcoinSatsConnectConnector };

package/src/connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs

@@ -0,0 +1,212 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var satsConnect = require('sats-connect');
+var utils = require('@dynamic-labs/utils');
+var walletBook = require('@dynamic-labs/wallet-book');
+var _const = require('../../const.cjs');
+require('bitcoinjs-lib');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('@wallet-standard/app');
+var BitcoinSatsConnectConnector = require('../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
+var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
+
+class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+    getAddress() {
+        return _tslib.__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.supportsSatsConnect(this)) {
+                return;
+            }
+            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 &&
+                this.mobileExperience === 'in-app-browser') {
+                const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
+                const deepLink = inAppBrowserTemplate({
+                    encodedDappURI: encodeURIComponent(window.location.toString()),
+                });
+                window.location.href = deepLink;
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                satsConnect.getAddress({
+                    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) => _tslib.__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 === satsConnect.AddressPurpose.Ordinals);
+                        const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.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: [satsConnect.AddressPurpose.Ordinals, satsConnect.AddressPurpose.Payment],
+                    },
+                });
+            });
+        });
+    }
+    signMessage(messageToSign, withAddress) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!supportsSatsConnect.supportsSatsConnect(this)) {
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                satsConnect.signMessage({
+                    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) => _tslib.__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 _tslib.__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.supportsSatsConnect(this)) {
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                satsConnect.sendBtcTransaction({
+                    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: {
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                        recipients: [
+                            {
+                                address: transaction.recipientAddress,
+                                amountSats: transaction.amount,
+                            },
+                        ],
+                        senderAddress,
+                    },
+                });
+            });
+        });
+    }
+    signTransaction(params) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { message, psbtBase64, broadcast, inputsToSign } = params;
+            return new Promise((resolve, reject) => {
+                satsConnect.signTransaction({
+                    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: {
+                        broadcast,
+                        inputsToSign,
+                        message: message || 'Sign Transaction',
+                        network: {
+                            type: this.currentNetwork,
+                        },
+                        psbtBase64,
+                    },
+                });
+            });
+        });
+    }
+    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,
+                    },
+                });
+            });
+        });
+    }
+}
+
+exports.BitcoinSatsConnectLegacyConnector = BitcoinSatsConnectLegacyConnector;

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

@@ -0,0 +1,10 @@
+import { SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
+import { BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
+import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector';
+export declare abstract class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
+    getAddress(): Promise<string | undefined>;
+    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
+    signTransaction(params: SatsConnectSignTransactionInput): Promise<SignTransactionResponse | undefined>;
+    signTransactions(transactions: SignMultipleTransactionsPayload): Promise<SignTransactionResponse[] | undefined>;
+}