@dynamic-labs/bitcoin 4.0.0-alpha.8 → 4.0.0

package/src/connectors/OylConnector/OylConnector.js

@@ -0,0 +1,67 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { Psbt } from 'bitcoinjs-lib';
+import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
+import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
+
+class OylConnector extends BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'oylwallet' }));
+        this.name = 'Oyl Wallet';
+        this.overrideKey = 'oylwallet';
+    }
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const addresses = yield provider.getAddresses();
+            const ordinalsAddress = addresses.taproot;
+            const paymentAddress = addresses.nativeSegwit;
+            const mainAddress = (_a = ordinalsAddress === null || ordinalsAddress === void 0 ? void 0 : ordinalsAddress.address) !== null && _a !== void 0 ? _a : paymentAddress === null || paymentAddress === void 0 ? void 0 : paymentAddress.address;
+            yield this.setConnectedAccountWithAddresses({
+                active: true,
+                mainAddress,
+                ordinalsAddress,
+                paymentAddress,
+            });
+            return mainAddress;
+        });
+    }
+    signMessage(messageToSign, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const { signature } = yield provider.signMessage({
+                address,
+                message: messageToSign,
+                // Oyl Wallet calls it just bip322 instead of bip322-simple
+                protocol: protocol === 'bip322-simple' ? 'bip322' : protocol,
+            });
+            return signature;
+        });
+    }
+    signPsbt(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64);
+            const options = createPsbtOptions(psbtFromBase64, request);
+            const { psbt: signedPsbtHex } = yield provider.signPsbt({
+                broadcast: false,
+                finalize: options.autoFinalized,
+                psbt: psbtFromBase64.toHex(),
+            });
+            return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
+        });
+    }
+}
+
+export { OylConnector };

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

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

package/src/connectors/PhantomConnector/PhantomConnector.cjs

@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('sats-connect');
 var sighashNumberToString = require('../../utils/psbt/sighashNumberToString.cjs');
 var base64 = require('../../utils/base64.cjs');
@@ -67,13 +67,14 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { address } = options;
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: withAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -83,17 +84,11 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });
     }
-    sendBitcoin(transaction) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            walletConnectorCore.logger.debug('sendBitcoin - function not implemented', transaction);
-            return undefined;
-        });
-    }
     signPsbt(request) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e;

package/src/connectors/PhantomConnector/PhantomConnector.d.ts

@@ -1,11 +1,13 @@
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
-    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
+    signMessage(messageToSign: string, options: {
+        address: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
 }

package/src/connectors/PhantomConnector/PhantomConnector.js

@@ -1,10 +1,10 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
-import { logger } from '@dynamic-labs/wallet-connector-core';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
+import '@dynamic-labs/wallet-connector-core';
 import 'sats-connect';
 import { sighashNumberToString } from '../../utils/psbt/sighashNumberToString.js';
 import { decodeBase64, encodeBase64 } from '../../utils/base64.js';
@@ -63,13 +63,14 @@ class PhantomConnector extends BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { address } = options;
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: withAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -79,17 +80,11 @@ class PhantomConnector extends BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });
     }
-    sendBitcoin(transaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            logger.debug('sendBitcoin - function not implemented', transaction);
-            return undefined;
-        });
-    }
     signPsbt(request) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e;

