fix(ethexe-consensus): address review issues in base-announce-priority

- Remove accidental O(N²) debug chain-traversal block from initial.rs
- Use saturating_sub(1) instead of - 1 in best_parent_announce/block_best_announce
- Include announce hashes in double-announcement warning
- Add docstring to best_announce noting it may return hash outside input set
- Add warn! logging when announces_have_equal_outcomes has missing outcome
- Add Ord/PartialOrd/Hash impls to WithHashOf<T> based on hash field

Co-authored-by: Gregory Sobol <grishasobol@users.noreply.github.com>

Author: github-actions[bot]

ethexe/common/src/hash.rs

@@ -222,3 +222,21 @@ pub struct WithHashOf<T: 'static> {
     pub hash: HashOf<T>,
     pub value: T,
 }
+
+impl<T> PartialOrd for WithHashOf<T> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl<T> Ord for WithHashOf<T> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.hash.cmp(&other.hash)
+    }
+}
+
+impl<T> Hash for WithHashOf<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.hash.hash(state)
+    }
+}

ethexe/consensus/src/announces.rs

@@ -645,7 +645,7 @@ pub fn best_parent_announce(
     // to be sure that we take only not expired parent announces.
     let candidates = db.announces_parents(announces)?;
 
-    best_announce(db, candidates, commitment_delay_limit - 1)
+    best_announce(db, candidates, commitment_delay_limit.saturating_sub(1))
 }
 
 pub fn block_best_announce(
@@ -664,7 +664,7 @@ pub fn block_best_announce(
     // to be sure that we take only not expired parent announces.
     let parent_announces = db.announces_parents(candidates.iter().cloned())?;
 
-    let best_parent = best_announce(db, parent_announces, commitment_delay_limit - 1)?;
+    let best_parent = best_announce(db, parent_announces, commitment_delay_limit.saturating_sub(1))?;
 
     // Find child announces
     let mut not_base_announce_hash = None;
@@ -675,8 +675,12 @@ pub fn block_best_announce(
             .ok_or_else(|| anyhow!("announce({candidate}) not found"))?;
 
         if announce.parent == best_parent && !announce.is_base() {
-            if not_base_announce_hash.is_some() {
-                tracing::warn!("Found multiple not-base announces: maybe double announcement");
+            if let Some(existing) = not_base_announce_hash {
+                tracing::warn!(
+                    existing = %existing,
+                    new = %candidate,
+                    "Found multiple not-base announces: maybe double announcement"
+                );
             } else {
                 not_base_announce_hash = Some(candidate);
             }
@@ -705,6 +709,9 @@ pub fn block_best_announce(
 }
 
 /// Returns announce hash, which is supposed to be best among provided announces.
+///
+/// Note: if the best candidate is a not-base announce that has an equal-outcome base sibling,
+/// the function may return that base sibling's hash, which is **not** in the input set.
 fn best_announce(
     db: &impl DBAnnouncesExt,
     announces: impl IntoIterator<Item = HashOf<Announce>>,
@@ -777,9 +784,18 @@ pub fn announces_have_equal_outcomes(
     announce1_hash: HashOf<Announce>,
     announce2_hash: HashOf<Announce>,
 ) -> bool {
-    db.announce_outcome(announce1_hash)
-        .map(|base_outcome| Some(base_outcome) == db.announce_outcome(announce2_hash))
-        .unwrap_or(false)
+    let outcome1 = db.announce_outcome(announce1_hash);
+    let outcome2 = db.announce_outcome(announce2_hash);
+    if outcome1.is_none() || outcome2.is_none() {
+        tracing::warn!(
+            announce1 = %announce1_hash,
+            announce2 = %announce2_hash,
+            "announces_have_equal_outcomes: one or both outcomes not yet computed, \
+             defaulting to not equal"
+        );
+        return false;
+    }
+    outcome1 == outcome2
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, derive_more::Display)]

ethexe/consensus/src/validator/initial.rs

@@ -223,28 +223,6 @@ impl Initial {
 
 impl ValidatorContext {
     fn switch_to_producer_or_subordinate(self, block: SimpleBlockData) -> Result<ValidatorState> {
-        // print chain
-        {
-            use ethexe_common::{
-                HashOf,
-                db::{AnnounceStorageRO, BlockMetaStorageRO},
-            };
-
-            let db = &self.core.db;
-            for mut head in db.block_meta(block.hash).announces.into_iter().flatten() {
-                let mut chain_str = String::new();
-                while head != HashOf::zero() {
-                    let announce = db.announce(head).unwrap();
-                    chain_str = format!(
-                        "{head:6}({}) <- {chain_str}",
-                        if announce.is_base() { "B" } else { "P" }
-                    );
-                    head = announce.parent;
-                }
-                tracing::info!(block = %block.hash, "Announces chain: {chain_str}");
-            }
-        }
-
         let era_index = self.core.timelines.era_from_ts(block.header.timestamp);
         let validators = self
             .core