@injectivelabs/wallet-evm 1.18.22 → 1.18.24

package/dist/cjs/index.cjs

@@ -117,8 +117,38 @@ function getPhantomFromWindow() {
 }
 
 //#endregion
-//#region src/strategy/utils/metamask.ts
+//#region src/strategy/utils/keplrEvm.ts
 const getWindow$3 = () => typeof window === "undefined" ? {} : window;
+async function getKeplrEvmProvider({ timeout } = { timeout: 3e3 }) {
+	const provider = getKeplrEvmFromWindow();
+	if (provider) return provider;
+	return listenForKeplrEvmInitialized({ timeout });
+}
+async function listenForKeplrEvmInitialized({ timeout } = { timeout: 3e3 }) {
+	return new Promise((resolve) => {
+		const handleInitialization = () => {
+			resolve(getKeplrEvmFromWindow());
+		};
+		const $window = getWindow$3();
+		$window.addEventListener("keplr#initialized", handleInitialization, { once: true });
+		setTimeout(() => {
+			$window.removeEventListener("keplr#initialized", handleInitialization);
+			resolve(null);
+		}, timeout);
+	});
+}
+function getKeplrEvmFromWindow() {
+	var _keplr, _keplr2, _$window$ethereum;
+	const $window = getWindow$3();
+	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof ((_keplr = $window.keplr) === null || _keplr === void 0 ? void 0 : _keplr.ethereum) !== "undefined"))) return;
+	if ((_keplr2 = $window.keplr) === null || _keplr2 === void 0 ? void 0 : _keplr2.ethereum) return $window.keplr.ethereum;
+	if ((_$window$ethereum = $window.ethereum) === null || _$window$ethereum === void 0 ? void 0 : _$window$ethereum.isKeplr) return $window.ethereum;
+	if ($window.providers) return $window.providers.find((p) => p.isKeplr);
+}
+
+//#endregion
+//#region src/strategy/utils/metamask.ts
+const getWindow$2 = () => typeof window === "undefined" ? {} : window;
 async function getMetamaskProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getMetamaskFromWindow();
 	if (provider) return provider;
@@ -129,7 +159,7 @@ async function listenForMetamaskInitialized({ timeout } = { timeout: 3e3 }) {
 		const handleInitialization = () => {
 			resolve(getMetamaskFromWindow());
 		};
-		const $window = getWindow$3();
+		const $window = getWindow$2();
 		$window.addEventListener("ethereum#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("ethereum#initialized", handleInitialization);
@@ -138,7 +168,7 @@ async function listenForMetamaskInitialized({ timeout } = { timeout: 3e3 }) {
 	});
 }
 function getMetamaskFromWindow() {
-	const $window = getWindow$3();
+	const $window = getWindow$2();
 	if (!(typeof window !== "undefined" && typeof $window.ethereum !== "undefined")) return;
 	if ($window.ethereum.isMetaMask) return $window.ethereum;
 	if ($window.providers) return $window.providers.find((p) => p.isMetaMask);
@@ -146,7 +176,7 @@ function getMetamaskFromWindow() {
 
 //#endregion
 //#region src/strategy/utils/trustWallet.ts
-const getWindow$2 = () => typeof window === "undefined" ? {} : window;
+const getWindow$1 = () => typeof window === "undefined" ? {} : window;
 async function getTrustWalletProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getTrustWalletFromWindow();
 	if (provider) return provider;
@@ -157,7 +187,7 @@ async function listenForTrustWalletInitialized({ timeout } = { timeout: 3e3 }) {
 		const handleInitialization = () => {
 			resolve(getTrustWalletFromWindow());
 		};
-		const $window = getWindow$2();
+		const $window = getWindow$1();
 		$window.addEventListener("trustwallet#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("trustwallet#initialized", handleInitialization);
@@ -166,7 +196,7 @@ async function listenForTrustWalletInitialized({ timeout } = { timeout: 3e3 }) {
 	});
 }
 function getTrustWalletFromWindow() {
-	const $window = getWindow$2();
+	const $window = getWindow$1();
 	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof $window.trustWallet !== "undefined"))) return;
 	if ($window.trustWallet) return $window.trustWallet;
 	if ($window.ethereum.isTrustWallet || $window.ethereum.isTrust) return $window.ethereum;
