@dynamic-labs/solana 4.39.0 → 4.40.1

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+### [4.40.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.40.0...v4.40.1) (2025-10-24)
+
+### Bug Fixes
+
+* add support for Keplr in-app browser redirect for cosmos chain ([#9770](https://github.com/dynamic-labs/dynamic-auth/issues/9770)) ([35652f3](https://github.com/dynamic-labs/dynamic-auth/commit/35652f3167a4e768f5d4c634ab1b4f127fd5076a))
+
+## [4.40.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.39.0...v4.40.0) (2025-10-22)
+
+
+### Features
+
+* add Wallet Connect Solana as a wallet option ([#9719](https://github.com/dynamic-labs/dynamic-auth/issues/9719)) ([ece5f6b](https://github.com/dynamic-labs/dynamic-auth/commit/ece5f6b36c1fbefdf05cf8203fe0fee0b2e8ed3d))
+* make updates to crypto.com onramp flow ([#9746](https://github.com/dynamic-labs/dynamic-auth/issues/9746)) ([22040d2](https://github.com/dynamic-labs/dynamic-auth/commit/22040d28d0d66b84f5c3be9bed4cfce7f1978944))
+
+
+### Bug Fixes
+
+* return undefined if json payload is undefined in parse token ([#9750](https://github.com/dynamic-labs/dynamic-auth/issues/9750)) ([5751198](https://github.com/dynamic-labs/dynamic-auth/commit/575119867c93f89062e96e30c02b128161fb9675))
+
 ## [4.39.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.38.0...v4.39.0) (2025-10-17)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "4.39.0",
+  "version": "4.40.1",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,6 +18,7 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
+    "@dynamic-labs/wallet-connect": "4.40.1",
     "@solana/web3.js": "1.98.1",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
@@ -25,17 +26,21 @@
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/assert-package-version": "4.39.0",
-    "@dynamic-labs/embedded-wallet-solana": "4.39.0",
-    "@dynamic-labs/logger": "4.39.0",
-    "@dynamic-labs/rpc-providers": "4.39.0",
-    "@dynamic-labs/sdk-api-core": "0.0.809",
-    "@dynamic-labs/solana-core": "4.39.0",
-    "@dynamic-labs/types": "4.39.0",
-    "@dynamic-labs/utils": "4.39.0",
-    "@dynamic-labs/waas-svm": "4.39.0",
-    "@dynamic-labs/wallet-book": "4.39.0",
-    "@dynamic-labs/wallet-connector-core": "4.39.0"
+    "@walletconnect/sign-client": "2.21.5",
+    "@walletconnect/utils": "2.21.5",
+    "@walletconnect/types": "2.21.5",
+    "@dynamic-labs/assert-package-version": "4.40.1",
+    "@dynamic-labs/embedded-wallet-solana": "4.40.1",
+    "@dynamic-labs/logger": "4.40.1",
+    "@dynamic-labs/rpc-providers": "4.40.1",
+    "@dynamic-labs/sdk-api-core": "0.0.813",
+    "@dynamic-labs/solana-core": "4.40.1",
+    "@dynamic-labs/types": "4.40.1",
+    "@dynamic-labs/utils": "4.40.1",
+    "@dynamic-labs/waas-svm": "4.40.1",
+    "@dynamic-labs/wallet-book": "4.40.1",
+    "@dynamic-labs/wallet-connector-core": "4.40.1",
+    "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}
 }

package/src/CoinbaseSolana/CoinbaseSolana.cjs

@@ -39,5 +39,9 @@ class CoinbaseSolana extends InjectedWalletBase.InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(CoinbaseSolana, 'key', {
+    value: 'coinbasesolana',
+    writable: false,
+});
 
 exports.CoinbaseSolana = CoinbaseSolana;

package/src/CoinbaseSolana/CoinbaseSolana.js

@@ -35,5 +35,9 @@ class CoinbaseSolana extends InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(CoinbaseSolana, 'key', {
+    value: 'coinbasesolana',
+    writable: false,
+});
 
 export { CoinbaseSolana };

package/src/Phantom/Phantom.cjs

@@ -38,5 +38,9 @@ class Phantom extends solanaCore.SolanaWalletConnector {
         }
     }
 }
+Object.defineProperty(Phantom, 'key', {
+    value: 'phantom',
+    writable: false,
+});
 
 exports.Phantom = Phantom;

package/src/Phantom/Phantom.js

@@ -34,5 +34,9 @@ class Phantom extends SolanaWalletConnector {
         }
     }
 }
+Object.defineProperty(Phantom, 'key', {
+    value: 'phantom',
+    writable: false,
+});
 
 export { Phantom };

package/src/SolanaWalletConnectors.cjs

@@ -13,16 +13,25 @@ require('../_virtual/_tslib.cjs');
 require('@solana/web3.js');
 require('bs58');
 require('./utils/logger.cjs');
+var getSolanaWalletConnectConnector = require('./walletConnect/utils/getSolanaWalletConnectConnector/getSolanaWalletConnectConnector.cjs');
+var addSolanaWalletConnectConnectors = require('./walletConnect/utils/addSolanaWalletConnectConnectors/addSolanaWalletConnectConnectors.cjs');
 
 const SolanaWalletConnectors = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-props) => [
-    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
-    ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
-    ...waasSvm.DynamicWaasSVMConnectors(),
-    Phantom.Phantom,
-    FallbackSolanaConnector.FallbackSolanaConnector,
-];
+props) => {
+    const initialConnectors = [
+        ...fetchInjectedWalletConnectors.injectedWalletOverrides,
+        ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
+        ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
+        ...waasSvm.DynamicWaasSVMConnectors(),
+        Phantom.Phantom,
+        FallbackSolanaConnector.FallbackSolanaConnector,
+        getSolanaWalletConnectConnector.getSolanaWalletConnectConnector(),
+    ];
+    return addSolanaWalletConnectConnectors.addSolanaWalletConnectConnectors({
+        connectors: initialConnectors,
+        walletBook: props.walletBook,
+    });
+};
 
 exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/SolanaWalletConnectors.js

@@ -9,16 +9,25 @@ import '../_virtual/_tslib.js';
 import '@solana/web3.js';
 import 'bs58';
 import './utils/logger.js';
+import { getSolanaWalletConnectConnector } from './walletConnect/utils/getSolanaWalletConnectConnector/getSolanaWalletConnectConnector.js';
+import { addSolanaWalletConnectConnectors } from './walletConnect/utils/addSolanaWalletConnectConnectors/addSolanaWalletConnectConnectors.js';
 
 const SolanaWalletConnectors = (
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-props) => [
-    ...injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors(props),
-    ...TurnkeySolanaWalletConnectors(props),
-    ...DynamicWaasSVMConnectors(),
-    Phantom,
-    FallbackSolanaConnector,
-];
+props) => {
+    const initialConnectors = [
+        ...injectedWalletOverrides,
+        ...fetchInjectedWalletConnectors(props),
+        ...TurnkeySolanaWalletConnectors(props),
+        ...DynamicWaasSVMConnectors(),
+        Phantom,
+        FallbackSolanaConnector,
+        getSolanaWalletConnectConnector(),
+    ];
+    return addSolanaWalletConnectConnectors({
+        connectors: initialConnectors,
+        walletBook: props.walletBook,
+    });
+};
 
 export { SolanaWalletConnectors };

