Fix conflicts

.changeset/flat-lamps-deliver.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/infra': minor
+---
+
+Add Artela/Base USDC and WETH warp route config

.changeset/green-schools-attack.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': patch
+---
+
+Print displayName instead of chain name in signer validity logs.

.changeset/three-walls-count.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+Add explorer link to warp send and send message commands

.changeset/violet-knives-drop.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+Fixing the chain resolver checks and handling for argv.chain

.github/actions/checkout-registry/action.yml

@@ -21,6 +21,7 @@ runs:
       with:
         repository: hyperlane-xyz/hyperlane-registry
         ref: ${{ env.REGISTRY_VERSION }}
+        fetch-depth: 0
         path: ./hyperlane-registry
 
     - name: Move hyperlane-registry to parent directory

.registryrc

@@ -1 +1 @@
-115d44069109f3ef43caeed5632f6255d9a3390a
+47aba98bdd78ecb5a3f756dca6dc2e28325bab43

Dockerfile

@@ -34,4 +34,5 @@ ENV REGISTRY_URI="/hyperlane-registry"
 ARG REGISTRY_COMMIT="main"
 RUN git clone https://github.com/hyperlane-xyz/hyperlane-registry.git "$REGISTRY_URI" \
     && cd "$REGISTRY_URI" \
+    && git fetch origin "$REGISTRY_COMMIT" \
     && git checkout "$REGISTRY_COMMIT"

rust/main/Cargo.toml

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

rust/main/agents/relayer/Cargo.toml

@@ -56,9 +56,11 @@ hyperlane-ethereum = { path = "../../chains/hyperlane-ethereum" }
 once_cell.workspace = true
 mockall.workspace = true
 tokio-test.workspace = true
+tracing-test.workspace = true
 hyperlane-test = { path = "../../hyperlane-test" }
 hyperlane-base = { path = "../../hyperlane-base", features = ["test-utils"] }
 hyperlane-core = { path = "../../hyperlane-core", features = ["agent", "async", "test-utils"] }
+ethers-prometheus = { path = "../../ethers-prometheus", features = ["serde"] }
 
 [features]
 default = ["color-eyre", "oneline-errors"]

rust/main/agents/relayer/src/main.rs

@@ -18,6 +18,9 @@ mod memory_profiler;
 
 #[tokio::main(flavor = "multi_thread", worker_threads = 20)]
 async fn main() -> Result<()> {
+    // Logging is not initialised at this point, so, using `println!`
+    println!("Relayer starting up...");
+
     let agent_main_fut = agent_main::<Relayer>();
 
     #[cfg(feature = "memory-profiling")]

rust/main/agents/relayer/src/msg/metadata/aggregation.rs

@@ -117,7 +117,7 @@ impl AggregationIsmMetadataBuilder {
 
 #[async_trait]
 impl MetadataBuilder for AggregationIsmMetadataBuilder {
-    #[instrument(err, skip(self), ret)]
+    #[instrument(err, skip(self, message), ret)]
     #[allow(clippy::blocks_in_conditions)] // TODO: `rustc` 1.80.1 clippy issue
     async fn build(
         &self,

rust/main/agents/relayer/src/msg/metadata/base.rs

@@ -189,7 +189,7 @@ impl Deref for MessageMetadataBuilder {
 
 #[async_trait]
 impl MetadataBuilder for MessageMetadataBuilder {
-    #[instrument(err, skip(self), fields(destination_domain=self.destination_domain().name()))]
+    #[instrument(err, skip(self, message), fields(destination_domain=self.destination_domain().name()))]
     async fn build(
         &self,
         ism_address: H256,
@@ -228,7 +228,7 @@ impl MessageMetadataBuilder {
         }
     }
 
-    #[instrument(err, skip(self), fields(destination_domain=self.destination_domain().name()), ret)]
+    #[instrument(err, skip(self, message), fields(destination_domain=self.destination_domain().name()), ret)]
     pub async fn build_ism_and_metadata(
         &self,
         ism_address: H256,

rust/main/agents/relayer/src/msg/metadata/ccip_read.rs

@@ -27,7 +27,7 @@ pub struct CcipReadIsmMetadataBuilder {
 
 #[async_trait]
 impl MetadataBuilder for CcipReadIsmMetadataBuilder {
-    #[instrument(err, skip(self))]
+    #[instrument(err, skip(self, message))]
     async fn build(
         &self,
         ism_address: H256,

rust/main/agents/relayer/src/msg/metadata/routing.rs

@@ -14,7 +14,7 @@ pub struct RoutingIsmMetadataBuilder {
 
 #[async_trait]
 impl MetadataBuilder for RoutingIsmMetadataBuilder {
-    #[instrument(err, skip(self), ret)]
+    #[instrument(err, skip(self, message), ret)]
     #[allow(clippy::blocks_in_conditions)] // TODO: `rustc` 1.80.1 clippy issue
     async fn build(
         &self,

rust/main/agents/relayer/src/msg/op_submitter.rs

@@ -543,7 +543,7 @@ impl OperationBatch {
         };
 
         if !excluded_ops.is_empty() {
-            warn!(excluded_ops=?excluded_ops, "Either the batch tx would revert, or the operations would revert in the batch. Falling back to serial submission.");
+            warn!(excluded_ops=?excluded_ops, "Either operations reverted in the batch or the txid wasn't included. Falling back to serial submission.");
             OperationBatch::new(excluded_ops, self.domain)
                 .submit_serially(prepare_queue, confirm_queue, metrics)
                 .await;

rust/main/agents/relayer/src/msg/pending_message.rs

@@ -32,7 +32,7 @@ pub const CONFIRM_DELAY: Duration = if cfg!(any(test, feature = "test-utils")) {
     // Wait 5 seconds after submitting the message before confirming in test mode
     Duration::from_secs(5)
 } else {
-    // Wait 1 min after submitting the message before confirming in normal/production mode
+    // Wait 10 min after submitting the message before confirming in normal/production mode
     Duration::from_secs(60 * 10)
 };