@dynamic-labs/solana 4.0.0-alpha.5 → 4.0.0-alpha.51

package/src/CoinbaseSolana/index.d.ts

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

package/src/{Phantom.cjs → Phantom/Phantom.cjs}

@@ -3,19 +3,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../_virtual/_tslib.cjs');
-var walletBook = require('@dynamic-labs/wallet-book');
-var utils = require('@dynamic-labs/utils');
+var _tslib = require('../../_virtual/_tslib.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
-var PhantomRedirect = require('./phantomRedirect/PhantomRedirect.cjs');
-var PhantomInjected = require('./injected/PhantomInjected.cjs');
+var utils = require('@dynamic-labs/utils');
+var PhantomInjected = require('../injected/PhantomInjected/PhantomInjected.cjs');
+var PhantomRedirect = require('../phantomRedirect/PhantomRedirect/PhantomRedirect.cjs');
 
-class Phantom extends solanaCore.SolWalletConnector {
-    constructor(opts) {
-        super(opts);
+class Phantom extends solanaCore.SolanaWalletConnector {
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {

package/src/Phantom/Phantom.d.ts

@@ -0,0 +1,9 @@
+import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
+import { WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
+export declare class Phantom extends SolanaWalletConnector {
+    name: string;
+    overrideKey: string;
+    connect(): Promise<void>;
+    getSigner(): Promise<ISolana | undefined>;
+    getMobileOrInstalledWallet(): WalletConnectorCore.WalletConnector;
+}

package/src/{Phantom.js → Phantom/Phantom.js}

@@ -1,17 +1,15 @@
 'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { SolanaWalletConnector } from '@dynamic-labs/solana-core';
 import { isMobile } from '@dynamic-labs/utils';
-import { SolWalletConnector } from '@dynamic-labs/solana-core';
-import { PhantomRedirect } from './phantomRedirect/PhantomRedirect.js';
-import { PhantomInjected } from './injected/PhantomInjected.js';
+import { PhantomInjected } from '../injected/PhantomInjected/PhantomInjected.js';
+import { PhantomRedirect } from '../phantomRedirect/PhantomRedirect/PhantomRedirect.js';
 
-class Phantom extends SolWalletConnector {
-    constructor(opts) {
-        super(opts);
+class Phantom extends SolanaWalletConnector {
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {

package/src/Phantom/index.d.ts

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

package/src/{solProviderHelper.cjs → SolProviderHelper/SolProviderHelper.cjs}

@@ -3,21 +3,22 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../_virtual/_tslib.cjs');
+var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var isSignedMessage = require('./utils/isSignedMessage.cjs');
-var findWalletProviderFromWalletStandard = require('./utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
+var findWalletProviderFromWalletStandard = require('../injected/walletStandard/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
+var isSignedMessage = require('../utils/isSignedMessage.cjs');
 
 class SolProviderHelper {
-    constructor(wallet) {
-        this.wallet = wallet;
+    constructor(connector) {
+        this.walletBookWallet = walletBook.findWalletBookWallet(connector.walletBook, connector.key);
+        this.connector = connector;
     }
     getInjectedConfig() {
-        if (!this.wallet || !this.wallet.injectedConfig)
-            return;
-        const { injectedConfig } = this.wallet;
-        return injectedConfig.find((c) => c.chain === 'sol');
+        var _a;
+        const injectedConfig = (_a = this.walletBookWallet) === null || _a === void 0 ? void 0 : _a.injectedConfig;
+        return injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.find((c) => c.chain === this.connector.connectedChain.toLowerCase());
     }
     getInstalledProvider() {
         const config = this.getInjectedConfig();
@@ -68,7 +69,7 @@ class SolProviderHelper {
         return walletConnectorCore.ProviderLookup(allInstalledProviders, extensionLocators);
     }
     findProvider() {
-        return this.getInstalledProvider();
+        return this.connector.findProvider();
     }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
@@ -132,23 +133,23 @@ class SolProviderHelper {
             }
         });
     }
-    _setupEventListeners(walletConnector) {
+    _setupEventListeners() {
         const provider = this.findProvider();
         if (!provider) {
             walletConnectorCore.logger.warn('Provider not found', {
-                connector: walletConnector,
+                connector: this.connector,
             });
             return;
         }
-        if (!('on' in provider)) {
+        if (!provider.on) {
             walletConnectorCore.logger.warn('Provider does not support event listeners', {
-                connector: walletConnector,
+                connector: this.connector,
                 provider,
             });
             return;
         }
-        provider.on('accountChanged', (publicKey) => this.handleAccountChange(walletConnector, provider, publicKey));
-        provider.on('disconnect', () => walletConnector.emit('disconnect'));
+        provider.on('accountChanged', (publicKey) => this.handleAccountChange(this.connector, provider, publicKey));
+        provider.on('disconnect', () => this.connector.emit('disconnect'));
     }
     _teardownEventListeners() {
         const provider = this.findProvider();
@@ -172,13 +173,23 @@ class SolProviderHelper {
                 return [];
             }
             const address = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address;
-            const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
-            if (address)
+            if (address) {
                 return [address];
-            else if (publicKey)
-                return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
-            else
-                return [];
+            }
+            // adding a try/catch to prevent errors from being thrown
+            // when the public key getter throws for wallet standard wallets
+            try {
+                const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
+                if (publicKey)
+                    return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
+            }
+            catch (e) {
+                walletConnectorCore.logger.debug('Error getting public key', {
+                    connector: this.connector,
+                    error: e,
+                });
+            }
+            return [];
         });
     }
 }

package/src/{solProviderHelper.d.ts → SolProviderHelper/SolProviderHelper.d.ts}

@@ -1,9 +1,10 @@
-import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { ExtensionLocator, ISolana } from '@dynamic-labs/solana-core';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { ISolana, ExtensionLocator as ExtensionLocator } from '@dynamic-labs/solana-core';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 export declare class SolProviderHelper {
-    private wallet;
-    constructor(wallet: WalletSchema);
+    private walletBookWallet;
+    private connector;
+    constructor(connector: InjectedWalletBase);
     getInjectedConfig(): {
         chain: string;
         extensionLocators: {
@@ -31,7 +32,7 @@ export declare class SolProviderHelper {
     connect(): Promise<ISolana | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     handleAccountChange(walletConnector: WalletConnector, web3Provider: ISolana, address: string): Promise<void>;
-    _setupEventListeners(walletConnector: WalletConnector): void;
+    _setupEventListeners(): void;
     _teardownEventListeners(): void;
     getConnectedAccounts(): Promise<string[]>;
 }

package/src/{solProviderHelper.js → SolProviderHelper/SolProviderHelper.js}

@@ -1,19 +1,20 @@
 'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
+import { __awaiter } from '../../_virtual/_tslib.js';
 import { getProvidersFromWindow, bufferToBase64 } from '@dynamic-labs/utils';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { ProviderLookup, logger } from '@dynamic-labs/wallet-connector-core';
-import { isSignedMessage } from './utils/isSignedMessage.js';
-import { findWalletProviderFromWalletStandard } from './utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
+import { findWalletProviderFromWalletStandard } from '../injected/walletStandard/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
+import { isSignedMessage } from '../utils/isSignedMessage.js';
 
 class SolProviderHelper {
-    constructor(wallet) {
-        this.wallet = wallet;
+    constructor(connector) {
+        this.walletBookWallet = findWalletBookWallet(connector.walletBook, connector.key);
+        this.connector = connector;
     }
     getInjectedConfig() {
-        if (!this.wallet || !this.wallet.injectedConfig)
-            return;
-        const { injectedConfig } = this.wallet;
-        return injectedConfig.find((c) => c.chain === 'sol');
+        var _a;
+        const injectedConfig = (_a = this.walletBookWallet) === null || _a === void 0 ? void 0 : _a.injectedConfig;
+        return injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.find((c) => c.chain === this.connector.connectedChain.toLowerCase());
     }
     getInstalledProvider() {
         const config = this.getInjectedConfig();
@@ -64,7 +65,7 @@ class SolProviderHelper {
         return ProviderLookup(allInstalledProviders, extensionLocators);
     }
     findProvider() {
-        return this.getInstalledProvider();
+        return this.connector.findProvider();
     }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
@@ -128,23 +129,23 @@ class SolProviderHelper {
             }
         });
     }
-    _setupEventListeners(walletConnector) {
+    _setupEventListeners() {
         const provider = this.findProvider();
         if (!provider) {
             logger.warn('Provider not found', {
-                connector: walletConnector,
+                connector: this.connector,
             });
             return;
         }
-        if (!('on' in provider)) {
+        if (!provider.on) {
             logger.warn('Provider does not support event listeners', {
-                connector: walletConnector,
+                connector: this.connector,
                 provider,
             });
             return;
         }
-        provider.on('accountChanged', (publicKey) => this.handleAccountChange(walletConnector, provider, publicKey));
-        provider.on('disconnect', () => walletConnector.emit('disconnect'));
+        provider.on('accountChanged', (publicKey) => this.handleAccountChange(this.connector, provider, publicKey));
+        provider.on('disconnect', () => this.connector.emit('disconnect'));
     }
     _teardownEventListeners() {
         const provider = this.findProvider();
@@ -168,13 +169,23 @@ class SolProviderHelper {
                 return [];
             }
             const address = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address;
-            const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
-            if (address)
+            if (address) {
                 return [address];
-            else if (publicKey)
-                return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
-            else
-                return [];
+            }
+            // adding a try/catch to prevent errors from being thrown
+            // when the public key getter throws for wallet standard wallets
+            try {
+                const publicKey = (_a = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.publicKey) !== null && _a !== void 0 ? _a : (_b = provider.publicKey) === null || _b === void 0 ? void 0 : _b.toString();
+                if (publicKey)
+                    return [publicKey === null || publicKey === void 0 ? void 0 : publicKey.toString()];
+            }
+            catch (e) {
+                logger.debug('Error getting public key', {
+                    connector: this.connector,
+                    error: e,
+                });
+            }
+            return [];
         });
     }
 }

package/src/SolProviderHelper/index.d.ts

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

package/src/SolanaWalletConnectors.cjs

@@ -0,0 +1,21 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var embeddedWalletSolana = require('@dynamic-labs/embedded-wallet-solana');
+var Phantom = require('./Phantom/Phantom.cjs');
+var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
+var FallbackSolanaConnector = require('./injected/FallbackSolanaConnector/FallbackSolanaConnector.cjs');
+
+const SolanaWalletConnectors = (
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+props) => [
+    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
+    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
+    ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
+    Phantom.Phantom,
+    FallbackSolanaConnector.FallbackSolanaConnector,
+];
+
+exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/SolanaWalletConnectors.d.ts

@@ -0,0 +1,2 @@
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+export declare const SolanaWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/SolanaWalletConnectors.js

@@ -0,0 +1,17 @@
+'use client'
+import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/embedded-wallet-solana';
+import { Phantom } from './Phantom/Phantom.js';
+import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
+import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector/FallbackSolanaConnector.js';
+
+const SolanaWalletConnectors = (
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+props) => [
+    ...injectedWalletOverrides,
+    ...fetchInjectedWalletConnectors(props),
+    ...TurnkeySolanaWalletConnectors(props),
+    Phantom,
+    FallbackSolanaConnector,
+];
+
+export { SolanaWalletConnectors };

package/src/SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.cjs

@@ -0,0 +1,26 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var SolanaWalletConnectors = require('../SolanaWalletConnectors.cjs');
+
+/**
+ * Allows passing in Solana connection configuration to all wallet connectors.
+ */
+const SolanaWalletConnectorsWithConfig = (connectionConfig) => {
+    // Idea here is to ensure that all wallet connectors are constructed with
+    // the client-provided connection configuration, so we "wrap" the constructors with it.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const classWithConfig = (className) => class extends className {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        constructor(...args) {
+            const [opts] = args;
+            super(Object.assign(Object.assign({}, opts), { connectionConfig }));
+        }
+    };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (props) => SolanaWalletConnectors.SolanaWalletConnectors(props).map(classWithConfig);
+};
+
+exports.SolanaWalletConnectorsWithConfig = SolanaWalletConnectorsWithConfig;

package/src/SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.d.ts

@@ -0,0 +1,6 @@
+import { ConnectionConfig } from '@solana/web3.js';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+/**
+ * Allows passing in Solana connection configuration to all wallet connectors.
+ */
+export declare const SolanaWalletConnectorsWithConfig: (connectionConfig: ConnectionConfig) => (props: any) => WalletConnectorConstructor[];

package/src/SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.js

@@ -0,0 +1,22 @@
+'use client'
+import { SolanaWalletConnectors } from '../SolanaWalletConnectors.js';
+
+/**
+ * Allows passing in Solana connection configuration to all wallet connectors.
+ */
+const SolanaWalletConnectorsWithConfig = (connectionConfig) => {
+    // Idea here is to ensure that all wallet connectors are constructed with
+    // the client-provided connection configuration, so we "wrap" the constructors with it.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const classWithConfig = (className) => class extends className {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        constructor(...args) {
+            const [opts] = args;
+            super(Object.assign(Object.assign({}, opts), { connectionConfig }));
+        }
+    };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (props) => SolanaWalletConnectors(props).map(classWithConfig);
+};
+
+export { SolanaWalletConnectorsWithConfig };

package/src/SolanaWalletConnectorsWithConfig/index.d.ts

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

package/src/{Solflare.cjs → Solflare/Solflare.cjs}

@@ -3,33 +3,32 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../_virtual/_tslib.cjs');
+var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
-var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../injected/InjectedWalletBase/InjectedWalletBase.cjs');
 
 class Solflare extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Solflare';
         this.overrideKey = 'solflare';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b;
             /**
              * It should redirect to in-app browser if on mobile and if not in the in-app browser,
              * this checks if it is not in the in-app browser by checking if the provider is not available.
              */
             if (utils.isMobile() && !this.isInstalledOnBrowser()) {
+                const mobileDeepLinks = (_a = this.metadata.deepLinks) === null || _a === void 0 ? void 0 : _a.mobile;
                 utils.handleMobileWalletRedirect({
-                    nativeLink: ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.native) || 'solflare://ul/v1/browse',
-                    universalLink: ((_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.universal) || 'https://solflare.com/ul/v1/browse',
+                    nativeLink: (mobileDeepLinks === null || mobileDeepLinks === void 0 ? void 0 : mobileDeepLinks.native) || 'solflare://ul/v1/browse',
+                    universalLink: (mobileDeepLinks === null || mobileDeepLinks === void 0 ? void 0 : mobileDeepLinks.universal) || 'https://solflare.com/ul/v1/browse',
                 });
                 return;
             }
-            return (_e = this.getSolProviderHelper()) === null || _e === void 0 ? void 0 : _e.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/{Solflare.d.ts → Solflare/Solflare.d.ts}

@@ -1,9 +1,7 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
-import { InjectedWalletBase } from './injected/InjectedWalletBase';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 export declare class Solflare extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(opts: SolWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
 }

package/src/{Solflare.js → Solflare/Solflare.js}

@@ -1,31 +1,30 @@
 'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
+import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase/InjectedWalletBase.js';
 
 class Solflare extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Solflare';
         this.overrideKey = 'solflare';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b;
             /**
              * It should redirect to in-app browser if on mobile and if not in the in-app browser,
              * this checks if it is not in the in-app browser by checking if the provider is not available.
              */
             if (isMobile() && !this.isInstalledOnBrowser()) {
+                const mobileDeepLinks = (_a = this.metadata.deepLinks) === null || _a === void 0 ? void 0 : _a.mobile;
                 handleMobileWalletRedirect({
-                    nativeLink: ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.native) || 'solflare://ul/v1/browse',
-                    universalLink: ((_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.universal) || 'https://solflare.com/ul/v1/browse',
+                    nativeLink: (mobileDeepLinks === null || mobileDeepLinks === void 0 ? void 0 : mobileDeepLinks.native) || 'solflare://ul/v1/browse',
+                    universalLink: (mobileDeepLinks === null || mobileDeepLinks === void 0 ? void 0 : mobileDeepLinks.universal) || 'https://solflare.com/ul/v1/browse',
                 });
                 return;
             }
-            return (_e = this.getSolProviderHelper()) === null || _e === void 0 ? void 0 : _e.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/Solflare/index.d.ts

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

package/src/index.cjs

@@ -3,29 +3,30 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var embeddedWalletSolana = require('@dynamic-labs/embedded-wallet-solana');
-var Phantom = require('./Phantom.cjs');
-var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
-var UnknownInjected = require('./injected/UnknownInjected.cjs');
-var FallbackSolanaConnector = require('./injected/FallbackSolanaConnector.cjs');
-var isSignedMessage = require('./utils/isSignedMessage.cjs');
-var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
+var BackpackSol = require('./injected/BackpackSol/BackpackSol.cjs');
+var InjectedWalletBase = require('./injected/InjectedWalletBase/InjectedWalletBase.cjs');
+var SolanaWalletConnectors = require('./SolanaWalletConnectors.cjs');
+var SolanaWalletConnectorsWithConfig = require('./SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.cjs');
+var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
+var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const SolanaWalletConnectors = (props) => [
-    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
-    ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
-    Phantom.Phantom,
-    UnknownInjected.UnknownInjected,
-    FallbackSolanaConnector.FallbackSolanaConnector,
-];
+assertPackageVersion.assertPackageVersion('@dynamic-labs/solana', _package.version);
 
-exports.isSignedMessage = isSignedMessage.isSignedMessage;
-exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
+Object.defineProperty(exports, 'SolanaWalletConnector', {
+  enumerable: true,
+  get: function () { return solanaCore.SolanaWalletConnector; }
+});
 Object.defineProperty(exports, 'isSolanaWallet', {
   enumerable: true,
   get: function () { return solanaCore.isSolanaWallet; }
 });
-exports.SolanaWalletConnectors = SolanaWalletConnectors;
+exports.BackpackConnector = BackpackSol.BackpackSol;
+exports.SolanaInjectedConnector = InjectedWalletBase.InjectedWalletBase;
+exports.SolanaWalletConnectors = SolanaWalletConnectors.SolanaWalletConnectors;
+exports.SolanaWalletConnectorsWithConfig = SolanaWalletConnectorsWithConfig.SolanaWalletConnectorsWithConfig;
+exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
+exports.isSignedMessage = isSignedMessage.isSignedMessage;

package/src/index.d.ts

@@ -1,6 +1,8 @@
-import { Phantom } from './Phantom';
-export declare const SolanaWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof Phantom)[];
-export { isSignedMessage } from './utils/isSignedMessage';
-export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export type { IEmbeddedWalletSolanaSigner } from '@dynamic-labs/embedded-wallet-solana';
-export { isSolanaWallet } from '@dynamic-labs/solana-core';
+export { isSolanaWallet, SolanaWalletConnector, } from '@dynamic-labs/solana-core';
+export { BackpackSol as BackpackConnector } from './injected/BackpackSol';
+export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase';
+export { SolanaWalletConnectors } from './SolanaWalletConnectors';
+export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig';
+export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
+export { isSignedMessage } from './utils/isSignedMessage';

package/src/index.js

@@ -1,21 +1,13 @@
 'use client'
-import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/embedded-wallet-solana';
-import { Phantom } from './Phantom.js';
-import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
-import { UnknownInjected } from './injected/UnknownInjected.js';
-import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector.js';
-export { isSignedMessage } from './utils/isSignedMessage.js';
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
+export { SolanaWalletConnector, isSolanaWallet } from '@dynamic-labs/solana-core';
+export { BackpackSol as BackpackConnector } from './injected/BackpackSol/BackpackSol.js';
+export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase/InjectedWalletBase.js';
+export { SolanaWalletConnectors } from './SolanaWalletConnectors.js';
+export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
-export { isSolanaWallet } from '@dynamic-labs/solana-core';
+export { isSignedMessage } from './utils/isSignedMessage.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const SolanaWalletConnectors = (props) => [
-    ...injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors(props),
-    ...TurnkeySolanaWalletConnectors(props),
-    Phantom,
-    UnknownInjected,
-    FallbackSolanaConnector,
-];
-
-export { SolanaWalletConnectors };
+assertPackageVersion('@dynamic-labs/solana', version);

package/src/injected/{BackpackSol.cjs → BackpackSol/BackpackSol.cjs}

@@ -3,22 +3,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
+var _tslib = require('../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../InjectedWalletBase/InjectedWalletBase.cjs');
 
 class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Backpack';
         this.overrideKey = 'backpacksol';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
+            return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     signMessage(messageToSign) {