@dynamic-labs/bitcoin 1.1.0-alpha.9 → 1.1.0

package/CHANGELOG.md

@@ -1,4 +1,202 @@
 
+## [1.1.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.25...v1.1.0) (2024-02-07)
+
+Check out our changelog here: https://docs.dynamic.xyz/changelog/v1-1
+
+
+### Features
+
+* add retry when using magic ([#4579](https://github.com/dynamic-labs/DynamicAuth/issues/4579)) ([183561c](https://github.com/dynamic-labs/DynamicAuth/commit/183561cc64f083fd1489c38a8cc8b1c4c51d2924))
+
+
+### Bug Fixes
+
+* bug where deprecated fields were still being used in the SDK ([#4604](https://github.com/dynamic-labs/DynamicAuth/issues/4604)) ([4fd15fc](https://github.com/dynamic-labs/DynamicAuth/commit/4fd15fc4daa9c5b7bbc81ce05a3b046c80a6d5b4))
+* log magic RPC error and update magic network error ([#4606](https://github.com/dynamic-labs/DynamicAuth/issues/4606)) ([2206961](https://github.com/dynamic-labs/DynamicAuth/commit/22069618a317bc40b1a17fd521eadf0956983de4))
+* onConnect is properly called for additional connected wallets ([#4607](https://github.com/dynamic-labs/DynamicAuth/issues/4607)) ([23241f4](https://github.com/dynamic-labs/DynamicAuth/commit/23241f4d5dc91ac9ca1251710161efbfce42dc40))
+
+## [1.1.0-alpha.25](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.24...v1.1.0-alpha.25) (2024-02-05)
+
+
+### Features
+
+* add signin with coinbase to sdk ([#4581](https://github.com/dynamic-labs/DynamicAuth/issues/4581)) ([08a31ed](https://github.com/dynamic-labs/DynamicAuth/commit/08a31ed3552c48645b398881f184440800af21ec))
+* exposing hook for creating either one-time code or passkeys authenticators ([#4591](https://github.com/dynamic-labs/DynamicAuth/issues/4591)) ([864d755](https://github.com/dynamic-labs/DynamicAuth/commit/864d75576152a10f73f5901bc06e2d66892b63ab))
+
+
+### Bug Fixes
+
+* solana wallet sign message with one-time code session ([#4588](https://github.com/dynamic-labs/DynamicAuth/issues/4588)) ([a738d10](https://github.com/dynamic-labs/DynamicAuth/commit/a738d10814dc5058158b9c0c59a399a375c69c10))
+
+## [1.1.0-alpha.24](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.23...v1.1.0-alpha.24) (2024-02-02)
+
+
+### Bug Fixes
+
+* remove isFullyConnected when unable to restore wallet ([#4575](https://github.com/dynamic-labs/DynamicAuth/issues/4575)) ([4504ff0](https://github.com/dynamic-labs/DynamicAuth/commit/4504ff03f594cd9a60055e6f52b7ea8001542bbe))
+
+## [1.1.0-alpha.23](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.22...v1.1.0-alpha.23) (2024-02-01)
+
+
+### Features
+
+* bitcoin signPsbt ([3c964de](https://github.com/dynamic-labs/DynamicAuth/commit/3c964dea8a55debaf184c5a94f0f5fabdda3c877))
+* embedded wallet email auth flow ([#4353](https://github.com/dynamic-labs/DynamicAuth/issues/4353)) ([4875da3](https://github.com/dynamic-labs/DynamicAuth/commit/4875da32c47c27facef1b1cdbdc214566bbfd171))
+
+## [1.1.0-alpha.22](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.21...v1.1.0-alpha.22) (2024-02-01)
+
+
+### Bug Fixes
+
+* onAuthFlowClose not being called ([#4563](https://github.com/dynamic-labs/DynamicAuth/issues/4563)) ([c4b2648](https://github.com/dynamic-labs/DynamicAuth/commit/c4b264885b7dba6e204ef49bf642d25c7d287b04))
+
+## [1.1.0-alpha.21](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.20...v1.1.0-alpha.21) (2024-02-01)
+
+
+### Features
+
+* add phantom redirect handling context ([#4479](https://github.com/dynamic-labs/DynamicAuth/issues/4479)) ([e0218ee](https://github.com/dynamic-labs/DynamicAuth/commit/e0218eec1a67787f5c0e7483d542a5f773e911ef))
+* add signPsbt method to bitcoin wallet connectors ([dfdc0fe](https://github.com/dynamic-labs/DynamicAuth/commit/dfdc0fe0e6894c1307b286e89b43a4c58a8808f3))
+
+
+### Bug Fixes
+
+* relax passkey feature detection check in sdk to avoid false nega… ([#4556](https://github.com/dynamic-labs/DynamicAuth/issues/4556)) ([4554f7d](https://github.com/dynamic-labs/DynamicAuth/commit/4554f7d7c5339859481cdecca95a9c07fae4ba5c))
+* workaround braavos undefined selectedWallet on chainChange event ([#4552](https://github.com/dynamic-labs/DynamicAuth/issues/4552)) ([aa35df0](https://github.com/dynamic-labs/DynamicAuth/commit/aa35df0e894feafa0606aa1c87bd3d3879ebc594))
+
+## [1.1.0-alpha.20](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.19...v1.1.0-alpha.20) (2024-01-31)
+
+
+### Bug Fixes
+
+* return all enabled chains in getSupportedNetworks instead of undefined ([#4547](https://github.com/dynamic-labs/DynamicAuth/issues/4547)) ([08e7889](https://github.com/dynamic-labs/DynamicAuth/commit/08e78896e045f24bbd96e39416a7f58006929da0))
+* show modal for existing social account from other signin provider ([#4535](https://github.com/dynamic-labs/DynamicAuth/issues/4535)) ([282914a](https://github.com/dynamic-labs/DynamicAuth/commit/282914ac94b3ef5bd66e0b2265d9e414203a7406))
+
+## [1.1.0-alpha.19](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.18...v1.1.0-alpha.19) (2024-01-31)
+
+
+### Features
+
+* add PhantomRedirect connector ([#4467](https://github.com/dynamic-labs/DynamicAuth/issues/4467)) ([75d6c95](https://github.com/dynamic-labs/DynamicAuth/commit/75d6c95940fcec185a699c2100b3e2d21a8233d5))
+
+
+### Bug Fixes
+
+* lock starknet to 5.25.0 since 5.27.0 breaks the build ([#4541](https://github.com/dynamic-labs/DynamicAuth/issues/4541)) ([00b4799](https://github.com/dynamic-labs/DynamicAuth/commit/00b479977f768cb067480e2e565eabf45e1000a2))
+
+## [1.1.0-alpha.18](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.17...v1.1.0-alpha.18) (2024-01-30)
+
+
+### Bug Fixes
+
+* catch email_associated_with_different_provider from response ([#4532](https://github.com/dynamic-labs/DynamicAuth/issues/4532)) ([52be1b4](https://github.com/dynamic-labs/DynamicAuth/commit/52be1b45af46c2b70972b99d73387eb4d7161ec6))
+
+## [1.1.0-alpha.17](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.16...v1.1.0-alpha.17) (2024-01-30)
+
+
+### Features
+
+* add sendRawTransaction to BitcoinWalletConnector ([2e86c5a](https://github.com/dynamic-labs/DynamicAuth/commit/2e86c5a5245bd0fc29162ef1f7fe2fbd65245fe1))
+
+
+### Bug Fixes
+
+* properly handle AccountExistsError for signInOAuth ([#4529](https://github.com/dynamic-labs/DynamicAuth/issues/4529)) ([d37fdc3](https://github.com/dynamic-labs/DynamicAuth/commit/d37fdc310fe4b70f8948fd5ed3d058342afbe08f))
+
+## [1.1.0-alpha.16](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.15...v1.1.0-alpha.16) (2024-01-30)
+
+
+### Bug Fixes
+
+* add fallback to getWalletBookWallet for customers still passing in name, add deprecation warn ([#4518](https://github.com/dynamic-labs/DynamicAuth/issues/4518)) ([b233ea1](https://github.com/dynamic-labs/DynamicAuth/commit/b233ea1cd640d8d9d94c52ab230787f3d869151a))
+* handle braavos network change to account which doesn not exist ([#4519](https://github.com/dynamic-labs/DynamicAuth/issues/4519)) ([486020f](https://github.com/dynamic-labs/DynamicAuth/commit/486020fb09a274388ba34c8d1b37ac3a1ff3dba6))
+
+## [1.1.0-alpha.15](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.14...v1.1.0-alpha.15) (2024-01-28)
+
+
+### Features
+
+* add wallet group override to wallet book ([#4488](https://github.com/dynamic-labs/DynamicAuth/issues/4488)) ([cb19ad3](https://github.com/dynamic-labs/DynamicAuth/commit/cb19ad3ea82de488752ceceeaf0e1458a388df6e))
+* enable solana embedded wallets ([#4457](https://github.com/dynamic-labs/DynamicAuth/issues/4457)) ([b0c47f4](https://github.com/dynamic-labs/DynamicAuth/commit/b0c47f4475baa12f52076da46ef993c13bd2c243))
+* group ArgentX wallets ([#4495](https://github.com/dynamic-labs/DynamicAuth/issues/4495)) ([b10d79a](https://github.com/dynamic-labs/DynamicAuth/commit/b10d79a668efecedca37ddb358e6adf95319650d))
+
+
+### Bug Fixes
+
+* add support for newest backpack extension ([#4468](https://github.com/dynamic-labs/DynamicAuth/issues/4468)) ([a219f32](https://github.com/dynamic-labs/DynamicAuth/commit/a219f325be672599e50b07f6751234a7fc98286e))
+* bump timeout for slower connections ([#4475](https://github.com/dynamic-labs/DynamicAuth/issues/4475)) ([7a07ff5](https://github.com/dynamic-labs/DynamicAuth/commit/7a07ff589eaaf3b28a94d277df3eedabbca60702))
+* change out getWalletBookWallet for findWalletBookWallet to avoid throwing during lookup ([#4477](https://github.com/dynamic-labs/DynamicAuth/issues/4477)) ([4648040](https://github.com/dynamic-labs/DynamicAuth/commit/4648040c166e73dd2c31b0e27897713339436c2f))
+* connect to wallet with wallet connect even if network is not supported ([#4465](https://github.com/dynamic-labs/DynamicAuth/issues/4465)) ([9dbca3e](https://github.com/dynamic-labs/DynamicAuth/commit/9dbca3eb4d4990ee4be642677c1604170b425dc3))
+* pass id to wagmi chain override ([#4512](https://github.com/dynamic-labs/DynamicAuth/issues/4512)) ([2bf2f04](https://github.com/dynamic-labs/DynamicAuth/commit/2bf2f0487f5b1be936dd279107c11fe5d2b42666))
+* switching wallet in extension caused connected flag to be false temporarily ([#4454](https://github.com/dynamic-labs/DynamicAuth/issues/4454)) ([3650f6e](https://github.com/dynamic-labs/DynamicAuth/commit/3650f6ec471a7c779f4d304ab94c9350dd55055b))
+
+## [1.1.0-alpha.14](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.13...v1.1.0-alpha.14) (2024-01-23)
+
+
+### Features
+
+* add wallet-book retryable ([#4462](https://github.com/dynamic-labs/DynamicAuth/issues/4462)) ([513b1a6](https://github.com/dynamic-labs/DynamicAuth/commit/513b1a67d6c49624398ad4b0cdca4f5618c9583f))
+
+## [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)
+
+
+### Features
+
+* add Leather wallet and BtcKit connector ([#4335](https://github.com/dynamic-labs/DynamicAuth/issues/4335)) ([fe3316b](https://github.com/dynamic-labs/DynamicAuth/commit/fe3316b5be9ef17eea885e99cf925ccd0f271da7))
+* add solana injected wallet configuration to walletbook ([#4375](https://github.com/dynamic-labs/DynamicAuth/issues/4375)) ([3677ce5](https://github.com/dynamic-labs/DynamicAuth/commit/3677ce5ff40d0c00bfaf0daa0d5d67bc40706ee0))
+* add support for unisat wallet ([#4355](https://github.com/dynamic-labs/DynamicAuth/issues/4355)) ([5b7d6b0](https://github.com/dynamic-labs/DynamicAuth/commit/5b7d6b0a9ea84811a8252b3cdf30a3a8e410180c))
+* add walletbook configurations for solana injected wallets ([#4360](https://github.com/dynamic-labs/DynamicAuth/issues/4360)) ([cdc8e5f](https://github.com/dynamic-labs/DynamicAuth/commit/cdc8e5f4878cb84e26e5b33299aa8547b84b6667))
+* passkey renaming frontend ([#4331](https://github.com/dynamic-labs/DynamicAuth/issues/4331)) ([4551013](https://github.com/dynamic-labs/DynamicAuth/commit/4551013d577c914cb3aedfe458ab9eaa018aceb4))
+
+
+### Bug Fixes
+
+* correctly update wallets connected flag after wallet switch ([#4397](https://github.com/dynamic-labs/DynamicAuth/issues/4397)) ([543a830](https://github.com/dynamic-labs/DynamicAuth/commit/543a830574f0d5a78fedbb9b18233e8dfbaddd86))
+* export modal header ([#4401](https://github.com/dynamic-labs/DynamicAuth/issues/4401)) ([77cf016](https://github.com/dynamic-labs/DynamicAuth/commit/77cf016fc742458988864647870149a56e991ee4))
+* trigger onAuthSuccess before embedded wallet creation ([4aa341a](https://github.com/dynamic-labs/DynamicAuth/commit/4aa341a1d08332a121daddb7c2dcb09a804a4de7))
+* ui issues on react 17 ([#4373](https://github.com/dynamic-labs/DynamicAuth/issues/4373)) ([93096d6](https://github.com/dynamic-labs/DynamicAuth/commit/93096d6017816a4f0ed299bf618b130d90c81514))
+
+## [1.1.0-alpha.10](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.9...v1.1.0-alpha.10) (2024-01-06)
+
+
+### Bug Fixes
+
+* pass flow network to magic client ([#4322](https://github.com/dynamic-labs/DynamicAuth/issues/4322)) ([f3adccf](https://github.com/dynamic-labs/DynamicAuth/commit/f3adccf9f8d835f6b04e4767acd0fbd2ac238379))
+* prevent error message when mobile wallet app is open ([#4301](https://github.com/dynamic-labs/DynamicAuth/issues/4301)) ([2a66dcf](https://github.com/dynamic-labs/DynamicAuth/commit/2a66dcfaf8100b3d910c559d35d8b731b1cb380e))
+* turnkeyWalletConnector is not an email otp connector and uses dynamic otp ([#4313](https://github.com/dynamic-labs/DynamicAuth/issues/4313)) ([e4ea56f](https://github.com/dynamic-labs/DynamicAuth/commit/e4ea56f40fdf97b3f5440b016ebd95501089cebe))
+
 ## [1.1.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.8...v1.1.0-alpha.9) (2024-01-04)
 
 

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.9",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -26,12 +26,16 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "@btckit/types": "^0.0.19",
+    "@dynamic-labs/sdk-api": "0.0.363",
     "@wallet-standard/app": "^1.0.1",
     "@wallet-standard/base": "^1.0.1",
+    "bitcoinjs-lib": "^6.1.5",
     "sats-connect": "^1.1.2",
-    "@dynamic-labs/utils": "1.1.0-alpha.9",
-    "@dynamic-labs/wallet-book": "1.1.0-alpha.9",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.9"
+    "@dynamic-labs/utils": "1.1.0",
+    "@dynamic-labs/wallet-book": "1.1.0",
+    "@dynamic-labs/wallet-connector-core": "1.1.0",
+    "stream": "0.0.2"
   },
   "peerDependencies": {}
 }

package/src/BitcoinBtcKitConnector.cjs

@@ -0,0 +1,108 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../_virtual/_tslib.cjs');
+var satsConnect = require('sats-connect');
+var bitcoinjsLib = require('bitcoinjs-lib');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var BitcoinWalletConnector = require('./BitcoinWalletConnector.cjs');
+var validatePsbt = require('./utils/psbt/validator/validatePsbt.cjs');
+var bitcoinNetworkTypeToNetworks = require('./utils/psbt/bitcoinNetworkTypeToNetworks.cjs');
+
+class BitcoinBtcKitConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
+    constructor(opts, btcKit) {
+        super(opts);
+        this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
+        this.btcKit = btcKit;
+    }
+    fetchPublicAddress() {
+        var _a;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const [connectedAccount] = yield this.getConnectedAccounts();
+            if (connectedAccount) {
+                return connectedAccount;
+            }
+            const response = yield this.btcKit.request('getAddresses', {
+                types: ['p2tr', 'p2wpkh'],
+            });
+            if (!('result' in response)) {
+                walletConnectorCore.logger.error('Fetch public address error', response);
+                return undefined;
+            }
+            const { addresses } = response.result;
+            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) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.getConnectedAccounts()).length)
+                return undefined;
+            const response = yield this.btcKit
+                .request('signMessage', {
+                message: messageToSign,
+                paymentType: 'p2tr',
+            })
+                .catch(({ error }) => {
+                throw error;
+            });
+            if (!('result' in response)) {
+                walletConnectorCore.logger.error('Signature error', response);
+                throw new Error('Failed to sign message');
+            }
+            return response.result.signature;
+        });
+    }
+    sendBitcoin(transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
+            const response = yield this.btcKit.request('sendTransfer', {
+                address: transaction.recipientAddress,
+                amount: transaction.amount,
+            });
+            if (!('result' in response)) {
+                walletConnectorCore.logger.error('Transaction error', response);
+                throw new Error('Failed to send transaction');
+            }
+            return response.result.txid;
+        });
+    }
+    signPsbt(request) {
+        var _a, _b;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
+            const network = bitcoinNetworkTypeToNetworks.convertNetworkTypeForPsbt(this.currentNetwork);
+            const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64, {
+                network,
+            });
+            if ((_a = request.signature) === null || _a === void 0 ? void 0 : _a.length) {
+                validatePsbt.validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
+            }
+            const signPsbtRequestParams = {
+                allowedSighash: request.allowedSighash,
+                hex: psbtFromBase64.toHex(),
+                signAtIndex: (_b = request.signature) === null || _b === void 0 ? void 0 : _b.flatMap((sig) => sig.signingIndexes).filter(Number.isInteger),
+            };
+            const signedPsbtResponse = (yield this.btcKit.request('signPsbt', Object.assign({ broadcast: false, network }, signPsbtRequestParams)));
+            if (!signedPsbtResponse ||
+                !('result' in signedPsbtResponse) ||
+                !('hex' in signedPsbtResponse.result)) {
+                throw new Error('signPsbt - failed to sign PSBT');
+            }
+            const psbtHex = signedPsbtResponse.result.hex;
+            return { signedPsbt: bitcoinjsLib.Psbt.fromHex(psbtHex, { network }).toBase64() };
+        });
+    }
+}
+
+exports.BitcoinBtcKitConnector = BitcoinBtcKitConnector;

package/src/BitcoinBtcKitConnector.d.ts

@@ -0,0 +1,17 @@
+import type { BtcKitListenFn, BtcKitRequestFn } from '@btckit/types';
+import { BitcoinNetworkType } from 'sats-connect';
+import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from './BitcoinWalletConnector';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from './types';
+export type BtcKitProvider = {
+    request: BtcKitRequestFn;
+    listen: BtcKitListenFn;
+};
+export declare abstract class BitcoinBtcKitConnector extends BitcoinWalletConnector {
+    currentNetwork: BitcoinNetworkType;
+    private btcKit;
+    constructor(opts: BitcoinWalletConnectorOpts, btcKit: BtcKitProvider);
+    fetchPublicAddress(): Promise<string | undefined>;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
+    signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+}

package/src/BitcoinBtcKitConnector.js

@@ -0,0 +1,104 @@
+import { __awaiter } from '../_virtual/_tslib.js';
+import { BitcoinNetworkType } from 'sats-connect';
+import { Psbt } from 'bitcoinjs-lib';
+import { logger } from '@dynamic-labs/wallet-connector-core';
+import { BitcoinWalletConnector } from './BitcoinWalletConnector.js';
+import { validatePsbt } from './utils/psbt/validator/validatePsbt.js';
+import { convertNetworkTypeForPsbt } from './utils/psbt/bitcoinNetworkTypeToNetworks.js';
+
+class BitcoinBtcKitConnector extends BitcoinWalletConnector {
+    constructor(opts, btcKit) {
+        super(opts);
+        this.currentNetwork = BitcoinNetworkType.Mainnet;
+        this.btcKit = btcKit;
+    }
+    fetchPublicAddress() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const [connectedAccount] = yield this.getConnectedAccounts();
+            if (connectedAccount) {
+                return connectedAccount;
+            }
+            const response = yield this.btcKit.request('getAddresses', {
+                types: ['p2tr', 'p2wpkh'],
+            });
+            if (!('result' in response)) {
+                logger.error('Fetch public address error', response);
+                return undefined;
+            }
+            const { addresses } = response.result;
+            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) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.getConnectedAccounts()).length)
+                return undefined;
+            const response = yield this.btcKit
+                .request('signMessage', {
+                message: messageToSign,
+                paymentType: 'p2tr',
+            })
+                .catch(({ error }) => {
+                throw error;
+            });
+            if (!('result' in response)) {
+                logger.error('Signature error', response);
+                throw new Error('Failed to sign message');
+            }
+            return response.result.signature;
+        });
+    }
+    sendBitcoin(transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
+            const response = yield this.btcKit.request('sendTransfer', {
+                address: transaction.recipientAddress,
+                amount: transaction.amount,
+            });
+            if (!('result' in response)) {
+                logger.error('Transaction error', response);
+                throw new Error('Failed to send transaction');
+            }
+            return response.result.txid;
+        });
+    }
+    signPsbt(request) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const connectedAddress = yield this.fetchPublicAddress();
+            if (!connectedAddress || !this.btcKit) {
+                return;
+            }
+            const network = convertNetworkTypeForPsbt(this.currentNetwork);
+            const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64, {
+                network,
+            });
+            if ((_a = request.signature) === null || _a === void 0 ? void 0 : _a.length) {
+                validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
+            }
+            const signPsbtRequestParams = {
+                allowedSighash: request.allowedSighash,
+                hex: psbtFromBase64.toHex(),
+                signAtIndex: (_b = request.signature) === null || _b === void 0 ? void 0 : _b.flatMap((sig) => sig.signingIndexes).filter(Number.isInteger),
+            };
+            const signedPsbtResponse = (yield this.btcKit.request('signPsbt', Object.assign({ broadcast: false, network }, signPsbtRequestParams)));
+            if (!signedPsbtResponse ||
+                !('result' in signedPsbtResponse) ||
+                !('hex' in signedPsbtResponse.result)) {
+                throw new Error('signPsbt - failed to sign PSBT');
+            }
+            const psbtHex = signedPsbtResponse.result.hex;
+            return { signedPsbt: Psbt.fromHex(psbtHex, { network }).toBase64() };
+        });
+    }
+}
+
+export { BitcoinBtcKitConnector };

package/src/BitcoinLocalStorageCache.cjs

@@ -7,32 +7,64 @@ 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,
+            };
         });
     }
-    setCurrentAccount(account) {
+    getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.setItemAsync(this.CONNECTED_ACCOUNT_KEY, account);
+            const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts;
         });
     }
-    clearCurrentAcccount() {
+    getConnectedAccount(address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return utils.removeItemAsync(this.CONNECTED_ACCOUNT_KEY);
+            const connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            return connectedAccounts === null || connectedAccounts === void 0 ? void 0 : connectedAccounts[address];
         });
     }
-    getLastBalance() {
+    setConnectedAccount(addess, account) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const balance = yield utils.getItemAsync(this.LAST_BALANCE_KEY);
-            if (!balance) {
-                return undefined;
+            let connectedAccounts = yield utils.getItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+            if (!connectedAccounts) {
+                connectedAccounts = {};
             }
-            return balance;
+            // 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);
+        });
+    }
+    clearConnectedAcccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return utils.removeItemAsync(this.CONNECTED_ACCOUNTS_KEY);
+        });
+    }
+    getLastBalance() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return utils.getItemAsync(this.LAST_BALANCE_KEY);
         });
     }
     setLastBalance(balance) {

package/src/BitcoinLocalStorageCache.d.ts

@@ -1,20 +1,33 @@
-import { BitcoinAccount } from './types';
+import { WalletAdditionalAddress } from '@dynamic-labs/sdk-api';
+import { BitcoinConnectedAccount } from './types';
+type BitcoinConnectedAccounts = {
+    [key: string]: BitcoinConnectedAccount;
+};
+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>;
+    getConnectedAccounts(): Promise<BitcoinConnectedAccounts | 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>;
+    getConnectedAccounts(): Promise<BitcoinConnectedAccounts | undefined>;
+    setConnectedAccount(addess: string, account: BitcoinConnectedAccount): Promise<void>;
     clearLastBalance(): Promise<void>;
     getLastBalance(): Promise<string | undefined>;
     setLastBalance(balance: string): Promise<void>;
 }
+export {};