Merge remote-tracking branch 'origin/main' into ab/epoch-integration-test

Author: imabdulbasit

Cargo.lock

@@ -298,6 +298,22 @@ impl TestBlockHeader {
     }
 }
 
+impl Default for TestBlockHeader {
+    fn default() -> Self {
+        let metadata = TestMetadata {
+            num_transactions: 0,
+        };
+        Self {
+            block_number: 0,
+            payload_commitment: Default::default(),
+            builder_commitment: Default::default(),
+            metadata,
+            timestamp: 0,
+            random: 0,
+        }
+    }
+}
+
 impl<
         TYPES: NodeType<
             BlockHeader = Self,

hotshot-example-types/src/block_types.rs

@@ -11,8 +11,8 @@ pub use hotshot::traits::election::helpers::{
 };
 use hotshot::traits::{
     election::{
-        helpers::QuorumFilterConfig, randomized_committee::Committee,
-        randomized_committee_members::RandomizedCommitteeMembers,
+        dummy_catchup_membership::DummyCatchupCommittee, helpers::QuorumFilterConfig,
+        randomized_committee::Committee, randomized_committee_members::RandomizedCommitteeMembers,
         static_committee::StaticCommittee,
         static_committee_leader_two_views::StaticCommitteeLeaderForTwoViews,
         two_static_committees::TwoStaticCommittees,
@@ -101,6 +101,36 @@ impl NodeType for TestTypesRandomizedLeader {
     type BuilderSignatureKey = BuilderKey;
 }
 
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    Hash,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    serde::Serialize,
+    serde::Deserialize,
+)]
+pub struct TestTypesEpochCatchupTypes;
+impl NodeType for TestTypesEpochCatchupTypes {
+    const UPGRADE_CONSTANTS: UpgradeConstants = TEST_UPGRADE_CONSTANTS;
+
+    type AuctionResult = TestAuctionResult;
+    type View = ViewNumber;
+    type Epoch = EpochNumber;
+    type BlockHeader = TestBlockHeader;
+    type BlockPayload = TestBlockPayload;
+    type SignatureKey = BLSPubKey;
+    type Transaction = TestTransaction;
+    type ValidatedState = TestValidatedState;
+    type InstanceState = TestInstanceState;
+    type Membership = DummyCatchupCommittee<TestTypesEpochCatchupTypes>;
+    type BuilderSignatureKey = BuilderKey;
+}
+
 #[derive(
     Copy,
     Clone,

hotshot-example-types/src/node_types.rs

@@ -54,6 +54,7 @@ use hotshot_testing::block_builder::{
 use hotshot_types::{
     consensus::ConsensusMetricsValue,
     data::{Leaf, TestableLeaf},
+    epoch_membership::EpochMembershipCoordinator,
     event::{Event, EventType},
     network::{BuilderType, NetworkConfig, NetworkConfigFile, NetworkConfigSource},
     traits::{
@@ -388,13 +389,14 @@ pub trait RunDa<
             // TODO: we need to pass a valid fallback builder url here somehow
             fallback_builder_url: config.config.builder_urls.first().clone(),
         };
+        let epoch_height = config.config.epoch_height;
 
         SystemContext::init(
             pk,
             sk,
             config.node_index,
             config.config,
-            membership,
+            EpochMembershipCoordinator::new(membership, epoch_height),
             Arc::from(network),
             initializer,
             ConsensusMetricsValue::default(),
@@ -524,15 +526,15 @@ pub trait RunDa<
                 }
             }
         }
+        // Panic if we don't have the genesis epoch, there is no recovery from that
         let num_eligible_leaders = context
             .hotshot
-            .memberships
-            .read()
+            .membership_coordinator
+            .membership_for_epoch(genesis_epoch_from_version::<V, TYPES>())
+            .await
+            .unwrap()
+            .committee_leaders(TYPES::View::genesis())
             .await
-            .committee_leaders(
-                TYPES::View::genesis(),
-                genesis_epoch_from_version::<V, TYPES>(),
-            )
             .len();
         let consensus_lock = context.hotshot.consensus();
         let consensus_reader = consensus_lock.read().await;

hotshot-examples/infra/mod.rs

