@dynamic-labs/bitcoin 2.1.0 → 2.1.2-alpha.0

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+### [2.1.2-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.1...v2.1.2-alpha.0) (2024-06-07)
+
+
+### Features
+
+* display enabled countries in phone number field ([#5825](https://github.com/dynamic-labs/DynamicAuth/issues/5825)) ([#5868](https://github.com/dynamic-labs/DynamicAuth/issues/5868)) ([640a4a7](https://github.com/dynamic-labs/DynamicAuth/commit/640a4a77c994390ceed759faf186717b38f393a4))
+
+
+### Bug Fixes
+
+* btc getBalance should use ordinal address if payment not available ([#5883](https://github.com/dynamic-labs/DynamicAuth/issues/5883)) ([bc5ac55](https://github.com/dynamic-labs/DynamicAuth/commit/bc5ac5589e90193d41282d23ce037db360dd23e6))
+* phone number in kyc step ([#5875](https://github.com/dynamic-labs/DynamicAuth/issues/5875)) ([#5879](https://github.com/dynamic-labs/DynamicAuth/issues/5879)) ([3d8a5be](https://github.com/dynamic-labs/DynamicAuth/commit/3d8a5bef35d4a13a1068aaf80d2c39e795b097cd))
+
+### [2.1.1](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0...v2.1.1) (2024-06-04)
+
 ## [2.1.0](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.32...v2.1.0) (2024-06-04)
 
 ## Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "2.1.0",
+  "version": "2.1.2-alpha.0",
   "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.453",
+    "@dynamic-labs/sdk-api-core": "0.0.460",
     "@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": "2.1.0",
-    "@dynamic-labs/wallet-book": "2.1.0",
-    "@dynamic-labs/wallet-connector-core": "2.1.0",
+    "@dynamic-labs/utils": "2.1.2-alpha.0",
+    "@dynamic-labs/wallet-book": "2.1.2-alpha.0",
+    "@dynamic-labs/wallet-connector-core": "2.1.2-alpha.0",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -4,12 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
-var satsConnect = require('sats-connect');
 var bitcoinjsLib = require('bitcoinjs-lib');
-var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
+var satsConnect = require('sats-connect');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var _const = require('../../const.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/wallet-connector-core');
+var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var validatePsbt = require('../../utils/psbt/validator/validatePsbt.cjs');
 var getSigHashType = require('../../utils/psbt/getSigHashType.cjs');
 var bitcoinNetworkTypeToNetworks = require('../../utils/psbt/bitcoinNetworkTypeToNetworks.cjs');
@@ -26,6 +27,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            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
@@ -34,6 +36,12 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             if (!supportsSatsConnect.supportsSatsConnect(this)) {
                 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 (_a = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _a !== void 0 ? _a : 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.d.ts

@@ -1,6 +1,6 @@
 import { BitcoinNetworkType, SignTransactionResponse } from 'sats-connect';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinTransaction, SatsConnectSignTransactionInput, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     currentNetwork: BitcoinNetworkType;
     canFetchConnectedAccounts: boolean;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -1,11 +1,12 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
-import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
 import { Psbt } from 'bitcoinjs-lib';
-import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
+import { BitcoinNetworkType, getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
+import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/wallet-connector-core';
+import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { validatePsbt } from '../../utils/psbt/validator/validatePsbt.js';
 import { getSigHashType } from '../../utils/psbt/getSigHashType.js';
 import { convertNetworkTypeForPsbt } from '../../utils/psbt/bitcoinNetworkTypeToNetworks.js';
@@ -22,6 +23,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
+            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
@@ -30,6 +32,12 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             if (!supportsSatsConnect(this)) {
                 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 (_a = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _a !== void 0 ? _a : 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,11 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         }
         this.cache = new BitcoinLocalStorageCache.BitcoinLocalStorageCache(this.overrideKey);
     }
+    clearConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.cache.clearConnectedAcccounts();
+        });
+    }
     canConnectWithHardwareWallet() {
         const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
         if (!wallet || !wallet.hardwareWallets)
@@ -48,21 +53,22 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearConnectedAcccounts(),
-                this.cache.clearLastBalance(),
-            ]);
+            yield this.cache.clearLastBalance();
         });
     }
     getBalance() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
                 throw new utils.DynamicError('getBalance - No connected address found!');
             }
             const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
-            const paymentAddress = (_a = additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Payment)) === null || _a === void 0 ? void 0 : _a.address;
+            const ordinalsAdditionalAddress = (_a = additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Ordinals)) === null || _a === void 0 ? void 0 : _a.address;
+            const paymentAdditionalAddress = (_b = additionalAddresses.find((address) => address.type === sdkApiCore.WalletAddressType.Payment)) === null || _b === void 0 ? void 0 : _b.address;
+            // Some BTC wallet connectors only have 1 address type. when this is the case, it would always be `ordinals`
+            // if a BTC walletConnector does NOT have a payment address, just use the ordinal address
+            const paymentAddress = paymentAdditionalAddress !== null && paymentAdditionalAddress !== void 0 ? paymentAdditionalAddress : ordinalsAdditionalAddress;
             if (!paymentAddress) {
                 throw new utils.DynamicError('getBalance - No payment address found!');
             }

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -24,12 +24,13 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     isHardwareWalletEnabled: boolean;
     verifiedCredentials: JwtVerifiedCredential[];
     constructor(opts: BitcoinWalletConnectorOpts);
