Revert "Merge remote-tracking branch 'origin' into feat/zksync-support"

This reverts commit ba08190, reversing
changes made to f782f4c.

rust/main/Cargo.toml

@@ -197,27 +197,27 @@ overflow-checks = true
 [workspace.dependencies.ethers]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2024-12-10"
+tag = "2024-12-03-3"
 
 [workspace.dependencies.ethers-contract]
 features = ["legacy"]
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2024-12-10"
+tag = "2024-12-03-3"
 
 [workspace.dependencies.ethers-core]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2024-12-10"
+tag = "2024-12-03-3"
 
 [workspace.dependencies.ethers-providers]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2024-12-10"
+tag = "2024-12-03-3"
 
 [workspace.dependencies.ethers-signers]
 features = ["aws"]
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2024-12-10"
+tag = "2024-12-03-3"
 
 [patch.crates-io.curve25519-dalek]
 branch = "v3.2.2-relax-zeroize"

typescript/cli/src/commands/signCommands.ts

@@ -32,5 +32,4 @@ export enum CommandType {
   STATUS = 'status:',
   SUBMIT = 'submit:',
   RELAYER = 'relayer:',
-  CORE_APPLY = 'core:apply',
 }

typescript/cli/src/context/strategies/chain/ChainResolverFactory.ts

