Handle HighQcSend (#3919)

* Handle HighQcSend * Use the new quorum cert struct
EspressoSystems · Dec 2, 2024 · 7ccea8b · 7ccea8b
1 parent 320ebe3
commit 7ccea8b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/crates/task-impls/src/consensus/handlers.rs b/crates/task-impls/src/consensus/handlers.rs
@@ -133,7 +133,15 @@ pub async fn send_high_qc<TYPES: NodeType, V: Versions, I: NodeImplementation<TY
     let leader = task_state
         .membership
         .leader(new_view_number, TYPES::Epoch::new(0))?;
-    broadcast_event(Arc::new(HotShotEvent::HighQcSend(high_qc, leader)), sender).await;
+    broadcast_event(
+        Arc::new(HotShotEvent::HighQcSend(
+            high_qc,
+            leader,
+            task_state.public_key.clone(),
+        )),
+        sender,
+    )
+    .await;
     Ok(())
 }
 

diff --git a/crates/task-impls/src/events.rs b/crates/task-impls/src/events.rs
@@ -242,7 +242,11 @@ pub enum HotShotEvent<TYPES: NodeType> {
     HighQcRecv(QuorumCertificate2<TYPES>, TYPES::SignatureKey),
 
     /// Send our HighQc to the next leader, should go to the same leader as our vote
-    HighQcSend(QuorumCertificate2<TYPES>, TYPES::SignatureKey),
+    HighQcSend(
+        QuorumCertificate2<TYPES>,
+        TYPES::SignatureKey,
+        TYPES::SignatureKey,
+    ),
 }
 
 impl<TYPES: NodeType> HotShotEvent<TYPES> {
@@ -322,7 +326,7 @@ impl<TYPES: NodeType> HotShotEvent<TYPES> {
             | HotShotEvent::VidRequestRecv(request, _) => Some(request.view),
             HotShotEvent::VidResponseSend(_, _, proposal)
             | HotShotEvent::VidResponseRecv(_, proposal) => Some(proposal.data.view_number),
-            HotShotEvent::HighQcRecv(qc, _) | HotShotEvent::HighQcSend(qc, _) => {
+            HotShotEvent::HighQcRecv(qc, _) | HotShotEvent::HighQcSend(qc, ..) => {
                 Some(qc.view_number())
             }
         }
@@ -590,7 +594,7 @@ impl<TYPES: NodeType> Display for HotShotEvent<TYPES> {
             HotShotEvent::HighQcRecv(qc, _) => {
                 write!(f, "HighQcRecv(view_number={:?}", qc.view_number())
             }
-            HotShotEvent::HighQcSend(qc, _) => {
+            HotShotEvent::HighQcSend(qc, ..) => {
                 write!(f, "HighQcSend(view_number={:?}", qc.view_number())
             }
         }

diff --git a/crates/task-impls/src/network.rs b/crates/task-impls/src/network.rs
@@ -114,9 +114,7 @@ impl<TYPES: NodeType> NetworkMessageTaskState<TYPES> {
                             tracing::error!("Received upgrade vote!");
                             HotShotEvent::UpgradeVoteRecv(message)
                         }
-                        GeneralConsensusMessage::HighQc(qc) => {
-                            HotShotEvent::HighQcRecv(qc.to_qc2(), sender)
-                        }
+                        GeneralConsensusMessage::HighQc(qc) => HotShotEvent::HighQcRecv(qc, sender),
                     },
                     SequencingMessage::Da(da_message) => match da_message {
                         DaConsensusMessage::DaProposal(proposal) => {
@@ -650,6 +648,13 @@ impl<
                     TransmitType::Direct(to),
                 ))
             }
+            HotShotEvent::HighQcSend(quorum_cert, leader, sender) => Some((
+                sender,
+                MessageKind::Consensus(SequencingMessage::General(
+                    GeneralConsensusMessage::HighQc(quorum_cert),
+                )),
+                TransmitType::Direct(leader),
+            )),
             _ => None,
         }
     }

diff --git a/crates/task-impls/src/quorum_proposal/mod.rs b/crates/task-impls/src/quorum_proposal/mod.rs
@@ -502,7 +502,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions>
             HotShotEvent::ViewChange(view, _) | HotShotEvent::Timeout(view) => {
                 self.cancel_tasks(*view);
             }
-            HotShotEvent::HighQcSend(qc, _sender) => {
+            HotShotEvent::HighQcSend(qc, ..) => {
                 ensure!(qc.view_number() > self.highest_qc.view_number());
                 let epoch_number = self.consensus.read().await.cur_epoch();
                 ensure!(

diff --git a/crates/types/src/message.rs b/crates/types/src/message.rs
@@ -30,7 +30,7 @@ use crate::{
     },
     request_response::ProposalRequestPayload,
     simple_certificate::{
-        DaCertificate, QuorumCertificate, UpgradeCertificate, ViewSyncCommitCertificate2,
+        DaCertificate, QuorumCertificate2, UpgradeCertificate, ViewSyncCommitCertificate2,
         ViewSyncFinalizeCertificate2, ViewSyncPreCommitCertificate2,
     },
     simple_vote::{
@@ -210,7 +210,7 @@ pub enum GeneralConsensusMessage<TYPES: NodeType> {
     ProposalResponse(Proposal<TYPES, QuorumProposal<TYPES>>),
 
     /// Message for the next leader containing our highest QC
-    HighQc(QuorumCertificate<TYPES>),
+    HighQc(QuorumCertificate2<TYPES>),
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Hash, Eq)]