@dynamic-labs/bitcoin 2.1.0-alpha.24 → 2.1.0-alpha.26

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## [2.1.0-alpha.26](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.25...v2.1.0-alpha.26) (2024-05-29)
+
+
+### Features
+
+* add farcaster login to react native ([#5713](https://github.com/dynamic-labs/DynamicAuth/issues/5713)) ([08f4473](https://github.com/dynamic-labs/DynamicAuth/commit/08f4473eec9b32b82b6f703fa4d5136514a61b25))
+
+
+### Bug Fixes
+
+* better error handling of invalid mfa otp ([#5759](https://github.com/dynamic-labs/DynamicAuth/issues/5759)) ([72ab01f](https://github.com/dynamic-labs/DynamicAuth/commit/72ab01f8f919f147eeedfabf8b4838802abf308a))
+* show correct status for magic eden btc wallets after ([#5748](https://github.com/dynamic-labs/DynamicAuth/issues/5748)) ([b8f20bb](https://github.com/dynamic-labs/DynamicAuth/commit/b8f20bb796b9a2e88817ef3b0da6ac32e9012b18))
+
+## [2.1.0-alpha.25](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.24...v2.1.0-alpha.25) (2024-05-27)
+
+
+### Bug Fixes
+
+* btc balance calculation ([#5737](https://github.com/dynamic-labs/DynamicAuth/issues/5737)) ([9b5ceb3](https://github.com/dynamic-labs/DynamicAuth/commit/9b5ceb32d543037f60d7104f0b81b3abc86ebd10))
+
 ## [2.1.0-alpha.24](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.23...v2.1.0-alpha.24) (2024-05-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "2.1.0-alpha.24",
+  "version": "2.1.0-alpha.26",
   "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.0.0",
-    "@dynamic-labs/utils": "2.1.0-alpha.24",
-    "@dynamic-labs/wallet-book": "2.1.0-alpha.24",
-    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.24",
+    "@dynamic-labs/utils": "2.1.0-alpha.26",
+    "@dynamic-labs/wallet-book": "2.1.0-alpha.26",
+    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.26",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/BitcoinSatsConnectConnector.cjs

@@ -19,6 +19,10 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
     constructor(opts) {
         super(opts);
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
+        this.canFetchConnectedAccounts = true;
+        // xverse does't support fetching connected accounts without prompting
+        // for a connection, so we handle getConnectedAccounts differently
+        this.canFetchConnectedAccounts = this.key !== 'xverse';
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -30,10 +34,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             if (!supportsSatsConnect.supportsSatsConnect(this)) {
                 return;
             }
-            const [connectedAccount] = yield this.getConnectedAccounts();
-            if (connectedAccount) {
-                return connectedAccount;
-            }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/BitcoinSatsConnectConnector.d.ts

@@ -3,6 +3,7 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from './BitcoinWal
 import { BitcoinTransaction, SatsConnectSignTransactionInput, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from './types';
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     currentNetwork: BitcoinNetworkType;
+    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/BitcoinSatsConnectConnector.js

@@ -15,6 +15,10 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
         this.currentNetwork = BitcoinNetworkType.Mainnet;
+        this.canFetchConnectedAccounts = true;
+        // xverse does't support fetching connected accounts without prompting
+        // for a connection, so we handle getConnectedAccounts differently
+        this.canFetchConnectedAccounts = this.key !== 'xverse';
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -26,10 +30,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             if (!supportsSatsConnect(this)) {
                 return;
             }
-            const [connectedAccount] = yield this.getConnectedAccounts();
-            if (connectedAccount) {
-                return connectedAccount;
-            }
             return new Promise((resolve, reject) => {
                 getAddress({
                     getProvider: () => __awaiter(this, void 0, void 0, function* () {

package/src/BitcoinWalletConnector.cjs

@@ -12,6 +12,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) {
@@ -76,12 +77,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();
         });
@@ -104,10 +107,19 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getConnectedAccounts() {
         return _tslib.__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) {
                 return this.getConnectedAccountsFromCache();
             }
-            const connectedAccounts = yield this.getAddress();
+            // if we decide that is ok to prompt for a connection when fetching connected accounts
+            // we shouldn't prompt every time we call this method (which is a lot of times)
+            // so we just store in a promise and return the same promise every time
+            if (!this.getAddressPromise) {
+                this.getAddressPromise = this.getAddress();
+            }
+            const connectedAccounts = yield this.getAddressPromise;
             if (!connectedAccounts) {
                 return [];
             }

package/src/BitcoinWalletConnector.d.ts

@@ -16,6 +16,7 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     cache: IBitcoinSessionCache;
     connectedChain: Chain;
     supportedChains: Chain[];
+    private getAddressPromise;
     private bitcoinProviderHelper;
     wallet: Wallet | undefined;
     canFetchConnectedAccounts: boolean;

package/src/BitcoinWalletConnector.js

@@ -8,6 +8,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) {
@@ -72,12 +73,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();
         });
@@ -100,10 +103,19 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     getConnectedAccounts() {
         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) {
                 return this.getConnectedAccountsFromCache();
             }
-            const connectedAccounts = yield this.getAddress();
+            // if we decide that is ok to prompt for a connection when fetching connected accounts
+            // we shouldn't prompt every time we call this method (which is a lot of times)
+            // so we just store in a promise and return the same promise every time
+            if (!this.getAddressPromise) {
+                this.getAddressPromise = this.getAddress();
+            }
+            const connectedAccounts = yield this.getAddressPromise;
             if (!connectedAccounts) {
                 return [];
             }

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

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

package/src/utils/satoshisToBtc/satoshisToBtc.cjs

@@ -0,0 +1,8 @@
+'use client'
+'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,4 @@
+'use client'
+const satoshisToBtc = (satoshis) => satoshis / 100000000;
+
+export { satoshisToBtc };