@dynamic-labs/solana-core 4.7.2 → 4.8.1

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 
+### [4.8.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.8.0...v4.8.1) (2025-02-25)
+
+
+### Bug Fixes
+
+* wc redirect for safari inside iframe ([#8131](https://github.com/dynamic-labs/dynamic-auth/issues/8131)) ([8c74bea](https://github.com/dynamic-labs/dynamic-auth/commit/8c74beae505014eb85be4fd211909709d0a339dd))
+
+## [4.8.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.7.2...v4.8.0) (2025-02-25)
+
+
+### Features
+
+* add support for network switching for SOL wallets ([#8095](https://github.com/dynamic-labs/dynamic-auth/issues/8095)) ([8997b39](https://github.com/dynamic-labs/dynamic-auth/commit/8997b399e1e5cd294aad8b719d39928eed5e911d))
+* add support for solNetworks override ([#8138](https://github.com/dynamic-labs/dynamic-auth/issues/8138)) ([8c3f374](https://github.com/dynamic-labs/dynamic-auth/commit/8c3f374a9b2b451f984aed98e7ce506552e2a6c5))
+* **react-native:** add account abstraction multi-chain ([#8132](https://github.com/dynamic-labs/dynamic-auth/issues/8132)) ([c64a26e](https://github.com/dynamic-labs/dynamic-auth/commit/c64a26e16943d913edf4683084f59592a9aeedfc))
+
+
+### Bug Fixes
+
+* ensure zero dev network cache use project id ([#8133](https://github.com/dynamic-labs/dynamic-auth/issues/8133)) ([408c4ed](https://github.com/dynamic-labs/dynamic-auth/commit/408c4ed764a623b6d870cd24973320e5ca4a74c7))
+
 ### [4.7.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.7.1...v4.7.2) (2025-02-22)
 
 ### Features

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana-core",
-  "version": "4.7.2",
+  "version": "4.8.1",
   "description": "Core package for utilities and types for solana",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -21,12 +21,12 @@
     "@dynamic-labs/sdk-api-core": "0.0.628",
     "@solana/web3.js": "1.92.1",
     "@solana/spl-token": "0.4.6",
-    "@dynamic-labs/assert-package-version": "4.7.2",
-    "@dynamic-labs/rpc-providers": "4.7.2",
-    "@dynamic-labs/types": "4.7.2",
-    "@dynamic-labs/utils": "4.7.2",
-    "@dynamic-labs/wallet-book": "4.7.2",
-    "@dynamic-labs/wallet-connector-core": "4.7.2",
+    "@dynamic-labs/assert-package-version": "4.8.1",
+    "@dynamic-labs/rpc-providers": "4.8.1",
+    "@dynamic-labs/types": "4.8.1",
+    "@dynamic-labs/utils": "4.8.1",
+    "@dynamic-labs/wallet-book": "4.8.1",
+    "@dynamic-labs/wallet-connector-core": "4.8.1",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/connector/SolanaWalletConnector.cjs

@@ -9,9 +9,9 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var SolanaWallet = require('../wallet/SolanaWallet.cjs');
 var extractNonce = require('../utils/extractNonce/extractNonce.cjs');
-var getGenesisHashLSKey = require('../utils/getGenesisHashLSKey/getGenesisHashLSKey.cjs');
 var getOverrideRpcUrlForNetwork = require('../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.cjs');
 require('@solana/spl-token');
+var constants = require('../constants.cjs');
 var getBackwardsCompatibleSolNetworks = require('../utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.cjs');
 
 const MEMO_PROGRAM_ID = new web3_js.PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
@@ -29,37 +29,74 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.connectionConfig = opts.connectionConfig;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
+    getNetworkId() {
+        var _a;
+        const defaultChainId = (_a = this.solNetworks[0]) === null || _a === void 0 ? void 0 : _a.networkId.toString();
+        const storedChainId = localStorage.getItem(constants.DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        return storedChainId !== null && storedChainId !== void 0 ? storedChainId : defaultChainId;
+    }
+    setNetworkId(networkId) {
+        if (!networkId) {
+            localStorage.removeItem(constants.DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        }
+        else {
+            localStorage.setItem(constants.DYNAMIC_SVM_NETWORK_ID_LS_KEY, networkId);
+        }
+    }
+    getSelectedNetwork() {
+        const selectedNetwork = this.solNetworks.find((network) => network.networkId.toString() === this.getNetworkId());
+        return selectedNetwork;
+    }
     /**
      * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
      * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
      */
     getNetwork() {
         return _tslib.__awaiter(this, arguments, void 0, function* (returnDynamicNetworkId = false) {
-            const provider = this.getWalletClient();
-            let genesisHash = localStorage.getItem(getGenesisHashLSKey.getGenesisHashLSKey(provider.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield provider.getGenesisHash();
-                localStorage.setItem(getGenesisHashLSKey.getGenesisHashLSKey(provider.rpcEndpoint), genesisHash);
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return '';
             }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            const { networkId, genesisHash } = network;
+            if (returnDynamicNetworkId) {
+                return networkId.toString();
+            }
+            // to keep backward compatibility with old network values
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                return returnDynamicNetworkId ? '101' : 'mainnet';
+                return 'mainnet';
+            }
+            if (genesisHash === '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2K') {
+                return 'testnet';
             }
             if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                return returnDynamicNetworkId ? '103' : 'devnet';
+                return 'devnet';
             }
-            return returnDynamicNetworkId ? '102' : 'testnet';
+            // if it's not one of the main solana networks, return the network id
+            // this should be ok because we didn't have support for other SVM networks before
+            return networkId.toString();
+        });
+    }
+    switchNetwork(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
+            if (!networkChainId)
+                return;
+            const networkIdString = networkChainId.toString();
+            const isNetworkIdValid = this.solNetworks.some((network) => network.networkId.toString() === networkIdString);
+            if (!isNetworkIdValid) {
+                return;
+            }
+            this.setNetworkId(networkIdString);
+            this.emit('chainChange', { chain: networkIdString });
         });
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(getGenesisHashLSKey.getGenesisHashLSKey(this.getWalletClient().rpcEndpoint));
+            this.setNetworkId(null);
         });
     }
     getWalletClient() {
         var _a;
-        const [network] = this.solNetworks;
+        const network = this.getSelectedNetwork();
         if (!network) {
             throw new utils.DynamicError('No enabled networks');
         }
@@ -69,8 +106,11 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
     getPublicClient() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (this.solNetworks.length === 0)
+            const network = this.getSelectedNetwork();
+            if (!network) {
                 return;
+            }
+            const networkId = network.networkId.toString();
             const configurations = {
                 cosmos: [],
                 evm: undefined,
@@ -80,7 +120,7 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
             if (!this.chainRpcProviders)
                 return undefined;
             const providers = this.chainRpcProviders.getProviders(configurations);
-            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, '101')) === null || _a === void 0 ? void 0 : _a.provider;
+            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, networkId)) === null || _a === void 0 ? void 0 : _a.provider;
         });
     }
     getBalance(address) {
@@ -173,12 +213,19 @@ class SolanaWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getBlockExplorerUrlsForCurrentNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return ['https://solscan.io/'];
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return [];
+            }
+            return network.blockExplorerUrls;
         });
     }
     getEnabledNetworks() {
         return this.solNetworks;
     }
