handle empty hash

Author: QuantumExplorer

dash/src/sml/masternode_list_engine/mod.rs

@@ -401,14 +401,18 @@ impl MasternodeListEngine {
 
         let can_verify_previous = quorum_snapshot_and_mn_list_diff_at_h_minus_4c.is_some();
 
-        let h_height = self
-            .block_container
-            .get_height(&mn_list_diff_h.block_hash)
-            .ok_or(QuorumValidationError::RequiredBlockNotPresent(mn_list_diff_h.block_hash))?;
-        let tip_height = self
-            .block_container
-            .get_height(&mn_list_diff_tip.block_hash)
-            .ok_or(QuorumValidationError::RequiredBlockNotPresent(mn_list_diff_tip.block_hash))?;
+        let h_height = self.block_container.get_height(&mn_list_diff_h.block_hash).ok_or(
+            QuorumValidationError::RequiredBlockNotPresent(
+                mn_list_diff_h.block_hash,
+                "getting height at diff h".to_string(),
+            ),
+        )?;
+        let tip_height = self.block_container.get_height(&mn_list_diff_tip.block_hash).ok_or(
+            QuorumValidationError::RequiredBlockNotPresent(
+                mn_list_diff_tip.block_hash,
+                "getting height at diff tip".to_string(),
+            ),
+        )?;
         let rotation_quorum_type = last_commitment_per_index
             .first()
             .map(|quorum_entry| quorum_entry.llmq_type)

dash/src/sml/masternode_list_engine/non_rotated_quorum_construction.rs

@@ -23,7 +23,10 @@ impl MasternodeListEngine {
                 ))
             }
         } else {
-            Err(QuorumValidationError::RequiredBlockNotPresent(*block_hash))
+            Err(QuorumValidationError::RequiredBlockNotPresent(
+                *block_hash,
+                "looking for masternode list and height for block hash 8 blocks ago".to_string(),
+            ))
         }
     }
 

dash/src/sml/masternode_list_engine/rotated_quorum_construction.rs

@@ -35,6 +35,7 @@ impl MasternodeListEngine {
         else {
             return Err(QuorumValidationError::RequiredBlockNotPresent(
                 quorum.quorum_entry.quorum_hash,
+                "getting height when finding rotated masternodes for quorum".to_string(),
             ));
         };
         let llmq_type = quorum.quorum_entry.llmq_type;
@@ -82,7 +83,7 @@ impl MasternodeListEngine {
                 self.block_container.get_height(&quorum.quorum_entry.quorum_hash)
             else {
                 return Err(QuorumValidationError::RequiredBlockNotPresent(
-                    quorum.quorum_entry.quorum_hash,
+                    quorum.quorum_entry.quorum_hash, "getting height for a quorum hash when trying to find rotated masternodes for quorums".to_string()
                 ));
             };
             let llmq_type = quorum.quorum_entry.llmq_type;
@@ -145,7 +146,10 @@ impl MasternodeListEngine {
         for quorum in &qr_info.last_commitment_per_index {
             let Some(quorum_block_height) = self.block_container.get_height(&quorum.quorum_hash)
             else {
-                return Err(QuorumValidationError::RequiredBlockNotPresent(quorum.quorum_hash));
+                return Err(QuorumValidationError::RequiredBlockNotPresent(
+                    quorum.quorum_hash,
+                    "getting required cl_sig heights".to_string(),
+                ));
             };
             let llmq_params = quorum.llmq_type.params();
             let quorum_index = quorum_block_height % llmq_params.dkg_params.interval;
@@ -164,6 +168,7 @@ impl MasternodeListEngine {
                     else {
                         return Err(QuorumValidationError::RequiredBlockNotPresent(
                             quorum.quorum_hash,
+                            "getting height for quorum hash for diff at h minus 4c".to_string(),
                         ));
                     };
                     let llmq_params = quorum.llmq_type.params();

dash/src/sml/quorum_entry/qualified_quorum_entry.rs

@@ -68,7 +68,7 @@ impl QualifiedQuorumEntry {
     /// * `result` - A `Result` containing either success (`Ok`) or a `QuorumValidationError`.
     pub fn update_quorum_status(&mut self, result: Result<(), QuorumValidationError>) {
         match result {
-            Err(QuorumValidationError::RequiredBlockNotPresent(block_hash)) => {
+            Err(QuorumValidationError::RequiredBlockNotPresent(block_hash, _)) => {
                 self.verified = LLMQEntryVerificationStatus::Skipped(
                     LLMQEntryVerificationSkipStatus::UnknownBlock(block_hash),
                 );

dash/src/sml/quorum_validation_error.rs

@@ -24,8 +24,8 @@ pub enum ClientDataRetrievalError {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
 pub enum QuorumValidationError {
-    #[error("Required block not present: {0}")]
-    RequiredBlockNotPresent(BlockHash),
+    #[error("Required block not present: {0} ({1})")]
+    RequiredBlockNotPresent(BlockHash, String),
 
     #[error("Required block height not present: {0}")]
     RequiredBlockHeightNotPresent(CoreBlockHeight),