@injectivelabs/wallet-evm 1.19.22 → 1.19.24

package/dist/cjs/index.cjs

@@ -222,6 +222,38 @@ const getEvmProvider = async (wallet) => {
 		throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please install ${(0, __injectivelabs_utils.capitalize)(wallet)} Extension`));
 	}
 };
+const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs = 3e4) => {
+	let timeoutId;
+	let handleChainChanged;
+	const cleanup = () => {
+		if (handleChainChanged) {
+			provider.removeListener("chainChanged", handleChainChanged);
+			handleChainChanged = void 0;
+		}
+		if (timeoutId !== void 0) {
+			clearTimeout(timeoutId);
+			timeoutId = void 0;
+		}
+	};
+	const switchRequest = provider.request({
+		method: "wallet_switchEthereumChain",
+		params: [{ chainId: chainIdHex }]
+	}).finally(cleanup);
+	const chainChangedWaiter = new Promise((resolve, reject) => {
+		handleChainChanged = (newChainId) => {
+			if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
+				cleanup();
+				resolve();
+			}
+		};
+		timeoutId = setTimeout(() => {
+			cleanup();
+			reject(/* @__PURE__ */ new Error("Chain switch timed out"));
+		}, timeoutMs);
+		provider.on("chainChanged", handleChainChanged);
+	});
+	await Promise.race([switchRequest, chainChangedWaiter]);
+};
 const updateEvmNetwork = async (wallet, chainId) => {
 	if (!(0, __injectivelabs_wallet_base.isEvmBrowserWallet)(wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Evm Wallet for ${(0, __injectivelabs_utils.capitalize)(wallet)} is not supported.`));
 	const provider = await getEvmProvider(wallet);