+    supportsNetworkSwitching() {
+        return true;
+    }
 }
 
 exports.SolanaWalletConnector = SolanaWalletConnector;

package/src/connector/SolanaWalletConnector.d.ts

@@ -6,6 +6,9 @@ import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
 import { IChainRpcProviders } from '../rpc';
 import { SolanaWallet } from '../wallet';
 import { ISolana, SolanaConnectionConfig } from '../types';
+export type SwitchNetworkOps = {
+    networkChainId: number;
+};
 export type SolanaWalletConnectorOpts = {
     chainRpcProviders: IChainRpcProviders;
     solNetworks: GenericNetwork[];
@@ -22,11 +25,15 @@ export declare abstract class SolanaWalletConnector extends WalletConnectorBase<
     connectedChain: Chain;
     protected connectionConfig: SolanaConnectionConfig | undefined;
     constructor(opts: SolanaWalletConnectorOpts);
+    getNetworkId(): string;
+    setNetworkId(networkId: string | null): void;
+    getSelectedNetwork(): GenericNetwork | undefined;
     /**
      * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
      * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
      */
     getNetwork(returnDynamicNetworkId?: boolean): Promise<string>;
+    switchNetwork({ networkChainId, }: SwitchNetworkOps): Promise<void>;
     endSession(): Promise<void>;
     getWalletClient(): Connection;
     getPublicClient(): Promise<Connection | undefined>;
@@ -43,4 +50,5 @@ export declare abstract class SolanaWalletConnector extends WalletConnectorBase<
     isLedgerAddress(address: string): boolean;
     getBlockExplorerUrlsForCurrentNetwork(): Promise<string[]>;
     getEnabledNetworks(): GenericNetwork[];
+    supportsNetworkSwitching(): boolean;
 }

