@dynamic-labs/bitcoin 4.0.0-alpha.2 → 4.0.0-alpha.20

package/src/connectors/{BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs → MagicEdenConnector/MagicEdenConnector.cjs}

@@ -4,46 +4,29 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
+var jsontokens = require('jsontokens');
 var satsConnect = require('sats-connect');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var _const = require('../../const.cjs');
 require('bitcoinjs-lib');
 require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/sdk-api-core');
 require('@wallet-standard/app');
 var BitcoinSatsConnectConnector = require('../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
 var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
 
-class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
-    constructor() {
-        super(...arguments);
+class MagicEdenConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'magicedenbtc' }));
+        this.name = 'Magic Eden';
+        this.overrideKey = 'magicedenbtc';
         this.isLegacy = true;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // xverse doesn't support wallet standard, so we won't have a wallet object,
-            // but it's already the default provider for sats-connect, so it's ok
-            // for getProvider in getAddress to return undefined
-            // if we're not using xverse, we need to check if there is a wallet and
-            // that it has the satsconnect feature to return the correct provider to use
-            if (!supportsSatsConnect.supportsSatsConnect(this)) {
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
-            const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (utils.isMobile() &&
-                !this.isInstalledOnBrowser() &&
-                inAppBrowserUrl &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
-                const deepLink = inAppBrowserTemplate({
-                    encodedDappURI: encodeURIComponent(window.location.toString()),
-                });
-                window.location.href = deepLink;
-                return;
-            }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -146,7 +129,7 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
                         recipients: [
                             {
                                 address: transaction.recipientAddress,
-                                amountSats: transaction.amount,
+                                amountSats: BigInt(transaction.amount),
                             },
                         ],
                         senderAddress,
@@ -185,32 +168,22 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
             });
         });
     }
+    /**
+     * Uses the custom Magic Eden signTransactions feature to sign multiple transactions
+     */
     signTransactions(transactions) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const { message, psbts, network } = transactions;
-            return new Promise((resolve, reject) => {
-                satsConnect.signMultipleTransactions({
-                    getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
-                        var _a, _b;
-                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[_const.SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
-                    }),
-                    onCancel: () => {
-                        const error = new Error();
-                        error.code = '-32000'; // error code for user cancelled
-                        reject(error);
-                    },
-                    onFinish: (response) => {
-                        resolve(response);
-                    },
-                    payload: {
-                        message: message || 'Sign Transaction',
-                        network,
-                        psbts,
-                    },
-                });
-            });
+            var _a;
+            (_a = transactions.message) !== null && _a !== void 0 ? _a : (transactions.message = 'Sign Transaction');
+            const request = jsontokens.createUnsecuredToken(transactions);
+            // Magic Eden has implemented their own signTransactions feature, and have requested us
+            // to ensure we use it rather than the general Sats Connect API for this method
+            const provider = this.getProvider();
+            if (!provider)
+                throw new utils.DynamicError('signTransactions failed: Magic Eden provider not found');
+            return provider.signMultipleTransactions(request);
         });
     }
 }
 
-exports.BitcoinSatsConnectLegacyConnector = BitcoinSatsConnectLegacyConnector;
+exports.MagicEdenConnector = MagicEdenConnector;

package/src/connectors/{BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.d.ts → MagicEdenConnector/MagicEdenConnector.d.ts}

