Clean up and reduce max blobs per block for testing PeerDAS.

Author: jimmygchen

consensus/types/src/chain_spec.rs

@@ -243,7 +243,7 @@ pub struct ChainSpec {
     /*
      * Networking Fulu
      */
-    max_blobs_per_block_fulu: u64,
+    pub max_blobs_per_block_fulu: u64,
 
     /*
      * Networking Derived

testing/simulator/src/basic_sim.rs

@@ -153,6 +153,7 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
     spec.deneb_fork_epoch = Some(Epoch::new(DENEB_FORK_EPOCH));
     spec.electra_fork_epoch = Some(Epoch::new(ELECTRA_FORK_EPOCH));
     spec.fulu_fork_epoch = Some(Epoch::new(FULU_FORK_EPOCH));
+    spec.max_blobs_per_block_fulu = 9;
     let spec = Arc::new(spec);
     env.eth2_config.spec = spec.clone();
 
@@ -185,29 +186,30 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
 
         // Add nodes to the network.
         for i in 0..node_count {
-            let mut beacon_config = beacon_config.clone();
-            // Run one PeerDAS supernode.
-            if i == 0 {
-                beacon_config.network.subscribe_all_data_column_subnets = true;
-            }
+            // Run two PeerDAS supernodes.
+            let is_supernode = i < 2;
             network
-                .add_beacon_node(beacon_config, mock_execution_config.clone(), false)
+                .add_beacon_node(
+                    beacon_config.clone(),
+                    mock_execution_config.clone(),
+                    false,
+                    is_supernode,
+                )
                 .await?;
         }
 
         /*
          * One by one, add proposer nodes to the network.
          */
-        for i in 0..proposer_nodes {
-            let mut beacon_config = beacon_config.clone();
-            // Run one PeerDAS proposer supernode.
-            if i == 0 {
-                beacon_config.network.subscribe_all_data_column_subnets = true;
-            }
-
+        for _ in 0..proposer_nodes {
             println!("Adding a proposer node");
             network
-                .add_beacon_node(beacon_config.clone(), mock_execution_config.clone(), true)
+                .add_beacon_node(
+                    beacon_config.clone(),
+                    mock_execution_config.clone(),
+                    true,
+                    false,
+                )
                 .await?;
         }
 

testing/simulator/src/fallback_sim.rs

@@ -181,7 +181,12 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> {
         // Add nodes to the network.
         for _ in 0..node_count {
             network
-                .add_beacon_node(beacon_config.clone(), mock_execution_config.clone(), false)
+                .add_beacon_node(
+                    beacon_config.clone(),
+                    mock_execution_config.clone(),
+                    false,
+                    false,
+                )
                 .await?;
         }
 

testing/simulator/src/local_network.rs

@@ -195,6 +195,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         &self,
         mut beacon_config: ClientConfig,
         mock_execution_config: MockExecutionConfig,
+        is_supernode: bool,
     ) -> Result<(LocalBeaconNode<E>, LocalExecutionNode<E>), String> {
         beacon_config.network.set_ipv4_listening_address(
             std::net::Ipv4Addr::UNSPECIFIED,
@@ -206,6 +207,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         beacon_config.network.enr_udp4_port = Some(BOOTNODE_PORT.try_into().expect("non zero"));
         beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT.try_into().expect("non zero"));
         beacon_config.network.discv5_config.table_filter = |_| true;
+        beacon_config.network.subscribe_all_data_column_subnets = is_supernode;
 
         let execution_node = LocalExecutionNode::new(
             self.context.service_context("boot_node_el".into()),
@@ -233,6 +235,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         mut beacon_config: ClientConfig,
         mut mock_execution_config: MockExecutionConfig,
         is_proposer: bool,
+        is_supernode: bool,
     ) -> Result<(LocalBeaconNode<E>, LocalExecutionNode<E>), String> {
         let count = (self.beacon_node_count() + self.proposer_node_count()) as u16;
 
@@ -249,6 +252,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         beacon_config.network.enr_tcp4_port = Some(libp2p_tcp_port.try_into().unwrap());
         beacon_config.network.discv5_config.table_filter = |_| true;
         beacon_config.network.proposer_only = is_proposer;
+        beacon_config.network.subscribe_all_data_column_subnets = is_supernode;
 
         mock_execution_config.server_config.listen_port = EXECUTION_PORT + count;
 
@@ -282,6 +286,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         mut beacon_config: ClientConfig,
         mock_execution_config: MockExecutionConfig,
         is_proposer: bool,
+        is_supernode: bool,
     ) -> Result<(), String> {
         let first_bn_exists: bool;
         {
@@ -301,11 +306,16 @@ impl<E: EthSpec> LocalNetwork<E> {
         }
         let (beacon_node, execution_node) = if first_bn_exists {
             // Network already exists. We construct a new node.
-            self.construct_beacon_node(beacon_config, mock_execution_config, is_proposer)
-                .await?
+            self.construct_beacon_node(
+                beacon_config,
+                mock_execution_config,
+                is_proposer,
+                is_supernode,
+            )
+            .await?
         } else {
             // Network does not exist. We construct a boot node.
-            self.construct_boot_node(beacon_config, mock_execution_config)
+            self.construct_boot_node(beacon_config, mock_execution_config, is_supernode)
                 .await?
         };
         // Add nodes to the network.
@@ -330,7 +340,7 @@ impl<E: EthSpec> LocalNetwork<E> {
     ) -> Result<(), String> {
         epoch_delay(Epoch::new(wait_until_epoch), slot_duration, slots_per_epoch).await;
 
-        self.add_beacon_node(beacon_config, mock_execution_config, false)
+        self.add_beacon_node(beacon_config, mock_execution_config, false, false)
             .await?;
 
         Ok(())