package/src/connector/SolanaWalletConnector.js

@@ -5,9 +5,9 @@ import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, isLedgerAddressViaVerifiedCredentials, NotSupportedError } from '@dynamic-labs/utils';
 import { SolanaWallet } from '../wallet/SolanaWallet.js';
 import { extractNonce } from '../utils/extractNonce/extractNonce.js';
-import { getGenesisHashLSKey } from '../utils/getGenesisHashLSKey/getGenesisHashLSKey.js';
 import { getOverrideRpcUrlForNetwork } from '../utils/getOverrideRpcUrlForNetwork/getOverrideRpcUrlForNetwork.js';
 import '@solana/spl-token';
+import { DYNAMIC_SVM_NETWORK_ID_LS_KEY } from '../constants.js';
 import { getBackwardsCompatibleSolNetworks } from '../utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.js';
 
 const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
@@ -25,37 +25,74 @@ class SolanaWalletConnector extends WalletConnectorBase {
         this.connectionConfig = opts.connectionConfig;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
     }
+    getNetworkId() {
+        var _a;
+        const defaultChainId = (_a = this.solNetworks[0]) === null || _a === void 0 ? void 0 : _a.networkId.toString();
+        const storedChainId = localStorage.getItem(DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        return storedChainId !== null && storedChainId !== void 0 ? storedChainId : defaultChainId;
+    }
+    setNetworkId(networkId) {
+        if (!networkId) {
+            localStorage.removeItem(DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        }
+        else {
+            localStorage.setItem(DYNAMIC_SVM_NETWORK_ID_LS_KEY, networkId);
+        }
+    }
+    getSelectedNetwork() {
+        const selectedNetwork = this.solNetworks.find((network) => network.networkId.toString() === this.getNetworkId());
+        return selectedNetwork;
+    }
     /**
      * @param returnDynamicNetworkId - If true, the dynamic network ID will be returned instead of the network cluster
      * @returns The network cluster (e.g. 'mainnet', 'testnet', 'devnet') or dynamic network (used for switching networks)
      */
     getNetwork() {
         return __awaiter(this, arguments, void 0, function* (returnDynamicNetworkId = false) {
-            const provider = this.getWalletClient();
-            let genesisHash = localStorage.getItem(getGenesisHashLSKey(provider.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield provider.getGenesisHash();
-                localStorage.setItem(getGenesisHashLSKey(provider.rpcEndpoint), genesisHash);
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return '';
             }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            const { networkId, genesisHash } = network;
+            if (returnDynamicNetworkId) {
+                return networkId.toString();
+            }
+            // to keep backward compatibility with old network values
             if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                return returnDynamicNetworkId ? '101' : 'mainnet';
+                return 'mainnet';
+            }
+            if (genesisHash === '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2K') {
+                return 'testnet';
             }
             if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                return returnDynamicNetworkId ? '103' : 'devnet';
+                return 'devnet';
             }
-            return returnDynamicNetworkId ? '102' : 'testnet';
+            // if it's not one of the main solana networks, return the network id
+            // this should be ok because we didn't have support for other SVM networks before
+            return networkId.toString();
+        });
+    }
+    switchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ networkChainId, }) {
+            if (!networkChainId)
+                return;
+            const networkIdString = networkChainId.toString();
+            const isNetworkIdValid = this.solNetworks.some((network) => network.networkId.toString() === networkIdString);
+            if (!isNetworkIdValid) {
+                return;
+            }
+            this.setNetworkId(networkIdString);
+            this.emit('chainChange', { chain: networkIdString });
         });
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(getGenesisHashLSKey(this.getWalletClient().rpcEndpoint));
+            this.setNetworkId(null);
         });
     }
     getWalletClient() {
         var _a;
-        const [network] = this.solNetworks;
+        const network = this.getSelectedNetwork();
         if (!network) {
             throw new DynamicError('No enabled networks');
         }
@@ -65,8 +102,11 @@ class SolanaWalletConnector extends WalletConnectorBase {
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (this.solNetworks.length === 0)
+            const network = this.getSelectedNetwork();
+            if (!network) {
                 return;
+            }
+            const networkId = network.networkId.toString();
             const configurations = {
                 cosmos: [],
                 evm: undefined,
@@ -76,7 +116,7 @@ class SolanaWalletConnector extends WalletConnectorBase {
             if (!this.chainRpcProviders)
                 return undefined;
             const providers = this.chainRpcProviders.getProviders(configurations);
-            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, '101')) === null || _a === void 0 ? void 0 : _a.provider;
+            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, networkId)) === null || _a === void 0 ? void 0 : _a.provider;
         });
     }
     getBalance(address) {
@@ -169,12 +209,19 @@ class SolanaWalletConnector extends WalletConnectorBase {
     }
     getBlockExplorerUrlsForCurrentNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            return ['https://solscan.io/'];
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return [];
+            }
+            return network.blockExplorerUrls;
         });
     }
     getEnabledNetworks() {
         return this.solNetworks;
     }
