@injectivelabs/wallet-evm 1.20.2 → 1.20.4

package/dist/cjs/index.cjs

@@ -222,6 +222,14 @@ const getEvmProvider = async (wallet) => {
 		throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`Please install ${(0, __injectivelabs_utils.capitalize)(wallet)} Extension`));
 	}
 };
+const extractNormalizedErrorCode = (error) => {
+	var _normalizedError$data;
+	const normalizedError = error && typeof error === "object" ? error : void 0;
+	const code = normalizedError === null || normalizedError === void 0 ? void 0 : normalizedError.code;
+	const originalCode = normalizedError === null || normalizedError === void 0 || (_normalizedError$data = normalizedError.data) === null || _normalizedError$data === void 0 || (_normalizedError$data = _normalizedError$data.originalError) === null || _normalizedError$data === void 0 ? void 0 : _normalizedError$data.code;
+	const rawCode = (code != null ? Number(code) : void 0) === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.InternalError || code === void 0 || code === null ? originalCode !== null && originalCode !== void 0 ? originalCode : code : code;
+	return rawCode != null ? Number(rawCode) : NaN;
+};
 const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs = 3e4) => {
 	let timeoutId;
 	let handleChainChanged;
@@ -254,22 +262,20 @@ const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs =
 	});
 	await Promise.race([switchRequest, chainChangedWaiter]);
 };
-const updateEvmNetwork = async (wallet, chainId) => {
+const updateEvmNetwork = async (wallet, chainId, providerOverride) => {
 	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);
+	const provider = providerOverride || 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 {
 		await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
 	} catch (switchError) {
-		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`));
+		var _chainConfig$rpcUrls, _chainConfig$blockExp;
+		const errorCode = extractNormalizedErrorCode(switchError);
+		if (errorCode === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) 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`));
+		if (errorCode !== __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UnrecognizedChain) 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;
@@ -284,23 +290,25 @@ const updateEvmNetwork = async (wallet, chainId) => {
 					blockExplorerUrls: explorerUrl ? [explorerUrl] : []
 				}]
 			});
-		} catch (_unused2) {
+		} catch (addError) {
+			if (extractNormalizedErrorCode(addError) === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(wallet)} add chain was rejected`), {
+				code: __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest,
+				type: __injectivelabs_exceptions.ErrorType.WalletError,
+				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
+			});
 			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) {
+		} catch (_unused2) {
 			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`));
+			if (extractNormalizedErrorCode(postAddError) === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) 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}`));
 		}
 	}
@@ -580,11 +588,8 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 		try {
 			await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
 		} catch (error) {
-			var _code, _data;
-			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`), {
+			const errorCode = extractNormalizedErrorCode(error);
+			if (errorCode === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) 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
@@ -594,7 +599,7 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.GetChainId
 			});