+    clearConnectedAccounts(): Promise<void>;
     canConnectWithHardwareWallet(): boolean;
     isInstalledOnBrowser(): boolean;
     getDeepLink(): string | undefined;
     endSession(): Promise<void>;
     getBalance(): Promise<string | undefined>;
-    private getConnectedAccountsFromCache;
+    getConnectedAccountsFromCache(): Promise<string[]>;
     getConnectedAccounts(): Promise<string[]>;
     getAdditionalAddresses(mainAddress?: string): Promise<WalletAdditionalAddress[]>;
     setAdditionalAddresses(mainAddress: string, additionalAddresses: WalletAdditionalAddress[]): Promise<void>;

package/src/connectors/BitcoinWalletConnector.js

@@ -29,6 +29,11 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         }
         this.cache = new BitcoinLocalStorageCache(this.overrideKey);
     }
+    clearConnectedAccounts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.cache.clearConnectedAcccounts();
+        });
+    }
     canConnectWithHardwareWallet() {
         const wallet = findWalletBookWallet(this.walletBook, this.key);
         if (!wallet || !wallet.hardwareWallets)
@@ -44,21 +49,22 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearConnectedAcccounts(),
-                this.cache.clearLastBalance(),
-            ]);
+            yield this.cache.clearLastBalance();
         });
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             const [connectedAddress] = yield this.getConnectedAccounts();
             if (!connectedAddress) {
                 throw new DynamicError('getBalance - No connected address found!');
             }
             const additionalAddresses = yield this.getAdditionalAddresses(connectedAddress);
-            const paymentAddress = (_a = additionalAddresses.find((address) => address.type === WalletAddressType.Payment)) === null || _a === void 0 ? void 0 : _a.address;
+            const ordinalsAdditionalAddress = (_a = additionalAddresses.find((address) => address.type === WalletAddressType.Ordinals)) === null || _a === void 0 ? void 0 : _a.address;
+            const paymentAdditionalAddress = (_b = additionalAddresses.find((address) => address.type === WalletAddressType.Payment)) === null || _b === void 0 ? void 0 : _b.address;
+            // Some BTC wallet connectors only have 1 address type. when this is the case, it would always be `ordinals`
+            // if a BTC walletConnector does NOT have a payment address, just use the ordinal address
+            const paymentAddress = paymentAdditionalAddress !== null && paymentAdditionalAddress !== void 0 ? paymentAdditionalAddress : ordinalsAdditionalAddress;
             if (!paymentAddress) {
                 throw new DynamicError('getBalance - No payment address found!');
             }

package/src/index.cjs

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

package/src/index.js

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