@dynamic-labs/bitcoin 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+### [2.2.2](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.1...v2.2.2) (2024-06-18)
+
+
+### Bug Fixes
+
+* make account change idemopotent ([#6062](https://github.com/dynamic-labs/DynamicAuth/issues/6062)) ([2308d32](https://github.com/dynamic-labs/DynamicAuth/commit/2308d32d18627f2673c8f4c9b5623a9c731e4752))
+
+### [2.2.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.0...v2.2.1) (2024-06-17)
+
+
+### Bug Fixes
+
+* improve handling of bitcoin connected accounts ([#6049](https://github.com/dynamic-labs/DynamicAuth/issues/6049)) ([08cb8ba](https://github.com/dynamic-labs/DynamicAuth/commit/08cb8bae2b1521367234cbe2bb55a8c3766df3c1))
+* improve wagmi hooks with embedded wallets ([#6044](https://github.com/dynamic-labs/DynamicAuth/issues/6044)) ([#6052](https://github.com/dynamic-labs/DynamicAuth/issues/6052)) ([28654e8](https://github.com/dynamic-labs/DynamicAuth/commit/28654e8a45b25c4fc3bb3abfa89b453808a55053))
+
 ## [2.2.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.5...v2.2.0) (2024-06-16)
 
 

package/package.json

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

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
 var satsConnect = require('sats-connect');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
 var _const = require('../../const.cjs');
@@ -21,14 +20,13 @@ 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';
+        // satsconnect wallets don't support fetching connected accounts without prompting
+        // for a connection, so we handle getConnectedAccounts differently.
+        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            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
@@ -47,12 +45,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                 window.location.href = deepLink;
                 return;
             }
-            const cachedActiveAccount = yield this.cache.getActiveAccount();
-            if (cachedActiveAccount) {
-                const ordinalsAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Ordinals);
-                const paymentAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Payment);
-                return (_b = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _b !== void 0 ? _b : paymentAddress === null || paymentAddress === void 0 ? void 0 : paymentAddress.address;
-            }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -2,7 +2,6 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
 import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
-import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
 import { isMobile, template } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { SATSCONNECT_FEATURE } from '../../const.js';
@@ -17,14 +16,13 @@ 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';
+        // satsconnect wallets don't support fetching connected accounts without prompting
+        // for a connection, so we handle getConnectedAccounts differently.
+        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            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
@@ -43,12 +41,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                 window.location.href = deepLink;
                 return;
             }
-            const cachedActiveAccount = yield this.cache.getActiveAccount();
-            if (cachedActiveAccount) {
-                const ordinalsAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === WalletAddressType.Ordinals);
-                const paymentAddress = cachedActiveAccount.additionalAddresses.find((address) => address.type === WalletAddressType.Payment);
-                return (_b = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _b !== void 0 ? _b : paymentAddress === null || paymentAddress === void 0 ? void 0 : paymentAddress.address;
-            }
             return new Promise((resolve, reject) => {
                 getAddress({
                     getProvider: () => __awaiter(this, void 0, void 0, function* () {

package/src/connectors/BitcoinWalletConnector.cjs

@@ -33,6 +33,12 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         }
         this.cache = new BitcoinLocalStorageCache.BitcoinLocalStorageCache(this.overrideKey);
     }
+    isSameAccountChangeRequest(to) {
+        return this.lastAccountChange === to;
+    }
+    setLastAccountChangeRequest(to) {
+        this.lastAccountChange = to;
+    }
     clearConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.cache.clearConnectedAcccounts();
@@ -53,7 +59,10 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield this.cache.clearLastBalance();
+            yield Promise.all([
+                this.cache.clearConnectedAcccounts(),
+                this.cache.clearLastBalance(),
+            ]);
         });
     }
     getBalance() {
@@ -234,9 +243,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
-            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+            // or if the account change request is the same as previous request
+            if (currentConnectedAccounts[0] === connectedAccounts[0] ||
+                this.isSameAccountChangeRequest(connectedAccounts[0])) {
                 return;
             }
+            // set the last account change request with the from and to addresses
+            // to ensure that the requests are not duplicated
+            this.setLastAccountChangeRequest(connectedAccounts[0]);
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -23,7 +23,10 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     canFetchConnectedAccounts: boolean;
     isHardwareWalletEnabled: boolean;
     verifiedCredentials: JwtVerifiedCredential[];
+    private lastAccountChange;
     constructor(opts: BitcoinWalletConnectorOpts);
+    private isSameAccountChangeRequest;
+    private setLastAccountChangeRequest;
     clearConnectedAccounts(): Promise<void>;
     canConnectWithHardwareWallet(): boolean;
     isInstalledOnBrowser(): boolean;

package/src/connectors/BitcoinWalletConnector.js

@@ -29,6 +29,12 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         }
         this.cache = new BitcoinLocalStorageCache(this.overrideKey);
     }
+    isSameAccountChangeRequest(to) {
+        return this.lastAccountChange === to;
+    }
+    setLastAccountChangeRequest(to) {
+        this.lastAccountChange = to;
+    }
     clearConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.cache.clearConnectedAcccounts();
@@ -49,7 +55,10 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.cache.clearLastBalance();
+            yield Promise.all([
+                this.cache.clearConnectedAcccounts(),
+                this.cache.clearLastBalance(),
+            ]);
         });
     }
     getBalance() {
@@ -230,9 +239,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
-            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+            // or if the account change request is the same as previous request
+            if (currentConnectedAccounts[0] === connectedAccounts[0] ||
+                this.isSameAccountChangeRequest(connectedAccounts[0])) {
                 return;
             }
+            // set the last account change request with the from and to addresses
+            // to ensure that the requests are not duplicated
+            this.setLastAccountChangeRequest(connectedAccounts[0]);
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);

package/src/index.cjs

@@ -9,7 +9,6 @@ require('sats-connect');
 require('bitcoinjs-lib');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/utils');
-require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs/wallet-book');
 var fetchBtcKitConnectors = require('./utils/fetchBtcKitConnectors/fetchBtcKitConnectors.cjs');
 var fetchSatsConnectConnectors = require('./utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs');

package/src/index.js

@@ -5,7 +5,6 @@ import 'sats-connect';
 import 'bitcoinjs-lib';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/utils';
-import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs/wallet-book';
 import { fetchBtcKitConnectors } from './utils/fetchBtcKitConnectors/fetchBtcKitConnectors.js';
 export { fetchBtcKitConnectors } from './utils/fetchBtcKitConnectors/fetchBtcKitConnectors.js';