package/src/Solflare/Solflare.cjs

@@ -58,5 +58,9 @@ class Solflare extends InjectedWalletBase.InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(Solflare, 'key', {
+    value: 'solflare',
+    writable: false,
+});
 
 exports.Solflare = Solflare;

package/src/Solflare/Solflare.js

@@ -54,5 +54,9 @@ class Solflare extends InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(Solflare, 'key', {
+    value: 'solflare',
+    writable: false,
+});
 
 export { Solflare };

package/src/index.cjs

@@ -15,11 +15,13 @@ var isSignedMessage = require('./utils/isSignedMessage.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/utils');
-require('../_virtual/_tslib.cjs');
+require('./CoinbaseSolana/CoinbaseSolana.cjs');
+require('./Solflare/Solflare.cjs');
 require('./utils/logger.cjs');
 var createSolanaSignerFromWalletStandard = require('./injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
 var getWalletStandardWallets = require('./injected/walletStandard/getWalletStandardWallets/getWalletStandardWallets.cjs');
 var hasAllWalletStandardRequiredFeatures = require('./injected/walletStandard/hasAllWalletStandardRequiredFeatures/hasAllWalletStandardRequiredFeatures.cjs');
+require('./injected/FallbackSolanaConnector/FallbackSolanaConnector.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 assertPackageVersion.assertPackageVersion('@dynamic-labs/solana', _package.version);

package/src/index.js

@@ -11,11 +11,13 @@ export { isSignedMessage } from './utils/isSignedMessage.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/utils';
-import '../_virtual/_tslib.js';
+import './CoinbaseSolana/CoinbaseSolana.js';
+import './Solflare/Solflare.js';
 import './utils/logger.js';
 export { createSolanaSignerFromWalletStandard } from './injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
 export { getWalletStandardWallets } from './injected/walletStandard/getWalletStandardWallets/getWalletStandardWallets.js';
 export { hasAllWalletStandardRequiredFeatures } from './injected/walletStandard/hasAllWalletStandardRequiredFeatures/hasAllWalletStandardRequiredFeatures.js';
+import './injected/FallbackSolanaConnector/FallbackSolanaConnector.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 assertPackageVersion('@dynamic-labs/solana', version);

package/src/injected/BackpackSol/BackpackSol.cjs

@@ -40,5 +40,9 @@ class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(BackpackSol, 'key', {
+    value: 'backpacksol',
+    writable: false,
+});
 
 exports.BackpackSol = BackpackSol;

package/src/injected/BackpackSol/BackpackSol.js

@@ -36,5 +36,9 @@ class BackpackSol extends InjectedWalletBase {
         });
     }
 }