@@ -185,6 +215,7 @@ const getEvmProvider = async (wallet) => {
 		if (wallet === __injectivelabs_wallet_base.Wallet.Phantom) provider = await getPhantomProvider();
 		if (wallet === __injectivelabs_wallet_base.Wallet.TrustWallet) provider = await getTrustWalletProvider();
 		if (wallet === __injectivelabs_wallet_base.Wallet.OkxWallet) provider = await getOkxWalletProvider();
+		if (wallet === __injectivelabs_wallet_base.Wallet.KeplrEvm) provider = await getKeplrEvmProvider();
 		if (!provider) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please install ${(0, __injectivelabs_utils.capitalize)(wallet)} Extension`));
 		return provider;
 	} catch (_unused) {
@@ -195,22 +226,59 @@ 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);
 	if (!provider) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please install ${(0, __injectivelabs_utils.capitalize)(wallet)} Extension`));
+	const chainIdToHex = `0x${chainId.toString(16)}`;
+	const TIMEOUT_MS = 3e4;
 	try {
-		const chainIdToHex = chainId.toString(16);
 		return await Promise.race([provider.request({
 			method: "wallet_switchEthereumChain",
-			params: [{ chainId: `0x${chainIdToHex}` }]
-		}), new Promise((resolve) => provider.on("chainChanged", ({ chain }) => {
-			if ((chain === null || chain === void 0 ? void 0 : chain.id) === chainIdToHex) resolve();
-		}))]);
-	} catch (_unused2) {
+			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);
+		})]);
+	} 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)}`));
+			}
+		}
 		throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please update your ${(0, __injectivelabs_utils.capitalize)(wallet)} network`));
 	}
 };
 
 //#endregion
 //#region src/strategy/utils/rainbow.ts
-const getWindow$1 = () => typeof window === "undefined" ? {} : window;
+const getWindow = () => typeof window === "undefined" ? {} : window;
 async function getRainbowProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getRainbowWalletFromWindow();
 	if (provider) return provider;
@@ -221,7 +289,7 @@ async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3e3 })
 		const handleInitialization = () => {
 			resolve(getRainbowWalletFromWindow());
 		};
-		const $window = getWindow$1();
+		const $window = getWindow();
 		$window.addEventListener("rainbow#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("rainbow#initialized", handleInitialization);
@@ -230,43 +298,13 @@ async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3e3 })
 	});
 }
 function getRainbowWalletFromWindow() {
-	const $window = getWindow$1();
+	const $window = getWindow();
 	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof $window.rainbow !== "undefined"))) return;
 	if ($window.rainbow) return $window.rainbow;
 	if ($window.ethereum.isRainbow) return $window.ethereum;
 	if ($window.providers) return $window.providers.find((p) => p.isRainbow);
 }
 
-//#endregion
-//#region src/strategy/utils/keplrEvm.ts
-const getWindow = () => typeof window === "undefined" ? {} : window;
-async function getKeplrEvmProvider({ timeout } = { timeout: 3e3 }) {
-	const provider = getKeplrEvmFromWindow();
-	if (provider) return provider;
-	return listenForKeplrEvmInitialized({ timeout });
-}
-async function listenForKeplrEvmInitialized({ timeout } = { timeout: 3e3 }) {
-	return new Promise((resolve) => {
-		const handleInitialization = () => {
-			resolve(getKeplrEvmFromWindow());
-		};
-		const $window = getWindow();
-		$window.addEventListener("keplr#initialized", handleInitialization, { once: true });
-		setTimeout(() => {
-			$window.removeEventListener("keplr#initialized", handleInitialization);
-			resolve(null);
-		}, timeout);
-	});
-}
-function getKeplrEvmFromWindow() {
-	var _keplr, _keplr2, _$window$ethereum;
-	const $window = getWindow();
-	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof ((_keplr = $window.keplr) === null || _keplr === void 0 ? void 0 : _keplr.ethereum) !== "undefined"))) return;
-	if ((_keplr2 = $window.keplr) === null || _keplr2 === void 0 ? void 0 : _keplr2.ethereum) return $window.keplr.ethereum;
-	if ((_$window$ethereum = $window.ethereum) === null || _$window$ethereum === void 0 ? void 0 : _$window$ethereum.isKeplr) return $window.ethereum;
-	if ($window.providers) return $window.providers.find((p) => p.isKeplr);
-}
-
 //#endregion
 //#region \0@oxc-project+runtime@0.99.0/helpers/typeof.js
 function _typeof(o) {
@@ -416,7 +454,7 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.SignTransaction
 			});