@@ -229,50 +261,48 @@ const updateEvmNetwork = async (wallet, chainId) => {
 	const chainIdToHex = `0x${chainId.toString(16)}`;
 	const TIMEOUT_MS = 3e4;
 	try {
-		return await Promise.race([provider.request({
-			method: "wallet_switchEthereumChain",
-			params: [{ chainId: chainIdToHex }]
-		}), new Promise((resolve, reject) => {
-			const handleChainChanged = (newChainId) => {
-				if (newChainId.toLowerCase() === chainIdToHex.toLowerCase()) {
-					cleanup();
-					resolve();
-				}
-			};
-			const timeoutId = setTimeout(() => {
-				cleanup();
-				reject(/* @__PURE__ */ new Error("Chain switch timed out"));
-			}, TIMEOUT_MS);
-			const cleanup = () => {
-				provider.removeListener("chainChanged", handleChainChanged);
-				clearTimeout(timeoutId);
-			};
-			provider.on("chainChanged", handleChainChanged);
-		})]);
+		await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
 	} catch (switchError) {
-		var _switchError$code, _switchError$data;
-		if (((_switchError$code = switchError === null || switchError === void 0 ? void 0 : switchError.code) !== null && _switchError$code !== void 0 ? _switchError$code : switchError === null || switchError === void 0 || (_switchError$data = switchError.data) === null || _switchError$data === void 0 || (_switchError$data = _switchError$data.originalError) === null || _switchError$data === void 0 ? void 0 : _switchError$data.code) === 4902) {
-			const chainConfig = (0, __injectivelabs_wallet_base.getEvmChainConfig)(chainId);
-			try {
-				var _chainConfig$rpcUrls, _chainConfig$blockExp;
-				const rpcUrl = (_chainConfig$rpcUrls = chainConfig.rpcUrls) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.default) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.http) === null || _chainConfig$rpcUrls === void 0 ? void 0 : _chainConfig$rpcUrls[0];
-				const explorerUrl = ((_chainConfig$blockExp = chainConfig.blockExplorers) === null || _chainConfig$blockExp === void 0 || (_chainConfig$blockExp = _chainConfig$blockExp.default) === null || _chainConfig$blockExp === void 0 ? void 0 : _chainConfig$blockExp.url) || void 0;
-				await provider.request({
-					method: "wallet_addEthereumChain",
-					params: [{
-						chainId: chainIdToHex,
-						chainName: chainConfig.name,
-						nativeCurrency: chainConfig.nativeCurrency,
-						rpcUrls: rpcUrl ? [rpcUrl] : [],
-						blockExplorerUrls: explorerUrl ? [explorerUrl] : void 0
-					}]
-				});
-				return;
-			} catch (_unused2) {
-				throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Failed to add ${chainConfig.name} network to ${(0, __injectivelabs_utils.capitalize)(wallet)}`));
-			}
+		var _switchError$code, _switchError$data, _chainConfig$rpcUrls, _chainConfig$blockExp;
+		const rawCode = (_switchError$code = switchError === null || switchError === void 0 ? void 0 : switchError.code) !== null && _switchError$code !== void 0 ? _switchError$code : switchError === null || switchError === void 0 || (_switchError$data = switchError.data) === null || _switchError$data === void 0 || (_switchError$data = _switchError$data.originalError) === null || _switchError$data === void 0 ? void 0 : _switchError$data.code;
+		const parsed = rawCode != null ? Number(rawCode) : NaN;
+		const errorCode = !isNaN(parsed) ? parsed : void 0;
+		if (errorCode === 4001) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(wallet)} chain switch was rejected`));
+		if (switchError.message === "Chain switch timed out") throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error("Chain switch timed out"));
+		if (errorCode !== 4902) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please update your ${(0, __injectivelabs_utils.capitalize)(wallet)} network`));
+		const chainConfig = (0, __injectivelabs_wallet_base.getEvmChainConfig)(chainId);
+		const rpcUrl = (_chainConfig$rpcUrls = chainConfig.rpcUrls) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.default) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.http) === null || _chainConfig$rpcUrls === void 0 ? void 0 : _chainConfig$rpcUrls[0];
+		const explorerUrl = ((_chainConfig$blockExp = chainConfig.blockExplorers) === null || _chainConfig$blockExp === void 0 || (_chainConfig$blockExp = _chainConfig$blockExp.default) === null || _chainConfig$blockExp === void 0 ? void 0 : _chainConfig$blockExp.url) || void 0;
+		try {
+			await provider.request({
+				method: "wallet_addEthereumChain",
+				params: [{
+					chainId: chainIdToHex,
+					chainName: chainConfig.name,
+					nativeCurrency: chainConfig.nativeCurrency,
+					rpcUrls: rpcUrl ? [rpcUrl] : [],
+					blockExplorerUrls: explorerUrl ? [explorerUrl] : []
+				}]
+			});
+		} catch (_unused2) {
+			throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Failed to add ${chainConfig.name} network to ${(0, __injectivelabs_utils.capitalize)(wallet)}`));
+		}
+		let currentChainId;
+		try {
+			currentChainId = await provider.request({ method: "eth_chainId" });
+		} catch (_unused3) {
+			throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Failed to get current chain ID from ${(0, __injectivelabs_utils.capitalize)(wallet)} wallet`));
+		}
+		if (typeof currentChainId !== "string" || !currentChainId.startsWith("0x")) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Invalid chain ID response from ${(0, __injectivelabs_utils.capitalize)(wallet)}: ${String(currentChainId)}`));
+		if (currentChainId.toLowerCase() !== chainIdToHex.toLowerCase()) try {
+			await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
+		} catch (postAddError) {
+			var _postAddError$code, _postAddError$data;
+			const rawCode$1 = (_postAddError$code = postAddError === null || postAddError === void 0 ? void 0 : postAddError.code) !== null && _postAddError$code !== void 0 ? _postAddError$code : postAddError === null || postAddError === void 0 || (_postAddError$data = postAddError.data) === null || _postAddError$data === void 0 || (_postAddError$data = _postAddError$data.originalError) === null || _postAddError$data === void 0 ? void 0 : _postAddError$data.code;
+			const parsed$1 = rawCode$1 != null ? Number(rawCode$1) : NaN;
+			if ((!isNaN(parsed$1) ? parsed$1 : void 0) === 4001) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(wallet)} chain switch after add was rejected`));
+			throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Failed to switch to ${chainConfig.name} network after adding it: ${postAddError.message}`));
 		}
