@dynamic-labs/solana 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",
-  "version": "4.7.2",
+  "version": "4.8.1",
   "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.7.2",
-    "@dynamic-labs/embedded-wallet-solana": "4.7.2",
-    "@dynamic-labs/logger": "4.7.2",
-    "@dynamic-labs/rpc-providers": "4.7.2",
+    "@dynamic-labs/assert-package-version": "4.8.1",
+    "@dynamic-labs/embedded-wallet-solana": "4.8.1",
+    "@dynamic-labs/logger": "4.8.1",
+    "@dynamic-labs/rpc-providers": "4.8.1",
     "@dynamic-labs/sdk-api-core": "0.0.628",
-    "@dynamic-labs/solana-core": "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/solana-core": "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"
   },
   "peerDependencies": {}
 }

package/src/index.cjs

@@ -20,7 +20,6 @@ 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');
-var fetchCluster = require('./utils/fetchCluster/fetchCluster.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 assertPackageVersion.assertPackageVersion('@dynamic-labs/solana', _package.version);
@@ -42,4 +41,3 @@ exports.isSignedMessage = isSignedMessage.isSignedMessage;
 exports.createSolanaSignerFromWalletStandard = createSolanaSignerFromWalletStandard.createSolanaSignerFromWalletStandard;
 exports.getWalletStandardWallets = getWalletStandardWallets.getWalletStandardWallets;
 exports.hasAllWalletStandardRequiredFeatures = hasAllWalletStandardRequiredFeatures.hasAllWalletStandardRequiredFeatures;
-exports.fetchCluster = fetchCluster.fetchCluster;

package/src/index.d.ts

@@ -7,4 +7,3 @@ export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithCo
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export { isSignedMessage } from './utils/isSignedMessage';
 export { getWalletStandardWallets, createSolanaSignerFromWalletStandard, hasAllWalletStandardRequiredFeatures, } from './injected';
-export { fetchCluster } from './utils/fetchCluster';

package/src/index.js

@@ -16,7 +16,6 @@ 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';
-export { fetchCluster } from './utils/fetchCluster/fetchCluster.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 assertPackageVersion('@dynamic-labs/solana', version);

package/src/injected/InjectedWalletBase/InjectedWalletBase.cjs

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
-var utils = require('@dynamic-labs/utils');
 var solanaCore = require('@dynamic-labs/solana-core');
+var utils = require('@dynamic-labs/utils');
 var SolProviderHelper = require('../../SolProviderHelper/SolProviderHelper.cjs');
 var SignMessageNotSupportedError = require('../../errors/SignMessageNotSupportedError.cjs');
 
@@ -88,7 +88,7 @@ class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });
-                    window.location.assign(deepLink);
+                    utils.PlatformService.openURL(deepLink);
                 }
                 return;
             }

package/src/injected/InjectedWalletBase/InjectedWalletBase.js

@@ -1,8 +1,8 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { PublicKey } from '@solana/web3.js';
-import { isMobile, template } from '@dynamic-labs/utils';
 import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
+import { isMobile, template, PlatformService } from '@dynamic-labs/utils';
 import { SolProviderHelper } from '../../SolProviderHelper/SolProviderHelper.js';
 import { SignMessageNotSupportedError } from '../../errors/SignMessageNotSupportedError.js';
 
@@ -84,7 +84,7 @@ class InjectedWalletBase extends SolanaWalletConnector {
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });
-                    window.location.assign(deepLink);
+                    PlatformService.openURL(deepLink);
                 }
                 return;
             }

package/src/injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs

@@ -6,10 +6,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
 var logger = require('../../../utils/logger.cjs');
-var fetchCluster = require('../../../utils/fetchCluster/fetchCluster.cjs');
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
-const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network, genesisHashesMap, }) => {
+const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, }) => {
     const features = wallet.features;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const connect = (args) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -45,17 +44,21 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
         }
         return account;
     });
