nonce -> leaf_index builder.get_proof

hyperlane-xyz · Nov 2, 2023 · 9751ce5 · 9751ce5
1 parent 228c698
commit 9751ce5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/rust/agents/relayer/src/merkle_tree/builder.rs b/rust/agents/relayer/src/merkle_tree/builder.rs
@@ -75,23 +75,16 @@ impl MerkleTreeBuilder {
     #[instrument(err, skip(self), level="debug", fields(prover_latest_index=self.count()-1))]
     pub fn get_proof(
         &self,
-        message_nonce: u32,
+        leaf_index: u32,
         root_index: u32,
     ) -> Result<Option<Proof>, MerkleTreeBuilderError> {
-        self.db
-            .retrieve_message_id_by_nonce(&message_nonce)?
-            .and_then(|message_id| {
-                self.db
-                    .retrieve_merkle_leaf_index_by_message_id(&message_id)
-                    .ok()
-                    .flatten()
-            })
-            .map(|leaf_index| {
-                self.prover
-                    .prove_against_previous(leaf_index as usize, root_index as usize)
-            })
-            .transpose()
-            .map_err(Into::into)
+        match self
+            .prover
+            .prove_against_previous(leaf_index as usize, root_index as usize)
+        {
+            Ok(proof) => Ok(Some(proof)),
+            Err(prover_err) => Err(MerkleTreeBuilderError::from(prover_err)),
+        }
     }
 
     pub fn count(&self) -> u32 {

diff --git a/rust/agents/relayer/src/msg/metadata/aggregation.rs b/rust/agents/relayer/src/msg/metadata/aggregation.rs
@@ -107,7 +107,7 @@ impl AggregationIsmMetadataBuilder {
 
         let metas_and_gas_count = metas_and_gas.len();
         if metas_and_gas_count < threshold {
-            info!("Could not fetch all metadata: Found {metas_and_gas_count} of the {threshold} required ISM metadata pieces");
+            info!("Could not fetch all metadata: Found {metas_and_gas_count} of the {threshold} required ISM metadata pieces for message_id {message_id}", metas_and_gas_count=metas_and_gas_count, threshold=threshold, message_id=message.id());
             return None;
         }
         Some(Self::n_cheapest_metas(metas_and_gas, threshold))

diff --git a/rust/agents/relayer/src/msg/metadata/base.rs b/rust/agents/relayer/src/msg/metadata/base.rs
@@ -120,12 +120,16 @@ impl BaseMetadataBuilder {
         }
     }
 
-    pub async fn get_proof(&self, nonce: u32, checkpoint: Checkpoint) -> Result<Option<Proof>> {
+    pub async fn get_proof(
+        &self,
+        leaf_index: u32,
+        checkpoint: Checkpoint,
+    ) -> Result<Option<Proof>> {
         const CTX: &str = "When fetching message proof";
         let proof = self.origin_prover_sync
             .read()
             .await
-            .get_proof(nonce, checkpoint.index)
+            .get_proof(leaf_index, checkpoint.index)
             .context(CTX)?
             .and_then(|proof| {
                 // checkpoint may be fraudulent if the root does not

diff --git a/rust/hyperlane-base/src/types/multisig.rs b/rust/hyperlane-base/src/types/multisig.rs
@@ -217,7 +217,7 @@ impl MultisigCheckpointSyncer {
                 // Gracefully handle errors getting the latest_index
                 match checkpoint_syncer.latest_index().await {
                     Ok(Some(index)) => {
-                        trace!(?address, ?index, "Validator returned latest index");
+                        debug!(?address, ?index, "Validator returned latest index");
                         latest_indices.push(index);
                     }
                     err => {