Final pass

rust/agents/scraper/src/agent.rs

@@ -211,7 +211,7 @@ impl AsRef<HyperlaneAgentCore> for Scraper {
     }
 }
 
-/// Generate a call to ChainSetup for the given builder
+/// Create a function to spawn task that syncs contract events
 macro_rules! spawn_sync_task {
     ($name:ident, $cursor: ident, $label:literal) => {
         async fn $name(

rust/agents/scraper/src/conversions.rs

@@ -13,7 +13,7 @@ pub fn address_to_bytes(data: &H256) -> Vec<u8> {
     }
 }
 
-// Creates a big-endian hex representation of the address hash
+// Creates a big-endian hex representation of the address
 pub fn bytes_to_address(data: Vec<u8>) -> eyre::Result<H256> {
     if (data.len() != 20) && (data.len() != 32) {
         return Err(eyre::eyre!("Invalid address length"));

rust/agents/scraper/src/db/message.rs

@@ -1,7 +1,7 @@
 use eyre::Result;
 use itertools::Itertools;
 use sea_orm::{
-    prelude::*, ActiveValue::*, DeriveColumn, EnumIter, Insert, QueryOrder, QuerySelect,
+    prelude::*, ActiveValue::*, DeriveColumn, EnumIter, Insert, QuerySelect,
 };
 use tracing::{debug, instrument, trace};
 
@@ -111,9 +111,9 @@ impl ScraperDb {
             .filter(message::Column::Origin.eq(origin_domain))
             .filter(message::Column::OriginMailbox.eq(address_to_bytes(origin_mailbox)))
             .filter(message::Column::Nonce.eq(nonce))
-            .order_by_desc(message::Column::Nonce)
             .select_only()
-            .column_as(message::Column::OriginTxId, QueryAs::Nonce)
+            .column_as(message::Column::OriginTxId.max(), QueryAs::Nonce)
+            .group_by(message::Column::Origin)
             .into_values::<i64, QueryAs>()
             .one(&self.0)
             .await?;

rust/hyperlane-base/src/contract_sync/mod.rs

@@ -76,7 +76,7 @@ where
             stored_logs.inc_by(stored as u64);
             // We check the value of the current gauge to avoid overwriting a higher value
             // when using a ForwardBackwardMessageSyncCursor
-            if to > indexed_height.get() {
+            if to as i64 > indexed_height.get() {
                 indexed_height.set(to as i64);
             }
             // Update cursor

rust/utils/run-locally/src/main.rs

@@ -9,7 +9,7 @@
 //!   the test for. This
 //! does not include the initial setup time. If this timeout is reached before
 //! the end conditions are met, the test is a failure. Defaults to 10 min.
-//! - `E2E_KATHY_MESSAGES`: Number of kathy messages to dispatch. Defaults to 10 if CI mode is enabled.
+//! - `E2E_KATHY_MESSAGES`: Number of kathy messages to dispatch. Defaults to 16 if CI mode is enabled.
 //! - `E2E_LOG_ALL`: Log all output instead of writing to log files. Defaults to
 //!   true if CI mode,
 //! else false.
@@ -132,7 +132,7 @@ fn main() -> ExitCode {
         let r = env::var("E2E_KATHY_MESSAGES")
             .ok()
             .map(|r| r.parse::<u64>().unwrap());
-        r.unwrap_or(10)
+        r.unwrap_or(16)
     };
 
     let log_all = env::var("E2E_LOG_ALL")
@@ -369,13 +369,13 @@ fn main() -> ExitCode {
         state.validators.push(validator);
     }
 
-    // Run one round of kathy before the relayer comes up
+    // Send half the kathy messages before the relayer comes up
     let mut kathy = Command::new("yarn");
     kathy
         .arg("kathy")
         .args([
             "--messages",
-            &kathy_messages.to_string(),
+            &(kathy_messages / 2).to_string(),
             "--timeout",
             "1000",
         ])
@@ -403,12 +403,13 @@ fn main() -> ExitCode {
     println!("Setup complete! Agents running in background...");
     println!("Ctrl+C to end execution...");
 
+    // Send half the kathy messages after the relayer comes up
     let mut kathy = Command::new("yarn");
     kathy
         .arg("kathy")
         .args([
             "--messages",
-            &kathy_messages.to_string(),
+            &(kathy_messages / 2).to_string(),
             "--timeout",
             "1000",
         ])
@@ -440,7 +441,7 @@ fn main() -> ExitCode {
         }
         if ci_mode {
             // for CI we have to look for the end condition.
-            let num_messages_expected = kathy_messages as u32 * 2;
+            let num_messages_expected = (kathy_messages / 2) as u32 * 2;
             if kathy_done && termination_invariants_met(num_messages_expected) {
                 // end condition reached successfully
                 println!("Kathy completed successfully and agent metrics look healthy");