+Object.defineProperty(BackpackSol, 'key', {
+    value: 'backpacksol',
+    writable: false,
+});
 
 export { BackpackSol };

package/src/injected/FallbackSolanaConnector/FallbackSolanaConnector.cjs

@@ -16,5 +16,9 @@ class FallbackSolanaConnector extends InjectedWalletBase.InjectedWalletBase {
         return false;
     }
 }
+Object.defineProperty(FallbackSolanaConnector, 'key', {
+    value: 'fallbackconnector',
+    writable: false,
+});
 
 exports.FallbackSolanaConnector = FallbackSolanaConnector;

package/src/injected/FallbackSolanaConnector/FallbackSolanaConnector.js

@@ -12,5 +12,9 @@ class FallbackSolanaConnector extends InjectedWalletBase {
         return false;
     }
 }
+Object.defineProperty(FallbackSolanaConnector, 'key', {
+    value: 'fallbackconnector',
+    writable: false,
+});
 
 export { FallbackSolanaConnector };

package/src/injected/InjectedWalletBase/InjectedWalletBase.cjs

@@ -6,11 +6,43 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
 var solanaCore = require('@dynamic-labs/solana-core');
-var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var SolProviderHelper = require('../../SolProviderHelper/SolProviderHelper.cjs');
 var SignMessageNotSupportedError = require('../../errors/SignMessageNotSupportedError.cjs');
+var logger = require('../../utils/logger.cjs');
+var SolanaWalletConnectConnector = require('../../walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.cjs');
 
 class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