-		throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please update your ${(0, __injectivelabs_utils.capitalize)(wallet)} network`));
 	}
 };
 
@@ -548,63 +578,71 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 		};
 		const TIMEOUT_MS = 3e4;
 		try {
-			let timeoutId;
-			let handleChainChanged;
-			const cleanup = () => {
-				if (handleChainChanged) {
-					ethereum.removeListener("chainChanged", handleChainChanged);
-					handleChainChanged = void 0;
-				}
-				if (timeoutId !== void 0) {
-					clearTimeout(timeoutId);
-					timeoutId = void 0;
-				}
-			};
-			const switchRequest = ethereum.request({
-				method: "wallet_switchEthereumChain",
-				params: [{ chainId: chainIdHex }]
-			}).finally(cleanup);
-			const chainChangedWaiter = new Promise((resolve, reject) => {
-				handleChainChanged = (newChainId) => {
-					if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
-						cleanup();
-						resolve();
-					}
-				};
-				timeoutId = setTimeout(() => {
-					cleanup();
-					reject(/* @__PURE__ */ new Error("Chain switch timed out"));
-				}, TIMEOUT_MS);
-				ethereum.on("chainChanged", handleChainChanged);
-			});
-			await Promise.race([switchRequest, chainChangedWaiter]);
+			await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
 		} catch (error) {
 			var _code, _data;
-			if (((_code = error.code) !== null && _code !== void 0 ? _code : error === null || error === void 0 || (_data = error.data) === null || _data === void 0 || (_data = _data.originalError) === null || _data === void 0 ? void 0 : _data.code) === 4902) {
-				await ethereum.request({
-					method: "wallet_addEthereumChain",
-					params: [params]
-				});
-				try {
-					await ethereum.request({
-						method: "wallet_switchEthereumChain",
-						params: [{ chainId: chainIdHex }]
-					});
-				} catch (switchError) {
-					console.warn(`Failed to switch to chain ${chainIdHex} after adding it:`, switchError);
-				}
-				return;
-			}
+			const rawCode = (_code = error.code) !== null && _code !== void 0 ? _code : error === null || error === void 0 || (_data = error.data) === null || _data === void 0 || (_data = _data.originalError) === null || _data === void 0 ? void 0 : _data.code;
+			const parsed = rawCode != null ? Number(rawCode) : NaN;
+			const errorCode = !isNaN(parsed) ? parsed : void 0;
+			if (errorCode === 4001) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} chain switch was rejected`), {
+				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+				type: __injectivelabs_exceptions.ErrorType.WalletError,
+				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+			});
 			if (error.message === "Chain switch timed out") throw this.EvmWalletException(/* @__PURE__ */ new Error("Chain switch timed out"), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
 			});
-			throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while adding ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} network`), {
+			if (errorCode !== 4902) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while switching ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} network`), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
 			});
+			try {
+				await ethereum.request({
+					method: "wallet_addEthereumChain",
+					params: [params]
+				});
+			} catch (_unused2) {
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while adding ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} network`), {
+					code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+					type: __injectivelabs_exceptions.ErrorType.WalletError,
+					contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+				});
+			}
+			let currentChainId;
+			try {
+				currentChainId = await ethereum.request({ method: "eth_chainId" });
+			} catch (_unused3) {
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Failed to get current chain ID from ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")}`), {
+					code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+					type: __injectivelabs_exceptions.ErrorType.WalletError,
+					contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+				});
+			}
+			if (typeof currentChainId !== "string" || !currentChainId.startsWith("0x")) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Invalid chain ID response from ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")}: ${String(currentChainId)}`), {
+				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+				type: __injectivelabs_exceptions.ErrorType.WalletError,
+				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+			});
+			if (currentChainId.toLowerCase() !== chainIdHex.toLowerCase()) try {
+				await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
+			} catch (postAddError) {
+				var _postAddError$code, _postAddError$data;
+				const postAddRawCode = (_postAddError$code = postAddError === null || postAddError === void 0 ? void 0 : postAddError.code) !== null && _postAddError$code !== void 0 ? _postAddError$code : postAddError === null || postAddError === void 0 || (_postAddError$data = postAddError.data) === null || _postAddError$data === void 0 || (_postAddError$data = _postAddError$data.originalError) === null || _postAddError$data === void 0 ? void 0 : _postAddError$data.code;
+				const postAddParsed = postAddRawCode != null ? Number(postAddRawCode) : NaN;
+				if ((!isNaN(postAddParsed) ? postAddParsed : void 0) === 4001) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} chain switch after add was rejected`), {
+					code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+					type: __injectivelabs_exceptions.ErrorType.WalletError,
+					contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+				});
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Failed to switch to ${chain.name} network after adding it: ${postAddError.message}`), {
+					code: __injectivelabs_exceptions.UnspecifiedErrorCode,
+					type: __injectivelabs_exceptions.ErrorType.WalletError,
+					contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+				});
+			}
 		}
 	}
 	async getEthereum() {
@@ -631,4 +669,5 @@ exports.getPhantomProvider = getPhantomProvider;
 exports.getRabbyProvider = getRabbyProvider;
 exports.getRainbowProvider = getRainbowProvider;
 exports.getTrustWalletProvider = getTrustWalletProvider;
+exports.switchEthereumChainWithTimeout = switchEthereumChainWithTimeout;
 exports.updateEvmNetwork = updateEvmNetwork;

package/dist/cjs/index.d.cts

@@ -6,7 +6,8 @@ import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk
 
 //#region src/utils/index.d.ts
 declare const getEvmProvider: (wallet: Wallet) => Promise<BrowserEip1993Provider>;
-declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<unknown>;
+declare const switchEthereumChainWithTimeout: (provider: BrowserEip1993Provider, chainIdHex: string, timeoutMs?: number) => Promise<void>;
+declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<void>;
 //#endregion
 //#region src/strategy/utils/rabby.d.ts
 declare function getRabbyProvider({
@@ -109,4 +110,4 @@ declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletSt
   private getEthereum;
 }
 //#endregion
-export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, updateEvmNetwork };
+export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, switchEthereumChainWithTimeout, updateEvmNetwork };

