@dynamic-labs/bitcoin 1.1.0-alpha.14 → 1.1.0-alpha.16

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+## [1.1.0-alpha.16](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.15...v1.1.0-alpha.16) (2024-01-30)
+
+
+### Bug Fixes
+
+* add fallback to getWalletBookWallet for customers still passing in name, add deprecation warn ([#4518](https://github.com/dynamic-labs/DynamicAuth/issues/4518)) ([b233ea1](https://github.com/dynamic-labs/DynamicAuth/commit/b233ea1cd640d8d9d94c52ab230787f3d869151a))
+* handle braavos network change to account which doesn not exist ([#4519](https://github.com/dynamic-labs/DynamicAuth/issues/4519)) ([486020f](https://github.com/dynamic-labs/DynamicAuth/commit/486020fb09a274388ba34c8d1b37ac3a1ff3dba6))
+
+## [1.1.0-alpha.15](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.14...v1.1.0-alpha.15) (2024-01-28)
+
+
+### Features
+
+* add wallet group override to wallet book ([#4488](https://github.com/dynamic-labs/DynamicAuth/issues/4488)) ([cb19ad3](https://github.com/dynamic-labs/DynamicAuth/commit/cb19ad3ea82de488752ceceeaf0e1458a388df6e))
+* enable solana embedded wallets ([#4457](https://github.com/dynamic-labs/DynamicAuth/issues/4457)) ([b0c47f4](https://github.com/dynamic-labs/DynamicAuth/commit/b0c47f4475baa12f52076da46ef993c13bd2c243))
+* group ArgentX wallets ([#4495](https://github.com/dynamic-labs/DynamicAuth/issues/4495)) ([b10d79a](https://github.com/dynamic-labs/DynamicAuth/commit/b10d79a668efecedca37ddb358e6adf95319650d))
+
+
+### Bug Fixes
+
+* add support for newest backpack extension ([#4468](https://github.com/dynamic-labs/DynamicAuth/issues/4468)) ([a219f32](https://github.com/dynamic-labs/DynamicAuth/commit/a219f325be672599e50b07f6751234a7fc98286e))
+* bump timeout for slower connections ([#4475](https://github.com/dynamic-labs/DynamicAuth/issues/4475)) ([7a07ff5](https://github.com/dynamic-labs/DynamicAuth/commit/7a07ff589eaaf3b28a94d277df3eedabbca60702))
+* change out getWalletBookWallet for findWalletBookWallet to avoid throwing during lookup ([#4477](https://github.com/dynamic-labs/DynamicAuth/issues/4477)) ([4648040](https://github.com/dynamic-labs/DynamicAuth/commit/4648040c166e73dd2c31b0e27897713339436c2f))
+* connect to wallet with wallet connect even if network is not supported ([#4465](https://github.com/dynamic-labs/DynamicAuth/issues/4465)) ([9dbca3e](https://github.com/dynamic-labs/DynamicAuth/commit/9dbca3eb4d4990ee4be642677c1604170b425dc3))
+* pass id to wagmi chain override ([#4512](https://github.com/dynamic-labs/DynamicAuth/issues/4512)) ([2bf2f04](https://github.com/dynamic-labs/DynamicAuth/commit/2bf2f0487f5b1be936dd279107c11fe5d2b42666))
+* switching wallet in extension caused connected flag to be false temporarily ([#4454](https://github.com/dynamic-labs/DynamicAuth/issues/4454)) ([3650f6e](https://github.com/dynamic-labs/DynamicAuth/commit/3650f6ec471a7c779f4d304ab94c9350dd55055b))
+
 ## [1.1.0-alpha.14](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.13...v1.1.0-alpha.14) (2024-01-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "1.1.0-alpha.14",
+  "version": "1.1.0-alpha.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -26,13 +26,14 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@dynamic-labs/sdk-api": "0.0.352",
+    "@dynamic-labs/sdk-api": "0.0.356",
     "@wallet-standard/app": "^1.0.1",
     "@wallet-standard/base": "^1.0.1",
     "sats-connect": "^1.1.2",
-    "@dynamic-labs/utils": "1.1.0-alpha.14",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.14",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.14"
+    "@dynamic-labs/utils": "1.1.0-alpha.16",
+    "@dynamic-labs/wallet-book": "1.1.0-alpha.16",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.16",
+    "stream": "0.0.2"
   },
   "peerDependencies": {}
 }

package/src/BitcoinLocalStorageCache.cjs

@@ -26,6 +26,12 @@ class BitcoinLocalStorageCache {
             };
         });
     }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts;
+        });
+    }
     getConnectedAccount(address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);

package/src/BitcoinLocalStorageCache.d.ts

@@ -1,5 +1,8 @@
 import { WalletAdditionalAddress } from '@dynamic-labs/sdk-api';
 import { BitcoinConnectedAccount } from './types';
+type BitcoinConnectedAccounts = {
+    [key: string]: BitcoinConnectedAccount;
+};
 type BitcoinActiveAccount = {
     address: string;
     additionalAddresses: WalletAdditionalAddress[];
@@ -9,6 +12,7 @@ export declare class BitcoinLocalStorageCache implements IBitcoinSessionCache {
     private readonly LAST_BALANCE_KEY;
     constructor(key: string);
     getActiveAccount(): Promise<BitcoinActiveAccount | undefined>;
+    getConnectedAccounts(): Promise<BitcoinConnectedAccounts | undefined>;
     getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
     setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
     clearConnectedAcccounts(): Promise<void>;
@@ -20,6 +24,7 @@ export interface IBitcoinSessionCache {
     clearConnectedAcccounts(): Promise<void>;
     getActiveAccount(): Promise<BitcoinActiveAccount | undefined>;
     getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
+    getConnectedAccounts(): Promise<BitcoinConnectedAccounts | undefined>;
     setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
     clearLastBalance(): Promise<void>;
     getLastBalance(): Promise<string | undefined>;

package/src/BitcoinLocalStorageCache.js

@@ -22,6 +22,12 @@ class BitcoinLocalStorageCache {
             };
         });
     }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connectedAccounts = yield getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts;
+        });
+    }
     getConnectedAccount(address) {
         return __awaiter(this, void 0, void 0, function* () {
             const connectedAccounts = yield getItemAsync(this.CONNECTED_ACCOUNTS_KEY);

package/src/BitcoinWalletConnector.cjs

@@ -17,6 +17,8 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         super(opts);
         this.connectedChain = 'BTC';
         this.supportedChains = ['BTC'];
+        // some wallets don't support fetching connected accounts without prompting for a connection
+        this.canFetchConnectedAccounts = false;
         // this is the key from the wallet book entry so that we don't purely rely on the normalized name
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
         this.bitcoinProviderHelper = new bitcoinProviderHelper.BitcoinProviderHelper(opts.walletData || walletBook.getWalletBookWallet(this.walletBook, this.key));
@@ -70,13 +72,32 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return balance.toString();
         });
     }
-    getConnectedAccounts() {
+    getConnectedAccountsFromCache() {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const currentAccount = yield this.cache.getActiveAccount();
+            const allAccounts = yield this.cache.getConnectedAccounts();
+            const allConnectedAddresses = (_a = Object.keys(allAccounts || {})) !== null && _a !== void 0 ? _a : [];
             if (!(currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address)) {
+                return allConnectedAddresses;
+            }
+            // return all connected accounts with the current account as the first item
+            return [
+                currentAccount.address,
+                ...allConnectedAddresses.filter((address) => address !== currentAccount.address),
+            ];
+        });
+    }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.canFetchConnectedAccounts) {
+                return this.getConnectedAccountsFromCache();
+            }
+            const connectedAccounts = yield this.fetchPublicAddress();
+            if (!connectedAccounts) {
                 return [];
             }
-            return [currentAccount.address];
+            return [connectedAccounts];
         });
     }
     getAdditionalAddresses(mainAddress) {
@@ -128,6 +149,26 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             });
         });
     }
+    setupEventListeners() {
+        const provider = this.getProvider();
+        if (!(provider === null || provider === void 0 ? void 0 : provider.on)) {
+            return;
+        }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
+        provider.on('accountsChanged', handleAccountChange);
+        provider.on('networkChanged', handleChainChange);
+        provider.on('disconnect', handleDisconnect);
+        const tearDownEventListeners = () => {
+            const provider = this.getProvider();
+            if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
+                return;
+            }
+            provider.removeListener('accountsChanged', handleAccountChange);
+            provider.removeListener('networkChanged', handleChainChange);
+            provider.removeListener('disconnect', handleDisconnect);
+        };
+        this.teardownEventListeners = tearDownEventListeners;
+    }
 }
 
 exports.BitcoinWalletConnector = BitcoinWalletConnector;