+    constructor() {
+        super(...arguments);
+        /**
+         * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+         * Therefore, for Solana wallets that support wallet connect, we must also hold the reference to the wallet book
+         * entry that has the wallet connect data for it.
+         */
+        this.walletConnectWalletBookEntry = undefined;
+    }
+    getMobileOrInstalledWallet() {
+        // can use WC if the wallet has WC setting in wallet book and projectId is set
+        const canUseWalletConnect = this.walletConnectWalletBookEntry && this.constructorProps.projectId;
+        logger.logger.logVerboseTroubleshootingMessage('[SOL InjectedWalletBase] getMobileOrInstalledWallet', {
+            canUseWalletConnect,
+            isInstalledOnBrowser: this.isInstalledOnBrowser(),
+            projectId: this.constructorProps.projectId,
+            walletConnectWalletBookEntry: this.walletConnectWalletBookEntry,
+        });
+        // if the wallet is installed on the browser or WC is not available, return the injected connector
+        if (this.isInstalledOnBrowser() || !canUseWalletConnect) {
+            return this;
+        }
+        // if the wallet is not installed on the browser and WC is available, return the WC connector
+        const wcConnector = new SolanaWalletConnectConnector.SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: walletConnectorCore.getWalletMetadataFromWalletBook({
+                walletBookWallet: this.walletConnectWalletBookEntry,
+                walletKey: this.key,
+            }), overrideKey: this.key, walletName: this.name }));
+        wcConnector.init();
+        return wcConnector;
+    }
     get solProviderHelper() {
         if (!this._solProviderHelper) {
             this._solProviderHelper = new SolProviderHelper.SolProviderHelper(this);
@@ -79,21 +111,12 @@ class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!this.isInstalledOnBrowser()) {
-                if (utils.isMobile() &&
-                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
-                    this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = utils.template(this.metadata.inAppBrowserUrl);
-                    const { href } = utils.PlatformService.getUrl();
-                    const deepLink = inAppBrowserCompiledTemplate({
-                        encodedDappURI: encodeURIComponent(href),
-                    });
-                    utils.PlatformService.openURL(deepLink);
-                }
+            var _a;
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
-            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/InjectedWalletBase/InjectedWalletBase.d.ts

@@ -1,9 +1,17 @@
 import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { IUITransaction } from '@dynamic-labs/types';
 import { ISendBalanceWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { SolProviderHelper } from '../../SolProviderHelper';
 export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
     _solProviderHelper: SolProviderHelper | undefined;
+    /**
+     * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+     * Therefore, for Solana wallets that support wallet connect, we must also hold the reference to the wallet book
+     * entry that has the wallet connect data for it.
+     */
+    walletConnectWalletBookEntry: WalletSchema | undefined;
+    getMobileOrInstalledWallet(): InjectedWalletBase;
     get solProviderHelper(): SolProviderHelper | undefined;
     findProvider(): ISolana | undefined;
     setupEventListeners(): void;

package/src/injected/InjectedWalletBase/InjectedWalletBase.js

@@ -2,11 +2,43 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { PublicKey } from '@solana/web3.js';
 import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
-import { isMobile, template, PlatformService } from '@dynamic-labs/utils';
+import { getWalletMetadataFromWalletBook } from '@dynamic-labs/wallet-connector-core';
 import { SolProviderHelper } from '../../SolProviderHelper/SolProviderHelper.js';
 import { SignMessageNotSupportedError } from '../../errors/SignMessageNotSupportedError.js';
+import { logger } from '../../utils/logger.js';
+import { SolanaWalletConnectConnector } from '../../walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.js';
 
 class InjectedWalletBase extends SolanaWalletConnector {
+    constructor() {
+        super(...arguments);
+        /**
+         * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+         * Therefore, for Solana wallets that support wallet connect, we must also hold the reference to the wallet book
+         * entry that has the wallet connect data for it.
+         */
+        this.walletConnectWalletBookEntry = undefined;
+    }
+    getMobileOrInstalledWallet() {
+        // can use WC if the wallet has WC setting in wallet book and projectId is set
+        const canUseWalletConnect = this.walletConnectWalletBookEntry && this.constructorProps.projectId;
+        logger.logVerboseTroubleshootingMessage('[SOL InjectedWalletBase] getMobileOrInstalledWallet', {
+            canUseWalletConnect,
+            isInstalledOnBrowser: this.isInstalledOnBrowser(),
+            projectId: this.constructorProps.projectId,
+            walletConnectWalletBookEntry: this.walletConnectWalletBookEntry,
+        });
+        // if the wallet is installed on the browser or WC is not available, return the injected connector
+        if (this.isInstalledOnBrowser() || !canUseWalletConnect) {
+            return this;
+        }
+        // if the wallet is not installed on the browser and WC is available, return the WC connector
+        const wcConnector = new SolanaWalletConnectConnector(Object.assign(Object.assign({}, this.constructorProps), { metadata: getWalletMetadataFromWalletBook({
+                walletBookWallet: this.walletConnectWalletBookEntry,
+                walletKey: this.key,
+            }), overrideKey: this.key, walletName: this.name }));
+        wcConnector.init();
+        return wcConnector;
+    }
     get solProviderHelper() {
         if (!this._solProviderHelper) {
             this._solProviderHelper = new SolProviderHelper(this);
@@ -75,21 +107,12 @@ class InjectedWalletBase extends SolanaWalletConnector {
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!this.isInstalledOnBrowser()) {
-                if (isMobile() &&
-                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
-                    this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = template(this.metadata.inAppBrowserUrl);
-                    const { href } = PlatformService.getUrl();
-                    const deepLink = inAppBrowserCompiledTemplate({
-                        encodedDappURI: encodeURIComponent(href),
-                    });
-                    PlatformService.openURL(deepLink);
-                }
+            var _a;
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
-            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -9,7 +9,7 @@ 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 getConnectorConstructorInjectedWallet = require('../utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.cjs');
 var BackpackSol = require('./BackpackSol/BackpackSol.cjs');
 var getConnectorConstructorForWalletStandardWallet = require('./walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs');
 var getWalletStandardWallets = require('./walletStandard/getWalletStandardWallets/getWalletStandardWallets.cjs');
@@ -66,18 +66,7 @@ const fetchInjectedWalletConnectors = ({ walletBook: walletBook$1, authMode, })
             ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
         return isSolanaWallet && !shouldBeFiltered;
     })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        return class extends InjectedWalletBase.InjectedWalletBase {
-            constructor() {
-                super(...arguments);
-                this.name = name;
-                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-        };
-    });
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet.getConnectorConstructorInjectedWallet({ key, wallet, walletBook: walletBook$1 }));
     const walletStandardWallets = getWalletStandardWallets.getWalletStandardWallets();
     const walletStandardConnectors = walletStandardWallets
         .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook$1, authMode))

package/src/injected/fetchInjectedWalletConnectors.js

@@ -5,7 +5,7 @@ import { sanitizeName } from '@dynamic-labs/utils';
 import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
 import { Solflare } from '../Solflare/Solflare.js';
 import { logger } from '../utils/logger.js';
-import { InjectedWalletBase } from './InjectedWalletBase/InjectedWalletBase.js';
+import { getConnectorConstructorInjectedWallet } from '../utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js';
 import { BackpackSol } from './BackpackSol/BackpackSol.js';
 import { getConnectorConstructorForWalletStandardWallet } from './walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js';
 import { getWalletStandardWallets } from './walletStandard/getWalletStandardWallets/getWalletStandardWallets.js';
@@ -62,18 +62,7 @@ const fetchInjectedWalletConnectors = ({ walletBook, authMode, }) => {
             ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
         return isSolanaWallet && !shouldBeFiltered;
     })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        return class extends InjectedWalletBase {
-            constructor() {
-                super(...arguments);
-                this.name = name;
-                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-        };
-    });
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet({ key, wallet, walletBook }));
     const walletStandardWallets = getWalletStandardWallets();
     const walletStandardConnectors = walletStandardWallets
         .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook, authMode))

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.cjs