-			throw new __injectivelabs_exceptions.MetamaskException(new Error(e.message), {
+			throw this.EvmWalletException(new Error(e.message), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.SignTransaction
@@ -509,26 +547,36 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 		};
 		const TIMEOUT_MS = 3e4;
 		try {
-			await Promise.race([ethereum.request({
+			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 }]
-			}), new Promise((resolve, reject) => {
-				const handleChainChanged = (newChainId) => {
+			}).finally(cleanup);
+			const chainChangedWaiter = new Promise((resolve, reject) => {
+				handleChainChanged = (newChainId) => {
 					if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
 						cleanup();
 						resolve();
 					}
 				};
-				const timeoutId = setTimeout(() => {
+				timeoutId = setTimeout(() => {
 					cleanup();
 					reject(/* @__PURE__ */ new Error("Chain switch timed out"));
 				}, TIMEOUT_MS);
-				const cleanup = () => {
-					ethereum.removeListener("chainChanged", handleChainChanged);
-					clearTimeout(timeoutId);
-				};
 				ethereum.on("chainChanged", handleChainChanged);
-			})]);
+			});
+			await Promise.race([switchRequest, chainChangedWaiter]);
 		} 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) {
@@ -536,6 +584,14 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 					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;
 			}
 			if (error.message === "Chain switch timed out") throw this.EvmWalletException(/* @__PURE__ */ new Error("Chain switch timed out"), {

package/dist/esm/index.js

@@ -117,8 +117,38 @@ function getPhantomFromWindow() {
 }
 
 //#endregion
-//#region src/strategy/utils/metamask.ts
+//#region src/strategy/utils/keplrEvm.ts
 const getWindow$3 = () => typeof window === "undefined" ? {} : window;
+async function getKeplrEvmProvider({ timeout } = { timeout: 3e3 }) {
+	const provider = getKeplrEvmFromWindow();
+	if (provider) return provider;
+	return listenForKeplrEvmInitialized({ timeout });
+}
+async function listenForKeplrEvmInitialized({ timeout } = { timeout: 3e3 }) {
+	return new Promise((resolve) => {
+		const handleInitialization = () => {
+			resolve(getKeplrEvmFromWindow());
+		};
+		const $window = getWindow$3();
+		$window.addEventListener("keplr#initialized", handleInitialization, { once: true });
+		setTimeout(() => {
+			$window.removeEventListener("keplr#initialized", handleInitialization);
+			resolve(null);
+		}, timeout);
+	});
+}
+function getKeplrEvmFromWindow() {
+	var _keplr, _keplr2, _$window$ethereum;
+	const $window = getWindow$3();
+	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof ((_keplr = $window.keplr) === null || _keplr === void 0 ? void 0 : _keplr.ethereum) !== "undefined"))) return;
+	if ((_keplr2 = $window.keplr) === null || _keplr2 === void 0 ? void 0 : _keplr2.ethereum) return $window.keplr.ethereum;
+	if ((_$window$ethereum = $window.ethereum) === null || _$window$ethereum === void 0 ? void 0 : _$window$ethereum.isKeplr) return $window.ethereum;
+	if ($window.providers) return $window.providers.find((p) => p.isKeplr);
+}
+
+//#endregion
+//#region src/strategy/utils/metamask.ts
+const getWindow$2 = () => typeof window === "undefined" ? {} : window;
 async function getMetamaskProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getMetamaskFromWindow();
 	if (provider) return provider;
