Update PeerDAS network parameters for peerdas-devnet-2 (#6290)

eserilev · jimmygchen · web-flow · commit 2c1605230055 · 2024-08-27T13:22:51.000+10:00
* update subnet count &amp; custody req

* das network params

* update ef tests

---------

Co-authored-by: Jimmy Chen &lt;jchen.tc@gmail.com&gt;
diff --git a/beacon_node/lighthouse_network/src/discovery/enr.rs b/beacon_node/lighthouse_network/src/discovery/enr.rs
@@ -360,7 +360,7 @@ mod test {
         let config = NetworkConfig::default();
         let spec = make_eip7594_spec();
         let (mut enr, enr_key) = build_enr_with_config(config, &spec);
-        let invalid_subnet_count = 99u64;
+        let invalid_subnet_count = 999u64;
 
         enr.insert(
             PEERDAS_CUSTODY_SUBNET_COUNT_ENR_KEY,
diff --git a/common/eth2_network_config/built_in_network_configs/chiado/config.yaml b/common/eth2_network_config/built_in_network_configs/chiado/config.yaml
@@ -138,6 +138,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 BLOB_SIDECAR_SUBNET_COUNT: 6
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml b/common/eth2_network_config/built_in_network_configs/gnosis/config.yaml
@@ -121,6 +121,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 BLOB_SIDECAR_SUBNET_COUNT: 6
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/common/eth2_network_config/built_in_network_configs/holesky/config.yaml b/common/eth2_network_config/built_in_network_configs/holesky/config.yaml
@@ -125,6 +125,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 BLOB_SIDECAR_SUBNET_COUNT: 6
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
@@ -147,6 +147,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 BLOB_SIDECAR_SUBNET_COUNT: 6
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml b/common/eth2_network_config/built_in_network_configs/sepolia/config.yaml
@@ -121,6 +121,6 @@ MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 BLOB_SIDECAR_SUBNET_COUNT: 6
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -807,8 +807,8 @@ impl ChainSpec {
              * DAS params
              */
             eip7594_fork_epoch: None,
-            custody_requirement: 1,
-            data_column_sidecar_subnet_count: 32,
+            custody_requirement: 4,
+            data_column_sidecar_subnet_count: 128,
             number_of_columns: 128,
 
             /*
@@ -1129,8 +1129,8 @@ impl ChainSpec {
              * DAS params
              */
             eip7594_fork_epoch: None,
-            custody_requirement: 1,
-            data_column_sidecar_subnet_count: 32,
+            custody_requirement: 4,
+            data_column_sidecar_subnet_count: 128,
             number_of_columns: 128,
             /*
              * Network specific
@@ -2122,7 +2122,7 @@ mod yaml_tests {
         DEPOSIT_NETWORK_ID: 1
         DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
         CUSTODY_REQUIREMENT: 1
-        DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+        DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
         NUMBER_OF_COLUMNS: 128
         "#;
 
diff --git a/lighthouse/environment/tests/testnet_dir/config.yaml b/lighthouse/environment/tests/testnet_dir/config.yaml
@@ -100,6 +100,6 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 ATTESTATION_SUBNET_SHUFFLING_PREFIX_BITS: 3
 
 # DAS
-CUSTODY_REQUIREMENT: 1
-DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+CUSTODY_REQUIREMENT: 4
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 NUMBER_OF_COLUMNS: 128
diff --git a/scripts/local_testnet/network_params_das_interop.yaml b/scripts/local_testnet/network_params_das_interop.yaml
@@ -26,7 +26,7 @@ participants:
 network_params:
   eip7594_fork_epoch: 0
   eip7594_fork_version: "0x50000038"
-  data_column_sidecar_subnet_count: 64
+  data_column_sidecar_subnet_count: 128
   samples_per_slot: 16
   custody_requirement: 4
 snooper_enabled: false
