switch to vec of versioneddacommittee

pls148 · pls148 · commit a09bb19c19f2 · 2025-10-06T15:02:18.000-07:00
diff --git a/crates/hotshot/types/src/hotshot_config_file.rs b/crates/hotshot/types/src/hotshot_config_file.rs
@@ -4,16 +4,15 @@
 // You should have received a copy of the MIT License
 // along with the HotShot repository. If not, see <https://mit-license.org/>.
 
-use std::{collections::BTreeMap, num::NonZeroUsize, time::Duration};
+use std::{num::NonZeroUsize, time::Duration};
 
 use alloy::primitives::U256;
 use url::Url;
-use vbs::version::Version;
 use vec1::Vec1;
 
 use crate::{
     constants::REQUEST_DATA_DELAY, upgrade_config::UpgradeConfig, HotShotConfig, NodeType,
-    PeerConfig, ValidatorConfig,
+    PeerConfig, ValidatorConfig, VersionedDaCommittee,
 };
 
 /// Default builder URL, used as placeholder
@@ -48,7 +47,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<Version, BTreeMap<u64, Vec<PeerConfig<TYPES>>>>,
+    pub da_committees: Vec<VersionedDaCommittee<TYPES>>,
     /// Number of staking DA nodes
     pub staked_da_nodes: usize,
     /// Number of fixed leaders for GPU VID
diff --git a/crates/hotshot/types/src/lib.rs b/crates/hotshot/types/src/lib.rs
@@ -5,9 +5,7 @@
 // along with the HotShot repository. If not, see <https://mit-license.org/>.
 
 //! Types and Traits for the `HotShot` consensus module
-use std::{
-    collections::BTreeMap, fmt::Debug, future::Future, num::NonZeroUsize, pin::Pin, time::Duration,
-};
+use std::{fmt::Debug, future::Future, num::NonZeroUsize, pin::Pin, time::Duration};
 
 use alloy::primitives::U256;
 use bincode::Options;
@@ -184,6 +182,14 @@ impl<TYPES: NodeType> Debug for PeerConfig<TYPES> {
     }
 }
 
+#[derive(Clone, derive_more::Debug, serde::Serialize, serde::Deserialize)]
+#[serde(bound(deserialize = ""))]
+pub struct VersionedDaCommittee<TYPES: NodeType> {
+    pub start_version: Version,
+    pub start_epoch: u64,
+    pub committee: Vec<PeerConfig<TYPES>>,
+}
+
 /// Holds configuration for a `HotShot`
 #[derive(Clone, derive_more::Debug, serde::Serialize, serde::Deserialize)]
 #[serde(bound(deserialize = ""))]
@@ -199,7 +205,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<Version, BTreeMap<u64, Vec<PeerConfig<TYPES>>>>,
+    pub da_committees: Vec<VersionedDaCommittee<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
diff --git a/sequencer/src/genesis.rs b/sequencer/src/genesis.rs
@@ -45,48 +45,21 @@ pub enum L1Finalized {
     Timestamp { timestamp: Timestamp },
 }
 
-/// Helper type to deal with TOML keys that are u64 but represented as strings
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct TomlKeyU64(u64);
-
-impl<'de> Deserialize<'de> for TomlKeyU64 {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        tracing::warn!("Using TomlKeyU64::deserialize");
-        let s = String::deserialize(deserializer)?;
-
-        let n = s
-            .parse::<u64>()
-            .map_err(|_| serde::de::Error::custom("invalid epoch"))?;
-
-        std::result::Result::Ok(TomlKeyU64(n))
-    }
-}
-
-impl Serialize for TomlKeyU64 {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.0.to_string())
-    }
-}
-
-impl From<&TomlKeyU64> for u64 {
-    fn from(val: &TomlKeyU64) -> Self {
-        val.0
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct PeerConfigData {
     pub stake_table_key: <SeqTypes as NodeType>::SignatureKey,
     pub state_ver_key: <SeqTypes as NodeType>::StateSignatureKey,
     pub stake: u64,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct VersionedDaCommittee {
+    #[serde(with = "version_ser")]
+    pub start_version: Version,
+    pub start_epoch: u64,
+    pub committee: Vec<PeerConfigData>,
+}
+
 /// Genesis of an Espresso chain.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Genesis {
@@ -111,7 +84,7 @@ pub struct Genesis {
     #[serde(default)]
     pub upgrades: BTreeMap<Version, Upgrade>,
     #[serde(default)]
-    pub da_committees: Option<BTreeMap<Version, BTreeMap<TomlKeyU64, Vec<PeerConfigData>>>>,
+    pub da_committees: Option<Vec<VersionedDaCommittee>>,
 }
 
 impl Genesis {
diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs
@@ -65,7 +65,7 @@ use hotshot_types::{
         storage::Storage,
     },
     utils::BuilderCommitment,
-    ValidatorConfig,
+    ValidatorConfig, VersionedDaCommittee,
 };
 pub use options::Options;
 use serde::{Deserialize, Serialize};
@@ -395,26 +395,20 @@ where
         tracing::warn!("setting da_committees from genesis");
         network_config.config.da_committees = da_committees
             .iter()
-            .map(|(k, v)| {
-                (
-                    *k,
-                    v.iter()
-                        .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(),
-                )
+            .map(|src| VersionedDaCommittee::<SeqTypes> {
+                start_version: src.start_version,
+                start_epoch: src.start_epoch,
+                committee: src
+                    .committee
+                    .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();
     }
diff --git a/types/src/v0/config.rs b/types/src/v0/config.rs
@@ -1,14 +1,13 @@
-use std::{collections::BTreeMap, num::NonZeroUsize, time::Duration};
+use std::{num::NonZeroUsize, time::Duration};
 
 use hotshot_types::{
     network::{
         BuilderType, CombinedNetworkConfig, Libp2pConfig, NetworkConfig, RandomBuilderConfig,
     },
-    HotShotConfig, PeerConfig, ValidatorConfig,
+    HotShotConfig, PeerConfig, ValidatorConfig, VersionedDaCommittee,
 };
 use serde::{Deserialize, Serialize};
 use tide_disco::Url;
-use vbs::version::Version;
 use vec1::Vec1;
 
 use crate::{PubKey, SeqTypes};
@@ -57,7 +56,7 @@ pub struct PublicHotShotConfig {
     known_nodes_with_stake: Vec<PeerConfig<SeqTypes>>,
     known_da_nodes: Vec<PeerConfig<SeqTypes>>,
     #[serde(default)]
-    da_committees: BTreeMap<Version, BTreeMap<u64, Vec<PeerConfig<SeqTypes>>>>,
+    da_committees: Vec<VersionedDaCommittee<SeqTypes>>,
     da_staked_committee_size: usize,
     fixed_leader_for_gpuvid: usize,
     next_view_timeout: u64,