package/src/connectors/UnisatConnector/UnisatConnector.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 
@@ -34,13 +35,19 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                walletConnectorCore.logger.debug('[UnisatConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, options === null || options === void 0 ? void 0 : options.protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/UnisatConnector/UnisatConnector.d.ts

@@ -1,11 +1,14 @@
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 export declare class UnisatConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options?: {
+        address?: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;

package/src/connectors/UnisatConnector/UnisatConnector.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
 
@@ -30,13 +31,19 @@ class UnisatConnector extends BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                logger.debug('[UnisatConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, options === null || options === void 0 ? void 0 : options.protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/index.d.ts

@@ -1,9 +1,10 @@
 export * from './BitcoinWalletConnector';
 export * from './BitcoinBtcKitConnector';
 export * from './BitcoinSatsConnectConnector';
-export * from './BitcoinSatsConnectLegacyConnector';
+export * from './MagicEdenConnector';
 export * from './PhantomConnector';
 export * from './OkxConnector';
+export * from './OneKeyConnector';
+export * from './OylConnector';
 export * from './UnisatConnector';
-export * from './UnknownInjected';
 export * from './FallbackBitcoinConnector';

package/src/const.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const XVERSE_KEY = 'xverse';
 const SATSCONNECT_FEATURE = 'sats-connect:';
 const BTCKIT_INTERFACE = 'btckit';
 const HTTP_STATUS_TOO_MANY_REQUESTS = 429;
@@ -17,4 +16,3 @@ exports.HTTP_STATUS_TOO_MANY_REQUESTS = HTTP_STATUS_TOO_MANY_REQUESTS;
 exports.MEMPOOL_API_URL = MEMPOOL_API_URL;
 exports.MEMPOOL_API_URL_TESTNET = MEMPOOL_API_URL_TESTNET;
 exports.SATSCONNECT_FEATURE = SATSCONNECT_FEATURE;
-exports.XVERSE_KEY = XVERSE_KEY;

package/src/const.js

@@ -1,5 +1,4 @@
 'use client'
-const XVERSE_KEY = 'xverse';
 const SATSCONNECT_FEATURE = 'sats-connect:';
 const BTCKIT_INTERFACE = 'btckit';
 const HTTP_STATUS_TOO_MANY_REQUESTS = 429;
@@ -7,4 +6,4 @@ const HTTP_STATUS_NOT_FOUND = 404;
 const MEMPOOL_API_URL = 'https://mempool.space/api';
 const MEMPOOL_API_URL_TESTNET = 'https://mempool.space/testnet/api';
 
-export { BTCKIT_INTERFACE, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_TOO_MANY_REQUESTS, MEMPOOL_API_URL, MEMPOOL_API_URL_TESTNET, SATSCONNECT_FEATURE, XVERSE_KEY };
+export { BTCKIT_INTERFACE, HTTP_STATUS_NOT_FOUND, HTTP_STATUS_TOO_MANY_REQUESTS, MEMPOOL_API_URL, MEMPOOL_API_URL_TESTNET, SATSCONNECT_FEATURE };

package/src/index.cjs

@@ -11,17 +11,17 @@ require('sats-connect');
 require('bitcoinjs-lib');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/utils');
-require('@dynamic-labs/wallet-book');
-var fetchBtcKitConnectors = require('./utils/fetchBtcKitConnectors/fetchBtcKitConnectors.cjs');
-var fetchSatsConnectConnectors = require('./utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs');
-var hasSatsConnectFeature = require('./utils/hasSatsConnectFeature.cjs');
-var supportsSatsConnect = require('./utils/supportsSatsConnect.cjs');
-var getMempoolApiUrl = require('./utils/getMempoolApiUrl.cjs');
+var MagicEdenConnector = require('./connectors/MagicEdenConnector/MagicEdenConnector.cjs');
 var PhantomConnector = require('./connectors/PhantomConnector/PhantomConnector.cjs');
 var OkxConnector = require('./connectors/OkxConnector/OkxConnector.cjs');
+var OneKeyConnector = require('./connectors/OneKeyConnector/OneKeyConnector.cjs');
+var OylConnector = require('./connectors/OylConnector/OylConnector.cjs');
 var UnisatConnector = require('./connectors/UnisatConnector/UnisatConnector.cjs');
-var UnknownInjected = require('./connectors/UnknownInjected/UnknownInjected.cjs');
 var FallbackBitcoinConnector = require('./connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs');
+var fetchBtcKitConnectors = require('./utils/fetchBtcKitConnectors/fetchBtcKitConnectors.cjs');
+var fetchSatsConnectConnectors = require('./utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs');
+var hasSatsConnectFeature = require('./utils/hasSatsConnectFeature.cjs');
+var getMempoolApiUrl = require('./utils/getMempoolApiUrl.cjs');
 var BitcoinWallet = require('./wallet/BitcoinWallet.cjs');
 var isBitcoinWallet = require('./wallet/isBitcoinWallet/isBitcoinWallet.cjs');
 
@@ -29,10 +29,12 @@ assertPackageVersion.assertPackageVersion('@dynamic-labs/bitcoin', _package.vers
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors.fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors.fetchBtcKitConnectors(props),
+    MagicEdenConnector.MagicEdenConnector,
     PhantomConnector.PhantomConnector,
     OkxConnector.OkxConnector,
+    OneKeyConnector.OneKeyConnector,
+    OylConnector.OylConnector,
     UnisatConnector.UnisatConnector,
-    UnknownInjected.UnknownInjectedConnector,
     FallbackBitcoinConnector.FallbackBitcoinConnector,
 ];
 
@@ -40,7 +42,6 @@ exports.BitcoinWalletConnector = BitcoinWalletConnector.BitcoinWalletConnector;
 exports.fetchBtcKitConnectors = fetchBtcKitConnectors.fetchBtcKitConnectors;
 exports.fetchSatsConnectConnectors = fetchSatsConnectConnectors.fetchSatsConnectConnectors;
 exports.hasSatsConnectFeature = hasSatsConnectFeature.hasSatsConnectFeature;
-exports.supportsSatsConnect = supportsSatsConnect.supportsSatsConnect;
 exports.getMempoolApiUrl = getMempoolApiUrl.getMempoolApiUrl;
 exports.BitcoinWallet = BitcoinWallet.BitcoinWallet;
 exports.isBitcoinWallet = isBitcoinWallet.isBitcoinWallet;

package/src/index.d.ts

@@ -1,6 +1,6 @@
-import { OkxConnector, UnknownInjectedConnector, PhantomConnector } from './connectors';
+import { OkxConnector } from './connectors';
 export { BitcoinWalletConnector } from './connectors';
-export type { BitcoinTransaction } from './types';
+export type { BitcoinTransaction, BitcoinSignProtocol } from './types';
 export * from './utils';
 export * from './wallet';
-export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof PhantomConnector | typeof OkxConnector | typeof UnknownInjectedConnector)[];
+export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof OkxConnector)[];

package/src/index.js

@@ -7,19 +7,19 @@ import 'sats-connect';
 import 'bitcoinjs-lib';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/utils';
-import '@dynamic-labs/wallet-book';
+import { MagicEdenConnector } from './connectors/MagicEdenConnector/MagicEdenConnector.js';
+import { PhantomConnector } from './connectors/PhantomConnector/PhantomConnector.js';
+import { OkxConnector } from './connectors/OkxConnector/OkxConnector.js';
+import { OneKeyConnector } from './connectors/OneKeyConnector/OneKeyConnector.js';
+import { OylConnector } from './connectors/OylConnector/OylConnector.js';
+import { UnisatConnector } from './connectors/UnisatConnector/UnisatConnector.js';
+import { FallbackBitcoinConnector } from './connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js';
 import { fetchBtcKitConnectors } from './utils/fetchBtcKitConnectors/fetchBtcKitConnectors.js';
 export { fetchBtcKitConnectors } from './utils/fetchBtcKitConnectors/fetchBtcKitConnectors.js';
 import { fetchSatsConnectConnectors } from './utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.js';
 export { fetchSatsConnectConnectors } from './utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.js';
 export { hasSatsConnectFeature } from './utils/hasSatsConnectFeature.js';
-export { supportsSatsConnect } from './utils/supportsSatsConnect.js';
 export { getMempoolApiUrl } from './utils/getMempoolApiUrl.js';
-import { PhantomConnector } from './connectors/PhantomConnector/PhantomConnector.js';
-import { OkxConnector } from './connectors/OkxConnector/OkxConnector.js';
-import { UnisatConnector } from './connectors/UnisatConnector/UnisatConnector.js';
-import { UnknownInjectedConnector } from './connectors/UnknownInjected/UnknownInjected.js';
-import { FallbackBitcoinConnector } from './connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js';
 export { BitcoinWallet } from './wallet/BitcoinWallet.js';
 export { isBitcoinWallet } from './wallet/isBitcoinWallet/isBitcoinWallet.js';
 
@@ -27,10 +27,12 @@ assertPackageVersion('@dynamic-labs/bitcoin', version);
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors(props),
+    MagicEdenConnector,
     PhantomConnector,
     OkxConnector,
+    OneKeyConnector,
+    OylConnector,
     UnisatConnector,
-    UnknownInjectedConnector,
     FallbackBitcoinConnector,
 ];
 

