@dynamic-labs/embedded-wallet-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,11 +3,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.7.2";
+var version = "4.8.1";
 var dependencies = {
-	"@dynamic-labs/utils": "4.7.2",
-	"@dynamic-labs/logger": "4.7.2",
-	"@dynamic-labs/types": "4.7.2",
+	"@dynamic-labs/utils": "4.8.1",
+	"@dynamic-labs/logger": "4.8.1",
+	"@dynamic-labs/types": "4.8.1",
 	"@dynamic-labs/sdk-api-core": "0.0.628",
 	eventemitter3: "5.0.1",
 	"@solana/web3.js": "1.92.1",

package/package.js

@@ -1,9 +1,9 @@
 'use client'
-var version = "4.7.2";
+var version = "4.8.1";
 var dependencies = {
-	"@dynamic-labs/utils": "4.7.2",
-	"@dynamic-labs/logger": "4.7.2",
-	"@dynamic-labs/types": "4.7.2",
+	"@dynamic-labs/utils": "4.8.1",
+	"@dynamic-labs/logger": "4.8.1",
+	"@dynamic-labs/types": "4.8.1",
 	"@dynamic-labs/sdk-api-core": "0.0.628",
 	eventemitter3: "5.0.1",
 	"@solana/web3.js": "1.92.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/embedded-wallet-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",
@@ -18,22 +18,22 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/utils": "4.7.2",
-    "@dynamic-labs/logger": "4.7.2",
-    "@dynamic-labs/types": "4.7.2",
+    "@dynamic-labs/utils": "4.8.1",
+    "@dynamic-labs/logger": "4.8.1",
+    "@dynamic-labs/types": "4.8.1",
     "@dynamic-labs/sdk-api-core": "0.0.628",
     "eventemitter3": "5.0.1",
     "@solana/web3.js": "1.92.1",
     "@turnkey/iframe-stamper": "2.0.0",
     "@turnkey/solana": "1.0.1",
     "@turnkey/webauthn-stamper": "0.5.0",
-    "@dynamic-labs/assert-package-version": "4.7.2",
-    "@dynamic-labs/embedded-wallet": "4.7.2",
-    "@dynamic-labs/rpc-providers": "4.7.2",
-    "@dynamic-labs/solana-core": "4.7.2",
-    "@dynamic-labs/wallet-book": "4.7.2",
-    "@dynamic-labs/wallet-connector-core": "4.7.2",
-    "@dynamic-labs/webauthn": "4.7.2",
+    "@dynamic-labs/assert-package-version": "4.8.1",
+    "@dynamic-labs/embedded-wallet": "4.8.1",
+    "@dynamic-labs/rpc-providers": "4.8.1",
+    "@dynamic-labs/solana-core": "4.8.1",
+    "@dynamic-labs/wallet-book": "4.8.1",
+    "@dynamic-labs/wallet-connector-core": "4.8.1",
+    "@dynamic-labs/webauthn": "4.8.1",
     "react-dom": "18.2.0",
     "viem": "2.21.57"
   },

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.cjs

@@ -45,61 +45,97 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
         this.solNetworks = solanaCore.getBackwardsCompatibleSolNetworks(props.solNetworks, props.connectionConfig);
         this.walletUiUtils = props.walletUiUtils;
         this._turnkeyAccount = undefined;
-        this._connectionClient = undefined;
         this.connectionConfig = props.connectionConfig;
         this.chainRpcProviders = props.chainRpcProviders;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
         this.__turnkeyClient = this.getTurnkeyClient();
     }
     getRpcUrl() {
-        const [network] = this.solNetworks;
+        const network = this.getSelectedNetwork();
         if (!network) {
             throw new utils.DynamicError('No enabled networks');
         }
         return solanaCore.getOverrideRpcUrlForNetwork(this.connectionConfig, network);
     }
     getConnection(commitmentOrConfig) {
-        if (!this._connectionClient) {
-            const rpcUrl = this.getRpcUrl();
-            if (!rpcUrl)
-                throw new utils.DynamicError('No rpcUrl');
-            const config = typeof commitmentOrConfig === 'string'
-                ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
-            this._connectionClient = createSolanaConnection.createSolanaConnection(rpcUrl, config);
-        }
-        return this._connectionClient;
+        const rpcUrl = this.getRpcUrl();
+        if (!rpcUrl)
+            throw new utils.DynamicError('No rpcUrl');
+        const config = typeof commitmentOrConfig === 'string'
+            ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
+        return createSolanaConnection.createSolanaConnection(rpcUrl, config);
     }
     getWalletClient() {
         return this.getConnection();
     }