@@ -0,0 +1,46 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var InjectedWalletBase = require('../../injected/InjectedWalletBase/InjectedWalletBase.cjs');
+
+const getConnectorConstructorInjectedWallet = ({ key, wallet, walletBook, }) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    /**
+     * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+     * Therefore, in order to tell whether this Sol wallet supports wallet connect, we will have to find the wallet book
+     * entry that has the wallet connect data for it.
+     */
+    let walletConnectWalletBookEntry = undefined;
+    if (wallet.group) {
+        walletConnectWalletBookEntry = Object.values(walletBook.wallets).find((entry) => {
+            var _a;
+            return entry.walletConnect &&
+                entry.group === wallet.group &&
+                (
+                // Disregard if the wallet connect data does not support Solana. WC chains are prefixed with 'solana:'
+                // as they follow CAIP-2 format
+                (_a = entry.chains) === null || _a === void 0 ? void 0 : _a.some((chain) => chain.includes('solana:')));
+        });
+    }
+    const InjectedWalletConstructor = class extends InjectedWalletBase.InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.walletName = name;
+            this.name = name;
+            this.walletConnectWalletBookEntry = walletConnectWalletBookEntry;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+    };
+    // Add this key so we can later tell which wallet each constructor is for
+    Object.defineProperty(InjectedWalletConstructor, 'key', {
+        value: key,
+        writable: false,
+    });
+    return InjectedWalletConstructor;
+};
+
+exports.getConnectorConstructorInjectedWallet = getConnectorConstructorInjectedWallet;

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.d.ts

