@dynamic-labs/bitcoin 3.4.4 → 3.4.6

package/CHANGELOG.md

@@ -1,4 +1,30 @@
 
+### [3.4.6](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.5...v3.4.6) (2024-10-31)
+
+
+### Features
+
+* add support for compass and leap wallets ([ab170c9](https://github.com/dynamic-labs/DynamicAuth/commit/ab170c962099ed6356d2f31c947b122f1aa7ec73))
+
+
+### Bug Fixes
+
+* prevent use-wallet-options from reading empty wallet-book ([#7320](https://github.com/dynamic-labs/DynamicAuth/issues/7320)) ([24c6cb1](https://github.com/dynamic-labs/DynamicAuth/commit/24c6cb14ce324925b120d363e029e29b72560895))
+* sats-connect wallets not prompting correctly to sync account when making a transaction ([#7311](https://github.com/dynamic-labs/DynamicAuth/issues/7311)) ([#7312](https://github.com/dynamic-labs/DynamicAuth/issues/7312)) ([2026be4](https://github.com/dynamic-labs/DynamicAuth/commit/2026be412edcbb7e98341a5a5b2a3bd75ffdb83f))
+* update check for wallet provider event listeners support ([#7303](https://github.com/dynamic-labs/DynamicAuth/issues/7303)) ([#7304](https://github.com/dynamic-labs/DynamicAuth/issues/7304)) ([1e91c76](https://github.com/dynamic-labs/DynamicAuth/commit/1e91c767ebe078f63c27884e4a8e7729d49b2114))
+
+### [3.4.5](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.4...v3.4.5) (2024-10-30)
+
+
+### Features
+
+* add support for epicgames social ([#7222](https://github.com/dynamic-labs/DynamicAuth/issues/7222)) ([f34f027](https://github.com/dynamic-labs/DynamicAuth/commit/f34f02738a4d163792ff457dfe053335a4d57328))
+
+
+### Bug Fixes
+
+* show connect view when user selects a wallet to connect with ([#7211](https://github.com/dynamic-labs/DynamicAuth/issues/7211)) ([c7d3ab0](https://github.com/dynamic-labs/DynamicAuth/commit/c7d3ab00d4ced00128e0e7bde908165707a15a5c))
+
 ### [3.4.4](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.3...v3.4.4) (2024-10-24)
 
 ### [3.4.3](https://github.com/dynamic-labs/DynamicAuth/compare/v3.4.2...v3.4.3) (2024-10-23)

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "3.4.4";
+var version = "3.4.6";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "3.4.4";
+var version = "3.4.6";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,16 +27,17 @@
   },
   "dependencies": {
     "@btckit/types": "0.0.19",
-    "@dynamic-labs/sdk-api-core": "0.0.547",
+    "@dynamic-labs/sdk-api-core": "0.0.559",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.8.0",
-    "@dynamic-labs/assert-package-version": "3.4.4",
-    "@dynamic-labs/types": "3.4.4",
-    "@dynamic-labs/utils": "3.4.4",
-    "@dynamic-labs/wallet-book": "3.4.4",
-    "@dynamic-labs/wallet-connector-core": "3.4.4",
+    "jsontokens": "4.0.1",
+    "@dynamic-labs/assert-package-version": "3.4.6",
+    "@dynamic-labs/types": "3.4.6",
+    "@dynamic-labs/utils": "3.4.6",
+    "@dynamic-labs/wallet-book": "3.4.6",
+    "@dynamic-labs/wallet-connector-core": "3.4.6",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -52,22 +52,30 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             return mainAddress;
         });
     }
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    handleInAppBrowserGetAddress() {
+        var _a;
+        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')
+            return false;
+        const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
+        const deepLink = inAppBrowserTemplate({
+            encodedDappURI: encodeURIComponent(window.location.toString()),
+        });
+        window.location.href = deepLink;
+        return true;
+    }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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;
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
             try {
                 // requesting permissions on initial connect will avoid connection prompt for other requests
                 const permissionResponse = yield satsConnect.request('wallet_requestPermissions', undefined);
@@ -243,13 +251,19 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
         });
     }
     validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             // TODO: this is a workaround to avoid extra connecting prompt for xverse
             // we should revisit it once xverse releases a new version with bug fixes
+            if (this.key !== 'xverse') {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+                return;
+            }
             walletConnectorCore.logger.debug('validateActiveWallet - skipping validation for xverse', {
                 expectedAddress,
             });
-            return;
         });
     }
     handleXverseAccountChange() {

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.d.ts

@@ -8,6 +8,11 @@ export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletC
     constructor(opts: BitcoinWalletConnectorOpts);
     private getGenericUserCancelledError;
     private getAddresses;
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    protected handleInAppBrowserGetAddress(): boolean;
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -48,22 +48,30 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             return mainAddress;
         });
     }
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    handleInAppBrowserGetAddress() {
+        var _a;
+        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')
+            return false;
+        const inAppBrowserTemplate = template(inAppBrowserUrl);
+        const deepLink = inAppBrowserTemplate({
+            encodedDappURI: encodeURIComponent(window.location.toString()),
+        });
+        window.location.href = deepLink;
+        return true;
+    }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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;
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
             try {
                 // requesting permissions on initial connect will avoid connection prompt for other requests
                 const permissionResponse = yield request('wallet_requestPermissions', undefined);
@@ -239,13 +247,19 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
         });
     }
     validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
         return __awaiter(this, void 0, void 0, function* () {
             // TODO: this is a workaround to avoid extra connecting prompt for xverse
             // we should revisit it once xverse releases a new version with bug fixes
+            if (this.key !== 'xverse') {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+                return;
+            }
             logger.debug('validateActiveWallet - skipping validation for xverse', {
                 expectedAddress,
             });
-            return;
         });
     }
     handleXverseAccountChange() {

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -1,6 +1,6 @@
 import { type EventEmitter } from 'eventemitter3';
 import type { Wallet } from '@wallet-standard/base';
-import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IBitcoinWalletConnector, WalletConnectorBase, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential, WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
 import { IBitcoinSessionCache } from '../BitcoinLocalStorageCache';
@@ -10,6 +10,7 @@ export type BitcoinWalletConnectorOpts = {
     walletBook: WalletBookSchema;
     walletData: WalletSchema;
     overrideKey?: string;
+    metadata?: WalletMetadata;
 };
 export declare abstract class BitcoinWalletConnector extends WalletConnectorBase<typeof BitcoinWallet> implements IBitcoinWalletConnector {
     cache: IBitcoinSessionCache;

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* () {
@@ -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* () {
@@ -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/index.d.ts

@@ -1,7 +1,7 @@
 export * from './BitcoinWalletConnector';
 export * from './BitcoinBtcKitConnector';
 export * from './BitcoinSatsConnectConnector';
-export * from './BitcoinSatsConnectLegacyConnector';
+export * from './MagicEdenConnector';
 export * from './PhantomConnector';
 export * from './OkxConnector';
 export * from './OylConnector';

package/src/index.cjs

@@ -12,17 +12,18 @@ 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');
 
@@ -30,6 +31,7 @@ assertPackageVersion.assertPackageVersion('@dynamic-labs/bitcoin', _package.vers
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors.fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors.fetchBtcKitConnectors(props),
+    MagicEdenConnector.MagicEdenConnector,
     PhantomConnector.PhantomConnector,
     OkxConnector.OkxConnector,
     OylConnector.OylConnector,

package/src/index.d.ts

@@ -1,4 +1,4 @@
-import { OkxConnector, PhantomConnector, OylConnector } from './connectors';
+import { OkxConnector, OylConnector, PhantomConnector } from './connectors';
 export { BitcoinWalletConnector } from './connectors';
 export type { BitcoinTransaction } from './types';
 export * from './utils';

package/src/index.js

@@ -8,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';
@@ -15,12 +22,6 @@ 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 { 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';
 export { BitcoinWallet } from './wallet/BitcoinWallet.js';
 export { isBitcoinWallet } from './wallet/isBitcoinWallet/isBitcoinWallet.js';
 
@@ -28,6 +29,7 @@ assertPackageVersion('@dynamic-labs/bitcoin', version);
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors(props),
     ...fetchBtcKitConnectors(props),
+    MagicEdenConnector,
     PhantomConnector,
     OkxConnector,
     OylConnector,

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/supportsSatsConnect.cjs

@@ -12,6 +12,7 @@ require('bitcoinjs-lib');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
 require('@wallet-standard/app');
+require('jsontokens');
 var hasSatsConnectFeature = require('./hasSatsConnectFeature.cjs');
 
 const supportsSatsConnect = (connector) => {

package/src/utils/supportsSatsConnect.js

@@ -8,6 +8,7 @@ import 'bitcoinjs-lib';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import '@wallet-standard/app';
+import 'jsontokens';
 import { hasSatsConnectFeature } from './hasSatsConnectFeature.js';
 
 const supportsSatsConnect = (connector) => {

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

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