-    const getChain = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
-        const rpc = (_d = (_c = network.privateCustomerRpcUrls) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : network.rpcUrls[0];
-        const cluster = yield fetchCluster.fetchCluster(rpc, genesisHashesMap);
+    const getChain = () => {
+        var _a;
+        const currentNetwork = walletConnector.getSelectedNetwork();
+        if (!currentNetwork) {
+            throw new Error('Network not found');
+        }
+        //for SVM netwroks, the cluster name is stored in shortName for now
+        const cluster = (_a = currentNetwork.cluster) !== null && _a !== void 0 ? _a : 'mainnet-beta';
         return `solana:${cluster}`;
-    });
+    };
     const signTransaction = (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const account = yield getCurrentAccount();
         const signTransactionResult = yield features['solana:signTransaction'].signTransaction({
             account,
-            chain: yield getChain(),
+            chain: getChain(),
             transaction: transaction.serialize({
                 requireAllSignatures: false,
             }),
@@ -67,8 +70,8 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
     });
     const signAllTransactions = (transactions) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return Promise.all(transactions.map(signTransaction)); });
     const signAndSendTransaction = (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e;
-        const signAndSendTransactionMethod = (_e = features['solana:signAndSendTransaction']) === null || _e === void 0 ? void 0 : _e.signAndSendTransaction;
+        var _c;
+        const signAndSendTransactionMethod = (_c = features['solana:signAndSendTransaction']) === null || _c === void 0 ? void 0 : _c.signAndSendTransaction;
         if (!signAndSendTransactionMethod) {
             logger.logger.error('signAndSendTransaction - Not implemented');
             throw new Error('signAndSendTransaction - Not implemented by wallet');
@@ -76,15 +79,15 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
         const account = yield getCurrentAccount();
         const signedTransactions = yield signAndSendTransactionMethod({
             account,
-            chain: yield getChain(),
+            chain: getChain(),
             transaction: transaction.serialize(),
         });
         const [{ signature }] = signedTransactions;
         return { signature: new TextDecoder().decode(signature) };
     });
     const signMessage = (message) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f;
-        const signMessageMethod = (_f = features['solana:signMessage']) === null || _f === void 0 ? void 0 : _f.signMessage;
+        var _d;
+        const signMessageMethod = (_d = features['solana:signMessage']) === null || _d === void 0 ? void 0 : _d.signMessage;
         if (!signMessageMethod) {
             logger.logger.error('signMessage - Not implemented');
             throw new Error('signMessage - Not implemented by wallet');
@@ -103,6 +106,7 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
             logger.logger.error('on - Not implemented');
             return;
         }
+        logger.logger.debug(`[SolanaWalletStandardConnector] - on: ${event}`);
         if (event !== 'accountChanged') {
             logger.logger.debug(`on - Not implemented for event: ${event}`);
             return;

package/src/injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.d.ts

@@ -1,12 +1,9 @@
 import { Wallet } from '@wallet-standard/base';
 import { ISolana } from '@dynamic-labs/solana-core';
-import { GenericNetwork } from '@dynamic-labs/types';
 import { InjectedWalletBase } from '../../InjectedWalletBase';
 type CreateSolanaSignerFromWalletStandardProps = {
     wallet: Wallet;
     walletConnector: InjectedWalletBase;
-    network: GenericNetwork;
-    genesisHashesMap?: Record<string, string>;
 };
-export declare const createSolanaSignerFromWalletStandard: ({ wallet, walletConnector, network, genesisHashesMap, }: CreateSolanaSignerFromWalletStandardProps) => ISolana;
+export declare const createSolanaSignerFromWalletStandard: ({ wallet, walletConnector, }: CreateSolanaSignerFromWalletStandardProps) => ISolana;
 export {};

package/src/injected/walletStandard/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js

@@ -2,10 +2,9 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { PublicKey, VersionedTransaction, Transaction } from '@solana/web3.js';
 import { logger } from '../../../utils/logger.js';
-import { fetchCluster } from '../../../utils/fetchCluster/fetchCluster.js';
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
-const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network, genesisHashesMap, }) => {
+const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, }) => {
     const features = wallet.features;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const connect = (args) => __awaiter(void 0, void 0, void 0, function* () {
@@ -41,17 +40,21 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
         }
         return account;
     });
