chainId is now hex string, not number

Author: legobeat

app/core/RPCMethods/RPCMethodMiddleware.ts

@@ -18,6 +18,7 @@ import {
   PermissionController,
   permissionRpcMethods,
 } from '@metamask/permission-controller';
+import type { Hex } from '@metamask/utils';
 import Networks, {
   blockTagParamIndex,
   getAllNetworks,
@@ -105,7 +106,7 @@ export const checkActiveAccountAndChainId = async ({
   isWalletConnect,
 }: {
   address?: string;
-  chainId?: number;
+  chainId?: Hex;
   channelId?: string;
   hostname: string;
   isWalletConnect: boolean;
@@ -218,7 +219,7 @@ const generateRawSignature = async ({
   title: { current: string };
   icon: { current: string | undefined };
   analytics: { [key: string]: string | boolean };
-  chainId: number;
+  chainId: Hex;
   isMMSDK: boolean;
   channelId?: string;
   getSource: () => string;
@@ -561,7 +562,7 @@ export const getRpcMethodMiddleware = ({
             chainId,
           }: {
             from?: string;
-            chainId?: number;
+            chainId?: Hex;
           }) => {
             await checkActiveAccountAndChainId({
               hostname,

app/core/WalletConnect/WalletConnectV2.ts

@@ -10,6 +10,8 @@ import Logger from '../../util/Logger';
 import { WalletDevice } from '@metamask/transaction-controller';
 
 import { PermissionController } from '@metamask/permission-controller';
+import { isStrictHexString } from '@metamask/utils';
+import type { Hex } from '@metamask/utils';
 import { NavigationContainerRef } from '@react-navigation/native';
 import { Core } from '@walletconnect/core';
 import { ErrorResponse } from '@walletconnect/jsonrpc-types';
@@ -296,7 +298,7 @@ class WalletConnect2Session {
     chainId,
     accounts,
   }: {
-    chainId: number;
+    chainId: Hex;
     accounts: string[];
   }) => {
     try {
@@ -326,20 +328,20 @@ class WalletConnect2Session {
           return;
         }
       }
-      if (chainId === 0) {
+      if (!isStrictHexString(chainId) || chainId.toLowerCase() === '0x0') {
         DevLogger.log(
           `WC2::updateSession invalid chainId --- skip ${typeof chainId} chainId=${chainId} accounts=${accounts})`,
         );
         // overwrite chainId with actual value.
-        const selectedChainId = parseInt(selectChainId(store.getState()));
+        const selectedChainId = selectChainId(store.getState());
         DevLogger.log(
           `WC2::updateSession overwrite invalid chain Id with selectedChainId=${selectedChainId}`,
         );
         chainId = selectedChainId;
       }
       await this.web3Wallet.updateSession({
         topic: this.session.topic,
-        chainId,
+        chainId: parseInt(chainId, 16),
         accounts,
       });
     } catch (err) {
@@ -566,13 +568,12 @@ export class WC2Manager {
           DevLogger.log(`WC2::init approvedAccounts`, approvedAccounts);
         }
 
-        const nChainId = parseInt(chainId, 16);
         DevLogger.log(
-          `WC2::init updateSession session=${sessionKey} chainId=${chainId} nChainId=${nChainId} selectedAddress=${selectedAddress}`,
+          `WC2::init updateSession session=${sessionKey} chainId=${chainId} selectedAddress=${selectedAddress}`,
           approvedAccounts,
         );
         await this.sessions[sessionKey].updateSession({
-          chainId: nChainId,
+          chainId,
           accounts: approvedAccounts,
         });
       } catch (err) {