@dynamic-labs/solana 4.0.0-alpha.37 → 4.0.0-alpha.39

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 
+## [4.0.0-alpha.39](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.38...v4.0.0-alpha.39) (2024-12-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove usages of findWalletBookWallet when possible (#7455)
+
+### Bug Fixes
+
+* sdkHasLoaded always false in cookie enabled env ([#7516](https://github.com/dynamic-labs/dynamic-auth/issues/7516)) ([1c3335c](https://github.com/dynamic-labs/dynamic-auth/commit/1c3335c13930e9bffe60cf1c09bc9c9584a59ef7))
+
+
+* remove usages of findWalletBookWallet when possible ([#7455](https://github.com/dynamic-labs/dynamic-auth/issues/7455)) ([0ce977d](https://github.com/dynamic-labs/dynamic-auth/commit/0ce977d5d4d591c371c6ea2edfb252ba7acff5d2))
+
+## [4.0.0-alpha.38](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.37...v4.0.0-alpha.38) (2024-11-27)
+
+
+### Bug Fixes
+
+* don't allow user to connect wallet in bridge while sdk is still loading ([#7506](https://github.com/dynamic-labs/dynamic-auth/issues/7506)) ([c0a913d](https://github.com/dynamic-labs/dynamic-auth/commit/c0a913d78675cc66b41f03ea9bfb316de5f95905))
+
 ## [4.0.0-alpha.37](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.36...v4.0.0-alpha.37) (2024-11-27)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.37";
+var version = "4.0.0-alpha.39";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "4.0.0-alpha.37",
+  "version": "4.0.0-alpha.39",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -25,16 +25,16 @@
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.37",
-    "@dynamic-labs/embedded-wallet-solana": "4.0.0-alpha.37",
-    "@dynamic-labs/logger": "4.0.0-alpha.37",
-    "@dynamic-labs/rpc-providers": "4.0.0-alpha.37",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.39",
+    "@dynamic-labs/embedded-wallet-solana": "4.0.0-alpha.39",
+    "@dynamic-labs/logger": "4.0.0-alpha.39",
+    "@dynamic-labs/rpc-providers": "4.0.0-alpha.39",
     "@dynamic-labs/sdk-api-core": "0.0.570",
-    "@dynamic-labs/solana-core": "4.0.0-alpha.37",
-    "@dynamic-labs/types": "4.0.0-alpha.37",
-    "@dynamic-labs/utils": "4.0.0-alpha.37",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.37",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.37"
+    "@dynamic-labs/solana-core": "4.0.0-alpha.39",
+    "@dynamic-labs/types": "4.0.0-alpha.39",
+    "@dynamic-labs/utils": "4.0.0-alpha.39",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.39",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.39"
   },
   "peerDependencies": {}
 }

package/src/CoinbaseSolana/CoinbaseSolana.cjs

@@ -17,7 +17,7 @@ class CoinbaseSolana extends InjectedWalletBase.InjectedWalletBase {
     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) {

package/src/CoinbaseSolana/CoinbaseSolana.js

@@ -13,7 +13,7 @@ class CoinbaseSolana extends InjectedWalletBase {
     getSigner() {
         return __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) {

package/src/Phantom/Phantom.cjs

@@ -6,16 +6,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../_virtual/_tslib.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var PhantomInjected = require('../injected/PhantomInjected.cjs');
 var PhantomRedirect = require('../phantomRedirect/PhantomRedirect/PhantomRedirect.cjs');
 
 class Phantom extends solanaCore.SolanaWalletConnector {
-    constructor(opts) {
-        super(opts);
+    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

@@ -1,11 +1,8 @@
-import { SolanaWalletConnector, SolanaWalletConnectorOpts, type ISolana } from '@dynamic-labs/solana-core';
-import { WalletSchema } from '@dynamic-labs/wallet-book';
+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;
-    wallet: WalletSchema | undefined;
-    constructor(opts: SolanaWalletConnectorOpts);
     connect(): Promise<void>;
     getSigner(): Promise<ISolana | undefined>;
     getMobileOrInstalledWallet(): WalletConnectorCore.WalletConnector;

package/src/Phantom/Phantom.js

@@ -2,16 +2,14 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { SolanaWalletConnector } from '@dynamic-labs/solana-core';
 import { isMobile } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { PhantomInjected } from '../injected/PhantomInjected.js';
 import { PhantomRedirect } from '../phantomRedirect/PhantomRedirect/PhantomRedirect.js';
 
 class Phantom extends SolanaWalletConnector {
-    constructor(opts) {
-        super(opts);
+    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/SolProviderHelper/SolProviderHelper.cjs

@@ -5,20 +5,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 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 findWalletProviderFromWalletStandard = require('../utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.cjs');
 var isSignedMessage = require('../utils/isSignedMessage.cjs');
 
 class SolProviderHelper {
-    constructor(wallet, chain) {
-        this.wallet = wallet;
-        this.chain = chain;
+    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 === this.chain);
+        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();
@@ -69,7 +69,7 @@ class SolProviderHelper {
         return walletConnectorCore.ProviderLookup(allInstalledProviders, extensionLocators);
     }
     findProvider() {
-        return this.getInstalledProvider();
+        return this.connector.findProvider();
     }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
@@ -133,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 (!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();

package/src/SolProviderHelper/SolProviderHelper.d.ts

@@ -1,11 +1,10 @@
 import { ExtensionLocator, ISolana } from '@dynamic-labs/solana-core';
-import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { AllowedSolanaChain } from '../types';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 export declare class SolProviderHelper {
-    private wallet;
-    private chain;
-    constructor(wallet: WalletSchema, chain: AllowedSolanaChain);
+    private walletBookWallet;
+    private connector;
+    constructor(connector: InjectedWalletBase);
     getInjectedConfig(): {
         chain: string;
         extensionLocators: {
@@ -33,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/SolProviderHelper.js

@@ -1,20 +1,20 @@
 'use client'
 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 { findWalletProviderFromWalletStandard } from '../utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.js';
 import { isSignedMessage } from '../utils/isSignedMessage.js';
 
 class SolProviderHelper {
-    constructor(wallet, chain) {
-        this.wallet = wallet;
-        this.chain = chain;
+    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 === this.chain);
+        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();
@@ -65,7 +65,7 @@ class SolProviderHelper {
         return ProviderLookup(allInstalledProviders, extensionLocators);
     }
     findProvider() {
-        return this.getInstalledProvider();
+        return this.connector.findProvider();
     }
     isInstalledHelper() {
         return this.findProvider() !== undefined;
@@ -129,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 (!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();

package/src/Solflare/Solflare.cjs

@@ -28,7 +28,7 @@ class Solflare extends InjectedWalletBase.InjectedWalletBase {
                 });
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/Solflare/Solflare.js

@@ -24,7 +24,7 @@ class Solflare extends InjectedWalletBase {
                 });
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/index.d.ts

@@ -4,6 +4,5 @@ export { BackpackSol as BackpackConnector } from './injected/BackpackSol';
 export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase';
 export { SolanaWalletConnectors } from './SolanaWalletConnectors';
 export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig';
-export type { AllowedSolanaChain } from './types';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export { isSignedMessage } from './utils/isSignedMessage';

package/src/injected/BackpackSol.cjs

@@ -16,7 +16,7 @@ class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
     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) {

package/src/injected/BackpackSol.js

@@ -12,7 +12,7 @@ class BackpackSol extends InjectedWalletBase {
     getSigner() {
         return __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) {

package/src/injected/InjectedWalletBase.cjs

@@ -5,56 +5,40 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 var solanaCore = require('@dynamic-labs/solana-core');
 var SolProviderHelper = require('../SolProviderHelper/SolProviderHelper.cjs');
 var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedError.cjs');
 
 class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
-    constructor() {
-        super(...arguments);
-        /**
-         * The chain being used.
-         * Defaults to 'sol', obviously, but since this connector is also used for other chains,
-         * such as eclipse, this can be overridden.
-         */
-        this.solanaChain = 'sol';
-    }
-    get wallet() {
-        if (!this._wallet) {
-            this._wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        }
-        return this._wallet;
-    }
-    getSolProviderHelper() {
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new SolProviderHelper.SolProviderHelper(this.wallet, this.solanaChain);
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper.SolProviderHelper(this);
         }
-        return this.solProviderHelper;
+        return this._solProviderHelper;
     }
-    getProvider() {
+    findProvider() {
         var _a;
-        return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+        return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
     }
     setupEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._setupEventListeners();
     }
     teardownEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
+            yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     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();
         });
     }
     createUiTransaction(from) {
@@ -91,7 +75,7 @@ class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
     }
     isInstalledOnBrowser() {
         var _a;
-        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
+        return Boolean((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -108,23 +92,23 @@ class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
                 }
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress());
+            const walletAddress = yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError.SignMessageNotSupportedError(this.name);
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
+            return (_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/injected/InjectedWalletBase.d.ts

@@ -1,90 +1,11 @@
-import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { IUITransaction } from '@dynamic-labs/types';
 import { ISendBalanceWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { SolProviderHelper } from '../SolProviderHelper';
-import { AllowedSolanaChain } from '../types';
 export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
-    solProviderHelper: SolProviderHelper | undefined;
-    _wallet: WalletSchema | undefined;
-    /**
-     * The chain being used.
-     * Defaults to 'sol', obviously, but since this connector is also used for other chains,
-     * such as eclipse, this can be overridden.
-     */
-    solanaChain: AllowedSolanaChain;
-    get wallet(): {
-        name: string;
-        brand?: {
-            alt?: string | undefined;
-            primaryColor?: string | undefined;
-            spriteId?: string | undefined;
-        } | undefined;
-        chainGroup?: string | undefined;
-        chains?: string[] | undefined;
-        desktop?: {
-            chromeId?: string | undefined;
-            edgeId?: string | undefined;
-            firefoxId?: string | undefined;
-            native?: string | undefined;
-            operaId?: string | undefined;
-            safariId?: string | undefined;
-            universal?: string | undefined;
-        } | undefined;
-        eip6963Config?: {
-            rdns: string;
-        } | undefined;
-        filterFromWalletConnect?: boolean | undefined;
-        group?: string | undefined;
-        hardwareWallets?: string[] | undefined;
-        injectedConfig?: {
-            chain: string;
-            extensionLocators: {
-                value: boolean;
-                flag: string;
-            }[];
-            providerInterface?: string | undefined;
-            walletStandard?: {
-                features: string[];
-                name: string;
-                providerId?: string | undefined;
-            } | undefined;
-            walletStandardLocators?: {
-                name: string;
-                locator: string;
-            }[] | undefined;
-            windowLocations?: string[] | undefined;
-        }[] | undefined;
-        mobile?: {
-            android?: string | null | undefined;
-            androidId?: string | undefined;
-            inAppBrowser?: string | null | undefined;
-            ios?: string | null | undefined;
-            iosId?: string | undefined;
-            native?: string | undefined;
-            universal?: string | undefined;
-        } | undefined;
-        mobileExperience?: "in-app-browser" | "redirect" | undefined;
-        shortName?: string | undefined;
-        showOnlyIfInstalled?: boolean | undefined;
-        switchNetworkOnlyFromWallet?: boolean | undefined;
-        walletConnect?: {
-            sdks?: string[] | undefined;
-        } | undefined;
-        walletGroup?: string | undefined;
-        walletLimitations?: {
-            browserExtension?: {
-                unsupportedEvents?: string[] | undefined;
-                unsupportedMethods?: string[] | undefined;
-            } | undefined;
-            mobile?: {
-                unsupportedEvents?: string[] | undefined;
-                unsupportedMethods?: string[] | undefined;
-            } | undefined;
-        } | undefined;
-    } | undefined;
-    getSolProviderHelper(): SolProviderHelper | undefined;
-    getProvider(): ISolana | undefined;
+    _solProviderHelper: SolProviderHelper | undefined;
+    get solProviderHelper(): SolProviderHelper | undefined;
+    findProvider(): ISolana | undefined;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;

package/src/injected/InjectedWalletBase.js

@@ -1,56 +1,40 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { PublicKey } from '@solana/web3.js';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile, template } from '@dynamic-labs/utils';
 import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
 import { SolProviderHelper } from '../SolProviderHelper/SolProviderHelper.js';
 import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
 
 class InjectedWalletBase extends SolanaWalletConnector {
-    constructor() {
-        super(...arguments);
-        /**
-         * The chain being used.
-         * Defaults to 'sol', obviously, but since this connector is also used for other chains,
-         * such as eclipse, this can be overridden.
-         */
-        this.solanaChain = 'sol';
-    }
-    get wallet() {
-        if (!this._wallet) {
-            this._wallet = findWalletBookWallet(this.walletBook, this.key);
-        }
-        return this._wallet;
-    }
-    getSolProviderHelper() {
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new SolProviderHelper(this.wallet, this.solanaChain);
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper(this);
         }
-        return this.solProviderHelper;
+        return this._solProviderHelper;
     }
-    getProvider() {
+    findProvider() {
         var _a;
-        return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+        return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
     }
     setupEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._setupEventListeners();
     }
     teardownEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
+            yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     getSigner() {
         return __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();
         });
     }
     createUiTransaction(from) {
@@ -87,7 +71,7 @@ class InjectedWalletBase extends SolanaWalletConnector {
     }
     isInstalledOnBrowser() {
         var _a;
-        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
+        return Boolean((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -104,23 +88,23 @@ class InjectedWalletBase extends SolanaWalletConnector {
                 }
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress());
+            const walletAddress = yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError(this.name);
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
+            return (_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/injected/PhantomInjected.cjs

@@ -32,7 +32,7 @@ class PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return ((_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
+        return ((_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
     }
 }
 

package/src/injected/PhantomInjected.js

@@ -28,7 +28,7 @@ class PhantomInjected extends InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return ((_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
+        return ((_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
     }
 }
 

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -54,9 +54,6 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }
-            get wallet() {
-                return wallet;
-            }
         };
     });
 };

package/src/injected/fetchInjectedWalletConnectors.js

@@ -50,9 +50,6 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }
-            get wallet() {
-                return wallet;
-            }
         };
     });
 };

package/src/types.d.ts

@@ -1,7 +0,0 @@
-/**
- * Which Solana chains are available for use.
- *
- * Should follow the same names as those seen in the `injectedConfig[number].chain` property
- * from the `getInjectedConfig` method under SolProviderHelper.
- */
-export type AllowedSolanaChain = 'sol' | 'eclipse';