@dynamic-labs/bitcoin 4.0.0-alpha.3 → 4.0.0-alpha.30

package/src/index.js

@@ -1,11 +1,19 @@
 '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';
 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 +21,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[];

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';