@dynamic-labs/bitcoin 1.4.12 → 1.4.13

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+### [1.4.13](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.12...v1.4.13) (2024-06-05)
+
+
+### Bug Fixes
+
+* bump @solana/web3.js containing new version of rpc-websockets ([#5864](https://github.com/dynamic-labs/DynamicAuth/issues/5864)) ([562ff9b](https://github.com/dynamic-labs/DynamicAuth/commit/562ff9b706c8be62812ace08bcaef96e26dcd841))
+* wallet improvements
+
 ### [1.4.12](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.11...v1.4.12) (2024-05-22)
 
 

package/package.json

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

package/src/BitcoinWalletConnector.cjs

@@ -11,6 +11,7 @@ var bitcoinProviderHelper = require('./bitcoinProviderHelper.cjs');
 var BitcoinLocalStorageCache = require('./BitcoinLocalStorageCache.cjs');
 var getMempoolApiUrl = require('./utils/getMempoolApiUrl.cjs');
 var _const = require('./const.cjs');
+var satoshisToBtc = require('./utils/satoshisToBtc/satoshisToBtc.cjs');
 
 class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
@@ -67,12 +68,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return undefined;
             }
             const addressInfo = yield response.json();
-            if (!(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.chain_stats)) {
+            if (!(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.chain_stats) || !(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.mempool_stats)) {
                 return undefined;
             }
-            const balance = (Number(addressInfo.chain_stats.funded_txo_sum) -
-                Number(addressInfo.chain_stats.spent_txo_sum)) /
-                100000000;
+            const confirmedBalanceInSats = Number(addressInfo.chain_stats.funded_txo_sum) -
+                Number(addressInfo.chain_stats.spent_txo_sum);
+            const unconfirmedBalanceInSats = Number(addressInfo.mempool_stats.funded_txo_sum) -
+                Number(addressInfo.mempool_stats.spent_txo_sum);
+            const balance = satoshisToBtc.satoshisToBtc(confirmedBalanceInSats + unconfirmedBalanceInSats);
             yield this.cache.setLastBalance(balance.toString());
             return balance.toString();
         });

package/src/BitcoinWalletConnector.js

@@ -7,6 +7,7 @@ import { BitcoinProviderHelper } from './bitcoinProviderHelper.js';
 import { BitcoinLocalStorageCache } from './BitcoinLocalStorageCache.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';
 
 class BitcoinWalletConnector extends WalletConnectorBase {
     constructor(opts) {
@@ -63,12 +64,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
                 return undefined;
             }
             const addressInfo = yield response.json();
-            if (!(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.chain_stats)) {
+            if (!(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.chain_stats) || !(addressInfo === null || addressInfo === void 0 ? void 0 : addressInfo.mempool_stats)) {
                 return undefined;
             }
-            const balance = (Number(addressInfo.chain_stats.funded_txo_sum) -
-                Number(addressInfo.chain_stats.spent_txo_sum)) /
-                100000000;
+            const confirmedBalanceInSats = Number(addressInfo.chain_stats.funded_txo_sum) -
+                Number(addressInfo.chain_stats.spent_txo_sum);
+            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();
         });

package/src/OkxConnector.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
+var utils = require('@dynamic-labs/utils');
 var BitcoinWalletConnector = require('./BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('./utils/psbt/createSignPsbtOptions.cjs');
 
@@ -13,8 +14,22 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         this.name = 'OKX Wallet (Bitcoin)';
         this.canFetchConnectedAccounts = true;
     }
+    get walletBookWallet() {
+        return this.walletBook.wallets[this.key];
+    }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.isInstalledOnBrowser() &&
+                utils.isMobile() &&
+                this.walletBookWallet.mobile &&
+                this.walletBookWallet.mobile.inAppBrowser) {
+                const inAppBrowserCompiledTemplate = utils.template(this.walletBookWallet.mobile.inAppBrowser);
+                const deepLink = inAppBrowserCompiledTemplate({
+                    encodedDappURI: encodeURIComponent(window.location.toString()),
+                });
+                window.location.assign(deepLink);
+                return;
+            }
             const provider = this.getProvider();
             if (!provider) {
                 return;

package/src/OkxConnector.d.ts

@@ -4,6 +4,7 @@ export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
     canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
+    private get walletBookWallet();
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;

package/src/OkxConnector.js

@@ -1,5 +1,6 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
+import { isMobile, template } from '@dynamic-labs/utils';
 import { BitcoinWalletConnector } from './BitcoinWalletConnector.js';
 import { createPsbtOptions } from './utils/psbt/createSignPsbtOptions.js';
 
@@ -9,8 +10,22 @@ class OkxConnector extends BitcoinWalletConnector {
         this.name = 'OKX Wallet (Bitcoin)';
         this.canFetchConnectedAccounts = true;
     }
+    get walletBookWallet() {
+        return this.walletBook.wallets[this.key];
+    }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isInstalledOnBrowser() &&
+                isMobile() &&
+                this.walletBookWallet.mobile &&
+                this.walletBookWallet.mobile.inAppBrowser) {
+                const inAppBrowserCompiledTemplate = template(this.walletBookWallet.mobile.inAppBrowser);
+                const deepLink = inAppBrowserCompiledTemplate({
+                    encodedDappURI: encodeURIComponent(window.location.toString()),
+                });
+                window.location.assign(deepLink);
+                return;
+            }
             const provider = this.getProvider();
             if (!provider) {
                 return;

package/src/index.d.ts

@@ -1,5 +1,5 @@
-import { OkxConnector } from './OkxConnector';
+import { UnisatConnector } from './UnisatConnector';
 export { BitcoinWalletConnector } from './BitcoinWalletConnector';
 export type { BitcoinTransaction } from './types';
 export * from './utils';
-export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof OkxConnector)[];
+export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof UnisatConnector)[];

package/src/utils/satoshisToBtc/index.d.ts

@@ -0,0 +1 @@
+export * from './satoshisToBtc';

package/src/utils/satoshisToBtc/satoshisToBtc.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const satoshisToBtc = (satoshis) => satoshis / 100000000;
+
+exports.satoshisToBtc = satoshisToBtc;

package/src/utils/satoshisToBtc/satoshisToBtc.d.ts

@@ -0,0 +1 @@
+export declare const satoshisToBtc: (satoshis: number) => number;

package/src/utils/satoshisToBtc/satoshisToBtc.js

@@ -0,0 +1,3 @@
+const satoshisToBtc = (satoshis) => satoshis / 100000000;
+
+export { satoshisToBtc };