Merge pull request #1794 from EspressoSystems/ed/timeout

Ed/timeout

crates/hotshot-signature-key/src/bn254/bn254_priv.rs

@@ -54,6 +54,7 @@ impl BLSPrivKey {
     }
 }
 
+// #[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
 impl PartialOrd for BLSPrivKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         let self_bytes = &self.priv_key.to_string();

crates/hotshot-signature-key/src/bn254/bn254_pub.rs

@@ -27,6 +27,7 @@ pub struct BLSPubKey {
     pub_key: VerKey,
 }
 
+// #[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
 impl PartialOrd for BLSPubKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         let self_bytes = &self.pub_key.to_string();

crates/hotshot/Cargo.toml

@@ -76,7 +76,6 @@ required-features = ["demo", "libp2p/rsa"]
 path = "examples/web-server-da/multi-web-server.rs"
 
 [dependencies]
-# TODO ED We should upgrade ark libraries to 0.4
 async-compatibility-layer = { workspace = true }
 async-lock = { workspace = true }
 async-trait = { workspace = true }

crates/hotshot/src/lib.rs

@@ -53,6 +53,9 @@ use hotshot_task::{
     task_launcher::TaskRunner,
 };
 use hotshot_task_impls::{events::SequencingHotShotEvent, network::NetworkTaskKind};
