@dynamic-labs/bitcoin 1.1.0-alpha.11 → 1.1.0-alpha.13

package/CHANGELOG.md

@@ -1,4 +1,36 @@
 
+## [1.1.0-alpha.13](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.12...v1.1.0-alpha.13) (2024-01-23)
+
+
+### Features
+
+* add createWalletClientFromWallet helper function ([#4416](https://github.com/dynamic-labs/DynamicAuth/issues/4416)) ([b384898](https://github.com/dynamic-labs/DynamicAuth/commit/b384898061bb3f9b38b2ed670b6650cfc1d4b429))
+* add hardware wallets to wallet book ([#4445](https://github.com/dynamic-labs/DynamicAuth/issues/4445)) ([66c0f5b](https://github.com/dynamic-labs/DynamicAuth/commit/66c0f5b29a6a700099bb95a6f7622f6178e0bccf))
+* add support for Argent Web and Mobile ([#4328](https://github.com/dynamic-labs/DynamicAuth/issues/4328)) ([bce20b8](https://github.com/dynamic-labs/DynamicAuth/commit/bce20b8f35a8630f2621f53a541a1acb06a38fc0))
+* enable ledger for glow, solflare and backpack ([#4392](https://github.com/dynamic-labs/DynamicAuth/issues/4392)) ([fa7b992](https://github.com/dynamic-labs/DynamicAuth/commit/fa7b992f87ebc43560f87b43ac56f2cd9909b306))
+
+
+### Bug Fixes
+
+* breaking changes script ([#4440](https://github.com/dynamic-labs/DynamicAuth/issues/4440)) ([446173d](https://github.com/dynamic-labs/DynamicAuth/commit/446173d074d652d81856c6412e304b46b1565320))
+* broken help icon in create passkey view ([#4428](https://github.com/dynamic-labs/DynamicAuth/issues/4428)) ([e0ffc02](https://github.com/dynamic-labs/DynamicAuth/commit/e0ffc02ffea34b7ac3198ff6e1baf7f9907acddd))
+* infinite loop when connecting with trust wallet ([#4448](https://github.com/dynamic-labs/DynamicAuth/issues/4448)) ([4e20edf](https://github.com/dynamic-labs/DynamicAuth/commit/4e20edf9abaabf20e5e9f9167b44d7f691e844f1))
+* render wagmi elements based on react version ([#4453](https://github.com/dynamic-labs/DynamicAuth/issues/4453)) ([43c624c](https://github.com/dynamic-labs/DynamicAuth/commit/43c624ca996b0c51de1454910f19fdf908149938))
+
+## [1.1.0-alpha.12](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.11...v1.1.0-alpha.12) (2024-01-18)
+
+
+### Features
+
+* expose setAuthMode method ([#4419](https://github.com/dynamic-labs/DynamicAuth/issues/4419)) ([7d156b3](https://github.com/dynamic-labs/DynamicAuth/commit/7d156b3e0eab9b9a80f70ff1c5201d90693ae755))
+
+
+### Bug Fixes
+
+* call onUnlinkSuccess in headless mode too ([#4412](https://github.com/dynamic-labs/DynamicAuth/issues/4412)) ([4c76af9](https://github.com/dynamic-labs/DynamicAuth/commit/4c76af9ac7c7b43883742d1289558dfcb5d612ca))
+* correctly map keplr chain ids from project settings ([#4418](https://github.com/dynamic-labs/DynamicAuth/issues/4418)) ([7046364](https://github.com/dynamic-labs/DynamicAuth/commit/7046364a316f7551f0b995eaae7afea13502eb9b))
+* logging in with an email linked to a third party wallet gets stuck on otp view ([#4407](https://github.com/dynamic-labs/DynamicAuth/issues/4407)) ([35bf142](https://github.com/dynamic-labs/DynamicAuth/commit/35bf142e74efeef866dbd7b8157a049cd36eeccb))
+
 ## [1.1.0-alpha.11](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.10...v1.1.0-alpha.11) (2024-01-17)
 
 

package/_virtual/_tslib.cjs

@@ -25,6 +25,11 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 exports.__awaiter = __awaiter;

package/_virtual/_tslib.js

@@ -21,6 +21,11 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 export { __awaiter };

package/package.json

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

package/src/BitcoinBtcKitConnector.cjs

@@ -14,11 +14,11 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
         this.btcKit = btcKit;
     }
     fetchPublicAddress() {
-        var _a, _b, _c, _d;
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const connectedAccount = yield this.cache.getCurrentAccount();
+            const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
-                return ((_a = connectedAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : connectedAccount.paymentAddress);
+                return connectedAccount;
             }
             const response = yield this.btcKit.request('getAddresses', {
                 types: ['p2tr', 'p2wpkh'],
@@ -28,12 +28,11 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
                 return undefined;
             }
             const { addresses } = response.result;
-            const bitcoinAccount = {
-                ordinalsAddress: (_b = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2tr')) === null || _b === void 0 ? void 0 : _b.address,
-                paymentAddress: (_c = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2wpkh')) === null || _c === void 0 ? void 0 : _c.address,
-            };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_d = bitcoinAccount.ordinalsAddress) !== null && _d !== void 0 ? _d : bitcoinAccount.paymentAddress;
+            const ordinalsAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2tr');
+            const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2wpkh');
+            const mainAddress = (_a = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _a !== void 0 ? _a : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+            yield this.setConnectedAccountWithAddresses(mainAddress, ordinalsAccount, paymentAccount, true);
+            return mainAddress;
         });
     }
     signMessage(messageToSign) {
@@ -55,10 +54,12 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnect
             return response.result.signature;
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.getConnectedAccounts()).length)
-                return undefined;
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
             const response = yield this.btcKit.request('sendTransfer', {
                 address: transaction.recipientAddress,
                 amount: transaction.amount,

package/src/BitcoinBtcKitConnector.d.ts

@@ -12,5 +12,5 @@ export declare abstract class BitcoinBtcKitConnector extends BitcoinWalletConnec
     constructor(opts: BitcoinWalletConnectorOpts, btcKit: BtcKitProvider);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    sendTransaction(transaction: BitcoinTransaction): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
 }

package/src/BitcoinBtcKitConnector.js

@@ -10,11 +10,11 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
         this.btcKit = btcKit;
     }
     fetchPublicAddress() {
-        var _a, _b, _c, _d;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const connectedAccount = yield this.cache.getCurrentAccount();
+            const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
-                return ((_a = connectedAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : connectedAccount.paymentAddress);
+                return connectedAccount;
             }
             const response = yield this.btcKit.request('getAddresses', {
                 types: ['p2tr', 'p2wpkh'],
@@ -24,12 +24,11 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
                 return undefined;
             }
             const { addresses } = response.result;
-            const bitcoinAccount = {
-                ordinalsAddress: (_b = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2tr')) === null || _b === void 0 ? void 0 : _b.address,
-                paymentAddress: (_c = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2wpkh')) === null || _c === void 0 ? void 0 : _c.address,
-            };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_d = bitcoinAccount.ordinalsAddress) !== null && _d !== void 0 ? _d : bitcoinAccount.paymentAddress;
+            const ordinalsAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2tr');
+            const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.type === 'p2wpkh');
+            const mainAddress = (_a = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _a !== void 0 ? _a : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+            yield this.setConnectedAccountWithAddresses(mainAddress, ordinalsAccount, paymentAccount, true);
+            return mainAddress;
         });
     }
     signMessage(messageToSign) {
@@ -51,10 +50,12 @@ class BitcoinBtcKitConnector extends BitcoinWalletConnector {
             return response.result.signature;
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.getConnectedAccounts()).length)
-                return undefined;
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
             const response = yield this.btcKit.request('sendTransfer', {
                 address: transaction.recipientAddress,
                 amount: transaction.amount,

package/src/BitcoinLocalStorageCache.cjs

@@ -7,32 +7,58 @@ var utils = require('@dynamic-labs/utils');
 
 class BitcoinLocalStorageCache {
     constructor(key) {
-        this.CONNECTED_ACCOUNT_KEY = `bitcoin_${key}_connectedAccount`;
+        this.CONNECTED_ACCOUNTS_KEY = `bitcoin_${key}_connectedAccounts`;
         this.LAST_BALANCE_KEY = `bitcoin_${key}_lastBalance`;
     }
-    getCurrentAccount() {
+    getActiveAccount() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const account = yield utils.getItemAsync(this.CONNECTED_ACCOUNT_KEY);
-            return account;
+            const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            if (!connectedAccounts) {
+                return;
+            }
+            const activeAddress = Object.keys(connectedAccounts).find((key) => connectedAccounts[key].active);
+            if (!activeAddress) {
+                return;
+            }
+            return {
+                additionalAddresses: connectedAccounts[activeAddress].additionalAddresses,
+                address: activeAddress,
+            };
+        });
+    }
+    getConnectedAccount(address) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts === null || connectedAccounts === void 0 ? void 0 : connectedAccounts[address];
         });
     }
-    setCurrentAccount(account) {
+    setConnectedAccount(addess, account) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.setItemAsync(this.CONNECTED_ACCOUNT_KEY, account);
+            let connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            if (!connectedAccounts) {
+                connectedAccounts = {};
+            }
+            // if current account is active, reset all other accounts to inactive
+            if (account.active) {
+                Object.keys(connectedAccounts).forEach((key) => {
+                    if (connectedAccounts) {
+                        connectedAccounts[key].active = false;
+                    }
+                });
+            }
+            // add new account to map or override existing one
+            connectedAccounts[addess] = account;
+            return utils.setItemAsync(this.CONNECTED_ACCOUNTS_KEY, connectedAccounts);
         });
     }
-    clearCurrentAcccount() {
+    clearConnectedAcccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.removeItemAsync(this.CONNECTED_ACCOUNT_KEY);
+            return utils.removeItemAsync(this.CONNECTED_ACCOUNTS_KEY);
         });
     }
     getLastBalance() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const balance = yield utils.getItemAsync(this.LAST_BALANCE_KEY);
-            if (!balance) {
-                return undefined;
-            }
-            return balance;
+            return utils.getItemAsync(this.LAST_BALANCE_KEY);
         });
     }
     setLastBalance(balance) {

package/src/BitcoinLocalStorageCache.d.ts

@@ -1,20 +1,28 @@
-import { BitcoinAccount } from './types';
+import { WalletAdditionalAddress } from '@dynamic-labs/sdk-api';
+import { BitcoinConnectedAccount } from './types';
+type BitcoinActiveAccount = {
+    address: string;
+    additionalAddresses: WalletAdditionalAddress[];
+};
 export declare class BitcoinLocalStorageCache implements IBitcoinSessionCache {
-    private readonly CONNECTED_ACCOUNT_KEY;
+    private readonly CONNECTED_ACCOUNTS_KEY;
     private readonly LAST_BALANCE_KEY;
     constructor(key: string);
-    getCurrentAccount(): Promise<BitcoinAccount | undefined>;
-    setCurrentAccount(account: BitcoinAccount): Promise<void>;
-    clearCurrentAcccount(): Promise<void>;
+    getActiveAccount(): Promise<BitcoinActiveAccount | undefined>;
+    getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
+    setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
+    clearConnectedAcccounts(): Promise<void>;
     getLastBalance(): Promise<string | undefined>;
     setLastBalance(balance: string): Promise<void>;
     clearLastBalance(): Promise<void>;
 }
 export interface IBitcoinSessionCache {
-    clearCurrentAcccount(): Promise<void>;
-    getCurrentAccount(): Promise<BitcoinAccount | undefined>;
-    setCurrentAccount(account: BitcoinAccount): Promise<void>;
+    clearConnectedAcccounts(): Promise<void>;
+    getActiveAccount(): Promise<BitcoinActiveAccount | undefined>;
+    getConnectedAccount(address: string): Promise<BitcoinConnectedAccount | undefined>;
+    setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
     clearLastBalance(): Promise<void>;
     getLastBalance(): Promise<string | undefined>;
     setLastBalance(balance: string): Promise<void>;
 }
+export {};

package/src/BitcoinLocalStorageCache.js

@@ -3,32 +3,58 @@ import { getItemAsync, setItemAsync, removeItemAsync } from '@dynamic-labs/utils
 
 class BitcoinLocalStorageCache {
     constructor(key) {
-        this.CONNECTED_ACCOUNT_KEY = `bitcoin_${key}_connectedAccount`;
+        this.CONNECTED_ACCOUNTS_KEY = `bitcoin_${key}_connectedAccounts`;
         this.LAST_BALANCE_KEY = `bitcoin_${key}_lastBalance`;
     }
-    getCurrentAccount() {
+    getActiveAccount() {
         return __awaiter(this, void 0, void 0, function* () {
-            const account = yield getItemAsync(this.CONNECTED_ACCOUNT_KEY);
-            return account;
+            const connectedAccounts = yield getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            if (!connectedAccounts) {
+                return;
+            }
+            const activeAddress = Object.keys(connectedAccounts).find((key) => connectedAccounts[key].active);
+            if (!activeAddress) {
+                return;
+            }
+            return {
+                additionalAddresses: connectedAccounts[activeAddress].additionalAddresses,
+                address: activeAddress,
+            };
+        });
+    }
+    getConnectedAccount(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connectedAccounts = yield getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts === null || connectedAccounts === void 0 ? void 0 : connectedAccounts[address];
         });
     }
-    setCurrentAccount(account) {
+    setConnectedAccount(addess, account) {
         return __awaiter(this, void 0, void 0, function* () {
-            return setItemAsync(this.CONNECTED_ACCOUNT_KEY, account);
+            let connectedAccounts = yield getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            if (!connectedAccounts) {
+                connectedAccounts = {};
+            }
+            // if current account is active, reset all other accounts to inactive
+            if (account.active) {
+                Object.keys(connectedAccounts).forEach((key) => {
+                    if (connectedAccounts) {
+                        connectedAccounts[key].active = false;
+                    }
+                });
+            }
+            // add new account to map or override existing one
+            connectedAccounts[addess] = account;
+            return setItemAsync(this.CONNECTED_ACCOUNTS_KEY, connectedAccounts);
         });
     }
-    clearCurrentAcccount() {
+    clearConnectedAcccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            return removeItemAsync(this.CONNECTED_ACCOUNT_KEY);
+            return removeItemAsync(this.CONNECTED_ACCOUNTS_KEY);
         });
     }
     getLastBalance() {
         return __awaiter(this, void 0, void 0, function* () {
-            const balance = yield getItemAsync(this.LAST_BALANCE_KEY);
-            if (!balance) {
-                return undefined;
-            }
-            return balance;
+            return getItemAsync(this.LAST_BALANCE_KEY);
         });
     }
     setLastBalance(balance) {

package/src/BitcoinSatsConnectConnector.cjs

@@ -16,7 +16,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
     }
     fetchPublicAddress() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             // 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
@@ -26,9 +25,9 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             if (!supportsSatsConnect.supportsSatsConnect(this)) {
                 return;
             }
-            const connectedAccount = yield this.cache.getCurrentAccount();
+            const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
-                return ((_a = connectedAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : connectedAccount.paymentAddress);
+                return connectedAccount;
             }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
@@ -42,14 +41,13 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                         reject(error);
                     },
                     onFinish: (response) => _tslib.__awaiter(this, void 0, void 0, function* () {
-                        var _c, _d, _e;
+                        var _c;
                         const { addresses } = response;
-                        const bitcoinAccount = {
-                            ordinalsAddress: (_c = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.AddressPurpose.Ordinals)) === null || _c === void 0 ? void 0 : _c.address,
-                            paymentAddress: (_d = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.AddressPurpose.Payment)) === null || _d === void 0 ? void 0 : _d.address,
-                        };
-                        yield this.cache.setCurrentAccount(bitcoinAccount);
-                        resolve((_e = bitcoinAccount.ordinalsAddress) !== null && _e !== void 0 ? _e : bitcoinAccount.paymentAddress);
+                        const ordinalsAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.AddressPurpose.Ordinals);
+                        const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === satsConnect.AddressPurpose.Payment);
+                        const mainAddress = (_c = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _c !== void 0 ? _c : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+                        yield this.setConnectedAccountWithAddresses(mainAddress, ordinalsAccount, paymentAccount, true);
+                        resolve(mainAddress);
                     }),
                     payload: {
                         message: 'Address for receiving Ordinals and payments',
@@ -93,10 +91,12 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             });
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
+        var _a, _b;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
-            if (!paymentAddress || !supportsSatsConnect.supportsSatsConnect(this)) {
+            const mainAddress = yield this.fetchPublicAddress();
+            const senderAddress = (_b = (_a = (yield this.getAdditionalAddresses(mainAddress))) === null || _a === void 0 ? void 0 : _a.find((address) => address.type === 'payment')) === null || _b === void 0 ? void 0 : _b.address;
+            if (!senderAddress || !supportsSatsConnect.supportsSatsConnect(this)) {
                 return;
             }
             return new Promise((resolve, reject) => {
@@ -123,7 +123,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                                 amountSats: transaction.amount,
                             },
                         ],
-                        senderAddress: paymentAddress,
+                        senderAddress,
                     },
                 });
             });

package/src/BitcoinSatsConnectConnector.d.ts

@@ -6,5 +6,5 @@ export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletC
     constructor(opts: BitcoinWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    sendTransaction(transaction: BitcoinTransaction): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
 }

package/src/BitcoinSatsConnectConnector.js

@@ -12,7 +12,6 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
         this.currentNetwork = BitcoinNetworkType.Mainnet;
     }
     fetchPublicAddress() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // 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
@@ -22,9 +21,9 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             if (!supportsSatsConnect(this)) {
                 return;
             }
-            const connectedAccount = yield this.cache.getCurrentAccount();
+            const [connectedAccount] = yield this.getConnectedAccounts();
             if (connectedAccount) {
-                return ((_a = connectedAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : connectedAccount.paymentAddress);
+                return connectedAccount;
             }
             return new Promise((resolve, reject) => {
                 getAddress({
@@ -38,14 +37,13 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                         reject(error);
                     },
                     onFinish: (response) => __awaiter(this, void 0, void 0, function* () {
-                        var _c, _d, _e;
+                        var _c;
                         const { addresses } = response;
-                        const bitcoinAccount = {
-                            ordinalsAddress: (_c = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Ordinals)) === null || _c === void 0 ? void 0 : _c.address,
-                            paymentAddress: (_d = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Payment)) === null || _d === void 0 ? void 0 : _d.address,
-                        };
-                        yield this.cache.setCurrentAccount(bitcoinAccount);
-                        resolve((_e = bitcoinAccount.ordinalsAddress) !== null && _e !== void 0 ? _e : bitcoinAccount.paymentAddress);
+                        const ordinalsAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Ordinals);
+                        const paymentAccount = addresses === null || addresses === void 0 ? void 0 : addresses.find((address) => address.purpose === AddressPurpose.Payment);
+                        const mainAddress = (_c = ordinalsAccount === null || ordinalsAccount === void 0 ? void 0 : ordinalsAccount.address) !== null && _c !== void 0 ? _c : paymentAccount === null || paymentAccount === void 0 ? void 0 : paymentAccount.address;
+                        yield this.setConnectedAccountWithAddresses(mainAddress, ordinalsAccount, paymentAccount, true);
+                        resolve(mainAddress);
                     }),
                     payload: {
                         message: 'Address for receiving Ordinals and payments',
@@ -89,10 +87,12 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             });
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
-            if (!paymentAddress || !supportsSatsConnect(this)) {
+            const mainAddress = yield this.fetchPublicAddress();
+            const senderAddress = (_b = (_a = (yield this.getAdditionalAddresses(mainAddress))) === null || _a === void 0 ? void 0 : _a.find((address) => address.type === 'payment')) === null || _b === void 0 ? void 0 : _b.address;
+            if (!senderAddress || !supportsSatsConnect(this)) {
                 return;
             }
             return new Promise((resolve, reject) => {
@@ -119,7 +119,7 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                                 amountSats: transaction.amount,
                             },
                         ],
-                        senderAddress: paymentAddress,
+                        senderAddress,
                     },
                 });
             });

