fixes

Author: pls148

crates/hotshot/types/src/hotshot_config_file.rs

@@ -45,6 +45,7 @@ pub struct HotShotConfigFile<TYPES: NodeType> {
     #[serde(skip)]
     /// The known DA nodes' public key and stake values
     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>>>,
     /// Number of staking DA nodes

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

@@ -201,6 +201,7 @@ async fn init_consensus(
         next_view_timeout: 10000,
         num_bootstrap: 0,
         known_da_nodes: known_nodes_with_stake.clone(),
+        da_committees: Default::default(),
         da_staked_committee_size: pub_keys.len(),
         data_request_delay: Duration::from_millis(200),
         view_sync_timeout: Duration::from_millis(250),

sequencer/src/genesis.rs

@@ -74,9 +74,9 @@ impl Serialize for TomlKeyU64 {
     }
 }
 
-impl Into<u64> for &TomlKeyU64 {
-    fn into(self) -> u64 {
-        self.0
+impl From<&TomlKeyU64> for u64 {
+    fn from(val: &TomlKeyU64) -> Self {
+        val.0
     }
 }
 
@@ -110,6 +110,7 @@ pub struct Genesis {
     #[serde(rename = "upgrade", with = "upgrade_ser")]
     #[serde(default)]
     pub upgrades: BTreeMap<Version, Upgrade>,
+    #[serde(default)]
     pub da_committees: Option<BTreeMap<TomlKeyU64, Vec<PeerConfigData>>>,
 }
 

sequencer/src/lib.rs

@@ -1042,6 +1042,7 @@ pub mod testing {
                 fixed_leader_for_gpuvid: 0,
                 num_nodes_with_stake: num_nodes.try_into().unwrap(),
                 known_da_nodes: known_nodes_with_stake.clone(),
+                da_committees: Default::default(),
                 known_nodes_with_stake: known_nodes_with_stake.clone(),
                 next_view_timeout: Duration::from_secs(5).as_millis() as u64,
                 num_bootstrap: 1usize,
@@ -1291,7 +1292,7 @@ pub mod testing {
             let block_reward = fetcher.fetch_fixed_block_reward().await.ok();
             let mut membership = EpochCommittees::new_stake(
                 config.known_nodes_with_stake.clone(),
-                config.known_da_nodes.clone(),
+                config.build_da_committees(),
                 block_reward,
                 fetcher,
                 config.epoch_height,

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(),
-            committee,
+            [(EpochNumber::new(0), committee)].into(),
             None,
             Fetcher::mock(),
             epoch_height,

sequencer/src/restart_tests.rs

@@ -668,6 +668,7 @@ impl TestNetwork {
                 .into_iter()
                 .collect(),
             genesis_version: Version { major: 0, minor: 1 },
+            da_committees: None,
         };
 
         let node_params = (0..da_nodes + regular_nodes)

sequencer/src/run.rs

@@ -336,6 +336,7 @@ mod test {
             epoch_start_block: None,
             stake_table_capacity: None,
             genesis_version: Version { major: 0, minor: 1 },
+            da_committees: None,
         };
         genesis.to_file(&genesis_file).unwrap();
 

types/src/v0/impls/instance_state.rs

@@ -170,7 +170,7 @@ impl NodeState {
 
         let membership = Arc::new(RwLock::new(EpochCommittees::new_stake(
             vec![],
-            vec![],
+            Default::default(),
             None,
             Fetcher::mock(),
             0,
@@ -202,7 +202,7 @@ impl NodeState {
 
         let membership = Arc::new(RwLock::new(EpochCommittees::new_stake(
             vec![],
-            vec![],
+            Default::default(),
             None,
             Fetcher::mock(),
             0,
@@ -232,7 +232,7 @@ impl NodeState {
 
         let membership = Arc::new(RwLock::new(EpochCommittees::new_stake(
             vec![],
-            vec![],
+            Default::default(),
             None,
             Fetcher::mock(),
             0,
@@ -327,7 +327,7 @@ impl Default for NodeState {
 
         let membership = Arc::new(RwLock::new(EpochCommittees::new_stake(
             vec![],
-            vec![],
+            Default::default(),
             None,
             Fetcher::mock(),
             0,