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

package/src/injected/{BackpackSol.d.ts → BackpackSol/BackpackSol.d.ts}

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

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

@@ -1,20 +1,18 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+import { __awaiter } from '../../../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class BackpackSol extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Backpack';
         this.overrideKey = 'backpacksol';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     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/BackpackSol/index.d.ts

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

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

@@ -3,16 +3,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletBook = require('@dynamic-labs/wallet-book');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../InjectedWalletBase/InjectedWalletBase.cjs');
 
 class FallbackSolanaConnector extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/{FallbackSolanaConnector.d.ts → FallbackSolanaConnector/FallbackSolanaConnector.d.ts}

@@ -1,9 +1,7 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
-import { InjectedWalletBase } from './InjectedWalletBase';
+import { InjectedWalletBase } from '../InjectedWalletBase';
 export declare class FallbackSolanaConnector extends InjectedWalletBase {
     name: string;
     overrideKey: string;
     isAvailable: boolean;
-    constructor(opts: SolWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
 }

package/src/injected/{FallbackSolanaConnector.js → FallbackSolanaConnector/FallbackSolanaConnector.js}

@@ -1,14 +1,12 @@
 'use client'
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class FallbackSolanaConnector extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/FallbackSolanaConnector/index.d.ts

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

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

@@ -3,46 +3,42 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
+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.cjs');
-var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedError.cjs');
+var SolProviderHelper = require('../../SolProviderHelper/SolProviderHelper.cjs');
+var SignMessageNotSupportedError = require('../../errors/SignMessageNotSupportedError.cjs');
 
-class InjectedWalletBase extends solanaCore.SolWalletConnector {
-    getSolProviderHelper() {
-        if (!this.wallet) {
-            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper.SolProviderHelper(this);
         }
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new solProviderHelper.SolProviderHelper(this.wallet);
-        }
-        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) {
@@ -53,6 +49,8 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                 from,
                 onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
                     var _a;
+                    if (!transaction)
+                        return;
                     const signer = yield this.getSigner();
                     if (!signer)
                         throw new Error('Signer not found');
@@ -72,23 +70,21 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
     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* () {
             var _a, _b;
             if (!this.isInstalledOnBrowser()) {
                 if (utils.isMobile() &&
-                    ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser &&
+                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
                     this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = utils.template(this.wallet.mobile.inAppBrowser);
+                    const inAppBrowserCompiledTemplate = utils.template(this.metadata.inAppBrowserUrl);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });
@@ -96,23 +92,23 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                 }
                 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 → InjectedWalletBase/InjectedWalletBase.d.ts}

@@ -1,13 +1,11 @@
-import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { SolWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
+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';
-export declare abstract class InjectedWalletBase extends SolWalletConnector implements ISendBalanceWalletConnector {
-    solProviderHelper: SolProviderHelper | undefined;
-    wallet: WalletSchema | undefined;
-    getSolProviderHelper(): SolProviderHelper | undefined;
-    getProvider(): ISolana | undefined;
+import { SolProviderHelper } from '../../SolProviderHelper';
+export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
+    _solProviderHelper: SolProviderHelper | undefined;
+    get solProviderHelper(): SolProviderHelper | undefined;
+    findProvider(): ISolana | undefined;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;

package/src/injected/{InjectedWalletBase.js → InjectedWalletBase/InjectedWalletBase.js}

@@ -1,44 +1,40 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+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 { SolWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
-import { SolProviderHelper } from '../solProviderHelper.js';
-import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
+import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
+import { SolProviderHelper } from '../../SolProviderHelper/SolProviderHelper.js';
+import { SignMessageNotSupportedError } from '../../errors/SignMessageNotSupportedError.js';
 
-class InjectedWalletBase extends SolWalletConnector {
-    getSolProviderHelper() {
-        if (!this.wallet) {
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+class InjectedWalletBase extends SolanaWalletConnector {
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper(this);
         }
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new SolProviderHelper(this.wallet);
-        }
-        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) {
@@ -49,6 +45,8 @@ class InjectedWalletBase extends SolWalletConnector {
                 from,
                 onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
+                    if (!transaction)
+                        return;
                     const signer = yield this.getSigner();
                     if (!signer)
                         throw new Error('Signer not found');
@@ -68,23 +66,21 @@ class InjectedWalletBase extends SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
     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* () {
             var _a, _b;
             if (!this.isInstalledOnBrowser()) {
                 if (isMobile() &&
-                    ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser &&
+                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
                     this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = template(this.wallet.mobile.inAppBrowser);
+                    const inAppBrowserCompiledTemplate = template(this.metadata.inAppBrowserUrl);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });
@@ -92,23 +88,23 @@ class InjectedWalletBase extends SolWalletConnector {
                 }
                 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/InjectedWalletBase/index.d.ts

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

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

@@ -3,17 +3,15 @@
 
 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 PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -34,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.d.ts → PhantomInjected/PhantomInjected.d.ts}

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

package/src/injected/{PhantomInjected.js → PhantomInjected/PhantomInjected.js}

@@ -1,15 +1,13 @@
 'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
+import { __awaiter } from '../../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { InjectedWalletBase } from './InjectedWalletBase.js';
+import { InjectedWalletBase } from '../InjectedWalletBase/InjectedWalletBase.js';
 
 class PhantomInjected extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -30,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/PhantomInjected/index.d.ts

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

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -3,60 +3,78 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var CoinbaseSolana = require('../CoinbaseSolana.cjs');
-var Solflare = require('../Solflare.cjs');
-var SolanaWalletStandardConnector = require('../SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs');
-var InjectedWalletBase = require('./InjectedWalletBase.cjs');
-var BackpackSol = require('./BackpackSol.cjs');
+var utils = require('@dynamic-labs/utils');
+var CoinbaseSolana = require('../CoinbaseSolana/CoinbaseSolana.cjs');
+var Solflare = require('../Solflare/Solflare.cjs');
+var logger = require('../utils/logger.cjs');
+var InjectedWalletBase = require('./InjectedWalletBase/InjectedWalletBase.cjs');
+var BackpackSol = require('./BackpackSol/BackpackSol.cjs');
+var getConnectorConstructorForWalletStandardWallet = require('./walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs');
+var getWalletStandardWallets = require('./walletStandard/getWalletStandardWallets/getWalletStandardWallets.cjs');
 
 const injectedWalletOverrides = [
     CoinbaseSolana.CoinbaseSolana,
     BackpackSol.BackpackSol,
     Solflare.Solflare,
 ];
-const filteredInjectedWalletKeysOverrides = [
+const walletsWithCustomConnectors = [
     'coinbasesolana',
     'phantom',
     'phantomledger',
     'backpacksol',
     'solflare',
 ];
+const shouldAddWalletStandardConnector = (wallet, walletBook) => {
+    var _a, _b, _c, _d, _e, _f;
+    const { name } = wallet;
+    const chain = 'sol';
+    const connectorKey = `${utils.sanitizeName(name)}${chain}`;
+    logger.logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', name, chain, connectorKey, wallet.features);
+    const existingWallet = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([key, wallet]) => {
+        var _a;
+        return key === connectorKey ||
+            walletsWithCustomConnectors.includes(connectorKey) ||
+            (wallet.name === name && ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a[0].chain) === chain);
+    });
+    const hasAllFeatures = Boolean(((_b = wallet.features) === null || _b === void 0 ? void 0 : _b['standard:events']) &&
+        ((_c = wallet.features) === null || _c === void 0 ? void 0 : _c['standard:connect']) &&
+        ((_d = wallet.features) === null || _d === void 0 ? void 0 : _d['solana:signMessage']) &&
+        ((_e = wallet.features) === null || _e === void 0 ? void 0 : _e['solana:signTransaction']) &&
+        ((_f = wallet.features) === null || _f === void 0 ? void 0 : _f['solana:signAndSendTransaction']));
+    logger.logger.logVerboseTroubleshootingMessage('[SOL shouldAddWalletStandardConnector]', {
+        existingWallet,
+        hasAllFeatures,
+        shouldAdd: !existingWallet && hasAllFeatures,
+    });
+    return !existingWallet && hasAllFeatures;
+};
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
-    return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
         .filter(([key, wallet]) => {
         var _a;
         const isSolanaWallet = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'sol'));
-        const shouldBeFiltered = filteredInjectedWalletKeysOverrides.includes(key);
+        const shouldBeFiltered = walletsWithCustomConnectors.includes(key);
         return isSolanaWallet && !shouldBeFiltered;
     })
         .map(([key, wallet]) => {
-        var _a;
         const { shortName } = wallet;
         const name = shortName || wallet.name;
-        const hasWalletStandard = Boolean((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.walletStandard));
-        if (hasWalletStandard) {
-            const isWalletStandardPresent = Boolean(SolanaWalletStandardConnector.SolanaWalletStandardConnector.getWallet(walletBook, key));
-            if (isWalletStandardPresent) {
-                return class extends SolanaWalletStandardConnector.SolanaWalletStandardConnector {
-                    constructor(props) {
-                        super(Object.assign({}, props));
-                        this.name = name;
-                        this.overrideKey = key;
-                    }
-                };
-            }
-        }
         return class extends InjectedWalletBase.InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
+            constructor() {
+                super(...arguments);
                 this.name = name;
-                this.wallet = wallet;
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }
         };
     });
+    const walletStandardWallets = getWalletStandardWallets.getWalletStandardWallets();
+    const walletStandardConnectors = walletStandardWallets
+        .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook))
+        .map((wallet) => getConnectorConstructorForWalletStandardWallet.getConnectorConstructorForWalletStandardWallet(wallet));
+    logger.logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
+    return [...walletBookConnectors, ...walletStandardConnectors];
 };
 
 exports.fetchInjectedWalletConnectors = fetchInjectedWalletConnectors;