@@ -1,11 +1,18 @@
 import { SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
 import { BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector';
-export declare abstract class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
+import { BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
+export declare class MagicEdenConnector extends BitcoinSatsConnectConnector {
+    name: string;
+    overrideKey: string;
     isLegacy: boolean;
+    constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signTransaction(params: SatsConnectSignTransactionInput): Promise<SignTransactionResponse | undefined>;
+    /**
+     * Uses the custom Magic Eden signTransactions feature to sign multiple transactions
+     */
     signTransactions(transactions: SignMultipleTransactionsPayload): Promise<SignTransactionResponse[] | undefined>;
 }

package/src/connectors/{BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.js → MagicEdenConnector/MagicEdenConnector.js}

@@ -1,45 +1,28 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
-import { getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction, signMultipleTransactions } from 'sats-connect';
-import { isMobile, template } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { createUnsecuredToken } from 'jsontokens';
+import { getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransaction } from 'sats-connect';
+import { DynamicError } from '@dynamic-labs/utils';
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import 'bitcoinjs-lib';
 import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/sdk-api-core';
 import '@wallet-standard/app';
 import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';
 import { supportsSatsConnect } from '../../utils/supportsSatsConnect.js';
 
-class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
-    constructor() {
-        super(...arguments);
+class MagicEdenConnector extends BitcoinSatsConnectConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'magicedenbtc' }));
+        this.name = 'Magic Eden';
+        this.overrideKey = 'magicedenbtc';
         this.isLegacy = true;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // xverse doesn't support wallet standard, so we won't have a wallet object,
-            // but it's already the default provider for sats-connect, so it's ok
-            // for getProvider in getAddress to return undefined
-            // if we're not using xverse, we need to check if there is a wallet and
-            // that it has the satsconnect feature to return the correct provider to use
-            if (!supportsSatsConnect(this)) {
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
-            const wallet = findWalletBookWallet(this.walletBook, this.key);
-            const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (isMobile() &&
-                !this.isInstalledOnBrowser() &&
-                inAppBrowserUrl &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserTemplate = template(inAppBrowserUrl);
-                const deepLink = inAppBrowserTemplate({
-                    encodedDappURI: encodeURIComponent(window.location.toString()),
-                });
-                window.location.href = deepLink;
-                return;
-            }
             return new Promise((resolve, reject) => {
                 getAddress({
                     getProvider: () => __awaiter(this, void 0, void 0, function* () {
@@ -142,7 +125,7 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
                         recipients: [
                             {
                                 address: transaction.recipientAddress,
-                                amountSats: transaction.amount,
+                                amountSats: BigInt(transaction.amount),
                             },
                         ],
                         senderAddress,
@@ -181,32 +164,22 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
             });
         });
     }
+    /**
+     * Uses the custom Magic Eden signTransactions feature to sign multiple transactions
+     */
     signTransactions(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { message, psbts, network } = transactions;
-            return new Promise((resolve, reject) => {
-                signMultipleTransactions({
-                    getProvider: () => __awaiter(this, void 0, void 0, function* () {
-                        var _a, _b;
-                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
-                    }),
-                    onCancel: () => {
-                        const error = new Error();
-                        error.code = '-32000'; // error code for user cancelled
-                        reject(error);
-                    },
-                    onFinish: (response) => {
-                        resolve(response);
-                    },
-                    payload: {
-                        message: message || 'Sign Transaction',
-                        network,
-                        psbts,
-                    },
-                });
-            });
+            var _a;
+            (_a = transactions.message) !== null && _a !== void 0 ? _a : (transactions.message = 'Sign Transaction');
+            const request = createUnsecuredToken(transactions);
+            // Magic Eden has implemented their own signTransactions feature, and have requested us
+            // to ensure we use it rather than the general Sats Connect API for this method
+            const provider = this.getProvider();
+            if (!provider)
+                throw new DynamicError('signTransactions failed: Magic Eden provider not found');
+            return provider.signMultipleTransactions(request);
         });
     }
 }
 
-export { BitcoinSatsConnectLegacyConnector };
+export { MagicEdenConnector };

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

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

package/src/connectors/OylConnector/OylConnector.cjs

@@ -0,0 +1,68 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var bitcoinjsLib = require('bitcoinjs-lib');
+var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
+var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
+
+class OylConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'oylwallet' }));
+        this.name = 'Oyl Wallet';
+        this.overrideKey = 'oylwallet';
+    }
+    getAddress() {
+        return _tslib.__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, withAddress) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const { signature } = yield provider.signMessage({
+                address: withAddress,
+                message: messageToSign,
+            });
+            return signature;
+        });
+    }
+    signPsbt(request) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64);
+            const options = createSignPsbtOptions.createPsbtOptions(psbtFromBase64, request);
+            const { psbt: signedPsbtHex } = yield provider.signPsbt({
+                broadcast: false,
+                finalize: options.autoFinalized,
+                psbt: psbtFromBase64.toHex(),
+            });
+            return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
+        });
+    }
+}
+
+exports.OylConnector = OylConnector;

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