@@ -129,7 +159,7 @@ async function listenForMetamaskInitialized({ timeout } = { timeout: 3e3 }) {
 		const handleInitialization = () => {
 			resolve(getMetamaskFromWindow());
 		};
-		const $window = getWindow$3();
+		const $window = getWindow$2();
 		$window.addEventListener("ethereum#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("ethereum#initialized", handleInitialization);
@@ -138,7 +168,7 @@ async function listenForMetamaskInitialized({ timeout } = { timeout: 3e3 }) {
 	});
 }
 function getMetamaskFromWindow() {
-	const $window = getWindow$3();
+	const $window = getWindow$2();
 	if (!(typeof window !== "undefined" && typeof $window.ethereum !== "undefined")) return;
 	if ($window.ethereum.isMetaMask) return $window.ethereum;
 	if ($window.providers) return $window.providers.find((p) => p.isMetaMask);
@@ -146,7 +176,7 @@ function getMetamaskFromWindow() {
 
 //#endregion
 //#region src/strategy/utils/trustWallet.ts
-const getWindow$2 = () => typeof window === "undefined" ? {} : window;
+const getWindow$1 = () => typeof window === "undefined" ? {} : window;
 async function getTrustWalletProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getTrustWalletFromWindow();
 	if (provider) return provider;
@@ -157,7 +187,7 @@ async function listenForTrustWalletInitialized({ timeout } = { timeout: 3e3 }) {
 		const handleInitialization = () => {
 			resolve(getTrustWalletFromWindow());
 		};
-		const $window = getWindow$2();
+		const $window = getWindow$1();
 		$window.addEventListener("trustwallet#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("trustwallet#initialized", handleInitialization);
@@ -166,7 +196,7 @@ async function listenForTrustWalletInitialized({ timeout } = { timeout: 3e3 }) {
 	});
 }
 function getTrustWalletFromWindow() {
-	const $window = getWindow$2();
+	const $window = getWindow$1();
 	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof $window.trustWallet !== "undefined"))) return;
 	if ($window.trustWallet) return $window.trustWallet;
 	if ($window.ethereum.isTrustWallet || $window.ethereum.isTrust) return $window.ethereum;
@@ -185,6 +215,7 @@ const getEvmProvider = async (wallet) => {
 		if (wallet === Wallet.Phantom) provider = await getPhantomProvider();
 		if (wallet === Wallet.TrustWallet) provider = await getTrustWalletProvider();
 		if (wallet === Wallet.OkxWallet) provider = await getOkxWalletProvider();
+		if (wallet === Wallet.KeplrEvm) provider = await getKeplrEvmProvider();
 		if (!provider) throw new WalletException(/* @__PURE__ */ new Error(`Please install ${capitalize(wallet)} Extension`));
 		return provider;
 	} catch (_unused) {
@@ -195,22 +226,59 @@ 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);
 	if (!provider) throw new WalletException(/* @__PURE__ */ new Error(`Please install ${capitalize(wallet)} Extension`));