-    const getChain = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
-        const rpc = (_d = (_c = network.privateCustomerRpcUrls) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : network.rpcUrls[0];
-        const cluster = yield fetchCluster(rpc, genesisHashesMap);
+    const getChain = () => {
+        var _a;
+        const currentNetwork = walletConnector.getSelectedNetwork();
+        if (!currentNetwork) {
+            throw new Error('Network not found');
+        }
+        //for SVM netwroks, the cluster name is stored in shortName for now
+        const cluster = (_a = currentNetwork.cluster) !== null && _a !== void 0 ? _a : 'mainnet-beta';
         return `solana:${cluster}`;
-    });
+    };
     const signTransaction = (transaction) => __awaiter(void 0, void 0, void 0, function* () {
         const account = yield getCurrentAccount();
         const signTransactionResult = yield features['solana:signTransaction'].signTransaction({
             account,
-            chain: yield getChain(),
+            chain: getChain(),
             transaction: transaction.serialize({
                 requireAllSignatures: false,
             }),
@@ -63,8 +66,8 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
     });
     const signAllTransactions = (transactions) => __awaiter(void 0, void 0, void 0, function* () { return Promise.all(transactions.map(signTransaction)); });
     const signAndSendTransaction = (transaction) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e;
-        const signAndSendTransactionMethod = (_e = features['solana:signAndSendTransaction']) === null || _e === void 0 ? void 0 : _e.signAndSendTransaction;
+        var _c;
+        const signAndSendTransactionMethod = (_c = features['solana:signAndSendTransaction']) === null || _c === void 0 ? void 0 : _c.signAndSendTransaction;
         if (!signAndSendTransactionMethod) {
             logger.error('signAndSendTransaction - Not implemented');
             throw new Error('signAndSendTransaction - Not implemented by wallet');
@@ -72,15 +75,15 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
         const account = yield getCurrentAccount();
         const signedTransactions = yield signAndSendTransactionMethod({
             account,
-            chain: yield getChain(),
+            chain: getChain(),
             transaction: transaction.serialize(),
         });
         const [{ signature }] = signedTransactions;
         return { signature: new TextDecoder().decode(signature) };
     });
     const signMessage = (message) => __awaiter(void 0, void 0, void 0, function* () {
-        var _f;
-        const signMessageMethod = (_f = features['solana:signMessage']) === null || _f === void 0 ? void 0 : _f.signMessage;
+        var _d;
+        const signMessageMethod = (_d = features['solana:signMessage']) === null || _d === void 0 ? void 0 : _d.signMessage;
         if (!signMessageMethod) {
             logger.error('signMessage - Not implemented');
             throw new Error('signMessage - Not implemented by wallet');
@@ -99,6 +102,7 @@ const createSolanaSignerFromWalletStandard = ({ wallet, walletConnector, network
             logger.error('on - Not implemented');
             return;
         }
+        logger.debug(`[SolanaWalletStandardConnector] - on: ${event}`);
         if (event !== 'accountChanged') {
             logger.debug(`on - Not implemented for event: ${event}`);
             return;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs

@@ -15,7 +15,6 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             this.name = wallet.name;
             this.overrideKey = `${sanitizedName}sol`;
             this._provider = createSolanaSignerFromWalletStandard.createSolanaSignerFromWalletStandard({
-                network: this.solNetworks[0],
                 wallet,
                 walletConnector: this,
             });

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js

@@ -11,7 +11,6 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             this.name = wallet.name;
             this.overrideKey = `${sanitizedName}sol`;
             this._provider = createSolanaSignerFromWalletStandard({
-                network: this.solNetworks[0],
                 wallet,
                 walletConnector: this,
             });

package/src/phantomRedirect/PhantomRedirect/PhantomRedirect.cjs

@@ -13,7 +13,6 @@ var buildUrl = require('../buildUrl/buildUrl.cjs');
 var decryptPayload = require('../decryptPayload/decryptPayload.cjs');
 var encryptPayload = require('../encryptPayload/encryptPayload.cjs');
 var storage = require('../storage/storage.cjs');
-var fetchCluster = require('../../utils/fetchCluster/fetchCluster.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -41,7 +40,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             // Consume the connection type
             const connectionType = utils.StorageService.getItem(utils.PHANTOM_REDIRECT_CONNECTION_TYPE_KEY);
             if (connectionType) {
@@ -61,15 +60,16 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
             const isLocalHost = window.location.href.includes('localhost') ||
                 window.location.href.includes('0.0.0.0') ||
                 window.location.href.includes('127.0.0.1');
-            const rpc = (_b = (_a = this.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : this.solNetworks[0].rpcUrls[0];
+            const currentNetwork = this.getSelectedNetwork();
+            const cluster = (_a = currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.cluster) !== null && _a !== void 0 ? _a : 'mainnet-beta';
             const params = new URLSearchParams({
                 app_url: isLocalHost ? 'https://demo.dynamic.xyz' : window.location.href,
-                cluster: yield fetchCluster.fetchCluster(rpc),
+                cluster,
                 dapp_encryption_public_key: bs58__default["default"].encode(keyPair.publicKey),
                 redirect_link: window.location.href,
             });
             const url = buildUrl.buildUrl('connect', params);
-            window.location.href = url;
+            utils.PlatformService.openURL(url);
         });
     }
     getSession() {
@@ -105,7 +105,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
             });
             const url = buildUrl.buildUrl('signMessage', params);
             storage.storage.method.set('signMessage');
-            window.location.href = url;
+            utils.PlatformService.openURL(url);
             // throwing this to prevent local storage from being cleared.
             // when verifying signature, the SDK calls endSession when no
             // signature is returned. in the case of phantom mobile, a signature
@@ -224,7 +224,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl.buildUrl('signAllTransactions', params);
-                    window.location.href = url;
+                    utils.PlatformService.openURL(url);
                     // actual signatures will be retrieved upon redirect back to dapp
                     return [];
                 }),
@@ -244,7 +244,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
                     });
                     const url = buildUrl.buildUrl('signAndSendTransaction', params);
                     storage.storage.method.set('signAndSendTransaction');
-                    window.location.href = url;
+                    utils.PlatformService.openURL(url);
                     // actual signature will be retrived upon redirect back to dapp
                     return { signature: '' };
                 }),