package/src/BitcoinWalletConnector.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { EventEmitter } from 'stream';
 import type { Wallet } from '@wallet-standard/base';
 import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
@@ -15,15 +17,18 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     supportedChains: Chain[];
     private bitcoinProviderHelper;
     wallet: Wallet | undefined;
+    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
     getDeepLink(): string | undefined;
     endSession(): Promise<void>;
     getBalance(): Promise<string | undefined>;
+    private getConnectedAccountsFromCache;
     getConnectedAccounts(): Promise<string[]>;
     getAdditionalAddresses(mainAddress?: string): Promise<WalletAdditionalAddress[] | undefined>;
     setAdditionalAddresses(mainAddress: string, additionalAddresses: WalletAdditionalAddress[]): Promise<void>;
     abstract sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
-    getProvider<T>(): T;
+    getProvider<T>(): T & EventEmitter;
     setConnectedAccountWithAddresses(mainAddress?: string, ordinalsAddress?: BitcoinAddress, paymentAddress?: BitcoinAddress, active?: boolean): Promise<void>;
+    setupEventListeners(): void;
 }

package/src/BitcoinWalletConnector.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { WalletConnectorBase, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { DynamicError } from '@dynamic-labs/utils';
 import { WalletAddressType } from '@dynamic-labs/sdk-api';
@@ -13,6 +13,8 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         super(opts);
         this.connectedChain = 'BTC';
         this.supportedChains = ['BTC'];
+        // some wallets don't support fetching connected accounts without prompting for a connection
+        this.canFetchConnectedAccounts = false;
         // this is the key from the wallet book entry so that we don't purely rely on the normalized name
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
         this.bitcoinProviderHelper = new BitcoinProviderHelper(opts.walletData || getWalletBookWallet(this.walletBook, this.key));
@@ -66,13 +68,32 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             return balance.toString();
         });
     }
