handle net_version where network may give it as hex

Web3Auth · Jul 11, 2024 · b1a3287 · b1a3287
1 parent f6a5c16
commit b1a3287
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...providers/ethereum-mpc-provider/src/providers/signingProviders/EthereumSigningProvider.ts b/...providers/ethereum-mpc-provider/src/providers/signingProviders/EthereumSigningProvider.ts
@@ -1,3 +1,4 @@
+import { isHexString } from "@ethereumjs/util";
 import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
 import { JRPCEngine, JRPCMiddleware, providerFromEngine } from "@toruslabs/openlogin-jrpc";
 import { CHAIN_NAMESPACES, CustomChainConfig, WalletInitializationError } from "@web3auth/base";
@@ -135,7 +136,9 @@ export class EthereumSigningProvider extends BaseProvider<
       params: [],
     });
 
-    if (parseInt(chainId, 16) !== parseInt(network, 10)) throw providerErrors.chainDisconnected(`Invalid network, net_version is: ${network}`);
+    const finalNetwork = isHexString(network) ? parseInt(network, 16) : parseInt(network, 10);
+
+    if (parseInt(chainId, 16) !== finalNetwork) throw providerErrors.chainDisconnected(`Invalid network, net_version is: ${network}`);
     if (this.state.chainId !== chainId) {
       this.emit("chainChanged", chainId);
       this.emit("connect", { chainId });

diff --git a/...oviders/ethereum-provider/src/providers/privateKeyProviders/EthereumPrivateKeyProvider.ts b/...oviders/ethereum-provider/src/providers/privateKeyProviders/EthereumPrivateKeyProvider.ts
@@ -1,3 +1,4 @@
+import { isHexString } from "@ethereumjs/util";
 import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
 import { JRPCEngine, JRPCMiddleware, providerFromEngine } from "@toruslabs/openlogin-jrpc";
 import { CHAIN_NAMESPACES, CustomChainConfig, WalletInitializationError } from "@web3auth/base";
@@ -94,7 +95,9 @@ export class EthereumPrivateKeyProvider extends BaseProvider<BaseProviderConfig,
       params: [],
     });
 
-    if (parseInt(chainId, 16) !== parseInt(network, 10)) throw providerErrors.chainDisconnected(`Invalid network, net_version is: ${network}`);
+    const finalNetwork = isHexString(network) ? parseInt(network, 16) : parseInt(network, 10);
+
+    if (parseInt(chainId, 16) !== finalNetwork) throw providerErrors.chainDisconnected(`Invalid network, net_version is: ${network}`);
     if (this.state.chainId !== chainId) {
       this.emit("chainChanged", chainId);
       this.emit("connect", { chainId });