@@ -0,0 +1,9 @@
+import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+type GetConnectorConstructorInjectedWalletProps = {
+    key: string;
+    wallet: WalletSchema;
+    walletBook: WalletBookSchema;
+};
+export declare const getConnectorConstructorInjectedWallet: ({ key, wallet, walletBook, }: GetConnectorConstructorInjectedWalletProps) => WalletConnectorConstructor;
+export {};

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js

@@ -0,0 +1,42 @@
+'use client'
+import { InjectedWalletBase } from '../../injected/InjectedWalletBase/InjectedWalletBase.js';
+
+const getConnectorConstructorInjectedWallet = ({ key, wallet, walletBook, }) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    /**
+     * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+     * Therefore, in order to tell whether this Sol wallet supports wallet connect, we will have to find the wallet book
+     * entry that has the wallet connect data for it.
+     */
+    let walletConnectWalletBookEntry = undefined;
+    if (wallet.group) {
+        walletConnectWalletBookEntry = Object.values(walletBook.wallets).find((entry) => {
+            var _a;
+            return entry.walletConnect &&
+                entry.group === wallet.group &&
+                (
+                // Disregard if the wallet connect data does not support Solana. WC chains are prefixed with 'solana:'
+                // as they follow CAIP-2 format
+                (_a = entry.chains) === null || _a === void 0 ? void 0 : _a.some((chain) => chain.includes('solana:')));
+        });
+    }
+    const InjectedWalletConstructor = class extends InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.walletName = name;
+            this.name = name;
+            this.walletConnectWalletBookEntry = walletConnectWalletBookEntry;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+    };
+    // Add this key so we can later tell which wallet each constructor is for
+    Object.defineProperty(InjectedWalletConstructor, 'key', {
+        value: key,
+        writable: false,
+    });
+    return InjectedWalletConstructor;
+};
+
+export { getConnectorConstructorInjectedWallet };

package/src/utils/getConnectorConstructorInjectedWallet/index.d.ts

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