Merge branch 'main' into A0-4560

.github/workflows/cargo-audit.yml

@@ -20,6 +20,11 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4
 
+      - name: Install cargo audit
+        shell: bash
+        run: |
+          cargo install cargo-audit --locked
+
       - name: Run `cargo-audit`
         uses: actions-rs/audit-check@v1
         with:

consensus/src/dag/reconstruction/mod.rs

@@ -26,10 +26,15 @@ impl<U: Unit> ReconstructedUnit<U> {
             == ControlHash::<U::Hasher>::combine_hashes(&parents)
         {
             true => {
-                let parents = unit.control_hash().parents_round_lookup.clone();
+                let unit_round = unit.round();
+                let mut parents_with_rounds = NodeMap::with_size(parents.size());
+                for (parent_index, hash) in parents.into_iter() {
+                    // we cannot have here round 0 units
+                    parents_with_rounds.insert(parent_index, (hash, unit_round.saturating_sub(1)));
+                }
                 Ok(ReconstructedUnit {
                     unit,
-                    parents,
+                    parents: parents_with_rounds,
                 })
             }
             false => Err(unit),

consensus/src/extension/election.rs

@@ -110,6 +110,7 @@ impl<U: UnitWithParents> CandidateElection<U> {
             // Otherwise we compute the vote based on the parents' votes.
             _ => {
                 let threshold = voter.node_count().consensus_threshold();
+                let direct_parents = voter.direct_parents().cloned().collect();
                 self.vote_from_parents(direct_parents, threshold, relative_round)?
             }
         };

consensus/src/testing/dag.rs

@@ -139,7 +139,7 @@ impl DagFeeder {
 
     fn on_reconstructed_unit(&mut self, unit: ReconstructedUnit) {
         let h = unit.hash();
-        let parents = unit.parents().cloned().collect::<Vec<_>>();
+        let parents: HashSet<_> = unit.parents().cloned().collect();
         let expected_hashes: HashSet<_> = self
             .units_map
             .get(&h)
@@ -148,7 +148,7 @@ impl DagFeeder {
             .into_iter()
             .collect();
 
-        assert_eq!(parents.into_iter().collect::<HashSet<_>>(), expected_hashes);
+        assert_eq!(parents, expected_hashes);
         self.result.push(unit.clone());
         self.store.insert(unit);
     }

examples/ordering/Cargo.toml

@@ -19,4 +19,4 @@ log = "0.4"
 parking_lot = "0.12"
 time = { version = "0.3", features = ["formatting", "macros", "local-offset"] }
 tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "io-util", "net", "time", "fs"] }
-tokio-util = { version = "0.7.12", features = ["compat"] }
+tokio-util = { version = "0.7.13", features = ["compat"] }