Merge branch 'feat/zksync-signer-strategy' into feat/zksync-support

rust/main/Cargo.toml

@@ -127,6 +127,7 @@ sha256 = "1.1.4"
 sha3 = "0.10"
 solana-account-decoder = "=1.14.13"
 solana-client = "=1.14.13"
+solana-program = "=1.14.13"
 solana-sdk = "=1.14.13"
 solana-transaction-status = "=1.14.13"
 static_assertions = "1.1"

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

@@ -86,24 +86,29 @@ impl ForwardBackwardIterator {
         loop {
             let high_nonce_message_status = self.high_nonce_iter.try_get_next_nonce(metrics)?;
             let low_nonce_message_status = self.low_nonce_iter.try_get_next_nonce(metrics)?;
-            // Always prioritize the high nonce message
+
             match (high_nonce_message_status, low_nonce_message_status) {
-                // Keep iterating if only processed messages are found
+                // Always prioritize advancing the the high nonce iterator, as
+                // we have a preference for higher nonces
                 (MessageStatus::Processed, _) => {
                     self.high_nonce_iter.iterate();
                 }
-                (_, MessageStatus::Processed) => {
-                    self.low_nonce_iter.iterate();
-                }
-                // Otherwise return - either a processable message or nothing to process
                 (MessageStatus::Processable(high_nonce_message), _) => {
                     self.high_nonce_iter.iterate();
                     return Ok(Some(high_nonce_message));
                 }
+
+                // Low nonce messages are only processed if the high nonce iterator
+                // can't make any progress
+                (_, MessageStatus::Processed) => {
+                    self.low_nonce_iter.iterate();
+                }
                 (_, MessageStatus::Processable(low_nonce_message)) => {
                     self.low_nonce_iter.iterate();
                     return Ok(Some(low_nonce_message));
                 }
+
+                // If both iterators give us unindexed messages, there are no messages at the moment
                 (MessageStatus::Unindexed, MessageStatus::Unindexed) => return Ok(None),
             }
             // This loop may iterate through millions of processed messages, blocking the runtime.
@@ -157,7 +162,7 @@ impl DirectionalNonceIterator {
     }
 
     fn try_get_next_nonce(
-        &mut self,
+        &self,
         metrics: &MessageProcessorMetrics,
     ) -> Result<MessageStatus<HyperlaneMessage>> {
         if let Some(message) = self.indexed_message_with_nonce()? {

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

@@ -96,9 +96,11 @@ mod tests {
         let (addr, mut rx) = setup_test_server();
 
         let client = reqwest::Client::new();
-        let mut message = HyperlaneMessage::default();
-        // Use a random destination domain
-        message.destination = 42;
+        let message = HyperlaneMessage {
+            // Use a random destination domain
+            destination: 42,
+            ..Default::default()
+        };
         let pending_operation = MockPendingOperation::with_message_data(message.clone());
         let matching_list_body = json!([
             {
@@ -127,9 +129,11 @@ mod tests {
         let (addr, mut rx) = setup_test_server();
 
         let client = reqwest::Client::new();
-        let mut message = HyperlaneMessage::default();
-        // Use a random origin domain
-        message.origin = 42;
+        let message = HyperlaneMessage {
+            // Use a random origin domain
+            origin: 42,
+            ..Default::default()
+        };
         let pending_operation = MockPendingOperation::with_message_data(message.clone());
         let matching_list_body = json!([
             {
@@ -216,9 +220,11 @@ mod tests {
         let (addr, mut rx) = setup_test_server();
 
         let client = reqwest::Client::new();
-        let mut message = HyperlaneMessage::default();
-        // Use a random origin domain
-        message.origin = 42;
+        let message = HyperlaneMessage {
+            // Use a random origin domain
+            origin: 42,
+            ..Default::default()
+        };
         let pending_operation = MockPendingOperation::with_message_data(message.clone());
         let matching_list_body = json!([
             {

rust/main/agents/validator/src/submit.rs

@@ -559,7 +559,7 @@ mod test {
         let unix_timestamp = chrono::Utc::now().timestamp() as u64;
         let expected_reorg_period = 12;
 
-        let pre_reorg_merke_insertions = vec![
+        let pre_reorg_merke_insertions = [
             MerkleTreeInsertion::new(0, H256::random()),
             MerkleTreeInsertion::new(1, H256::random()),
             MerkleTreeInsertion::new(2, H256::random()),
@@ -570,9 +570,9 @@ mod test {
         }
 
         // the last leaf is different post-reorg
-        let post_reorg_merkle_insertions = vec![
-            pre_reorg_merke_insertions[0].clone(),
-            pre_reorg_merke_insertions[1].clone(),
+        let post_reorg_merkle_insertions = [
+            pre_reorg_merke_insertions[0],
+            pre_reorg_merke_insertions[1],
             MerkleTreeInsertion::new(2, H256::random()),
         ];
         let mut mock_onchain_merkle_tree = IncrementalMerkle::default();
@@ -589,9 +589,7 @@ mod test {
         // the db returns the pre-reorg merkle tree insertions
         let mut db = MockDb::new();
         db.expect_retrieve_merkle_tree_insertion_by_leaf_index()
-            .returning(move |sequence| {
-                Ok(Some(pre_reorg_merke_insertions[*sequence as usize].clone()))
-            });
+            .returning(move |sequence| Ok(Some(pre_reorg_merke_insertions[*sequence as usize])));
 
         // boilerplate mocks
         let mut mock_merkle_tree_hook = MockMerkleTreeHook::new();

rust/main/chains/hyperlane-cosmos/src/libs/account/tests.rs

@@ -61,14 +61,14 @@ fn test_ethereum_style() {
 fn compressed_public_key() -> PublicKey {
     let hex = hex::decode(COMPRESSED_PUBLIC_KEY).unwrap();
     let tendermint = tendermint::PublicKey::from_raw_secp256k1(&hex).unwrap();
-    let pub_key = PublicKey::from(tendermint);
-    pub_key
+
+    PublicKey::from(tendermint)
 }
 
 fn decompressed_public_key() -> PublicKey {
     let hex = hex::decode(COMPRESSED_PUBLIC_KEY).unwrap();
     let decompressed = decompress_public_key(&hex).unwrap();
     let tendermint = tendermint::PublicKey::from_raw_secp256k1(&decompressed).unwrap();
-    let pub_key = PublicKey::from(tendermint);
-    pub_key
+
+    PublicKey::from(tendermint)
 }

rust/main/chains/hyperlane-cosmos/src/providers/cosmos/provider/parse.rs

@@ -153,7 +153,7 @@ mod tests {
 
     fn encode_proto(msg: &MsgRecvPacket) -> Any {
         let mut buf = Vec::with_capacity(msg.encoded_len());
-        MsgRecvPacket::encode(&msg, &mut buf).unwrap();
+        MsgRecvPacket::encode(msg, &mut buf).unwrap();
 
         Any {
             type_url: "".to_string(),

rust/main/chains/hyperlane-sealevel/Cargo.toml

@@ -18,6 +18,7 @@ serde.workspace = true
 serde_json.workspace = true
 solana-account-decoder.workspace = true
 solana-client.workspace = true
+solana-program.workspace = true
 solana-sdk.workspace = true
 solana-transaction-status.workspace = true
 thiserror.workspace = true