@@ -262,7 +262,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl.buildUrl('signMessage', params);
-                    window.location.href = url;
+                    utils.PlatformService.openURL(url);
                     // actual signature will be retrived upon redirect back to dapp
                     return { signature: Buffer.from('') };
                 }),
@@ -283,7 +283,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl.buildUrl('signTransaction', params);
-                    window.location.href = url;
+                    utils.PlatformService.openURL(url);
                     return transaction;
                 }),
             };
@@ -315,7 +315,7 @@ class PhantomRedirect extends solanaCore.SolanaWalletConnector {
                 redirect_link: window.location.href,
             });
             const url = buildUrl.buildUrl('disconnect', params);
-            window.location.href = url;
+            utils.PlatformService.openURL(url);
         });
     }
     /**

package/src/phantomRedirect/PhantomRedirect/PhantomRedirect.js

@@ -4,12 +4,11 @@ import { PublicKey, Transaction } from '@solana/web3.js';
 import bs58 from 'bs58';
 import nacl from 'tweetnacl';
 import { SolanaWalletConnector } from '@dynamic-labs/solana-core';
-import { StorageService, PHANTOM_REDIRECT_CONNECTION_TYPE_KEY } from '@dynamic-labs/utils';
+import { StorageService, PHANTOM_REDIRECT_CONNECTION_TYPE_KEY, PlatformService } from '@dynamic-labs/utils';
 import { buildUrl } from '../buildUrl/buildUrl.js';
 import { decryptPayload } from '../decryptPayload/decryptPayload.js';
 import { encryptPayload } from '../encryptPayload/encryptPayload.js';
 import { storage, clearStorage } from '../storage/storage.js';
-import { fetchCluster } from '../../utils/fetchCluster/fetchCluster.js';
 
 class PhantomRedirect extends SolanaWalletConnector {
     constructor(props) {
@@ -32,7 +31,7 @@ class PhantomRedirect extends SolanaWalletConnector {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             // Consume the connection type
             const connectionType = StorageService.getItem(PHANTOM_REDIRECT_CONNECTION_TYPE_KEY);
             if (connectionType) {
@@ -52,15 +51,16 @@ class PhantomRedirect extends SolanaWalletConnector {
             const isLocalHost = window.location.href.includes('localhost') ||
                 window.location.href.includes('0.0.0.0') ||
                 window.location.href.includes('127.0.0.1');
-            const rpc = (_b = (_a = this.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : this.solNetworks[0].rpcUrls[0];
+            const currentNetwork = this.getSelectedNetwork();
+            const cluster = (_a = currentNetwork === null || currentNetwork === void 0 ? void 0 : currentNetwork.cluster) !== null && _a !== void 0 ? _a : 'mainnet-beta';
             const params = new URLSearchParams({
                 app_url: isLocalHost ? 'https://demo.dynamic.xyz' : window.location.href,
-                cluster: yield fetchCluster(rpc),
+                cluster,
                 dapp_encryption_public_key: bs58.encode(keyPair.publicKey),
                 redirect_link: window.location.href,
             });
             const url = buildUrl('connect', params);
-            window.location.href = url;
+            PlatformService.openURL(url);
         });
     }
     getSession() {
@@ -96,7 +96,7 @@ class PhantomRedirect extends SolanaWalletConnector {
             });
             const url = buildUrl('signMessage', params);
             storage.method.set('signMessage');
-            window.location.href = url;
+            PlatformService.openURL(url);
             // throwing this to prevent local storage from being cleared.
             // when verifying signature, the SDK calls endSession when no
             // signature is returned. in the case of phantom mobile, a signature
@@ -215,7 +215,7 @@ class PhantomRedirect extends SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl('signAllTransactions', params);
-                    window.location.href = url;
+                    PlatformService.openURL(url);
                     // actual signatures will be retrieved upon redirect back to dapp
                     return [];
                 }),
@@ -235,7 +235,7 @@ class PhantomRedirect extends SolanaWalletConnector {
                     });
                     const url = buildUrl('signAndSendTransaction', params);
                     storage.method.set('signAndSendTransaction');
-                    window.location.href = url;
+                    PlatformService.openURL(url);
                     // actual signature will be retrived upon redirect back to dapp
                     return { signature: '' };
                 }),
@@ -253,7 +253,7 @@ class PhantomRedirect extends SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl('signMessage', params);
-                    window.location.href = url;
+                    PlatformService.openURL(url);
                     // actual signature will be retrived upon redirect back to dapp
                     return { signature: Buffer.from('') };
                 }),
@@ -274,7 +274,7 @@ class PhantomRedirect extends SolanaWalletConnector {
                         redirect_link: window.location.href,
                     });
                     const url = buildUrl('signTransaction', params);
-                    window.location.href = url;
+                    PlatformService.openURL(url);
                     return transaction;
                 }),
             };
@@ -306,7 +306,7 @@ class PhantomRedirect extends SolanaWalletConnector {
                 redirect_link: window.location.href,
             });
             const url = buildUrl('disconnect', params);
-            window.location.href = url;
+            PlatformService.openURL(url);
         });
     }
     /**

package/src/utils/fetchCluster/fetchCluster.cjs

@@ -1,33 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../_virtual/_tslib.cjs');
-
-const GENESIS_HASHES = {
-    '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY': 'testnet',
-    '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d': 'mainnet-beta',
-    EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG: 'devnet',
-};
-const fetchCluster = (rpc_1, ...args_1) => _tslib.__awaiter(void 0, [rpc_1, ...args_1], void 0, function* (rpc, genesisHashesMap = GENESIS_HASHES) {
-    try {
-        const { result } = yield (yield fetch(rpc, {
-            body: JSON.stringify({
-                id: 1,
-                jsonrpc: '2.0',
-                method: 'getGenesisHash',
-            }),
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            method: 'POST',
-        })).json();
-        return genesisHashesMap[result];
-    }
-    catch (err) {
-        return 'mainnet-beta';
-    }
-});
-
-exports.fetchCluster = fetchCluster;

package/src/utils/fetchCluster/fetchCluster.d.ts

@@ -1 +0,0 @@
-export declare const fetchCluster: (rpc: string, genesisHashesMap?: Record<string, string>) => Promise<string>;

package/src/utils/fetchCluster/fetchCluster.js

@@ -1,29 +0,0 @@
-'use client'
-import { __awaiter } from '../../../_virtual/_tslib.js';
-
-const GENESIS_HASHES = {
-    '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY': 'testnet',
-    '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d': 'mainnet-beta',
-    EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG: 'devnet',
-};
-const fetchCluster = (rpc_1, ...args_1) => __awaiter(void 0, [rpc_1, ...args_1], void 0, function* (rpc, genesisHashesMap = GENESIS_HASHES) {
-    try {
-        const { result } = yield (yield fetch(rpc, {
-            body: JSON.stringify({
-                id: 1,
-                jsonrpc: '2.0',
-                method: 'getGenesisHash',
-            }),
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            method: 'POST',
-        })).json();
-        return genesisHashesMap[result];
-    }
-    catch (err) {
-        return 'mainnet-beta';
-    }
-});
-
-export { fetchCluster };

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

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