-			if (errorCode !== 4902) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while switching ${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} network`), {
+			if (errorCode !== __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UnrecognizedChain) 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
@@ -604,7 +609,12 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 					method: "wallet_addEthereumChain",
 					params: [params]
 				});
-			} catch (_unused2) {
+			} catch (addError) {
+				if (extractNormalizedErrorCode(addError) === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${(0, __injectivelabs_utils.capitalize)(this.wallet || "wallet")} add chain was rejected`), {
+					code: __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest,
+					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`), {
 					code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 					type: __injectivelabs_exceptions.ErrorType.WalletError,
@@ -614,7 +624,7 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 			let currentChainId;
 			try {
 				currentChainId = await ethereum.request({ method: "eth_chainId" });
-			} catch (_unused3) {
+			} catch (_unused2) {
 				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,
@@ -629,10 +639,7 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 			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`), {
+				if (extractNormalizedErrorCode(postAddError) === __injectivelabs_wallet_base.EvmWalletProviderErrorCode.UserRejectedRequest) 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
@@ -660,6 +667,7 @@ var EvmWallet = class extends __injectivelabs_wallet_base.BaseConcreteStrategy {
 
 //#endregion
 exports.EvmWalletStrategy = EvmWallet;
+exports.extractNormalizedErrorCode = extractNormalizedErrorCode;
 exports.getBitGetProvider = getBitGetProvider;
 exports.getEvmProvider = getEvmProvider;
 exports.getKeplrEvmProvider = getKeplrEvmProvider;

package/dist/cjs/index.d.cts

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

package/dist/esm/index.d.ts

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

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import { capitalize } from "@injectivelabs/utils";
 import { BitGetException, ErrorType, KeplrEvmException, MetamaskException, OkxWalletException, RabbyWalletException, RainbowWalletException, TransactionException, TrustWalletException, UnspecifiedErrorCode, WalletException } from "@injectivelabs/exceptions";
-import { BaseConcreteStrategy, Wallet, WalletAction, WalletDeviceType, WalletEventListener, getEvmChainConfig, getViemPublicClientFromEip1193Provider, isEvmBrowserWallet } from "@injectivelabs/wallet-base";
+import { BaseConcreteStrategy, EvmWalletProviderErrorCode, Wallet, WalletAction, WalletDeviceType, WalletEventListener, getEvmChainConfig, getViemPublicClientFromEip1193Provider, isEvmBrowserWallet } from "@injectivelabs/wallet-base";
 import { TxGrpcApi } from "@injectivelabs/sdk-ts/core/tx";
 import { isServerSide, stringToUint8Array, toUtf8, uint8ArrayToHex } from "@injectivelabs/sdk-ts/utils";
 
@@ -222,6 +222,14 @@ const getEvmProvider = async (wallet) => {
 		throw new WalletException(/* @__PURE__ */ new Error(`Please install ${capitalize(wallet)} Extension`));
 	}
 };
+const extractNormalizedErrorCode = (error) => {
+	var _normalizedError$data;
+	const normalizedError = error && typeof error === "object" ? error : void 0;
+	const code = normalizedError === null || normalizedError === void 0 ? void 0 : normalizedError.code;
+	const originalCode = normalizedError === null || normalizedError === void 0 || (_normalizedError$data = normalizedError.data) === null || _normalizedError$data === void 0 || (_normalizedError$data = _normalizedError$data.originalError) === null || _normalizedError$data === void 0 ? void 0 : _normalizedError$data.code;
+	const rawCode = (code != null ? Number(code) : void 0) === EvmWalletProviderErrorCode.InternalError || code === void 0 || code === null ? originalCode !== null && originalCode !== void 0 ? originalCode : code : code;
+	return rawCode != null ? Number(rawCode) : NaN;
+};
 const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs = 3e4) => {
 	let timeoutId;
 	let handleChainChanged;
@@ -254,22 +262,20 @@ const switchEthereumChainWithTimeout = async (provider, chainIdHex, timeoutMs =
 	});
 	await Promise.race([switchRequest, chainChangedWaiter]);
 };
-const updateEvmNetwork = async (wallet, chainId) => {
+const updateEvmNetwork = async (wallet, chainId, providerOverride) => {
 	if (!isEvmBrowserWallet(wallet)) throw new WalletException(/* @__PURE__ */ new Error(`Evm Wallet for ${capitalize(wallet)} is not supported.`));
-	const provider = await getEvmProvider(wallet);
+	const provider = providerOverride || 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 {
 		await switchEthereumChainWithTimeout(provider, chainIdToHex, TIMEOUT_MS);
 	} catch (switchError) {
-		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`));
+		var _chainConfig$rpcUrls, _chainConfig$blockExp;
+		const errorCode = extractNormalizedErrorCode(switchError);
+		if (errorCode === EvmWalletProviderErrorCode.UserRejectedRequest) 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`));
+		if (errorCode !== EvmWalletProviderErrorCode.UnrecognizedChain) 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;
@@ -284,23 +290,25 @@ const updateEvmNetwork = async (wallet, chainId) => {
 					blockExplorerUrls: explorerUrl ? [explorerUrl] : []
 				}]
 			});