package/dist/esm/index.d.ts

@@ -6,7 +6,8 @@ import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk
 
 //#region src/utils/index.d.ts
 declare const getEvmProvider: (wallet: Wallet) => Promise<BrowserEip1993Provider>;
-declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<unknown>;
+declare const switchEthereumChainWithTimeout: (provider: BrowserEip1993Provider, chainIdHex: string, timeoutMs?: number) => Promise<void>;
+declare const updateEvmNetwork: (wallet: Wallet, chainId: EvmChainId) => Promise<void>;
 //#endregion
 //#region src/strategy/utils/rabby.d.ts
 declare function getRabbyProvider({
@@ -109,4 +110,4 @@ declare class EvmWallet extends BaseConcreteStrategy implements ConcreteWalletSt
   private getEthereum;
 }
 //#endregion
-export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, updateEvmNetwork };
+export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, switchEthereumChainWithTimeout, updateEvmNetwork };

package/dist/esm/index.js

@@ -222,6 +222,38 @@ const getEvmProvider = async (wallet) => {
 		throw new WalletException(/* @__PURE__ */ new Error(`Please install ${capitalize(wallet)} Extension`));
 	}
 };
+const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs = 3e4) => {
+	let timeoutId;
+	let handleChainChanged;
+	const cleanup = () => {
+		if (handleChainChanged) {
+			provider.removeListener("chainChanged", handleChainChanged);
+			handleChainChanged = void 0;
+		}
+		if (timeoutId !== void 0) {
+			clearTimeout(timeoutId);
+			timeoutId = void 0;
+		}
+	};
+	const switchRequest = provider.request({
+		method: "wallet_switchEthereumChain",
+		params: [{ chainId: chainIdHex }]
+	}).finally(cleanup);
+	const chainChangedWaiter = new Promise((resolve, reject) => {
+		handleChainChanged = (newChainId) => {
+			if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
+				cleanup();
+				resolve();
+			}
+		};
+		timeoutId = setTimeout(() => {
+			cleanup();
+			reject(/* @__PURE__ */ new Error("Chain switch timed out"));
+		}, timeoutMs);
+		provider.on("chainChanged", handleChainChanged);
+	});
+	await Promise.race([switchRequest, chainChangedWaiter]);
+};
 const updateEvmNetwork = async (wallet, chainId) => {
 	if (!isEvmBrowserWallet(wallet)) throw new WalletException(/* @__PURE__ */ new Error(`Evm Wallet for ${capitalize(wallet)} is not supported.`));
 	const provider = await getEvmProvider(wallet);
@@ -229,50 +261,48 @@ const updateEvmNetwork = async (wallet, chainId) => {
 	const chainIdToHex = `0x${chainId.toString(16)}`;
 	const TIMEOUT_MS = 3e4;
 	try {
-		return await Promise.race([provider.request({
-			method: "wallet_switchEthereumChain",
-			params: [{ chainId: chainIdToHex }]
-		}), new Promise((resolve, reject) => {
-			const handleChainChanged = (newChainId) => {
-				if (newChainId.toLowerCase() === chainIdToHex.toLowerCase()) {
-					cleanup();
-					resolve();
-				}
-			};
-			const timeoutId = setTimeout(() => {
-				cleanup();
-				reject(/* @__PURE__ */ new Error("Chain switch timed out"));
-			}, TIMEOUT_MS);
-			const cleanup = () => {
-				provider.removeListener("chainChanged", handleChainChanged);
-				clearTimeout(timeoutId);
-			};
-			provider.on("chainChanged", handleChainChanged);
-		})]);
+		await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
 	} catch (switchError) {
-		var _switchError$code, _switchError$data;
-		if (((_switchError$code = switchError === null || switchError === void 0 ? void 0 : switchError.code) !== null && _switchError$code !== void 0 ? _switchError$code : switchError === null || switchError === void 0 || (_switchError$data = switchError.data) === null || _switchError$data === void 0 || (_switchError$data = _switchError$data.originalError) === null || _switchError$data === void 0 ? void 0 : _switchError$data.code) === 4902) {
-			const chainConfig = getEvmChainConfig(chainId);
-			try {
-				var _chainConfig$rpcUrls, _chainConfig$blockExp;
-				const rpcUrl = (_chainConfig$rpcUrls = chainConfig.rpcUrls) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.default) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.http) === null || _chainConfig$rpcUrls === void 0 ? void 0 : _chainConfig$rpcUrls[0];
-				const explorerUrl = ((_chainConfig$blockExp = chainConfig.blockExplorers) === null || _chainConfig$blockExp === void 0 || (_chainConfig$blockExp = _chainConfig$blockExp.default) === null || _chainConfig$blockExp === void 0 ? void 0 : _chainConfig$blockExp.url) || void 0;
-				await provider.request({
-					method: "wallet_addEthereumChain",
-					params: [{
-						chainId: chainIdToHex,
-						chainName: chainConfig.name,
-						nativeCurrency: chainConfig.nativeCurrency,
-						rpcUrls: rpcUrl ? [rpcUrl] : [],
-						blockExplorerUrls: explorerUrl ? [explorerUrl] : void 0
-					}]
-				});
-				return;
-			} catch (_unused2) {
-				throw new WalletException(/* @__PURE__ */ new Error(`Failed to add ${chainConfig.name} network to ${capitalize(wallet)}`));
-			}
+		var _switchError$code, _switchError$data, _chainConfig$rpcUrls, _chainConfig$blockExp;
+		const rawCode = (_switchError$code = switchError === null || switchError === void 0 ? void 0 : switchError.code) !== null && _switchError$code !== void 0 ? _switchError$code : switchError === null || switchError === void 0 || (_switchError$data = switchError.data) === null || _switchError$data === void 0 || (_switchError$data = _switchError$data.originalError) === null || _switchError$data === void 0 ? void 0 : _switchError$data.code;
+		const parsed = rawCode != null ? Number(rawCode) : NaN;
+		const errorCode = !isNaN(parsed) ? parsed : void 0;
+		if (errorCode === 4001) throw new WalletException(/* @__PURE__ */ new Error(`${capitalize(wallet)} chain switch was rejected`));
+		if (switchError.message === "Chain switch timed out") throw new WalletException(/* @__PURE__ */ new Error("Chain switch timed out"));
+		if (errorCode !== 4902) throw new WalletException(/* @__PURE__ */ new Error(`Please update your ${capitalize(wallet)} network`));
+		const chainConfig = getEvmChainConfig(chainId);
+		const rpcUrl = (_chainConfig$rpcUrls = chainConfig.rpcUrls) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.default) === null || _chainConfig$rpcUrls === void 0 || (_chainConfig$rpcUrls = _chainConfig$rpcUrls.http) === null || _chainConfig$rpcUrls === void 0 ? void 0 : _chainConfig$rpcUrls[0];
+		const explorerUrl = ((_chainConfig$blockExp = chainConfig.blockExplorers) === null || _chainConfig$blockExp === void 0 || (_chainConfig$blockExp = _chainConfig$blockExp.default) === null || _chainConfig$blockExp === void 0 ? void 0 : _chainConfig$blockExp.url) || void 0;
+		try {
+			await provider.request({
+				method: "wallet_addEthereumChain",
+				params: [{
+					chainId: chainIdToHex,
+					chainName: chainConfig.name,
+					nativeCurrency: chainConfig.nativeCurrency,
+					rpcUrls: rpcUrl ? [rpcUrl] : [],
+					blockExplorerUrls: explorerUrl ? [explorerUrl] : []
+				}]
+			});
+		} catch (_unused2) {
+			throw new WalletException(/* @__PURE__ */ new Error(`Failed to add ${chainConfig.name} network to ${capitalize(wallet)}`));
+		}
+		let currentChainId;
+		try {
+			currentChainId = await provider.request({ method: "eth_chainId" });
+		} catch (_unused3) {
+			throw new WalletException(/* @__PURE__ */ new Error(`Failed to get current chain ID from ${capitalize(wallet)} wallet`));
+		}
+		if (typeof currentChainId !== "string" || !currentChainId.startsWith("0x")) throw new WalletException(/* @__PURE__ */ new Error(`Invalid chain ID response from ${capitalize(wallet)}: ${String(currentChainId)}`));
+		if (currentChainId.toLowerCase() !== chainIdToHex.toLowerCase()) try {
+			await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
+		} catch (postAddError) {
+			var _postAddError$code, _postAddError$data;
+			const rawCode$1 = (_postAddError$code = postAddError === null || postAddError === void 0 ? void 0 : postAddError.code) !== null && _postAddError$code !== void 0 ? _postAddError$code : postAddError === null || postAddError === void 0 || (_postAddError$data = postAddError.data) === null || _postAddError$data === void 0 || (_postAddError$data = _postAddError$data.originalError) === null || _postAddError$data === void 0 ? void 0 : _postAddError$data.code;
+			const parsed$1 = rawCode$1 != null ? Number(rawCode$1) : NaN;
+			if ((!isNaN(parsed$1) ? parsed$1 : void 0) === 4001) throw new WalletException(/* @__PURE__ */ new Error(`${capitalize(wallet)} chain switch after add was rejected`));
+			throw new WalletException(/* @__PURE__ */ new Error(`Failed to switch to ${chainConfig.name} network after adding it: ${postAddError.message}`));
 		}
-		throw new WalletException(/* @__PURE__ */ new Error(`Please update your ${capitalize(wallet)} network`));
 	}
 };
 
