@dynamic-labs/bitcoin 3.0.0-alpha.5 → 3.0.0-alpha.7

package/CHANGELOG.md

@@ -1,4 +1,44 @@
 
+## [3.0.0-alpha.7](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.6...v3.0.0-alpha.7) (2024-06-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* add selectedTabIndex and helpers (#6040)
+
+### Features
+
+* add selectedTabIndex and helpers ([#6040](https://github.com/dynamic-labs/DynamicAuth/issues/6040)) ([ae20b80](https://github.com/dynamic-labs/DynamicAuth/commit/ae20b8081376dce97b18fa69c81c9ab73c1ff317))
+* add useRefreshUser to trigger a user state refresh ([#6079](https://github.com/dynamic-labs/DynamicAuth/issues/6079)) ([1236d35](https://github.com/dynamic-labs/DynamicAuth/commit/1236d35fe9fab44ed2114ad9f3c8c6dca7ec27be))
+
+
+### Bug Fixes
+
+* always return userWallets when available ([#6080](https://github.com/dynamic-labs/DynamicAuth/issues/6080)) ([#6083](https://github.com/dynamic-labs/DynamicAuth/issues/6083)) ([11992d2](https://github.com/dynamic-labs/DynamicAuth/commit/11992d2af5a401ba4ff1dc6904e2a9f8ef5904ca))
+* less solana rpc calls and improve fee fetching ([#6019](https://github.com/dynamic-labs/DynamicAuth/issues/6019)) ([e2609db](https://github.com/dynamic-labs/DynamicAuth/commit/e2609db962c7708ff5b127cb23260a25bc5032e3))
+* make account change idemopotent ([#6061](https://github.com/dynamic-labs/DynamicAuth/issues/6061)) ([8c87513](https://github.com/dynamic-labs/DynamicAuth/commit/8c8751390ea14888c4889679895e2f06d75717b9))
+* only run multi wallet prompt when user profile or auth flow are open ([#6073](https://github.com/dynamic-labs/DynamicAuth/issues/6073)) ([d48ca10](https://github.com/dynamic-labs/DynamicAuth/commit/d48ca105359018457a78588fd8d9aa8a91583a02))
+* recompute multiwallet state after merging accounts ([#6078](https://github.com/dynamic-labs/DynamicAuth/issues/6078)) ([e08a274](https://github.com/dynamic-labs/DynamicAuth/commit/e08a274c4d848f2a8360be7106cfbfa00b9a8f9b))
+* stop querying okx for accounts while locked ([#6081](https://github.com/dynamic-labs/DynamicAuth/issues/6081)) ([#6084](https://github.com/dynamic-labs/DynamicAuth/issues/6084)) ([34365ac](https://github.com/dynamic-labs/DynamicAuth/commit/34365ac1981fe020b03e666c24535a247645d2ad))
+* update copy for primary wallet not connected modal ([#6069](https://github.com/dynamic-labs/DynamicAuth/issues/6069)) ([4a3f43c](https://github.com/dynamic-labs/DynamicAuth/commit/4a3f43ce5585983f7fea0c5b97e812c0ade80e2c))
+
+## [3.0.0-alpha.6](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.5...v3.0.0-alpha.6) (2024-06-18)
+
+
+### Features
+
+* implement useExternalAuth hook to signin using external jwt auth ([#6039](https://github.com/dynamic-labs/DynamicAuth/issues/6039)) ([ba90908](https://github.com/dynamic-labs/DynamicAuth/commit/ba90908509ec21f708a4a0782a7f94861fc3b484))
+
+
+### Bug Fixes
+
+* allow sign-in with different ME BTC wallet after initial connection ([a527b46](https://github.com/dynamic-labs/DynamicAuth/commit/a527b464f321b4fc27730f57c3812e996b5ed878))
+* close sign modal when signing in with a wallet when embedded wallet is enabled ([#6013](https://github.com/dynamic-labs/DynamicAuth/issues/6013)) ([0f4f3c8](https://github.com/dynamic-labs/DynamicAuth/commit/0f4f3c83db162f7a1794a3549b60bbad6b03e2c0))
+* custom network without a valid icon should still display its name in network picker ([#6018](https://github.com/dynamic-labs/DynamicAuth/issues/6018)) ([0b10df6](https://github.com/dynamic-labs/DynamicAuth/commit/0b10df68950bfc9b8492443158a6bb030dc1122c))
+* e2e: remove page pause ([#6045](https://github.com/dynamic-labs/DynamicAuth/issues/6045)) ([55bba00](https://github.com/dynamic-labs/DynamicAuth/commit/55bba0034255055d6ae266b1296542f47ed48e2b))
+* more fixes for connect starknet button ([#6046](https://github.com/dynamic-labs/DynamicAuth/issues/6046)) ([0fb570a](https://github.com/dynamic-labs/DynamicAuth/commit/0fb570a44e65f8dd6d4d2bf5edb2ee54985ec9d4))
+* set verified credentials on embedded wallet creation ([#6044](https://github.com/dynamic-labs/DynamicAuth/issues/6044)) ([b52a96d](https://github.com/dynamic-labs/DynamicAuth/commit/b52a96d321e7efdb30dce9cdb3f6f176c24ceb81))
+
 ## [3.0.0-alpha.5](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.4...v3.0.0-alpha.5) (2024-06-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,14 +27,14 @@
   },
   "dependencies": {
     "@btckit/types": "0.0.19",
-    "@dynamic-labs/sdk-api-core": "0.0.461",
+    "@dynamic-labs/sdk-api-core": "0.0.470",
     "@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": "3.0.0-alpha.5",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.5",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.5",
+    "@dynamic-labs/utils": "3.0.0-alpha.7",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.7",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.7",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/bitcoinProviderHelper.d.ts

@@ -15,6 +15,10 @@ export declare class BitcoinProviderHelper {
             features: string[];
             name: string;
         } | undefined;
+        walletStandardLocators?: {
+            name: string;
+            locator: string;
+        }[] | undefined;
         windowLocations?: string[] | undefined;
     } | undefined;
     getProvider(): any;

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/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs

@@ -0,0 +1,38 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
+
+class FallbackBitcoinConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'fallbackconnector' }));
+        this.name = 'Fallback Connector';
+        this.overrideKey = 'fallbackconnector';
+        this.isAvailable = false;
+        this.canFetchConnectedAccounts = false;
+    }
+    getAddress() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    signPsbt(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _request) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    sendBitcoin(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+}
+
+exports.FallbackBitcoinConnector = FallbackBitcoinConnector;

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.d.ts

@@ -0,0 +1,12 @@
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction } from '../../types';
+import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
+export declare class FallbackBitcoinConnector extends BitcoinWalletConnector {
+    name: string;
+    overrideKey: string;
+    isAvailable: boolean;
+    canFetchConnectedAccounts: boolean;
+    constructor(opts: BitcoinWalletConnectorOpts);
+    getAddress(): Promise<string | undefined>;
+    signPsbt(_request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    sendBitcoin(_transaction: BitcoinTransaction): Promise<string | undefined>;
+}

package/src/connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js

@@ -0,0 +1,34 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
+
+class FallbackBitcoinConnector extends BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'fallbackconnector' }));
+        this.name = 'Fallback Connector';
+        this.overrideKey = 'fallbackconnector';
+        this.isAvailable = false;
+        this.canFetchConnectedAccounts = false;
+    }
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    signPsbt(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+    sendBitcoin(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+}
+
+export { FallbackBitcoinConnector };

package/src/connectors/FallbackBitcoinConnector/index.d.ts

@@ -0,0 +1 @@
+export { FallbackBitcoinConnector } from './FallbackBitcoinConnector';

package/src/connectors/OkxConnector/OkxConnector.cjs

@@ -13,7 +13,7 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
+        this.canFetchConnectedAccounts = false;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];

package/src/connectors/OkxConnector/OkxConnector.js

@@ -9,7 +9,7 @@ class OkxConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = true;
+        this.canFetchConnectedAccounts = false;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];

package/src/connectors/index.d.ts

@@ -5,3 +5,4 @@ export * from './PhantomConnector';
 export * from './OkxConnector';
 export * from './UnisatConnector';
 export * from './UnknownInjected';
+export * from './FallbackBitcoinConnector';

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');
@@ -20,6 +19,7 @@ var PhantomConnector = require('./connectors/PhantomConnector/PhantomConnector.c
 var OkxConnector = require('./connectors/OkxConnector/OkxConnector.cjs');
 var UnisatConnector = require('./connectors/UnisatConnector/UnisatConnector.cjs');
 var UnknownInjected = require('./connectors/UnknownInjected/UnknownInjected.cjs');
+var FallbackBitcoinConnector = require('./connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs');
 
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors.fetchSatsConnectConnectors(props),
@@ -28,6 +28,7 @@ const BitcoinWalletConnectors = (props) => [
     OkxConnector.OkxConnector,
     UnisatConnector.UnisatConnector,
     UnknownInjected.UnknownInjectedConnector,
+    FallbackBitcoinConnector.FallbackBitcoinConnector,
 ];
 
 exports.BitcoinWalletConnector = BitcoinWalletConnector.BitcoinWalletConnector;

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';
@@ -18,6 +17,7 @@ import { PhantomConnector } from './connectors/PhantomConnector/PhantomConnector
 import { OkxConnector } from './connectors/OkxConnector/OkxConnector.js';
 import { UnisatConnector } from './connectors/UnisatConnector/UnisatConnector.js';
 import { UnknownInjectedConnector } from './connectors/UnknownInjected/UnknownInjected.js';
+import { FallbackBitcoinConnector } from './connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js';
 
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors(props),
@@ -26,6 +26,7 @@ const BitcoinWalletConnectors = (props) => [
     OkxConnector,
     UnisatConnector,
     UnknownInjectedConnector,
+    FallbackBitcoinConnector,
 ];
 
 export { BitcoinWalletConnectors };