@dynamic-labs/bitcoin 1.4.6 → 1.4.8

package/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+### [1.4.8](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.7...v1.4.8) (2024-04-18)
+
+
+### Bug Fixes
+
+* copy and ui fixes ([#5382](https://github.com/dynamic-labs/DynamicAuth/issues/5382)) ([210a52c](https://github.com/dynamic-labs/DynamicAuth/commit/210a52ce85a9812fe20c41445873b3a8b8dc44c2)), closes [#5325](https://github.com/dynamic-labs/DynamicAuth/issues/5325) ([#5339](https://github.com/dynamic-labs/DynamicAuth/issues/5339)) ([c1fde6b](https://github.com/dynamic-labs/DynamicAuth/commit/c1fde6beb1fa2666d71a4ffaed84adb3302665d4))
+* bitcoin connector improvements
+
+### [1.4.7](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.6...v1.4.7) (2024-04-12)
+
+
+### Bug Fixes
+
+* ui and layout improvements ([#5269](https://github.com/dynamic-labs/DynamicAuth/issues/5269)) ([#5296](https://github.com/dynamic-labs/DynamicAuth/issues/5296)) ([a1f7204](https://github.com/dynamic-labs/DynamicAuth/commit/a1f7204e44b4ae1650f86b76663c0802530935cb)) ([#5270](https://github.com/dynamic-labs/DynamicAuth/issues/5270)) ([#5278](https://github.com/dynamic-labs/DynamicAuth/issues/5278)) ([5f262f5](https://github.com/dynamic-labs/DynamicAuth/commit/5f262f54bba8eb2fa6346040478dd0417f42d2d1))
+* callback trigger fixes ([#5310](https://github.com/dynamic-labs/DynamicAuth/issues/5310)) ([e6f7720](https://github.com/dynamic-labs/DynamicAuth/commit/e6f7720781a68b9d36448e4edea834e6478e7263))
+* improve bridge connect experience on mobile ([#5284](https://github.com/dynamic-labs/DynamicAuth/issues/5284)) ([c8eab02](https://github.com/dynamic-labs/DynamicAuth/commit/c8eab0243ca5752d365fd907fde36b7c08669d5e))
+* improve integration with i18n ([#5267](https://github.com/dynamic-labs/DynamicAuth/issues/5267)) ([#5313](https://github.com/dynamic-labs/DynamicAuth/issues/5313)) ([5f02f72](https://github.com/dynamic-labs/DynamicAuth/commit/5f02f72fe547e93d59a2545ffcce62c20fb22dbe))
+
 ### [1.4.6](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.5...v1.4.6) (2024-04-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -26,15 +26,15 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@btckit/types": "^0.0.19",
+    "@btckit/types": "0.0.19",
     "@dynamic-labs/sdk-api": "0.0.387",
-    "@wallet-standard/app": "^1.0.1",
-    "@wallet-standard/base": "^1.0.1",
-    "bitcoinjs-lib": "^6.1.5",
-    "sats-connect": "^1.1.2",
-    "@dynamic-labs/utils": "1.4.6",
-    "@dynamic-labs/wallet-book": "1.4.6",
-    "@dynamic-labs/wallet-connector-core": "1.4.6",
+    "@wallet-standard/app": "1.0.1",
+    "@wallet-standard/base": "1.0.1",
+    "bitcoinjs-lib": "6.1.5",
+    "sats-connect": "2.0.0",
+    "@dynamic-labs/utils": "1.4.8",
+    "@dynamic-labs/wallet-book": "1.4.8",
+    "@dynamic-labs/wallet-connector-core": "1.4.8",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/BitcoinBtcKitConnector.cjs

@@ -17,8 +17,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
         this.btcKit = btcKit;
     }
     fetchPublicAddress() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
                 return connectedAccount;
@@ -65,7 +65,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
             }
             const response = yield this.btcKit.request('sendTransfer', {
                 address: transaction.recipientAddress,
-                amount: transaction.amount,
+                amount: transaction.amount.toString(),
+                network: this.convertNetworkTypeToNetworkMode(),
             });
             if (!('result' in response)) {
                 walletConnectorCore.logger.error('Transaction error', response);
@@ -80,8 +81,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
             : 'testnet';
     }
     signPsbt(request) {
-        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const connectedAddress = yield this.fetchPublicAddress();
             if (!connectedAddress || !this.btcKit) {
                 return;

package/src/BitcoinBtcKitConnector.js

@@ -13,8 +13,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
         this.btcKit = btcKit;
     }
     fetchPublicAddress() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
                 return connectedAccount;
@@ -61,7 +61,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
             }
             const response = yield this.btcKit.request('sendTransfer', {
                 address: transaction.recipientAddress,
-                amount: transaction.amount,
+                amount: transaction.amount.toString(),
+                network: this.convertNetworkTypeToNetworkMode(),
             });
             if (!('result' in response)) {
                 logger.error('Transaction error', response);
@@ -76,8 +77,8 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
             : 'testnet';
     }
     signPsbt(request) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const connectedAddress = yield this.fetchPublicAddress();
             if (!connectedAddress || !this.btcKit) {
                 return;

package/src/BitcoinSatsConnectConnector.cjs

@@ -96,8 +96,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
         });
     }
     sendBitcoin(transaction) {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const mainAddress = yield this.fetchPublicAddress();
             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)) {
@@ -164,8 +164,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
         });
     }
     signPsbt(request) {
-        var _a, _b, _c, _d;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
             if (!((_a = request.allowedSighash) === null || _a === void 0 ? void 0 : _a.length))
                 throw new Error('allowedSighash cannot be an empty array');
             const network = bitcoinNetworkTypeToNetworks.convertNetworkTypeForPsbt(this.currentNetwork);

package/src/BitcoinSatsConnectConnector.js

@@ -92,8 +92,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
         });
     }
     sendBitcoin(transaction) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const mainAddress = yield this.fetchPublicAddress();
             const senderAddress = (_a = (yield this.getAdditionalAddresses(mainAddress)).find((address) => address.type === 'payment')) === null || _a === void 0 ? void 0 : _a.address;
             if (!senderAddress || !supportsSatsConnect(this)) {
@@ -160,8 +160,8 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
         });
     }
     signPsbt(request) {
-        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
             if (!((_a = request.allowedSighash) === null || _a === void 0 ? void 0 : _a.length))
                 throw new Error('allowedSighash cannot be an empty array');
             const network = convertNetworkTypeForPsbt(this.currentNetwork);

package/src/BitcoinWalletConnector.cjs

@@ -43,12 +43,18 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getBalance() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
                 throw new utils.DynamicError('getBalance - No connected address found!');
             }
-            const API_URL = getMempoolApiUrl.getMempoolApiUrl(connectedAddress);
-            const response = yield fetch(`${API_URL}/address/${connectedAddress}`);
+            const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
+            const paymentAddress = (_a = additionalAddresses.find((address) => address.type === sdkApi.WalletAddressType.Payment)) === null || _a === void 0 ? void 0 : _a.address;
+            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}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === _const.HTTP_STATUS_TOO_MANY_REQUESTS) {
@@ -72,8 +78,8 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     getConnectedAccountsFromCache() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const currentAccount = yield this.cache.getActiveAccount();
             const allAccounts = yield this.cache.getConnectedAccounts();
             const allConnectedAddresses = (_a = Object.keys(allAccounts || {})) !== null && _a !== void 0 ? _a : [];

package/src/BitcoinWalletConnector.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { EventEmitter } from 'stream';
 import type { Wallet } from '@wallet-standard/base';
 import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';

package/src/BitcoinWalletConnector.js

@@ -39,12 +39,18 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
                 throw new DynamicError('getBalance - No connected address found!');
             }
-            const API_URL = getMempoolApiUrl(connectedAddress);
-            const response = yield fetch(`${API_URL}/address/${connectedAddress}`);
+            const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
+            const paymentAddress = (_a = additionalAddresses.find((address) => address.type === WalletAddressType.Payment)) === null || _a === void 0 ? void 0 : _a.address;
+            if (!paymentAddress) {
+                throw new DynamicError('getBalance - No payment address found!');
+            }
+            const API_URL = getMempoolApiUrl(paymentAddress);
+            const response = yield fetch(`${API_URL}/address/${paymentAddress}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === HTTP_STATUS_TOO_MANY_REQUESTS) {
@@ -68,8 +74,8 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         });
     }
     getConnectedAccountsFromCache() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const currentAccount = yield this.cache.getActiveAccount();
             const allAccounts = yield this.cache.getConnectedAccounts();
             const allConnectedAddresses = (_a = Object.keys(allAccounts || {})) !== null && _a !== void 0 ? _a : [];

package/src/OkxConnector.cjs

@@ -44,7 +44,7 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             if (!connectedAddress || !provider) {
                 return;
             }
-            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);
+            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount.toString());
         });
     }
     signPsbt(request) {

package/src/OkxConnector.js

@@ -40,7 +40,7 @@ class OkxConnector extends BitcoinWalletConnector {
             if (!connectedAddress || !provider) {
                 return;
             }
-            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);
+            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount.toString());
         });
     }
     signPsbt(request) {

package/src/UnisatConnector.cjs

@@ -45,7 +45,7 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             if (!connectedAddress || !provider) {
                 return;
             }
-            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);
+            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount.toString());
         });
     }
     signPsbt(request) {

package/src/UnisatConnector.js

@@ -41,7 +41,7 @@ class UnisatConnector extends BitcoinWalletConnector {
             if (!connectedAddress || !provider) {
                 return;
             }
-            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);
+            return provider.sendBitcoin(transaction.recipientAddress, transaction.amount.toString());
         });
     }
     signPsbt(request) {