+    getNetworkId() {
+        var _a;
+        const defaultChainId = (_a = this.solNetworks[0]) === null || _a === void 0 ? void 0 : _a.networkId.toString();
+        const storedChainId = localStorage.getItem(solanaCore.DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        return storedChainId !== null && storedChainId !== void 0 ? storedChainId : defaultChainId;
+    }
+    setNetworkId(networkId) {
+        if (!networkId) {
+            localStorage.removeItem(solanaCore.DYNAMIC_SVM_NETWORK_ID_LS_KEY);
+        }
+        else {
+            localStorage.setItem(solanaCore.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 connection = this.getConnection();
-            let genesisHash = localStorage.getItem(solanaCore.getGenesisHashLSKey(connection.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield connection.getGenesisHash();
-                localStorage.setItem(solanaCore.getGenesisHashLSKey(connection.rpcEndpoint), genesisHash);
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return '';
+            }
+            const { networkId, genesisHash } = network;
+            if (returnDynamicNetworkId) {
+                return networkId.toString();
             }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            // 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 });
         });
     }
     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,
@@ -109,11 +145,11 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             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;
         });
     }
     supportsNetworkSwitching() {
-        return false;
+        return true;
     }
     setVerifiedCredentials(verifiedCredentials) {
         const turnkeyVerifiedCredentials = embeddedWallet.findTurnkeyVerifiedCredentials(verifiedCredentials, solanaCore.ProviderChain.SOLANA);
@@ -147,7 +183,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(solanaCore.getGenesisHashLSKey(this.getRpcUrl()));
+            this.setNetworkId(null);
         });
     }
     refreshTurnkeyAccount() {
@@ -452,6 +488,15 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             return optimizedTransaction;
         });
     }
+    getBlockExplorerUrlsForCurrentNetwork() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return [];
+            }
+            return network.blockExplorerUrls;
+        });
+    }
     getEnabledNetworks() {
         return this.solNetworks;
     }

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.d.ts

@@ -3,7 +3,7 @@ import { GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/typ
 import { Chain, ISendBalanceWalletConnector, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
-import { IChainRpcProviders, SolanaWallet } from '@dynamic-labs/solana-core';
+import { IChainRpcProviders, SolanaWallet, SwitchNetworkOps } from '@dynamic-labs/solana-core';
 import { TurnkeyWalletConnectorBase, TurnkeyWalletConnectorNameAndKey } from '@dynamic-labs/embedded-wallet';
 import { TurnkeySolanaSigner } from './TurnkeySolanaSigner';
 type SendTransactionOptions = ConfirmOptions & {
@@ -25,17 +25,20 @@ export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnector
     verifiedCredentialChain: string;
     private walletUiUtils;
     private _turnkeyAccount;
-    private _connectionClient;
     private connectionConfig;
     constructor(nameAndKey: TurnkeyWalletConnectorNameAndKey, props: TurnkeySolanaConnectorProps);
     getRpcUrl(): string;
     getConnection(commitmentOrConfig?: Commitment | ConnectionConfig): Connection;
     getWalletClient(): Connection;
+    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>;
     getPublicClient(): Promise<Connection | undefined>;
     supportsNetworkSwitching(): boolean;
     setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;
@@ -60,6 +63,7 @@ export declare class TurnkeySolanaWalletConnector extends TurnkeyWalletConnector
     sendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, connection: Connection, options?: SendTransactionOptions): Promise<string>;
     private lamportsToSol;
     private optimizeTransaction;
+    getBlockExplorerUrlsForCurrentNetwork(): Promise<string[]>;
     getEnabledNetworks(): GenericNetwork[];
 }
 export {};

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.js

@@ -6,7 +6,7 @@ import { TurnkeySigner } from '@turnkey/solana';
 import { IframeStamper } from '@turnkey/iframe-stamper';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, bufferToBase64 } from '@dynamic-labs/utils';