@@ -20,7 +20,6 @@ export class ChainResolverFactory {
     [CommandType.STATUS, () => MultiChainResolver.forOriginDestination()],
     [CommandType.SUBMIT, () => MultiChainResolver.forStrategyConfig()],
     [CommandType.RELAYER, () => MultiChainResolver.forRelayer()],
-    [CommandType.CORE_APPLY, () => MultiChainResolver.forCoreApply()],
   ]);
 
   /**

typescript/cli/src/context/strategies/chain/MultiChainResolver.ts

@@ -1,14 +1,7 @@
-import {
-  ChainMap,
-  ChainName,
-  DeployedCoreAddresses,
-  DeployedCoreAddressesSchema,
-  EvmCoreModule,
-} from '@hyperlane-xyz/sdk';
+import { ChainMap, ChainName } from '@hyperlane-xyz/sdk';
 import { assert } from '@hyperlane-xyz/utils';
 
 import { DEFAULT_WARP_ROUTE_DEPLOYMENT_CONFIG_PATH } from '../../../commands/options.js';
-import { readCoreDeployConfigs } from '../../../config/core.js';
 import { readChainSubmissionStrategyConfig } from '../../../config/strategy.js';
 import { log } from '../../../logger.js';
 import {
@@ -32,7 +25,6 @@ enum ChainSelectionMode {
   WARP_READ,
   STRATEGY,
   RELAYER,
-  CORE_APPLY,
 }
 
 // This class could be broken down into multiple strategies
@@ -56,8 +48,6 @@ export class MultiChainResolver implements ChainResolver {
         return this.resolveStrategyChains(argv);
       case ChainSelectionMode.RELAYER:
         return this.resolveRelayerChains(argv);
-      case ChainSelectionMode.CORE_APPLY:
-        return this.resolveCoreApplyChains(argv);
       case ChainSelectionMode.ORIGIN_DESTINATION:
       default:
         return this.resolveOriginDestinationChains(argv);
@@ -184,41 +174,6 @@ export class MultiChainResolver implements ChainResolver {
     return chains;
   }
 
-  private async resolveCoreApplyChains(
-    argv: Record<string, any>,
-  ): Promise<ChainName[]> {
-    try {
-      const config = readCoreDeployConfigs(argv.config);
-
-      if (!config?.interchainAccountRouter) {
-        return [argv.chain];
-      }
-
-      const addresses = await argv.context.registry.getChainAddresses(
-        argv.chain,
-      );
-      const coreAddresses = DeployedCoreAddressesSchema.parse(
-        addresses,
-      ) as DeployedCoreAddresses;
-
-      const evmCoreModule = new EvmCoreModule(argv.context.multiProvider, {
-        chain: argv.chain,
-        config,
-        addresses: coreAddresses,
-      });
-
-      const transactions = await evmCoreModule.update(config);
-
-      return Array.from(new Set(transactions.map((tx) => tx.chainId))).map(
-        (chainId) => argv.context.multiProvider.getChainName(chainId),
-      );
-    } catch (error) {
-      throw new Error(`Failed to resolve core apply chains`, {
-        cause: error,
-      });
-    }
-  }
-
   static forAgentKurtosis(): MultiChainResolver {
     return new MultiChainResolver(ChainSelectionMode.AGENT_KURTOSIS);
   }
@@ -242,8 +197,4 @@ export class MultiChainResolver implements ChainResolver {
   static forWarpCoreConfig(): MultiChainResolver {
     return new MultiChainResolver(ChainSelectionMode.WARP_READ);
   }
-
-  static forCoreApply(): MultiChainResolver {
-    return new MultiChainResolver(ChainSelectionMode.CORE_APPLY);
-  }
 }

typescript/infra/config/environments/mainnet3/agent.ts

@@ -276,7 +276,8 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     degenchain: true,
     dogechain: true,
     duckchain: true,
-    eclipsemainnet: true,
+    // Cannot scrape Sealevel chains
+    eclipsemainnet: false,
     endurance: true,
     ethereum: true,
     everclear: true,
@@ -327,7 +328,8 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     sei: true,
     shibarium: true,
     snaxchain: true,
-    solanamainnet: true,
+    // Cannot scrape Sealevel chains
+    solanamainnet: false,
     stride: true,
     superseed: true,
     superpositionmainnet: true,

typescript/infra/config/environments/mainnet3/chains.ts

@@ -65,16 +65,6 @@ export const chainMetadataOverrides: ChainMap<Partial<ChainMetadata>> = {
   //     maxFeePerGas: 100000 * 10 ** 9, // 100,000 gwei
   //   },
   // },
-  // taiko: {
-  //   transactionOverrides: {
-  //     gasPrice: 25 * 10 ** 7, // 0.25 gwei
-  //   },
-  // },
-  // linea: {
-  //   transactionOverrides: {
-  //     gasPrice: 5 * 10 ** 8, // 0.5 gwei
-  //   },
-  // },
   // zircuit: {
   //   blocks: {
   //     confirmations: 3,

typescript/infra/config/environments/mainnet3/gasPrices.json

@@ -28,19 +28,19 @@
     "decimals": 9
   },
   "astarzkevm": {
-    "amount": "0.0988",
+    "amount": "0.24",
     "decimals": 9
   },
   "flame": {
     "amount": "101.0",
     "decimals": 9
   },
   "avalanche": {
-    "amount": "27.735398516",
+    "amount": "25.0",
     "decimals": 9
   },
   "b3": {
-    "amount": "0.001000253",
+    "amount": "0.001000252",
     "decimals": 9
   },
   "base": {
@@ -60,7 +60,7 @@
     "decimals": 9
   },
   "boba": {
-    "amount": "0.001000059",
+    "amount": "0.001000047",
     "decimals": 9
   },
   "bsc": {
@@ -140,7 +140,7 @@
     "decimals": 9
   },
   "gnosis": {
-    "amount": "1.500000007",
+    "amount": "1.500000008",
     "decimals": 9
   },
   "gravity": {
@@ -176,11 +176,11 @@
     "decimals": 9
   },
   "lisk": {
-    "amount": "0.001001147",
+    "amount": "0.00100103",
     "decimals": 9
   },
   "lukso": {
-    "amount": "1.109955713",
+    "amount": "0.921815267",
     "decimals": 9
   },
   "lumia": {
@@ -192,7 +192,7 @@
     "decimals": 9
   },
   "mantapacific": {
-    "amount": "0.003000983",
+    "amount": "0.00300029",
     "decimals": 9
   },
   "mantle": {
@@ -216,7 +216,7 @@
     "decimals": 9
   },
   "mode": {
-    "amount": "0.001001363",
+    "amount": "0.001000252",
     "decimals": 9
   },
   "molten": {
@@ -240,7 +240,7 @@
     "decimals": 9
   },
   "optimism": {
-    "amount": "0.001000469",
+    "amount": "0.001065045",
     "decimals": 9
   },
   "orderly": {
@@ -264,7 +264,7 @@
     "decimals": 9
   },
   "prom": {
-    "amount": "51.9",
+    "amount": "546.0",
     "decimals": 9
   },
   "proofofplay": {
@@ -276,7 +276,7 @@
     "decimals": 9
   },
   "real": {
-    "amount": "0.022",
+    "amount": "0.04",
     "decimals": 9
   },
   "redstone": {
@@ -296,7 +296,7 @@
     "decimals": 9
   },
   "sei": {
-    "amount": "3.328028877",
+    "amount": "100.0",
     "decimals": 9
   },
   "shibarium": {
@@ -336,23 +336,23 @@
     "decimals": 9
   },
   "treasure": {
-    "amount": "702.999550885",
+    "amount": "10000.0",
     "decimals": 9
   },
   "unichain": {
     "amount": "0.001000252",
     "decimals": 9
   },
   "vana": {
-    "amount": "0.002986",
+    "amount": "0.002488334",
     "decimals": 9
   },
   "viction": {
     "amount": "0.25",
     "decimals": 9
   },
   "worldchain": {
-    "amount": "0.001000255",
+    "amount": "0.00100026",
     "decimals": 9
   },
   "xai": {