@@ -42,6 +42,7 @@ use hotshot_query_service::{
 use hotshot_testing::block_builder::{SimpleBuilderImplementation, TestBuilderImplementation};
 use hotshot_types::{
     consensus::ConsensusMetricsValue,
+    epoch_membership::EpochMembershipCoordinator,
     light_client::StateKeyPair,
     signature_key::BLSPubKey,
     traits::{election::Membership, network::Topic},
@@ -236,13 +237,17 @@ async fn init_consensus(
                 ));
 
                 let storage: TestStorage<MockTypes> = TestStorage::default();
+                let coordinator = EpochMembershipCoordinator::new(
+                    Arc::new(RwLock::new(membership)),
+                    config.epoch_height,
+                );
 
                 SystemContext::init(
                     pub_keys[node_id],
                     priv_key,
                     node_id as u64,
                     config,
-                    Arc::new(RwLock::new(membership)),
+                    coordinator,
                     network,
                     HotShotInitializer::from_genesis::<MockVersions>(
                         TestInstanceState::default(),

hotshot-query-service/examples/simple-server.rs

@@ -38,6 +38,7 @@ use hotshot_example_types::{
 use hotshot_testing::block_builder::{SimpleBuilderImplementation, TestBuilderImplementation};
 use hotshot_types::{
     consensus::ConsensusMetricsValue,
+    epoch_membership::EpochMembershipCoordinator,
     light_client::StateKeyPair,
     signature_key::BLSPubKey,
     traits::{election::Membership, network::Topic, signature_key::SignatureKey as _},
@@ -181,13 +182,15 @@ impl<D: DataSourceLifeCycle + UpdateStatusData> MockNetwork<D> {
                         ));
 
                         let hs_storage: TestStorage<MockTypes> = TestStorage::default();
+                        let memberships =
+                            EpochMembershipCoordinator::new(membership, config.epoch_height);
 
                         let hotshot = SystemContext::init(
                             pub_keys[node_id],
                             priv_key,
                             node_id as u64,
                             config,
-                            membership,
+                            memberships,
                             network,
                             HotShotInitializer::from_genesis::<MockVersions>(
                                 TestInstanceState::default(),

hotshot-query-service/src/testing/consensus.rs

@@ -11,10 +11,7 @@ use chrono::Utc;
 use hotshot_types::{
     event::{Event, EventType},
     simple_vote::{HasEpoch, QuorumVote2, TimeoutData2, TimeoutVote2},
-    traits::{
-        election::Membership,
-        node_implementation::{ConsensusTime, NodeImplementation, NodeType},
-    },
+    traits::node_implementation::{ConsensusTime, NodeImplementation, NodeType},
     utils::EpochTransitionIndicator,
     vote::{HasViewNumber, Vote},
 };
@@ -47,12 +44,14 @@ pub(crate) async fn handle_quorum_vote_recv<
         .read()
         .await
         .is_high_qc_for_last_block();
-    let we_are_leader = task_state
-        .membership
-        .read()
+    let epoch_membership = task_state
+        .membership_coordinator
+        .membership_for_epoch(vote.data.epoch)
         .await
-        .leader(vote.view_number() + 1, vote.data.epoch)?
-        == task_state.public_key;
+        .context(warn!("No stake table for epoch"))?;
+
+    let we_are_leader =
+        epoch_membership.leader(vote.view_number() + 1).await? == task_state.public_key;
     ensure!(
         in_transition || we_are_leader,
         info!(
@@ -70,8 +69,7 @@ pub(crate) async fn handle_quorum_vote_recv<
         &mut task_state.vote_collectors,
         vote,
         task_state.public_key.clone(),
-        &task_state.membership,
-        vote.data.epoch,
+        &epoch_membership,
         task_state.id,
         &event,
         sender,
@@ -80,20 +78,19 @@ pub(crate) async fn handle_quorum_vote_recv<
     )
     .await?;
 
-    if let Some(vote_epoch) = vote.epoch() {
+    if vote.epoch().is_some() {
         // If the vote sender belongs to the next epoch, collect it separately to form the second QC
-        let has_stake = task_state
-            .membership
-            .read()
-            .await
-            .has_stake(&vote.signing_key(), Some(vote_epoch + 1));
+        let has_stake = epoch_membership
+            .next_epoch()
+            .await?
+            .has_stake(&vote.signing_key())
+            .await;
         if has_stake {
             handle_vote(
                 &mut task_state.next_epoch_vote_collectors,
                 &vote.clone().into(),
                 task_state.public_key.clone(),
-                &task_state.membership,
-                vote.data.epoch,
+                &epoch_membership.next_epoch().await?.clone(),
                 task_state.id,
                 &event,
                 sender,
@@ -118,14 +115,14 @@ pub(crate) async fn handle_timeout_vote_recv<
     sender: &Sender<Arc<HotShotEvent<TYPES>>>,
     task_state: &mut ConsensusTaskState<TYPES, I, V>,
 ) -> Result<()> {
+    let epoch_membership = task_state
+        .membership_coordinator
+        .membership_for_epoch(task_state.cur_epoch)
+        .await
+        .context(warn!("No stake table for epoch"))?;
     // Are we the leader for this view?
     ensure!(
-        task_state
-            .membership
-            .read()
-            .await
-            .leader(vote.view_number() + 1, task_state.cur_epoch)?
-            == task_state.public_key,
+        epoch_membership.leader(vote.view_number() + 1).await? == task_state.public_key,
         info!(
             "We are not the leader for view {:?}",
             vote.view_number() + 1
@@ -136,8 +133,10 @@ pub(crate) async fn handle_timeout_vote_recv<
         &mut task_state.timeout_vote_collectors,
         vote,
         task_state.public_key.clone(),
-        &task_state.membership,
-        vote.data.epoch,
+        &task_state
+            .membership_coordinator
+            .membership_for_epoch(vote.data.epoch)
+            .await?,
         task_state.id,
         &event,
         sender,
@@ -201,10 +200,11 @@ pub async fn send_high_qc<TYPES: NodeType, V: Versions, I: NodeImplementation<TY
         .await;
     } else {
         let leader = task_state
-            .membership
-            .read()
-            .await
-            .leader(new_view_number, task_state.cur_epoch)?;
+            .membership_coordinator
+            .membership_for_epoch(task_state.cur_epoch)
+            .await?
+            .leader(new_view_number)
+            .await?;
         broadcast_event(
             Arc::new(HotShotEvent::HighQcSend(
                 high_qc,
@@ -305,10 +305,12 @@ pub(crate) async fn handle_view_change<
     std::mem::replace(&mut task_state.timeout_task, new_timeout_task).abort();
 
     let old_view_leader_key = task_state
-        .membership
-        .read()
+        .membership_coordinator
+        .membership_for_epoch(task_state.cur_epoch)
         .await
-        .leader(old_view_number, task_state.cur_epoch)?;
+        .context(warn!("No stake table for epoch"))?
+        .leader(old_view_number)
+        .await?;
 
     let consensus_reader = task_state.consensus.read().await;
     consensus_reader
@@ -367,10 +369,12 @@ pub(crate) async fn handle_timeout<TYPES: NodeType, I: NodeImplementation<TYPES>
 
     ensure!(
         task_state
-            .membership
-            .read()
+            .membership_coordinator
+            .membership_for_epoch(epoch)
             .await
-            .has_stake(&task_state.public_key, epoch),
+            .context(warn!("No stake table for epoch"))?
+            .has_stake(&task_state.public_key)
+            .await,
         debug!(
             "We were not chosen for the consensus committee for view {:?}",
             view_number
@@ -416,10 +420,12 @@ pub(crate) async fn handle_timeout<TYPES: NodeType, I: NodeImplementation<TYPES>
     .await;
 
     let leader = task_state
-        .membership
-        .read()
+        .membership_coordinator
+        .membership_for_epoch(task_state.cur_epoch)
         .await
-        .leader(view_number, task_state.cur_epoch);
+        .context(warn!("No stake table for epoch"))?
+        .leader(view_number)
+        .await;
 
     let consensus_reader = task_state.consensus.read().await;
     consensus_reader.metrics.number_of_timeouts.add(1);

hotshot-task-impls/src/consensus/handlers.rs

@@ -5,11 +5,11 @@
 // along with the HotShot repository. If not, see <https://mit-license.org/>.
 
 use async_broadcast::{Receiver, Sender};
-use async_lock::RwLock;
 use async_trait::async_trait;
 use hotshot_task::task::TaskState;
 use hotshot_types::{
     consensus::OuterConsensus,
+    epoch_membership::EpochMembershipCoordinator,
     event::Event,
     message::UpgradeLock,
     simple_certificate::{NextEpochQuorumCertificate2, QuorumCertificate2, TimeoutCertificate2},
@@ -53,7 +53,7 @@ pub struct ConsensusTaskState<TYPES: NodeType, I: NodeImplementation<TYPES>, V:
     pub network: Arc<I::Network>,
 
     /// Membership for Quorum Certs/votes
-    pub membership: Arc<RwLock<TYPES::Membership>>,
+    pub membership_coordinator: EpochMembershipCoordinator<TYPES>,
 
     /// A map of `QuorumVote` collector tasks.
     pub vote_collectors: VoteCollectorsMap<TYPES, QuorumVote2<TYPES>, QuorumCertificate2<TYPES>, V>,
@@ -183,7 +183,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions> ConsensusTaskSt
                     high_qc,
                     Some(next_epoch_high_qc),
                     &self.consensus,
-                    &self.membership,
+                    &self.membership_coordinator,
                     &self.upgrade_lock,
                 )
                 .await