-import { SolanaWallet, getBackwardsCompatibleSolNetworks, getOverrideRpcUrlForNetwork, ProviderChain, getGenesisHashLSKey, SolanaUiTransaction, isTxAlreadySigned } from '@dynamic-labs/solana-core';
+import { SolanaWallet, getBackwardsCompatibleSolNetworks, getOverrideRpcUrlForNetwork, DYNAMIC_SVM_NETWORK_ID_LS_KEY, ProviderChain, SolanaUiTransaction, isTxAlreadySigned } from '@dynamic-labs/solana-core';
 import { TurnkeyWalletConnectorBase, findTurnkeyVerifiedCredentials, TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS, logger } from '@dynamic-labs/embedded-wallet';
 import { createSolanaConnection } from '../utils/createSolanaConnection/createSolanaConnection.js';
 import { optimizeSolanaTransaction } from '../utils/api/api.js';
@@ -41,61 +41,97 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
         this.solNetworks = getBackwardsCompatibleSolNetworks(props.solNetworks, props.connectionConfig);
         this.walletUiUtils = props.walletUiUtils;
         this._turnkeyAccount = undefined;
-        this._connectionClient = undefined;
         this.connectionConfig = props.connectionConfig;
         this.chainRpcProviders = props.chainRpcProviders;
         (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders(this.connectionConfig);
         this.__turnkeyClient = this.getTurnkeyClient();
     }
     getRpcUrl() {
-        const [network] = this.solNetworks;
+        const network = this.getSelectedNetwork();
         if (!network) {
             throw new DynamicError('No enabled networks');
         }
         return getOverrideRpcUrlForNetwork(this.connectionConfig, network);
     }
     getConnection(commitmentOrConfig) {
-        if (!this._connectionClient) {
-            const rpcUrl = this.getRpcUrl();
-            if (!rpcUrl)
-                throw new DynamicError('No rpcUrl');
-            const config = typeof commitmentOrConfig === 'string'
-                ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
-            this._connectionClient = createSolanaConnection(rpcUrl, config);
-        }
-        return this._connectionClient;
+        const rpcUrl = this.getRpcUrl();
+        if (!rpcUrl)
+            throw new DynamicError('No rpcUrl');
+        const config = typeof commitmentOrConfig === 'string'
+            ? Object.assign(Object.assign({}, this.connectionConfig), { commitment: commitmentOrConfig }) : Object.assign(Object.assign({}, this.connectionConfig), commitmentOrConfig);
+        return createSolanaConnection(rpcUrl, config);
     }
     getWalletClient() {
         return this.getConnection();
     }
+    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 connection = this.getConnection();
-            let genesisHash = localStorage.getItem(getGenesisHashLSKey(connection.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield connection.getGenesisHash();
-                localStorage.setItem(getGenesisHashLSKey(connection.rpcEndpoint), genesisHash);
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return '';
+            }
+            const { networkId, genesisHash } = network;
+            if (returnDynamicNetworkId) {
+                return networkId.toString();
             }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+            // 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 });
         });
     }
     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,
@@ -105,11 +141,11 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             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;
         });
     }
     supportsNetworkSwitching() {
-        return false;
+        return true;
     }
     setVerifiedCredentials(verifiedCredentials) {
         const turnkeyVerifiedCredentials = findTurnkeyVerifiedCredentials(verifiedCredentials, ProviderChain.SOLANA);
@@ -143,7 +179,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(getGenesisHashLSKey(this.getRpcUrl()));
+            this.setNetworkId(null);
         });
     }
     refreshTurnkeyAccount() {
@@ -448,6 +484,15 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             return optimizedTransaction;
         });
     }
+    getBlockExplorerUrlsForCurrentNetwork() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const network = this.getSelectedNetwork();
+            if (!network) {
+                return [];
+            }
+            return network.blockExplorerUrls;
+        });
+    }
     getEnabledNetworks() {
         return this.solNetworks;
     }