@@ -548,63 +578,71 @@ var EvmWallet = class extends BaseConcreteStrategy {
 		};
 		const TIMEOUT_MS = 3e4;
 		try {
-			let timeoutId;
-			let handleChainChanged;
-			const cleanup = () => {
-				if (handleChainChanged) {
-					ethereum.removeListener("chainChanged", handleChainChanged);
-					handleChainChanged = void 0;
-				}
-				if (timeoutId !== void 0) {
-					clearTimeout(timeoutId);
-					timeoutId = void 0;
-				}
-			};
-			const switchRequest = ethereum.request({
-				method: "wallet_switchEthereumChain",
-				params: [{ chainId: chainIdHex }]
-			}).finally(cleanup);
-			const chainChangedWaiter = new Promise((resolve, reject) => {
-				handleChainChanged = (newChainId) => {
-					if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
-						cleanup();
-						resolve();
-					}
-				};
-				timeoutId = setTimeout(() => {
-					cleanup();
-					reject(/* @__PURE__ */ new Error("Chain switch timed out"));
-				}, TIMEOUT_MS);
-				ethereum.on("chainChanged", handleChainChanged);
-			});
-			await Promise.race([switchRequest, chainChangedWaiter]);
+			await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
 		} catch (error) {
 			var _code, _data;
-			if (((_code = error.code) !== null && _code !== void 0 ? _code : error === null || error === void 0 || (_data = error.data) === null || _data === void 0 || (_data = _data.originalError) === null || _data === void 0 ? void 0 : _data.code) === 4902) {
-				await ethereum.request({
-					method: "wallet_addEthereumChain",
-					params: [params]
-				});
-				try {
-					await ethereum.request({
-						method: "wallet_switchEthereumChain",
-						params: [{ chainId: chainIdHex }]
-					});
-				} catch (switchError) {
-					console.warn(`Failed to switch to chain ${chainIdHex} after adding it:`, switchError);
-				}
-				return;
-			}
+			const rawCode = (_code = error.code) !== null && _code !== void 0 ? _code : error === null || error === void 0 || (_data = error.data) === null || _data === void 0 || (_data = _data.originalError) === null || _data === void 0 ? void 0 : _data.code;
+			const parsed = rawCode != null ? Number(rawCode) : NaN;
+			const errorCode = !isNaN(parsed) ? parsed : void 0;
+			if (errorCode === 4001) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${capitalize(this.wallet || "wallet")} chain switch was rejected`), {
+				code: UnspecifiedErrorCode,
+				type: ErrorType.WalletError,
+				contextModule: WalletAction.GetChainId
+			});
 			if (error.message === "Chain switch timed out") throw this.EvmWalletException(/* @__PURE__ */ new Error("Chain switch timed out"), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetChainId
 			});
-			throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while adding ${capitalize(this.wallet || "wallet")} network`), {
+			if (errorCode !== 4902) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while switching ${capitalize(this.wallet || "wallet")} network`), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetChainId
 			});
+			try {
+				await ethereum.request({
+					method: "wallet_addEthereumChain",
+					params: [params]
+				});
+			} catch (_unused2) {
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while adding ${capitalize(this.wallet || "wallet")} network`), {
+					code: UnspecifiedErrorCode,
+					type: ErrorType.WalletError,
+					contextModule: WalletAction.GetChainId
+				});
+			}
+			let currentChainId;
+			try {
+				currentChainId = await ethereum.request({ method: "eth_chainId" });
+			} catch (_unused3) {
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Failed to get current chain ID from ${capitalize(this.wallet || "wallet")}`), {
+					code: UnspecifiedErrorCode,
+					type: ErrorType.WalletError,
+					contextModule: WalletAction.GetChainId
+				});
+			}
+			if (typeof currentChainId !== "string" || !currentChainId.startsWith("0x")) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Invalid chain ID response from ${capitalize(this.wallet || "wallet")}: ${String(currentChainId)}`), {
+				code: UnspecifiedErrorCode,
+				type: ErrorType.WalletError,
+				contextModule: WalletAction.GetChainId
+			});
+			if (currentChainId.toLowerCase() !== chainIdHex.toLowerCase()) try {
+				await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
+			} catch (postAddError) {
+				var _postAddError$code, _postAddError$data;
+				const postAddRawCode = (_postAddError$code = postAddError === null || postAddError === void 0 ? void 0 : postAddError.code) !== null && _postAddError$code !== void 0 ? _postAddError$code : postAddError === null || postAddError === void 0 || (_postAddError$data = postAddError.data) === null || _postAddError$data === void 0 || (_postAddError$data = _postAddError$data.originalError) === null || _postAddError$data === void 0 ? void 0 : _postAddError$data.code;
+				const postAddParsed = postAddRawCode != null ? Number(postAddRawCode) : NaN;
+				if ((!isNaN(postAddParsed) ? postAddParsed : void 0) === 4001) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${capitalize(this.wallet || "wallet")} chain switch after add was rejected`), {
+					code: UnspecifiedErrorCode,
+					type: ErrorType.WalletError,
+					contextModule: WalletAction.GetChainId
+				});
+				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Failed to switch to ${chain.name} network after adding it: ${postAddError.message}`), {
+					code: UnspecifiedErrorCode,
+					type: ErrorType.WalletError,
+					contextModule: WalletAction.GetChainId
+				});
+			}
 		}
 	}
 	async getEthereum() {
@@ -621,4 +659,4 @@ var EvmWallet = class extends BaseConcreteStrategy {
 };
 
 //#endregion
-export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, updateEvmNetwork };
+export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, switchEthereumChainWithTimeout, updateEvmNetwork };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-evm",
-  "version": "1.19.22",
+  "version": "1.19.24",
   "description": "EVM wallet strategies for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
@@ -42,11 +42,11 @@
     "dist"
   ],
   "dependencies": {
-    "@injectivelabs/exceptions": "1.19.22",
-    "@injectivelabs/ts-types": "1.19.22",
-    "@injectivelabs/utils": "1.19.22",
-    "@injectivelabs/wallet-base": "1.19.22",
-    "@injectivelabs/sdk-ts": "1.19.22"
+    "@injectivelabs/exceptions": "1.19.24",
+    "@injectivelabs/sdk-ts": "1.19.24",
+    "@injectivelabs/ts-types": "1.19.24",
+    "@injectivelabs/utils": "1.19.24",
+    "@injectivelabs/wallet-base": "1.19.24"
   },
   "publishConfig": {
     "access": "public"