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

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## [3.0.0-alpha.65](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.64...v3.0.0-alpha.65) (2024-09-11)
+
+
+### Bug Fixes
+
+* gracefully handle errors when trying to find solana tx destination ([#6847](https://github.com/dynamic-labs/DynamicAuth/issues/6847)) ([19359ad](https://github.com/dynamic-labs/DynamicAuth/commit/19359ad40b16af0edb822d1fc6643fecdbc89adf))
+
 ## [3.0.0-alpha.64](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.63...v3.0.0-alpha.64) (2024-09-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "3.0.0-alpha.64",
+  "version": "3.0.0-alpha.65",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -32,9 +32,9 @@
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.8.0",
-    "@dynamic-labs/utils": "3.0.0-alpha.64",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.64",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.64",
+    "@dynamic-labs/utils": "3.0.0-alpha.65",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.65",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.65",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/bitcoinProviderHelper.d.ts

@@ -14,6 +14,7 @@ export declare class BitcoinProviderHelper {
         walletStandard?: {
             features: string[];
             name: string;
+            providerId?: string | undefined;
         } | undefined;
         walletStandardLocators?: {
             name: string;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -8,29 +8,46 @@ var bitcoinjsLib = require('bitcoinjs-lib');
 var satsConnect = require('sats-connect');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
-var _const = require('../../const.cjs');
-require('@dynamic-labs/wallet-connector-core');
-var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var bitcoinNetworkTypeToNetworks = require('../../utils/psbt/bitcoinNetworkTypeToNetworks.cjs');
+var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
-var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
     }
-    getAddress() {
+    getGenericUserCancelledError() {
+        const error = new Error();
+        error.code = '-32000'; // error code for user cancelled
+        return error;
+    }
+    getAddresses() {
         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 getAddressResponse = yield satsConnect.request('getAddresses', {
+                purposes: [satsConnect.AddressPurpose.Payment, satsConnect.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 === satsConnect.AddressPurpose.Ordinals);
+            const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.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 _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             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() &&
@@ -44,154 +61,87 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                 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],
-                    },
-                });
-            });
-        });
-    }
-    signMessageWithAddress(messageToSign, address) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!supportsSatsConnect.supportsSatsConnect(this)) {
-                return;
+            try {
+                // requesting permissions on initial connect will avoid connection prompt for other requests
+                const permissionResponse = yield satsConnect.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) => {
-                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,
-                        message: messageToSign,
-                        network: {
-                            type: this.currentNetwork,
-                        },
-                    },
-                });
-            });
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
+            try {
+                const response = yield satsConnect.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 _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,
+            try {
+                const response = yield satsConnect.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 _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,
-                    },
+            const { allowedSignHash, psbtBase64, broadcast, inputsToSign } = params;
+            try {
+                const response = yield satsConnect.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) {
@@ -199,13 +149,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             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
+                        const error = this.getGenericUserCancelledError();
                         reject(error);
                     },
                     onFinish: (response) => {
@@ -265,6 +210,16 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
         });
     }
+    validateActiveWallet(expectedAddress) {
+        return _tslib.__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
+            walletConnectorCore.logger.debug('validateActiveWallet - skipping validation for xverse', {
+                expectedAddress,
+            });
+            return;
+        });
+    }
 }
 
 exports.BitcoinSatsConnectConnector = BitcoinSatsConnectConnector;

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

@@ -4,12 +4,14 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     currentNetwork: BitcoinNetworkType;
     constructor(opts: BitcoinWalletConnectorOpts);
+    private getGenericUserCancelledError;
+    private getAddresses;
     getAddress(): Promise<string | undefined>;
-    signMessageWithAddress(messageToSign: string, address: string): Promise<string | undefined>;
-    signMessage(messageToSign: string): 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>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
+    validateActiveWallet(expectedAddress: string): Promise<void>;
 }