@@ -0,0 +1,10 @@
+import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+export declare class OylConnector extends BitcoinWalletConnector {
+    name: string;
+    overrideKey: string;
+    constructor(opts: BitcoinWalletConnectorOpts);
+    getAddress(): Promise<string | undefined>;
+    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+}

package/src/connectors/OylConnector/OylConnector.js

@@ -0,0 +1,64 @@
+'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, withAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const { signature } = yield provider.signMessage({
+                address: withAddress,
+                message: messageToSign,
+            });
+            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');
@@ -88,12 +88,6 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             }
         });
     }
-    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,4 +1,4 @@
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
@@ -6,6 +6,5 @@ export declare class PhantomConnector extends BitcoinWalletConnector {
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
-    sendBitcoin(transaction: BitcoinTransaction): 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';
@@ -84,12 +84,6 @@ class PhantomConnector extends BitcoinWalletConnector {
             }
         });
     }
-    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/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 './OylConnector';
 export * from './UnisatConnector';
 export * from './UnknownInjected';
 export * from './FallbackBitcoinConnector';

package/src/index.cjs

@@ -3,6 +3,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var BitcoinWalletConnector = require('./connectors/BitcoinWalletConnector.cjs');
 require('../_virtual/_tslib.cjs');
 require('sats-connect');
@@ -10,24 +12,29 @@ 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 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 supportsSatsConnect = require('./utils/supportsSatsConnect.cjs');
+var getMempoolApiUrl = require('./utils/getMempoolApiUrl.cjs');
 var BitcoinWallet = require('./wallet/BitcoinWallet.cjs');
 var isBitcoinWallet = require('./wallet/isBitcoinWallet/isBitcoinWallet.cjs');
 
+assertPackageVersion.assertPackageVersion('@dynamic-labs/bitcoin', _package.version);
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors.fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors.fetchBtcKitConnectors(props),
+    MagicEdenConnector.MagicEdenConnector,
     PhantomConnector.PhantomConnector,
     OkxConnector.OkxConnector,
+    OylConnector.OylConnector,
     UnisatConnector.UnisatConnector,
     UnknownInjected.UnknownInjectedConnector,
     FallbackBitcoinConnector.FallbackBitcoinConnector,

package/src/index.d.ts

@@ -1,6 +1,6 @@
-import { OkxConnector, UnknownInjectedConnector, PhantomConnector } from './connectors';
+import { OkxConnector, OylConnector, PhantomConnector } from './connectors';
 export { BitcoinWalletConnector } from './connectors';
 export type { BitcoinTransaction } 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 PhantomConnector | typeof OkxConnector | typeof OylConnector)[];

package/src/index.js

@@ -1,4 +1,6 @@
 'use client'
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
 export { BitcoinWalletConnector } from './connectors/BitcoinWalletConnector.js';
 import '../_virtual/_tslib.js';
 import 'sats-connect';
@@ -6,6 +8,13 @@ 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 { OylConnector } from './connectors/OylConnector/OylConnector.js';
+import { UnisatConnector } from './connectors/UnisatConnector/UnisatConnector.js';
+import { UnknownInjectedConnector } from './connectors/UnknownInjected/UnknownInjected.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';
@@ -13,19 +22,17 @@ export { fetchSatsConnectConnectors } from './utils/fetchSatsConnectConnectors/f
 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';
 
+assertPackageVersion('@dynamic-labs/bitcoin', version);
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors(props),
+    MagicEdenConnector,
     PhantomConnector,
     OkxConnector,
+    OylConnector,
     UnisatConnector,
     UnknownInjectedConnector,
     FallbackBitcoinConnector,

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[];