-		} catch (_unused2) {
+		} catch (addError) {
+			if (extractNormalizedErrorCode(addError) === EvmWalletProviderErrorCode.UserRejectedRequest) throw new WalletException(/* @__PURE__ */ new Error(`${capitalize(wallet)} add chain was rejected`), {
+				code: EvmWalletProviderErrorCode.UserRejectedRequest,
+				type: ErrorType.WalletError,
+				contextModule: WalletAction.GetChainId
+			});
 			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) {
+		} catch (_unused2) {
 			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`));
+			if (extractNormalizedErrorCode(postAddError) === EvmWalletProviderErrorCode.UserRejectedRequest) 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}`));
 		}
 	}
@@ -580,11 +588,8 @@ var EvmWallet = class extends BaseConcreteStrategy {
 		try {
 			await switchEthereumChainWithTimeout(ethereum, chainIdHex, TIMEOUT_MS);
 		} catch (error) {
-			var _code, _data;
-			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`), {
+			const errorCode = extractNormalizedErrorCode(error);
+			if (errorCode === EvmWalletProviderErrorCode.UserRejectedRequest) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${capitalize(this.wallet || "wallet")} chain switch was rejected`), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetChainId
@@ -594,7 +599,7 @@ var EvmWallet = class extends BaseConcreteStrategy {
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetChainId
 			});
-			if (errorCode !== 4902) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while switching ${capitalize(this.wallet || "wallet")} network`), {
+			if (errorCode !== EvmWalletProviderErrorCode.UnrecognizedChain) throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while switching ${capitalize(this.wallet || "wallet")} network`), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetChainId
@@ -604,7 +609,12 @@ var EvmWallet = class extends BaseConcreteStrategy {
 					method: "wallet_addEthereumChain",
 					params: [params]
 				});
-			} catch (_unused2) {
+			} catch (addError) {
+				if (extractNormalizedErrorCode(addError) === EvmWalletProviderErrorCode.UserRejectedRequest) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${capitalize(this.wallet || "wallet")} add chain was rejected`), {
+					code: EvmWalletProviderErrorCode.UserRejectedRequest,
+					type: ErrorType.WalletError,
+					contextModule: WalletAction.GetChainId
+				});
 				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Something went wrong while adding ${capitalize(this.wallet || "wallet")} network`), {
 					code: UnspecifiedErrorCode,
 					type: ErrorType.WalletError,
@@ -614,7 +624,7 @@ var EvmWallet = class extends BaseConcreteStrategy {
 			let currentChainId;
 			try {
 				currentChainId = await ethereum.request({ method: "eth_chainId" });
-			} catch (_unused3) {
+			} catch (_unused2) {
 				throw this.EvmWalletException(/* @__PURE__ */ new Error(`Failed to get current chain ID from ${capitalize(this.wallet || "wallet")}`), {
 					code: UnspecifiedErrorCode,
 					type: ErrorType.WalletError,
@@ -629,10 +639,7 @@ var EvmWallet = class extends BaseConcreteStrategy {
 			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`), {
+				if (extractNormalizedErrorCode(postAddError) === EvmWalletProviderErrorCode.UserRejectedRequest) throw this.EvmWalletException(/* @__PURE__ */ new Error(`${capitalize(this.wallet || "wallet")} chain switch after add was rejected`), {
 					code: UnspecifiedErrorCode,
 					type: ErrorType.WalletError,
 					contextModule: WalletAction.GetChainId
@@ -659,4 +666,4 @@ var EvmWallet = class extends BaseConcreteStrategy {
 };
 
 //#endregion
-export { EvmWallet as EvmWalletStrategy, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, switchEthereumChainWithTimeout, updateEvmNetwork };
+export { EvmWallet as EvmWalletStrategy, extractNormalizedErrorCode, getBitGetProvider, getEvmProvider, getKeplrEvmProvider, getMetamaskProvider, getOkxWalletProvider, getPhantomProvider, getRabbyProvider, getRainbowProvider, getTrustWalletProvider, switchEthereumChainWithTimeout, updateEvmNetwork };

package/package.json

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