chore: update hardocded devnet and mainnet evm ids

Author: ThomasRalee

packages/ts-types/src/enums.ts

@@ -8,7 +8,8 @@ export enum EthereumChainId {
   Sepolia = 11155111,
   Ganache = 1337,
   HardHat = 31337,
-  DevnetEvm = 1778,
+  MainnetEvm = 1776,
+  DevnetEvm = 1337,
   TestnetEvm = 1439,
 }
 

packages/wallets/wallet-core/src/broadcaster/MsgBroadcaster.ts

@@ -153,20 +153,30 @@ export class MsgBroadcaster {
       options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation
   }
 
-  async verifyEvmChainId() {
+  async getEvmChainId(): Promise<EthereumChainId | undefined> {
     const { walletStrategy } = this
+
     if (!isEvmBrowserWallet(walletStrategy.wallet)) {
-      return
+      return this.ethereumChainId
     }
 
-    const mainnetEvmIds = [EthereumChainId.Mainnet]
+    const mainnetEvmIds = [EthereumChainId.Mainnet, EthereumChainId.MainnetEvm]
     const testnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.TestnetEvm]
     const devnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.DevnetEvm]
 
     try {
       const chainId = await walletStrategy.getEthereumChainId()
+
+      if (!chainId) {
+        return this.ethereumChainId
+      }
+
       const evmChainId = parseInt(chainId, 16) as EthereumChainId
 
+      if (isNaN(evmChainId)) {
+        return this.ethereumChainId
+      }
+
       if (
         (isMainnet(this.options.network) &&
           !mainnetEvmIds.includes(evmChainId)) ||
@@ -181,10 +191,10 @@ export class MsgBroadcaster {
         )
       }
 
-      if (this.ethereumChainId !== evmChainId) {
-        this.ethereumChainId = evmChainId
-      }
-    } catch {}
+      return evmChainId
+    } catch (e: any) {
+      throw new WalletException(e)
+    }
   }
 
   /**
@@ -317,16 +327,15 @@ export class MsgBroadcaster {
    * @returns transaction hash
    */
   private async broadcastEip712(tx: MsgBroadcasterTxOptionsWithAddresses) {
-    const { chainId, txTimeout, endpoints, ethereumChainId, walletStrategy } =
-      this
+    const { chainId, txTimeout, endpoints, walletStrategy } = this
     const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs]
 
+    const ethereumChainId = await this.getEvmChainId()
+
     if (!ethereumChainId) {
       throw new GeneralException(new Error('Please provide ethereumChainId'))
     }
 
-    await this.verifyEvmChainId()
-
     /** Account Details * */
     const { baseAccount, latestHeight } =
       await this.fetchAccountAndBlockDetails(tx.injectiveAddress)
@@ -431,16 +440,15 @@ export class MsgBroadcaster {
   private async broadcastEip712V2(
     tx: MsgBroadcasterTxOptionsWithAddresses,
   ): Promise<TxResponse> {
-    const { chainId, endpoints, txTimeout, walletStrategy, ethereumChainId } =
-      this
+    const { chainId, endpoints, txTimeout, walletStrategy } = this
     const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs]
 
+    const ethereumChainId = await this.getEvmChainId()
+
     if (!ethereumChainId) {
       throw new GeneralException(new Error('Please provide ethereumChainId'))
     }
 
-    await this.verifyEvmChainId()
-
     /** Account Details * */
     const { baseAccount, latestHeight } =
       await this.fetchAccountAndBlockDetails(tx.injectiveAddress)
@@ -560,18 +568,17 @@ export class MsgBroadcaster {
       simulateTx,
       httpHeaders,
       walletStrategy,
-      ethereumChainId,
       txTimeoutOnFeeDelegation,
     } = this
     const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs]
     const web3Msgs = msgs.map((msg) => msg.toWeb3())
 
+    const ethereumChainId = await this.getEvmChainId()
+
     if (!ethereumChainId) {
       throw new GeneralException(new Error('Please provide ethereumChainId'))
     }
 
-    await this.verifyEvmChainId()
-
     const transactionApi = new IndexerGrpcWeb3GwApi(
       endpoints.web3gw || endpoints.indexer,
     )