+    supportsNetworkSwitching() {
+        return true;
+    }
 }
 
 export { SolanaWalletConnector };

package/src/constants.cjs

@@ -4,5 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const SOLANA_GENESIS_HASH = 'genesis-hash';
+const DYNAMIC_SVM_NETWORK_ID_LS_KEY = 'dynamic_svm_network_id';
 
+exports.DYNAMIC_SVM_NETWORK_ID_LS_KEY = DYNAMIC_SVM_NETWORK_ID_LS_KEY;
 exports.SOLANA_GENESIS_HASH = SOLANA_GENESIS_HASH;

package/src/constants.d.ts

@@ -1 +1,2 @@
 export declare const SOLANA_GENESIS_HASH = "genesis-hash";
+export declare const DYNAMIC_SVM_NETWORK_ID_LS_KEY = "dynamic_svm_network_id";

package/src/constants.js

@@ -1,4 +1,5 @@
 'use client'
 const SOLANA_GENESIS_HASH = 'genesis-hash';
+const DYNAMIC_SVM_NETWORK_ID_LS_KEY = 'dynamic_svm_network_id';
 
-export { SOLANA_GENESIS_HASH };
+export { DYNAMIC_SVM_NETWORK_ID_LS_KEY, SOLANA_GENESIS_HASH };

package/src/index.cjs

@@ -41,6 +41,7 @@ exports.getBackwardsCompatibleSolNetworks = getBackwardsCompatibleSolNetworks.ge
 exports.SolanaWallet = SolanaWallet.SolanaWallet;
 exports.isSolanaWallet = isSolanaWallet.isSolanaWallet;
 exports.isLedgerSolanaWallet = isLedgerSolanaWallet.isLedgerSolanaWallet;