+	const chainIdToHex = `0x${chainId.toString(16)}`;
+	const TIMEOUT_MS = 3e4;
 	try {
-		const chainIdToHex = chainId.toString(16);
 		return await Promise.race([provider.request({
 			method: "wallet_switchEthereumChain",
-			params: [{ chainId: `0x${chainIdToHex}` }]
-		}), new Promise((resolve) => provider.on("chainChanged", ({ chain }) => {
-			if ((chain === null || chain === void 0 ? void 0 : chain.id) === chainIdToHex) resolve();
-		}))]);
-	} catch (_unused2) {
+			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);
+		})]);
+	} 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)}`));
+			}
+		}
 		throw new WalletException(/* @__PURE__ */ new Error(`Please update your ${capitalize(wallet)} network`));
 	}
 };
 
 //#endregion
 //#region src/strategy/utils/rainbow.ts
-const getWindow$1 = () => typeof window === "undefined" ? {} : window;
+const getWindow = () => typeof window === "undefined" ? {} : window;
 async function getRainbowProvider({ timeout } = { timeout: 3e3 }) {
 	const provider = getRainbowWalletFromWindow();
 	if (provider) return provider;
@@ -221,7 +289,7 @@ async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3e3 })
 		const handleInitialization = () => {
 			resolve(getRainbowWalletFromWindow());
 		};
-		const $window = getWindow$1();
+		const $window = getWindow();
 		$window.addEventListener("rainbow#initialized", handleInitialization, { once: true });
 		setTimeout(() => {
 			$window.removeEventListener("rainbow#initialized", handleInitialization);
@@ -230,43 +298,13 @@ async function listenForRainbowWalletInitialized({ timeout } = { timeout: 3e3 })
 	});
 }
 function getRainbowWalletFromWindow() {
-	const $window = getWindow$1();
+	const $window = getWindow();
 	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof $window.rainbow !== "undefined"))) return;
 	if ($window.rainbow) return $window.rainbow;
 	if ($window.ethereum.isRainbow) return $window.ethereum;
 	if ($window.providers) return $window.providers.find((p) => p.isRainbow);
 }
 
-//#endregion
-//#region src/strategy/utils/keplrEvm.ts
-const getWindow = () => typeof window === "undefined" ? {} : window;
-async function getKeplrEvmProvider({ timeout } = { timeout: 3e3 }) {
-	const provider = getKeplrEvmFromWindow();
-	if (provider) return provider;
-	return listenForKeplrEvmInitialized({ timeout });
-}
-async function listenForKeplrEvmInitialized({ timeout } = { timeout: 3e3 }) {
-	return new Promise((resolve) => {
-		const handleInitialization = () => {
-			resolve(getKeplrEvmFromWindow());
-		};
-		const $window = getWindow();
-		$window.addEventListener("keplr#initialized", handleInitialization, { once: true });
-		setTimeout(() => {
-			$window.removeEventListener("keplr#initialized", handleInitialization);
-			resolve(null);
-		}, timeout);
-	});
-}
-function getKeplrEvmFromWindow() {
-	var _keplr, _keplr2, _$window$ethereum;
-	const $window = getWindow();
-	if (!(typeof window !== "undefined" && (typeof $window.ethereum !== "undefined" || typeof ((_keplr = $window.keplr) === null || _keplr === void 0 ? void 0 : _keplr.ethereum) !== "undefined"))) return;
-	if ((_keplr2 = $window.keplr) === null || _keplr2 === void 0 ? void 0 : _keplr2.ethereum) return $window.keplr.ethereum;
-	if ((_$window$ethereum = $window.ethereum) === null || _$window$ethereum === void 0 ? void 0 : _$window$ethereum.isKeplr) return $window.ethereum;
-	if ($window.providers) return $window.providers.find((p) => p.isKeplr);
-}
-
 //#endregion
 //#region \0@oxc-project+runtime@0.99.0/helpers/typeof.js
 function _typeof(o) {
@@ -416,7 +454,7 @@ var EvmWallet = class extends BaseConcreteStrategy {
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.SignTransaction
 			});
-			throw new MetamaskException(new Error(e.message), {
+			throw this.EvmWalletException(new Error(e.message), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.SignTransaction
@@ -509,26 +547,36 @@ var EvmWallet = class extends BaseConcreteStrategy {
 		};
 		const TIMEOUT_MS = 3e4;
 		try {
-			await Promise.race([ethereum.request({
+			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 }]
-			}), new Promise((resolve, reject) => {
-				const handleChainChanged = (newChainId) => {
+			}).finally(cleanup);
+			const chainChangedWaiter = new Promise((resolve, reject) => {
+				handleChainChanged = (newChainId) => {
 					if (newChainId.toLowerCase() === chainIdHex.toLowerCase()) {
 						cleanup();
 						resolve();
 					}
 				};
-				const timeoutId = setTimeout(() => {
+				timeoutId = setTimeout(() => {
 					cleanup();
 					reject(/* @__PURE__ */ new Error("Chain switch timed out"));
 				}, TIMEOUT_MS);
-				const cleanup = () => {
-					ethereum.removeListener("chainChanged", handleChainChanged);
-					clearTimeout(timeoutId);
-				};
 				ethereum.on("chainChanged", handleChainChanged);
-			})]);
+			});
+			await Promise.race([switchRequest, chainChangedWaiter]);
 		} 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) {
@@ -536,6 +584,14 @@ var EvmWallet = class extends BaseConcreteStrategy {
 					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;
 			}
 			if (error.message === "Chain switch timed out") throw this.EvmWalletException(/* @__PURE__ */ new Error("Chain switch timed out"), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-evm",
-  "version": "1.18.22",
+  "version": "1.18.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.18.22",
-    "@injectivelabs/sdk-ts": "1.18.22",
-    "@injectivelabs/ts-types": "1.18.22",
-    "@injectivelabs/utils": "1.18.22",
-    "@injectivelabs/wallet-base": "1.18.22"
+    "@injectivelabs/exceptions": "1.18.24",
+    "@injectivelabs/sdk-ts": "1.18.24",
+    "@injectivelabs/ts-types": "1.18.24",
+    "@injectivelabs/utils": "1.18.24",
+    "@injectivelabs/wallet-base": "1.18.24"
   },
   "publishConfig": {
     "access": "public"