-    getConnectedAccounts() {
+    getConnectedAccountsFromCache() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const currentAccount = yield this.cache.getActiveAccount();
+            const allAccounts = yield this.cache.getConnectedAccounts();
+            const allConnectedAddresses = (_a = Object.keys(allAccounts || {})) !== null && _a !== void 0 ? _a : [];
             if (!(currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address)) {
+                return allConnectedAddresses;
+            }
+            // return all connected accounts with the current account as the first item
+            return [
+                currentAccount.address,
+                ...allConnectedAddresses.filter((address) => address !== currentAccount.address),
+            ];
+        });
+    }
+    getConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.canFetchConnectedAccounts) {
+                return this.getConnectedAccountsFromCache();
+            }
+            const connectedAccounts = yield this.fetchPublicAddress();
+            if (!connectedAccounts) {
                 return [];
             }
-            return [currentAccount.address];
+            return [connectedAccounts];
         });
     }
     getAdditionalAddresses(mainAddress) {
@@ -124,6 +145,26 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             });
         });
     }
+    setupEventListeners() {
+        const provider = this.getProvider();
+        if (!(provider === null || provider === void 0 ? void 0 : provider.on)) {
+            return;
+        }
+        const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
+        provider.on('accountsChanged', handleAccountChange);
+        provider.on('networkChanged', handleChainChange);
+        provider.on('disconnect', handleDisconnect);
+        const tearDownEventListeners = () => {
+            const provider = this.getProvider();
+            if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
+                return;
+            }
+            provider.removeListener('accountsChanged', handleAccountChange);
+            provider.removeListener('networkChanged', handleChainChange);
+            provider.removeListener('disconnect', handleDisconnect);
+        };
+        this.teardownEventListeners = tearDownEventListeners;
+    }
 }
 
 export { BitcoinWalletConnector };

package/src/OkxConnector.cjs

@@ -9,6 +9,7 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet (Bitcoin)';
+        this.canFetchConnectedAccounts = true;
     }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/OkxConnector.d.ts

@@ -2,6 +2,7 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from './BitcoinWal
 import { BitcoinTransaction } from './types';
 export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
+    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/OkxConnector.js

@@ -5,6 +5,7 @@ class OkxConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet (Bitcoin)';
+        this.canFetchConnectedAccounts = true;
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/UnisatConnector.cjs

@@ -9,6 +9,7 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
+        this.canFetchConnectedAccounts = true;
     }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/UnisatConnector.d.ts

@@ -2,6 +2,7 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from './BitcoinWal
 import { BitcoinTransaction } from './types';
 export declare class UnisatConnector extends BitcoinWalletConnector {
     name: string;
+    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/UnisatConnector.js

@@ -5,6 +5,7 @@ class UnisatConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
+        this.canFetchConnectedAccounts = true;
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {