change da_committees to a map of version to map of epoch to committee

Author: pls148

crates/hotshot/types/src/hotshot_config_file.rs

@@ -8,6 +8,7 @@ use std::{collections::BTreeMap, num::NonZeroUsize, time::Duration};
 
 use alloy::primitives::U256;
 use url::Url;
+use vbs::version::Version;
 use vec1::Vec1;
 
 use crate::{
@@ -47,7 +48,7 @@ pub struct HotShotConfigFile<TYPES: NodeType> {
     pub known_da_nodes: Vec<PeerConfig<TYPES>>,
     #[serde(skip)]
     /// The known DA nodes' public keys and stake values, by start epoch
-    pub da_committees: BTreeMap<u64, Vec<PeerConfig<TYPES>>>,
+    pub da_committees: BTreeMap<Version, BTreeMap<u64, Vec<PeerConfig<TYPES>>>>,
     /// Number of staking DA nodes
     pub staked_da_nodes: usize,
     /// Number of fixed leaders for GPU VID

crates/hotshot/types/src/lib.rs

@@ -19,9 +19,10 @@ use traits::{
     signature_key::{SignatureKey, StateSignatureKey},
 };
 use url::Url;
+use vbs::version::Version;
 use vec1::Vec1;
 
-use crate::{traits::node_implementation::ConsensusTime, utils::bincode_opts};
+use crate::utils::bincode_opts;
 pub mod bundle;
 pub mod consensus;
 pub mod constants;
@@ -198,7 +199,7 @@ pub struct HotShotConfig<TYPES: NodeType> {
     /// All public keys known to be DA nodes
     pub known_da_nodes: Vec<PeerConfig<TYPES>>,
     /// All public keys known to be DA nodes, by start epoch
-    pub da_committees: BTreeMap<u64, Vec<PeerConfig<TYPES>>>,
+    pub da_committees: BTreeMap<Version, BTreeMap<u64, Vec<PeerConfig<TYPES>>>>,
     /// List of DA committee (staking)nodes for static DA committee
     pub da_staked_committee_size: usize,
     /// Number of fixed leaders for GPU VID, normally it will be 0, it's only used when running GPU VID
@@ -271,25 +272,10 @@ impl<TYPES: NodeType> HotShotConfig<TYPES> {
         self.known_nodes_with_stake.clone().into()
     }
 
-    pub fn build_da_committees(&self) -> BTreeMap<TYPES::Epoch, Vec<PeerConfig<TYPES>>> {
-        if self.da_committees.is_empty() {
-            tracing::warn!(
-                "da_committees is not set, falling back to known_da_nodes, which is deprecated."
-            );
-
-            [(TYPES::Epoch::new(0), self.known_da_nodes.clone())].into()
-        } else {
-            if !self.known_da_nodes.is_empty() {
-                tracing::warn!(
-                    "Both known_da_nodes and da_committees are set, known_da_nodes is deprecated \
-                     and will be ignored."
-                );
-            }
-
-            self.da_committees
-                .iter()
-                .map(|(k, v)| (TYPES::Epoch::new(*k), v.clone()))
-                .collect()
-        }
+    pub fn build_da_committees(&self) -> Vec<PeerConfig<TYPES>> {
+        // TODO: THIS IS A TEMPORARY FIX WITH THE WRONG RETURN TYPE.
+        // It's done so that we can start using this function and have the existing behavior
+        // (use known_da_nodes) while we transition to using da_committees.
+        self.known_da_nodes.clone()
     }
 }

sequencer/src/genesis.rs

@@ -111,7 +111,7 @@ pub struct Genesis {
     #[serde(default)]
     pub upgrades: BTreeMap<Version, Upgrade>,
     #[serde(default)]
-    pub da_committees: Option<BTreeMap<TomlKeyU64, Vec<PeerConfigData>>>,
+    pub da_committees: Option<BTreeMap<Version, BTreeMap<TomlKeyU64, Vec<PeerConfigData>>>>,
 }
 
 impl Genesis {

sequencer/src/lib.rs

@@ -397,14 +397,21 @@ where
             .iter()
             .map(|(k, v)| {
                 (
-                    k.into(),
+                    *k,
                     v.iter()
-                        .map(|pcd| hotshot_types::PeerConfig {
-                            stake_table_entry: StakeTableEntry {
-                                stake_key: pcd.stake_table_key,
-                                stake_amount: U256::from(pcd.stake),
-                            },
-                            state_ver_key: pcd.state_ver_key.clone(),
+                        .map(|(k, v)| {
+                            (
+                                k.into(),
+                                v.iter()
+                                    .map(|pcd| hotshot_types::PeerConfig {
+                                        stake_table_entry: StakeTableEntry {
+                                            stake_key: pcd.stake_table_key,
+                                            stake_amount: U256::from(pcd.stake),
+                                        },
+                                        state_ver_key: pcd.state_ver_key.clone(),
+                                    })
+                                    .collect(),
+                            )
                         })
                         .collect(),
                 )

sequencer/src/message_compat_tests.rs

@@ -69,7 +69,7 @@ async fn test_message_compat<Ver: StaticVersionType>(_ver: Ver) {
     let membership = EpochMembershipCoordinator::new(
         Arc::new(RwLock::new(EpochCommittees::new_stake(
             committee.clone(),
-            [(EpochNumber::new(0), committee)].into(),
+            committee,
             None,
             Fetcher::mock(),
             epoch_height,

types/src/v0/config.rs

@@ -8,6 +8,7 @@ use hotshot_types::{
 };
 use serde::{Deserialize, Serialize};
 use tide_disco::Url;
+use vbs::version::Version;
 use vec1::Vec1;
 
 use crate::{PubKey, SeqTypes};
@@ -56,7 +57,7 @@ pub struct PublicHotShotConfig {
     known_nodes_with_stake: Vec<PeerConfig<SeqTypes>>,
     known_da_nodes: Vec<PeerConfig<SeqTypes>>,
     #[serde(default)]
-    da_committees: BTreeMap<u64, Vec<PeerConfig<SeqTypes>>>,
+    da_committees: BTreeMap<Version, BTreeMap<u64, Vec<PeerConfig<SeqTypes>>>>,
     da_staked_committee_size: usize,
     fixed_leader_for_gpuvid: usize,
     next_view_timeout: u64,
@@ -202,10 +203,6 @@ impl PublicHotShotConfig {
         self.known_da_nodes.clone()
     }
 
-    pub fn da_committees(&self) -> BTreeMap<u64, Vec<PeerConfig<SeqTypes>>> {
-        self.da_committees.clone()
-    }
-
     pub fn blocks_per_epoch(&self) -> u64 {
         self.epoch_height
     }

types/src/v0/impls/stake_table.rs

@@ -1689,18 +1689,11 @@ impl EpochCommittees {
         // TODO remove `new` from trait and rename this to `new`.
         // https://github.com/EspressoSystems/HotShot/commit/fcb7d54a4443e29d643b3bbc53761856aef4de8b
         committee_members: Vec<PeerConfig<SeqTypes>>,
-        da_committees: BTreeMap<Epoch, Vec<PeerConfig<SeqTypes>>>,
+        da_members: Vec<PeerConfig<SeqTypes>>,
         fixed_block_reward: Option<RewardAmount>,
         fetcher: Fetcher,
         epoch_height: u64,
     ) -> Self {
-        // TODO: Store da_committees in EpochCommittees. Currently we just pull da_members back out, but we
-        // will need to figure out how to integrate da_committees into EpochCommittee and the like.
-        let da_members = da_committees
-            .get(&Epoch::new(0))
-            .cloned()
-            .unwrap_or_default(); // For testing reasons, we want to support being given an empty map
-
         // For each member, get the stake table entry
         let stake_table: Vec<_> = committee_members
             .iter()