+exports.DYNAMIC_SVM_NETWORK_ID_LS_KEY = constants.DYNAMIC_SVM_NETWORK_ID_LS_KEY;
 exports.SOLANA_GENESIS_HASH = constants.SOLANA_GENESIS_HASH;
 Object.keys(rpcProviders).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {

package/src/index.d.ts

@@ -2,5 +2,5 @@ export * from './connector';
 export * from './rpc';
 export * from './utils';
 export * from './wallet';
-export { SOLANA_GENESIS_HASH } from './constants';
+export { SOLANA_GENESIS_HASH, DYNAMIC_SVM_NETWORK_ID_LS_KEY, } from './constants';
 export type { ConnectionResult, ExtensionLocator, ISolana, IBackpackSolanaSigner, SignedMessage, ISolanaSigner, SolanaConnectionConfig, } from './types';

package/src/index.js

@@ -18,6 +18,6 @@ export { getBackwardsCompatibleSolNetworks } from './utils/getBackwardsCompatibl
 export { SolanaWallet } from './wallet/SolanaWallet.js';
 export { isSolanaWallet } from './wallet/isSolanaWallet/isSolanaWallet.js';
 export { isLedgerSolanaWallet } from './wallet/isLedgerSolanaWallet/isLedgerSolanaWallet.js';
-export { SOLANA_GENESIS_HASH } from './constants.js';
+export { DYNAMIC_SVM_NETWORK_ID_LS_KEY, SOLANA_GENESIS_HASH } from './constants.js';
 
 assertPackageVersion('@dynamic-labs/solana-core', version);

package/src/utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.cjs

@@ -8,6 +8,7 @@ var getOverrideRpcUrlForNetwork = require('../getOverrideRpcUrlForNetwork/getOve
 const SOLANA_MAINNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com'],
     chainId: '101',
+    cluster: 'mainnet-beta',
     genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Mainnet',
@@ -25,6 +26,7 @@ const SOLANA_MAINNET_NETWORK = {
 const SOLANA_TESTNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com/?cluster=testnet'],
     chainId: '102',
+    cluster: 'testnet',
     genesisHash: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Testnet',
@@ -41,6 +43,7 @@ const SOLANA_TESTNET_NETWORK = {
 const SOLANA_DEVNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com/?cluster=devnet'],
     chainId: '103',
+    cluster: 'devnet',
     genesisHash: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Devnet',
@@ -58,7 +61,10 @@ const getBackwardsCompatibleSolNetworks = (originalSolNetworks, connectionConfig
     if (!(originalSolNetworks === null || originalSolNetworks === void 0 ? void 0 : originalSolNetworks.length)) {
         return [];
     }
-    if (originalSolNetworks.length > 1) {
+    // if we have more than one network or if the chainId is not 101,
+    // it means the correct rpc should have already been set in the dashboard
+    if (originalSolNetworks.length > 1 ||
+        originalSolNetworks[0].chainId !== '101') {
         return originalSolNetworks;
     }
     // because we didn't have multi-network support in the past,

package/src/utils/getBackwardsCompatibleSolNetworks/getBackwardsCompatibleSolNetworks.js

@@ -4,6 +4,7 @@ import { getOverrideRpcUrlForNetwork } from '../getOverrideRpcUrlForNetwork/getO
 const SOLANA_MAINNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com'],
     chainId: '101',
+    cluster: 'mainnet-beta',
     genesisHash: '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Mainnet',
@@ -21,6 +22,7 @@ const SOLANA_MAINNET_NETWORK = {
 const SOLANA_TESTNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com/?cluster=testnet'],
     chainId: '102',
+    cluster: 'testnet',
     genesisHash: '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Testnet',
@@ -37,6 +39,7 @@ const SOLANA_TESTNET_NETWORK = {
 const SOLANA_DEVNET_NETWORK = {
     blockExplorerUrls: ['https://explorer.solana.com/?cluster=devnet'],
     chainId: '103',
+    cluster: 'devnet',
     genesisHash: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG',
     iconUrls: ['https://app.dynamic.xyz/assets/networks/solana.svg'],
     name: 'Solana Devnet',
@@ -54,7 +57,10 @@ const getBackwardsCompatibleSolNetworks = (originalSolNetworks, connectionConfig
     if (!(originalSolNetworks === null || originalSolNetworks === void 0 ? void 0 : originalSolNetworks.length)) {
         return [];
     }
-    if (originalSolNetworks.length > 1) {
+    // if we have more than one network or if the chainId is not 101,
+    // it means the correct rpc should have already been set in the dashboard
+    if (originalSolNetworks.length > 1 ||
+        originalSolNetworks[0].chainId !== '101') {
         return originalSolNetworks;
     }
     // because we didn't have multi-network support in the past,