Merge branch 'main' into kunal/avs-contracts

.changeset/afraid-dryers-grab.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/sdk': minor
+---
+
+Add EvmCoreReader, minor updates.

.changeset/blue-eyes-hunt.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/cli': minor
+'@hyperlane-xyz/sdk': minor
+---
+
+Update the warp-route-deployment.yaml to a more sensible schema. This schema sets us up to allow multi-chain collateral deployments. Removes intermediary config objects by using zod instead.

.changeset/early-crabs-float.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+Adds single-chain dry-run support for deploying warp routes & gas estimation for core and warp route dry-run deployments.

.changeset/hip-toys-warn.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/infra': minor
+---
+
+Moved Hook/ISM reading into CLI.

.changeset/khaki-days-float.md

@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/sdk": patch
+---
+
+Allow gasLimit overrides in the SDK/CLI for deploy txs

.changeset/nice-pianos-tease.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/cli': minor
+'@hyperlane-xyz/sdk': minor
+---
+
+Migrate fork util from CLI to SDK. Anvil IP & Port are now optionally passed into fork util by client.

.changeset/odd-books-think.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+Introduces `hyperlane hook read` and `hyperlane ism read` commands for deriving onchain Hook/ISM configs from an address on a given chain.

.changeset/poor-kings-fold.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/utils': patch
+---
+
+Add objLength and isObjEmpty utils

.changeset/thirty-games-shake.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/utils': minor
+'@hyperlane-xyz/sdk': minor
+---
+
+Moved Hook/ISM config stringify into a general object stringify utility.

.eslintrc

@@ -11,7 +11,7 @@
     "sourceType": "module",
     "project": "./tsconfig.json"
   },
-  "plugins": ["@typescript-eslint"],
+  "plugins": ["@typescript-eslint","jest"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -47,6 +47,11 @@
         },
         "extendDefaults": true
       }
-    ]
+    ],
+    "jest/no-disabled-tests": "warn",
+    "jest/no-focused-tests": "error",
+    "jest/no-identical-title": "error",
+    "jest/prefer-to-have-length": "warn",
+    "jest/valid-expect": "error"
   }
 }

package.json

@@ -6,8 +6,9 @@
     "@trivago/prettier-plugin-sort-imports": "^4.2.1",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
-    "eslint": "^8.57.0",
+    "eslint": "^9.0.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^28.2.0",
     "husky": "^8.0.0",
     "lint-staged": "^12.4.3",
     "prettier": "^2.8.8",

rust/.gitignore

@@ -4,3 +4,4 @@ relayerdb
 kathydb
 hyperlane_db
 config/test_config.json
+validator_db_anvil*

rust/agents/relayer/src/relayer.rs

