@dynamic-labs/bitcoin 2.2.8 → 2.2.10

package/CHANGELOG.md

@@ -1,4 +1,26 @@
 
+### [2.2.10](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.9...v2.2.10) (2024-07-05)
+
+
+### Bug Fixes
+
+* Allow user to close connect wallet modal to cancel making a wallet primary. ([#6251](https://github.com/dynamic-labs/DynamicAuth/issues/6251)) ([5a53fac](https://github.com/dynamic-labs/DynamicAuth/commit/5a53fac6e3e77de880e3fe5619b0c2be32fe5a92))
+* Use white color in farcaster qr code when in dark mode to improve scanning. ([#6247](https://github.com/dynamic-labs/DynamicAuth/issues/6247)) ([1967bd7](https://github.com/dynamic-labs/DynamicAuth/commit/1967bd71423ae03c73fdce53adc41ad01f09a52e))
+
+### [2.2.9](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.8...v2.2.9) (2024-07-04)
+
+
+### Features
+
+* add solana support for multi-asset ([#6239](https://github.com/dynamic-labs/DynamicAuth/issues/6239)) ([4e9a924](https://github.com/dynamic-labs/DynamicAuth/commit/4e9a92464253d60fce1542ca38664330e74cf4d6)), closes [#6222](https://github.com/dynamic-labs/DynamicAuth/issues/6222)
+
+
+### Bug Fixes
+
+* relax phone number length validation ([#6226](https://github.com/dynamic-labs/DynamicAuth/issues/6226)) ([#6231](https://github.com/dynamic-labs/DynamicAuth/issues/6231)) ([2419441](https://github.com/dynamic-labs/DynamicAuth/commit/2419441f471a5edc3c0e831e24840d9d85d4a570))
+* set last active account on accountChange request ([#6218](https://github.com/dynamic-labs/DynamicAuth/issues/6218)) ([#6228](https://github.com/dynamic-labs/DynamicAuth/issues/6228)) ([1842445](https://github.com/dynamic-labs/DynamicAuth/commit/184244535faeaea09f55ef0c0a62a4ace41432c7))
+* stop auto-switching to connected secondary wallet if primary wallet is not connected ([#6196](https://github.com/dynamic-labs/DynamicAuth/issues/6196)) ([#6233](https://github.com/dynamic-labs/DynamicAuth/issues/6233)) ([82fd872](https://github.com/dynamic-labs/DynamicAuth/commit/82fd87251758b39c31dd334abc85dc05a7e8affa))
+
 ### [2.2.8](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.7...v2.2.8) (2024-07-01)
 
 

package/package.json

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

package/src/connectors/BitcoinWalletConnector.cjs

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
+var satsConnect = require('sats-connect');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
@@ -234,12 +235,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
         const handleBitcoinAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
             let connectedAccounts = accounts;
+            let ordinalsAccount, paymentAccount;
             // if accounts is an array of objects, we need to parse them to return only addresses
             // since ordinals is the main address we use, we should return it as the first address
             if (typeof accounts[0] === 'object') {
                 connectedAccounts = accounts
-                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .sort((account) => account.purpose === satsConnect.AddressPurpose.Ordinals ? -1 : 1)
                     .map((account) => account.address);
+                [ordinalsAccount, paymentAccount] = connectedAccounts;
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
@@ -251,6 +254,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             // set the last account change request with the from and to addresses
             // to ensure that the requests are not duplicated
             this.setLastAccountChangeRequest(connectedAccounts[0]);
+            if (ordinalsAccount || paymentAccount) {
+                this.setConnectedAccountWithAddresses({
+                    active: true,
+                    mainAddress: ordinalsAccount !== null && ordinalsAccount !== void 0 ? ordinalsAccount : paymentAccount,
+                    ordinalsAddress: ordinalsAccount,
+                    paymentAddress: paymentAccount,
+                });
+            }
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);

package/src/connectors/BitcoinWalletConnector.js

@@ -1,5 +1,6 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
+import { AddressPurpose } from 'sats-connect';
 import { WalletConnectorBase, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
 import { getWalletBookWallet, findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isLedgerAddressViaVerifiedCredentials, DynamicError } from '@dynamic-labs/utils';
@@ -230,12 +231,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
         const handleBitcoinAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
             let connectedAccounts = accounts;
+            let ordinalsAccount, paymentAccount;
             // if accounts is an array of objects, we need to parse them to return only addresses
             // since ordinals is the main address we use, we should return it as the first address
             if (typeof accounts[0] === 'object') {
                 connectedAccounts = accounts
-                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .sort((account) => account.purpose === AddressPurpose.Ordinals ? -1 : 1)
                     .map((account) => account.address);
+                [ordinalsAccount, paymentAccount] = connectedAccounts;
             }
             const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
             // don't do anything if the connected accounts haven't changed
@@ -247,6 +250,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             // set the last account change request with the from and to addresses
             // to ensure that the requests are not duplicated
             this.setLastAccountChangeRequest(connectedAccounts[0]);
+            if (ordinalsAccount || paymentAccount) {
+                this.setConnectedAccountWithAddresses({
+                    active: true,
+                    mainAddress: ordinalsAccount !== null && ordinalsAccount !== void 0 ? ordinalsAccount : paymentAccount,
+                    ordinalsAddress: ordinalsAccount,
+                    paymentAddress: paymentAccount,
+                });
+            }
             handleAccountChange(connectedAccounts);
         });
         provider.on('accountsChanged', handleBitcoinAccountChange);

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs

@@ -5,12 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _const = require('../../const.cjs');
 require('../../../_virtual/_tslib.cjs');
+require('sats-connect');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 require('@wallet-standard/app');
-require('sats-connect');
 require('bitcoinjs-lib');
 var BitcoinSatsConnectConnector = require('../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
 

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.js

@@ -1,12 +1,12 @@
 'use client'
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import '../../../_virtual/_tslib.js';
+import 'sats-connect';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '@wallet-standard/app';
-import 'sats-connect';
 import 'bitcoinjs-lib';
 import { BitcoinSatsConnectConnector } from '../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';