package/src/types.d.ts

@@ -128,3 +128,4 @@ export type BitcoinWalletStandardMethods = {
     signTransaction?: BitcoinSignTransactionMethod;
     signAndSendTransaction?: BitcoinSignAndSendTransactionMethod;
 };
+export type BitcoinSignProtocol = 'ecdsa' | 'bip322-simple';

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _const = require('../../const.cjs');
 require('../../../_virtual/_tslib.cjs');
 require('sats-connect');
 require('@dynamic-labs/wallet-connector-core');
@@ -11,9 +10,10 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 require('@wallet-standard/app');
+var _const = require('../../const.cjs');
 require('bitcoinjs-lib');
 var BitcoinSatsConnectConnector = require('../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
-var BitcoinSatsConnectLegacyConnector = require('../../connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs');
+require('jsontokens');
 
 const fetchSatsConnectConnectors = ({ walletBook, }) => {
     var _a;
@@ -22,26 +22,16 @@ const fetchSatsConnectConnectors = ({ walletBook, }) => {
         .filter(([_, wallet]) => {
         var _a;
         return (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => {
-            var _a;
+            var _a, _b;
             return config.chain === 'btc' &&
-                Boolean((_a = config.walletStandard) === null || _a === void 0 ? void 0 : _a.features.includes(_const.SATSCONNECT_FEATURE));
+                ((_a = config.walletStandard) === null || _a === void 0 ? void 0 : _a.features.includes(_const.SATSCONNECT_FEATURE)) &&
+                ((_b = config.walletStandard) === null || _b === void 0 ? void 0 : _b.providerId);
         });
     })
         .map(([key, wallet]) => {
-        var _a;
-        const { shortName, injectedConfig } = wallet;
+        const { shortName } = wallet;
         const name = shortName || wallet.name;
-        // if has providerId, use the new connector (xverse)
-        if ((_a = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig[0].walletStandard) === null || _a === void 0 ? void 0 : _a.providerId) {
-            return class extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
-                    this.name = name;
-                }
-            };
-        }
-        // id doesn't have providerId, use the legacy connector (magiceden)
-        return class extends BitcoinSatsConnectLegacyConnector.BitcoinSatsConnectLegacyConnector {
+        return class extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
                 this.name = name;

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.d.ts

@@ -1,5 +1,5 @@
-import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
 export declare const fetchSatsConnectConnectors: ({ walletBook, }: {
     walletBook: WalletBookSchema;
 }) => WalletConnectorConstructor[];

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.js

@@ -1,5 +1,4 @@
 'use client'
-import { SATSCONNECT_FEATURE } from '../../const.js';
 import '../../../_virtual/_tslib.js';
 import 'sats-connect';
 import '@dynamic-labs/wallet-connector-core';
@@ -7,9 +6,10 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '@wallet-standard/app';
+import { SATSCONNECT_FEATURE } from '../../const.js';
 import 'bitcoinjs-lib';
 import { BitcoinSatsConnectConnector } from '../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';
-import { BitcoinSatsConnectLegacyConnector } from '../../connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.js';
+import 'jsontokens';
 
 const fetchSatsConnectConnectors = ({ walletBook, }) => {
     var _a;
@@ -18,26 +18,16 @@ const fetchSatsConnectConnectors = ({ walletBook, }) => {
         .filter(([_, wallet]) => {
         var _a;
         return (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => {
-            var _a;
+            var _a, _b;
             return config.chain === 'btc' &&
-                Boolean((_a = config.walletStandard) === null || _a === void 0 ? void 0 : _a.features.includes(SATSCONNECT_FEATURE));
+                ((_a = config.walletStandard) === null || _a === void 0 ? void 0 : _a.features.includes(SATSCONNECT_FEATURE)) &&
+                ((_b = config.walletStandard) === null || _b === void 0 ? void 0 : _b.providerId);
         });
     })
         .map(([key, wallet]) => {
-        var _a;
-        const { shortName, injectedConfig } = wallet;
+        const { shortName } = wallet;
         const name = shortName || wallet.name;
-        // if has providerId, use the new connector (xverse)
-        if ((_a = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig[0].walletStandard) === null || _a === void 0 ? void 0 : _a.providerId) {
-            return class extends BitcoinSatsConnectConnector {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
-                    this.name = name;
-                }
-            };
-        }
-        // id doesn't have providerId, use the legacy connector (magiceden)
-        return class extends BitcoinSatsConnectLegacyConnector {
+        return class extends BitcoinSatsConnectConnector {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
                 this.name = name;

package/src/utils/getAddressByType/getAddressByType.cjs

@@ -0,0 +1,11 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getAddressByType = (wallet, addressType) => {
+    var _a;
+    return ((_a = wallet.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || wallet.address;
+};
+
+exports.getAddressByType = getAddressByType;

package/src/utils/getAddressByType/getAddressByType.d.ts

@@ -0,0 +1,3 @@
+import { WalletAddressType } from '@dynamic-labs/types';
+import { BitcoinWallet } from '../../wallet/BitcoinWallet';
+export declare const getAddressByType: (wallet: BitcoinWallet, addressType: WalletAddressType) => string;

package/src/utils/getAddressByType/getAddressByType.js

@@ -0,0 +1,7 @@
+'use client'
+const getAddressByType = (wallet, addressType) => {
+    var _a;
+    return ((_a = wallet.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || wallet.address;
+};
+
+export { getAddressByType };

package/src/utils/getAddressByType/index.d.ts

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

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var satsConnect = require('sats-connect');
+
+const getSatsConnectSigningProtocol = (protocol) => {
+    if (!protocol) {
+        return undefined;
+    }
+    return protocol === 'ecdsa'
+        ? satsConnect.MessageSigningProtocols.ECDSA
+        : satsConnect.MessageSigningProtocols.BIP322;
+};
+
+exports.getSatsConnectSigningProtocol = getSatsConnectSigningProtocol;

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.d.ts

@@ -0,0 +1,3 @@
+import { MessageSigningProtocols } from 'sats-connect';
+import { BitcoinSignProtocol } from '../../types';
+export declare const getSatsConnectSigningProtocol: (protocol: BitcoinSignProtocol | undefined) => MessageSigningProtocols | undefined;

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.js

@@ -0,0 +1,13 @@
+'use client'
+import { MessageSigningProtocols } from 'sats-connect';
+
+const getSatsConnectSigningProtocol = (protocol) => {
+    if (!protocol) {
+        return undefined;
+    }
+    return protocol === 'ecdsa'
+        ? MessageSigningProtocols.ECDSA
+        : MessageSigningProtocols.BIP322;
+};
+
+export { getSatsConnectSigningProtocol };

package/src/utils/getSatsConnectSigningProtocol/index.d.ts

@@ -0,0 +1 @@
+export * from './getSatsConnectSigningProtocol';

package/src/utils/index.d.ts

@@ -1,5 +1,4 @@
 export * from './fetchBtcKitConnectors';
 export * from './fetchSatsConnectConnectors';
 export { hasSatsConnectFeature } from './hasSatsConnectFeature';
-export { supportsSatsConnect } from './supportsSatsConnect';
 export { getMempoolApiUrl } from './getMempoolApiUrl';