package/src/BitcoinWalletConnector.cjs

@@ -6,6 +6,7 @@ var _tslib = require('../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
+var sdkApi = require('@dynamic-labs/sdk-api');
 var bitcoinProviderHelper = require('./bitcoinProviderHelper.cjs');
 var BitcoinLocalStorageCache = require('./BitcoinLocalStorageCache.cjs');
 var _const = require('./const.cjs');
@@ -29,18 +30,24 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     getDeepLink() {
         return undefined;
     }
-    getBalance() {
-        var _a;
+    endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const addresses = yield Promise.all([
-                this.getPaymentAddress(),
-                this.getOrdinalsAddress(),
+            yield Promise.all([
+                this.cache.clearConnectedAcccounts(),
+                this.cache.clearLastBalance(),
             ]);
-            if (!addresses[0] && !addresses[1]) {
+        });
+    }
+    getBalance() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const [connectedAddress] = yield this.getConnectedAccounts();
+            if (!connectedAddress) {
                 throw new utils.DynamicError('getBalance - No connected address found!');
             }
-            const fetchAddress = (_a = addresses[0]) !== null && _a !== void 0 ? _a : addresses[1];
-            const response = yield fetch(`${_const.BALANCE_API_URL}${fetchAddress}`);
+            const API_URL = connectedAddress.startsWith('t')
+                ? _const.BALANCE_API_URL_TESTNET
+                : _const.BALANCE_API_URL;
+            const response = yield fetch(`${API_URL}${connectedAddress}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === _const.HTTP_STATUS_TOO_MANY_REQUESTS) {
@@ -63,49 +70,64 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return balance.toString();
         });
     }
-    endSession() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearCurrentAcccount(),
-                this.cache.clearLastBalance(),
-            ]);
-        });
-    }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            // ordinals address is the preferred address
-            if (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.ordinalsAddress) {
-                return [currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.ordinalsAddress];
+            const currentAccount = yield this.cache.getActiveAccount();
+            if (!(currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address)) {
+                return [];
             }
-            if (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.paymentAddress) {
-                return [currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.paymentAddress];
-            }
-            return [];
+            return [currentAccount.address];
         });
     }
-    getPaymentAddress() {
+    getAdditionalAddresses(mainAddress) {
+        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            if (!currentAccount) {
+            if (!mainAddress) {
                 return;
             }
-            return currentAccount.paymentAddress;
+            const currentAccount = yield this.cache.getConnectedAccount(mainAddress);
+            return ((_a = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.additionalAddresses) === null || _a === void 0 ? void 0 : _a.length)
+                ? currentAccount.additionalAddresses
+                : undefined;
         });
     }
-    getOrdinalsAddress() {
+    setAdditionalAddresses(mainAddress, additionalAddresses) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            if (!currentAccount) {
-                return;
-            }
-            return currentAccount.ordinalsAddress;
+            return this.cache.setConnectedAccount(mainAddress, {
+                additionalAddresses,
+            });
         });
     }
     getProvider() {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
     }
+    setConnectedAccountWithAddresses(mainAddress, ordinalsAddress, paymentAddress, active) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!mainAddress) {
+                return;
+            }
+            const additionalAddresses = [];
+            if (ordinalsAddress) {
+                additionalAddresses.push({
+                    address: ordinalsAddress.address,
+                    publicKey: ordinalsAddress.publicKey,
+                    type: sdkApi.WalletAddressType.Ordinals,
+                });
+            }
+            if (paymentAddress) {
+                additionalAddresses.push({
+                    address: paymentAddress.address,
+                    publicKey: paymentAddress.publicKey,
+                    type: sdkApi.WalletAddressType.Payment,
+                });
+            }
+            this.cache.setConnectedAccount(mainAddress, {
+                active,
+                additionalAddresses,
+            });
+        });
+    }
 }
 
 exports.BitcoinWalletConnector = BitcoinWalletConnector;

package/src/BitcoinWalletConnector.d.ts

@@ -1,14 +1,15 @@
 import type { Wallet } from '@wallet-standard/base';
-import { Chain, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
+import { WalletAdditionalAddress } from '@dynamic-labs/sdk-api';
 import { IBitcoinSessionCache } from './BitcoinLocalStorageCache';
-import { BitcoinTransaction } from './types';
+import { BitcoinAddress, BitcoinTransaction } from './types';
 export type BitcoinWalletConnectorOpts = {
     walletBook: WalletBookSchema;
     walletData: WalletSchema;
     overrideKey?: string;
 };
-export declare abstract class BitcoinWalletConnector extends WalletConnectorBase {
+export declare abstract class BitcoinWalletConnector extends WalletConnectorBase implements IBitcoinWalletConnector {
     cache: IBitcoinSessionCache;
     connectedChain: Chain;
     supportedChains: Chain[];
@@ -17,11 +18,12 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     constructor(opts: BitcoinWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
     getDeepLink(): string | undefined;
-    getBalance(): Promise<string | undefined>;
     endSession(): Promise<void>;
+    getBalance(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
-    getPaymentAddress(): Promise<string | undefined>;
-    getOrdinalsAddress(): Promise<string | undefined>;
-    abstract sendTransaction(transaction: BitcoinTransaction): Promise<string | undefined>;
+    getAdditionalAddresses(mainAddress?: string): Promise<WalletAdditionalAddress[] | undefined>;
+    setAdditionalAddresses(mainAddress: string, additionalAddresses: WalletAdditionalAddress[]): Promise<void>;
+    abstract sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     getProvider<T>(): T;
+    setConnectedAccountWithAddresses(mainAddress?: string, ordinalsAddress?: BitcoinAddress, paymentAddress?: BitcoinAddress, active?: boolean): Promise<void>;
 }

package/src/BitcoinWalletConnector.js

@@ -2,9 +2,10 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { WalletConnectorBase } 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';
 import { BitcoinProviderHelper } from './bitcoinProviderHelper.js';
 import { BitcoinLocalStorageCache } from './BitcoinLocalStorageCache.js';
-import { BALANCE_API_URL, HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_NOT_FOUND } from './const.js';
+import { BALANCE_API_URL_TESTNET, BALANCE_API_URL, HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_NOT_FOUND } from './const.js';
 
 class BitcoinWalletConnector extends WalletConnectorBase {
     constructor(opts) {
@@ -25,18 +26,24 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     getDeepLink() {
         return undefined;
     }
-    getBalance() {
-        var _a;
+    endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            const addresses = yield Promise.all([
-                this.getPaymentAddress(),
-                this.getOrdinalsAddress(),
+            yield Promise.all([
+                this.cache.clearConnectedAcccounts(),
+                this.cache.clearLastBalance(),
             ]);
-            if (!addresses[0] && !addresses[1]) {
+        });
+    }
+    getBalance() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [connectedAddress] = yield this.getConnectedAccounts();
+            if (!connectedAddress) {
                 throw new DynamicError('getBalance - No connected address found!');
             }
-            const fetchAddress = (_a = addresses[0]) !== null && _a !== void 0 ? _a : addresses[1];
-            const response = yield fetch(`${BALANCE_API_URL}${fetchAddress}`);
+            const API_URL = connectedAddress.startsWith('t')
+                ? BALANCE_API_URL_TESTNET
+                : BALANCE_API_URL;
+            const response = yield fetch(`${API_URL}${connectedAddress}`);
             if (!response.ok) {
                 // if the request fails due to rate limits, return cached value
                 if (response.status === HTTP_STATUS_TOO_MANY_REQUESTS) {
@@ -59,49 +66,64 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             return balance.toString();
         });
     }
-    endSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.cache.clearCurrentAcccount(),
-                this.cache.clearLastBalance(),
-            ]);
-        });
-    }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            // ordinals address is the preferred address
-            if (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.ordinalsAddress) {
-                return [currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.ordinalsAddress];
+            const currentAccount = yield this.cache.getActiveAccount();
+            if (!(currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address)) {
+                return [];
             }
-            if (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.paymentAddress) {
-                return [currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.paymentAddress];
-            }
-            return [];
+            return [currentAccount.address];
         });
     }
-    getPaymentAddress() {
+    getAdditionalAddresses(mainAddress) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            if (!currentAccount) {
+            if (!mainAddress) {
                 return;
             }
-            return currentAccount.paymentAddress;
+            const currentAccount = yield this.cache.getConnectedAccount(mainAddress);
+            return ((_a = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.additionalAddresses) === null || _a === void 0 ? void 0 : _a.length)
+                ? currentAccount.additionalAddresses
+                : undefined;
         });
     }
-    getOrdinalsAddress() {
+    setAdditionalAddresses(mainAddress, additionalAddresses) {
         return __awaiter(this, void 0, void 0, function* () {
-            const currentAccount = yield this.cache.getCurrentAccount();
-            if (!currentAccount) {
-                return;
-            }
-            return currentAccount.ordinalsAddress;
+            return this.cache.setConnectedAccount(mainAddress, {
+                additionalAddresses,
+            });
         });
     }
     getProvider() {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
     }
+    setConnectedAccountWithAddresses(mainAddress, ordinalsAddress, paymentAddress, active) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!mainAddress) {
+                return;
+            }
+            const additionalAddresses = [];
+            if (ordinalsAddress) {
+                additionalAddresses.push({
+                    address: ordinalsAddress.address,
+                    publicKey: ordinalsAddress.publicKey,
+                    type: WalletAddressType.Ordinals,
+                });
+            }
+            if (paymentAddress) {
+                additionalAddresses.push({
+                    address: paymentAddress.address,
+                    publicKey: paymentAddress.publicKey,
+                    type: WalletAddressType.Payment,
+                });
+            }
+            this.cache.setConnectedAccount(mainAddress, {
+                active,
+                additionalAddresses,
+            });
+        });
+    }
 }
 
 export { BitcoinWalletConnector };

package/src/OkxConnector.cjs

@@ -11,19 +11,18 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         this.name = 'OKX Wallet (Bitcoin)';
     }
     fetchPublicAddress() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            const account = yield provider.connect();
-            const bitcoinAccount = {
-                ordinalsAddress: account.address,
-                paymentAddress: account.address,
+            const { address, publicKey } = yield provider.connect();
+            const bitcoinAddress = {
+                address,
+                publicKey,
             };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_a = bitcoinAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : bitcoinAccount.paymentAddress;
+            yield this.setConnectedAccountWithAddresses(address, bitcoinAddress, bitcoinAddress, true);
+            return address;
         });
     }
     signMessage(messageToSign) {
@@ -35,11 +34,11 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return provider.signMessage(messageToSign, 'bip322-simple');
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
             const provider = this.getProvider();
-            if (!paymentAddress || !provider) {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !provider) {
                 return;
             }
             return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);

package/src/OkxConnector.d.ts

@@ -5,5 +5,5 @@ export declare class OkxConnector extends BitcoinWalletConnector {
     constructor(opts: BitcoinWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    sendTransaction(transaction: BitcoinTransaction): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
 }

package/src/OkxConnector.js

@@ -7,19 +7,18 @@ class OkxConnector extends BitcoinWalletConnector {
         this.name = 'OKX Wallet (Bitcoin)';
     }
     fetchPublicAddress() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            const account = yield provider.connect();
-            const bitcoinAccount = {
-                ordinalsAddress: account.address,
-                paymentAddress: account.address,
+            const { address, publicKey } = yield provider.connect();
+            const bitcoinAddress = {
+                address,
+                publicKey,
             };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_a = bitcoinAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : bitcoinAccount.paymentAddress;
+            yield this.setConnectedAccountWithAddresses(address, bitcoinAddress, bitcoinAddress, true);
+            return address;
         });
     }
     signMessage(messageToSign) {
@@ -31,11 +30,11 @@ class OkxConnector extends BitcoinWalletConnector {
             return provider.signMessage(messageToSign, 'bip322-simple');
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
             const provider = this.getProvider();
-            if (!paymentAddress || !provider) {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !provider) {
                 return;
             }
             return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);

package/src/UnisatConnector.cjs

@@ -11,19 +11,19 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         this.name = 'UniSat';
     }
     fetchPublicAddress() {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
             const [address] = yield provider.requestAccounts();
-            const bitcoinAccount = {
-                ordinalsAddress: address,
-                paymentAddress: address,
+            const publicKey = yield provider.getPublicKey();
+            const bitcoinAddress = {
+                address,
+                publicKey,
             };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_a = bitcoinAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : bitcoinAccount.paymentAddress;
+            yield this.setConnectedAccountWithAddresses(address, bitcoinAddress, bitcoinAddress, true);
+            return address;
         });
     }
     signMessage(messageToSign) {
@@ -35,11 +35,11 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return provider.signMessage(messageToSign, 'bip322-simple');
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
             const provider = this.getProvider();
-            if (!paymentAddress || !provider) {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !provider) {
                 return;
             }
             return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);

package/src/UnisatConnector.d.ts

@@ -5,5 +5,5 @@ export declare class UnisatConnector extends BitcoinWalletConnector {
     constructor(opts: BitcoinWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
-    sendTransaction(transaction: BitcoinTransaction): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
 }

package/src/UnisatConnector.js

@@ -7,19 +7,19 @@ class UnisatConnector extends BitcoinWalletConnector {
         this.name = 'UniSat';
     }
     fetchPublicAddress() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
             const [address] = yield provider.requestAccounts();
-            const bitcoinAccount = {
-                ordinalsAddress: address,
-                paymentAddress: address,
+            const publicKey = yield provider.getPublicKey();
+            const bitcoinAddress = {
+                address,
+                publicKey,
             };
-            yield this.cache.setCurrentAccount(bitcoinAccount);
-            return (_a = bitcoinAccount.ordinalsAddress) !== null && _a !== void 0 ? _a : bitcoinAccount.paymentAddress;
+            yield this.setConnectedAccountWithAddresses(address, bitcoinAddress, bitcoinAddress, true);
+            return address;
         });
     }
     signMessage(messageToSign) {
@@ -31,11 +31,11 @@ class UnisatConnector extends BitcoinWalletConnector {
             return provider.signMessage(messageToSign, 'bip322-simple');
         });
     }
-    sendTransaction(transaction) {
+    sendBitcoin(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const paymentAddress = yield this.getPaymentAddress();
             const provider = this.getProvider();
-            if (!paymentAddress || !provider) {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !provider) {
                 return;
             }
             return provider.sendBitcoin(transaction.recipientAddress, transaction.amount);

package/src/const.cjs

@@ -8,8 +8,10 @@ const BTCKIT_INTERFACE = 'btckit';
 const HTTP_STATUS_TOO_MANY_REQUESTS = 429;
 const HTTP_STATUS_NOT_FOUND = 404;
 const BALANCE_API_URL = 'https://mempool.space/api/address/';
+const BALANCE_API_URL_TESTNET = 'https://mempool.space/testnet/api/address/';
 
 exports.BALANCE_API_URL = BALANCE_API_URL;
+exports.BALANCE_API_URL_TESTNET = BALANCE_API_URL_TESTNET;
 exports.BTCKIT_INTERFACE = BTCKIT_INTERFACE;
 exports.HTTP_STATUS_NOT_FOUND = HTTP_STATUS_NOT_FOUND;
 exports.HTTP_STATUS_TOO_MANY_REQUESTS = HTTP_STATUS_TOO_MANY_REQUESTS;

package/src/const.js

@@ -4,5 +4,6 @@ const BTCKIT_INTERFACE = 'btckit';
 const HTTP_STATUS_TOO_MANY_REQUESTS = 429;
 const HTTP_STATUS_NOT_FOUND = 404;
 const BALANCE_API_URL = 'https://mempool.space/api/address/';
+const BALANCE_API_URL_TESTNET = 'https://mempool.space/testnet/api/address/';
 
-export { BALANCE_API_URL, BTCKIT_INTERFACE, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_TOO_MANY_REQUESTS, SATSCONNECT_FEATURE, XVERSE_KEY };
+export { BALANCE_API_URL, BALANCE_API_URL_TESTNET, BTCKIT_INTERFACE, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_TOO_MANY_REQUESTS, SATSCONNECT_FEATURE, XVERSE_KEY };

package/src/types.d.ts

@@ -1,4 +1,5 @@
 import { BitcoinProvider } from 'sats-connect';
+import type { WalletAdditionalAddress } from '@dynamic-labs/sdk-api';
 import { SATSCONNECT_FEATURE } from './const';
 export type ErrorWithCode = Error & {
     code: string;
@@ -8,9 +9,13 @@ export type SatsConnectFeature = {
         provider: BitcoinProvider;
     };
 };
-export type BitcoinAccount = {
-    ordinalsAddress?: string;
-    paymentAddress?: string;
+export type BitcoinAddress = {
+    address: string;
+    publicKey?: string;
+};
+export type BitcoinConnectedAccount = {
+    additionalAddresses: WalletAdditionalAddress[];
+    active?: boolean;
 };
 export type BitcoinTransaction = {
     amount: bigint;

package/src/utils/supportsSatsConnect.cjs

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

package/src/utils/supportsSatsConnect.js

@@ -1,8 +1,10 @@
 import { XVERSE_KEY } from '../const.js';
 import '@dynamic-labs/utils';
+import '../../_virtual/_tslib.js';
 import 'sats-connect';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/sdk-api';
 import '@wallet-standard/app';
 import { hasSatsConnectFeature } from './hasSatsConnectFeature.js';