@@ -12,8 +12,7 @@ use hyperlane_base::{
     db::{HyperlaneRocksDB, DB},
     metrics::{AgentMetrics, MetricsUpdater},
     settings::ChainConf,
-    BaseAgent, ChainMetrics, ContractSyncMetrics, CoreMetrics, HyperlaneAgentCore,
-    SequencedDataContractSync, WatermarkContractSync,
+    BaseAgent, ChainMetrics, ContractSyncMetrics, ContractSyncer, CoreMetrics, HyperlaneAgentCore,
 };
 use hyperlane_core::{
     HyperlaneDomain, HyperlaneMessage, InterchainGasPayment, MerkleTreeInsertion, MpmcChannel,
@@ -60,15 +59,14 @@ pub struct Relayer {
     destination_chains: HashMap<HyperlaneDomain, ChainConf>,
     #[as_ref]
     core: HyperlaneAgentCore,
-    message_syncs: HashMap<HyperlaneDomain, Arc<SequencedDataContractSync<HyperlaneMessage>>>,
+    message_syncs: HashMap<HyperlaneDomain, Arc<dyn ContractSyncer<HyperlaneMessage>>>,
     interchain_gas_payment_syncs:
-        HashMap<HyperlaneDomain, Arc<WatermarkContractSync<InterchainGasPayment>>>,
+        HashMap<HyperlaneDomain, Arc<dyn ContractSyncer<InterchainGasPayment>>>,
     /// Context data for each (origin, destination) chain pair a message can be
     /// sent between
     msg_ctxs: HashMap<ContextKey, Arc<MessageContext>>,
     prover_syncs: HashMap<HyperlaneDomain, Arc<RwLock<MerkleTreeBuilder>>>,
-    merkle_tree_hook_syncs:
-        HashMap<HyperlaneDomain, Arc<SequencedDataContractSync<MerkleTreeInsertion>>>,
+    merkle_tree_hook_syncs: HashMap<HyperlaneDomain, Arc<dyn ContractSyncer<MerkleTreeInsertion>>>,
     dbs: HashMap<HyperlaneDomain, HyperlaneRocksDB>,
     whitelist: Arc<MatchingList>,
     blacklist: Arc<MatchingList>,
@@ -133,35 +131,46 @@ impl BaseAgent for Relayer {
         let contract_sync_metrics = Arc::new(ContractSyncMetrics::new(&core_metrics));
 
         let message_syncs = settings
-            .build_message_indexers(
+            .contract_syncs::<HyperlaneMessage, _>(
                 settings.origin_chains.iter(),
                 &core_metrics,
                 &contract_sync_metrics,
                 dbs.iter()
-                    .map(|(d, db)| (d.clone(), Arc::new(db.clone()) as _))
+                    .map(|(d, db)| (d.clone(), Arc::new(db.clone())))
                     .collect(),
             )
-            .await?;
+            .await?
+            .into_iter()
+            .map(|(k, v)| (k, v as _))
+            .collect();
+
         let interchain_gas_payment_syncs = settings
-            .build_interchain_gas_payment_indexers(
+            .contract_syncs::<InterchainGasPayment, _>(
                 settings.origin_chains.iter(),
                 &core_metrics,
                 &contract_sync_metrics,
                 dbs.iter()
-                    .map(|(d, db)| (d.clone(), Arc::new(db.clone()) as _))
+                    .map(|(d, db)| (d.clone(), Arc::new(db.clone())))
                     .collect(),
             )
-            .await?;
+            .await?
+            .into_iter()
+            .map(|(k, v)| (k, v as _))
+            .collect();
+
         let merkle_tree_hook_syncs = settings
-            .build_merkle_tree_hook_indexers(
+            .contract_syncs::<MerkleTreeInsertion, _>(
                 settings.origin_chains.iter(),
                 &core_metrics,
                 &contract_sync_metrics,
                 dbs.iter()
-                    .map(|(d, db)| (d.clone(), Arc::new(db.clone()) as _))
+                    .map(|(d, db)| (d.clone(), Arc::new(db.clone())))
                     .collect(),
             )
-            .await?;
+            .await?
+            .into_iter()
+            .map(|(k, v)| (k, v as _))
+            .collect();
 
         let whitelist = Arc::new(settings.whitelist);
         let blacklist = Arc::new(settings.blacklist);
@@ -341,9 +350,7 @@ impl Relayer {
     async fn run_message_sync(&self, origin: &HyperlaneDomain) -> Instrumented<JoinHandle<()>> {
         let index_settings = self.as_ref().settings.chains[origin.name()].index_settings();
         let contract_sync = self.message_syncs.get(origin).unwrap().clone();
-        let cursor = contract_sync
-            .forward_backward_message_sync_cursor(index_settings)
-            .await;
+        let cursor = contract_sync.cursor(index_settings).await;
         tokio::spawn(async move {
             contract_sync
                 .clone()
@@ -363,7 +370,7 @@ impl Relayer {
             .get(origin)
             .unwrap()
             .clone();
-        let cursor = contract_sync.rate_limited_cursor(index_settings).await;
+        let cursor = contract_sync.cursor(index_settings).await;
         tokio::spawn(async move { contract_sync.clone().sync("gas_payments", cursor).await })
             .instrument(info_span!("ContractSync"))
     }
@@ -374,9 +381,7 @@ impl Relayer {
     ) -> Instrumented<JoinHandle<()>> {
         let index_settings = self.as_ref().settings.chains[origin.name()].index.clone();
         let contract_sync = self.merkle_tree_hook_syncs.get(origin).unwrap().clone();
-        let cursor = contract_sync
-            .forward_backward_message_sync_cursor(index_settings)
-            .await;
+        let cursor = contract_sync.cursor(index_settings).await;
         tokio::spawn(async move { contract_sync.clone().sync("merkle_tree_hook", cursor).await })
             .instrument(info_span!("ContractSync"))
     }

rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs

@@ -22,6 +22,14 @@ const DOMAINS: &[RawDomain] = &[
         is_test_net: true,
         is_deprecated: false,
     },
+    RawDomain {
+        name: "ancient8",
+        token: "ETH",
+        domain: 888888888,
+        chain_id: 888888888,
+        is_test_net: false,
+        is_deprecated: false,
+    },
     RawDomain {
         name: "arbitrum",
         token: "ETH",
@@ -46,6 +54,14 @@ const DOMAINS: &[RawDomain] = &[
         is_test_net: false,
         is_deprecated: false,
     },
+    RawDomain {
+        name: "blast",
+        token: "ETH",
+        domain: 81457,
+        chain_id: 81457,
+        is_test_net: false,
+        is_deprecated: false,
+    },
     RawDomain {
         name: "bsc",
         token: "BNB",
@@ -102,6 +118,14 @@ const DOMAINS: &[RawDomain] = &[
         is_test_net: false,
         is_deprecated: false,
     },
+    RawDomain {
+        name: "mode",
+        token: "ETH",
+        domain: 34443,
+        chain_id: 34443,
+        is_test_net: false,
+        is_deprecated: false,
+    },
     RawDomain {
         name: "moonbasealpha",
         token: "DEV",