+use hotshot_types::{
+    certificate::TimeoutCertificate, traits::node_implementation::SequencingTimeoutEx,
+};
 
 use hotshot_types::{
     block_impl::{VIDBlockPayload, VIDTransaction},
@@ -238,22 +241,14 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> SystemContext<TYPES, I> {
         Ok(Self { inner })
     }
 
-    /// "Starts" consensus by sending a `ViewChange` event
+    /// "Starts" consensus by sending a `QCFormed` event
     pub async fn start_consensus(&self) {
         self.inner
             .internal_event_stream
-            .publish(SequencingHotShotEvent::ViewChange(TYPES::Time::new(1)))
+            .publish(SequencingHotShotEvent::QCFormed(either::Left(
+                QuorumCertificate::genesis(),
+            )))
             .await;
-
-        // ED This isn't ideal...
-        // async_sleep(Duration::new(1, 0)).await;
-
-        // self.inner
-        //     .internal_event_stream
-        //     .publish(SequencingHotShotEvent::QCFormed(
-        //         QuorumCertificate::genesis(),
-        //     ))
-        //     .await;
     }
 
     /// Marks a given view number as timed out. This should be called a fixed period after a round is started.
@@ -663,6 +658,14 @@ where
             Commitment = Commitment<ViewSyncData<TYPES>>,
             Membership = MEMBERSHIP,
         > + 'static,
+    SequencingTimeoutEx<TYPES, I>: ConsensusExchange<
+            TYPES,
+            Message<TYPES, I>,
+            Proposal = QuorumProposal<TYPES, SequencingLeaf<TYPES>>,
+            Certificate = TimeoutCertificate<TYPES>,
+            Commitment = Commitment<TYPES::Time>,
+            Membership = MEMBERSHIP,
+        > + 'static,
 {
     fn consensus(&self) -> &Arc<RwLock<Consensus<TYPES, I::Leaf>>> {
         &self.inner.consensus

crates/hotshot/src/tasks/mod.rs

@@ -28,15 +28,16 @@ use hotshot_task_impls::{
 };
 use hotshot_types::{
     block_impl::{VIDBlockPayload, VIDTransaction},
-    certificate::ViewSyncCertificate,
+    certificate::{TimeoutCertificate, ViewSyncCertificate},
     data::{ProposalType, QuorumProposal, SequencingLeaf},
     event::Event,
     message::{Message, Messages, SequencingMessage},
     traits::{
         election::{ConsensusExchange, Membership},
-        network::{CommunicationChannel, TransmitType},
+        network::{CommunicationChannel, ConsensusIntentEvent, TransmitType},
         node_implementation::{
-            CommitteeEx, ExchangesType, NodeImplementation, NodeType, QuorumEx, ViewSyncEx,
+            CommitteeEx, ExchangesType, NodeImplementation, NodeType, QuorumEx,
+            SequencingTimeoutEx, ViewSyncEx,
         },
         state::ConsensusTime,
     },
@@ -276,6 +277,13 @@ where
         Certificate = DACertificate<TYPES>,
         Commitment = Commitment<TYPES::BlockType>,
     >,
+    SequencingTimeoutEx<TYPES, I>: ConsensusExchange<
+        TYPES,
+        Message<TYPES, I>,
+        Proposal = QuorumProposal<TYPES, SequencingLeaf<TYPES>>,
+        Certificate = TimeoutCertificate<TYPES>,
+        Commitment = Commitment<TYPES::Time>,
+    >,
 {
     let consensus = handle.hotshot.get_consensus();
     let c_api: HotShotSequencingConsensusApi<TYPES, I> = HotShotSequencingConsensusApi {
@@ -290,6 +298,7 @@ where
         cur_view: TYPES::Time::new(0),
         block: Some(VIDBlockPayload::genesis()),
         quorum_exchange: c_api.inner.exchanges.quorum_exchange().clone().into(),
+        timeout_exchange: c_api.inner.exchanges.timeout_exchange().clone().into(),
         api: c_api.clone(),
         committee_exchange: c_api.inner.exchanges.committee_exchange().clone().into(),
         _pd: PhantomData,
@@ -302,6 +311,16 @@ where
         id: handle.hotshot.inner.id,
         qc: None,
     };
+    consensus_state
+        .quorum_exchange
+        .network()
+        .inject_consensus_info(ConsensusIntentEvent::PollForCurrentProposal)
+        .await;
+    consensus_state
+        .quorum_exchange
+        .network()
+        .inject_consensus_info(ConsensusIntentEvent::PollForProposal(1))
+        .await;
     let filter = FilterEvent(Arc::new(consensus_event_filter));
     let consensus_name = "Consensus Task";
     let consensus_event_handler = HandleEvent(Arc::new(

crates/hotshot/src/traits/networking/combined_network.rs

@@ -287,7 +287,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, MEMBERSHIP: Membership<TYPES
                 .broadcast_message(message.clone(), recipients.clone())
                 .await
             {
-                Ok(_) => {
+                Ok(()) => {
                     self.primary_down.store(0, Ordering::Relaxed);
                 }
                 Err(e) => {
@@ -318,7 +318,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, MEMBERSHIP: Membership<TYPES
                 .direct_message(message.clone(), recipient.clone())
                 .await
             {
-                Ok(_) => {
+                Ok(()) => {
                     self.primary_down.store(0, Ordering::Relaxed);
                 }
                 Err(e) => {

crates/hotshot/src/traits/networking/web_server_network.rs

@@ -116,8 +116,6 @@ struct Inner<M: NetworkMsg, KEY: SignatureKey, TYPES: NodeType> {
     /// The last tx_index we saw from the web server
     tx_index: Arc<RwLock<u64>>,
 
-    // TODO ED This should be TYPES::Time
-    // Theoretically there should never be contention for this lock...
     /// Task map for quorum proposals.
     proposal_task_map:
         Arc<RwLock<HashMap<u64, UnboundedSender<ConsensusIntentEvent<TYPES::SignatureKey>>>>>,

crates/hotshot/src/types/handle.rs

@@ -191,7 +191,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES> + 'static> SystemContextHandl
             if anchor_leaf.view_number == TYPES::Time::genesis() {
                 let leaf: I::Leaf = I::Leaf::from_stored_view(anchor_leaf);
                 let mut qc = QuorumCertificate::<TYPES, Commitment<I::Leaf>>::genesis();
-                qc.set_leaf_commitment(leaf.commit());
+                qc.leaf_commitment = leaf.commit();
                 let event = Event {
                     view_number: TYPES::Time::genesis(),
                     event: EventType::Decide {

crates/libp2p-networking/src/network/node/handle.rs

@@ -136,6 +136,9 @@ impl<S: Default + Debug> NetworkNodeHandle<S> {
     ///
     /// Will panic if a handler is already spawned
     #[allow(clippy::unused_async)]
+    // // Tokio and async_std disagree how this function should be linted
+    // #[allow(clippy::ignored_unit_patterns)]
+
     pub async fn spawn_handler<F, RET>(self: &Arc<Self>, cb: F) -> impl Future<Output = ()>
     where
         F: Fn(NetworkEvent, Arc<NetworkNodeHandle<S>>) -> RET + Sync + Send + 'static,

crates/orchestrator/src/config.rs

@@ -1,6 +1,6 @@
 use hotshot_types::{ExecutionType, HotShotConfig};
-use std::marker::PhantomData;
 use std::{
+    marker::PhantomData,
     net::{IpAddr, Ipv4Addr, SocketAddr},
     num::NonZeroUsize,
     time::Duration,