Add new config options

consensus/types/src/chain_spec.rs

@@ -231,6 +231,13 @@ pub struct ChainSpec {
     pub blob_sidecar_subnet_count: u64,
     max_blobs_per_block: u64,
 
+    /*
+     * Networking Electra
+     */
+    max_blobs_per_block_electra: u64,
+    pub blob_sidecar_subnet_count_electra: u64,
+    pub max_request_blob_sidecars_electra: u64,
+
     /*
      * Networking Derived
      *
@@ -606,15 +613,26 @@ impl ChainSpec {
         }
     }
 
+    pub fn max_request_blob_sidecars(&self, fork_name: ForkName) -> usize {
+        if fork_name >= ForkName::Electra {
+            self.max_request_blob_sidecars_electra as usize
+        } else {
+            self.max_request_blob_sidecars as usize
+        }
+    }
+
     /// Return the value of `MAX_BLOBS_PER_BLOCK` appropriate for the fork at `epoch`.
     pub fn max_blobs_per_block(&self, epoch: Epoch) -> u64 {
         self.max_blobs_per_block_by_fork(self.fork_name_at_epoch(epoch))
     }
 
     /// Return the value of `MAX_BLOBS_PER_BLOCK` appropriate for `fork`.
-    pub fn max_blobs_per_block_by_fork(&self, _fork_name: ForkName) -> u64 {
-        // TODO(electra): add Electra blobs per block change here
-        self.max_blobs_per_block
+    pub fn max_blobs_per_block_by_fork(&self, fork_name: ForkName) -> u64 {
+        if fork_name >= ForkName::Electra {
+            self.max_blobs_per_block_electra
+        } else {
+            self.max_blobs_per_block
+        }
     }
 
     pub fn data_columns_per_subnet(&self) -> usize {
@@ -863,6 +881,13 @@ impl ChainSpec {
             max_blobs_by_root_request: default_max_blobs_by_root_request(),
             max_data_columns_by_root_request: default_data_columns_by_root_request(),
 
+            /*
+             * Networking Electra specific
+             */
+            max_blobs_per_block_electra: default_max_blobs_per_block_electra(),
+            blob_sidecar_subnet_count_electra: default_blob_sidecar_subnet_count_electra(),
+            max_request_blob_sidecars_electra: default_max_request_blob_sidecars_electra(),
+
             /*
              * Application specific
              */
@@ -1182,6 +1207,13 @@ impl ChainSpec {
             max_blobs_by_root_request: default_max_blobs_by_root_request(),
             max_data_columns_by_root_request: default_data_columns_by_root_request(),
 
+            /*
+             * Networking Electra specific
+             */
+            max_blobs_per_block_electra: default_max_blobs_per_block_electra(),
+            blob_sidecar_subnet_count_electra: default_blob_sidecar_subnet_count_electra(),
+            max_request_blob_sidecars_electra: default_max_request_blob_sidecars_electra(),
+
             /*
              * Application specific
              */
@@ -1376,6 +1408,15 @@ pub struct Config {
     #[serde(default = "default_max_per_epoch_activation_exit_churn_limit")]
     #[serde(with = "serde_utils::quoted_u64")]
     max_per_epoch_activation_exit_churn_limit: u64,
+    #[serde(default = "default_max_blobs_per_block_electra")]
+    #[serde(with = "serde_utils::quoted_u64")]
+    max_blobs_per_block_electra: u64,
+    #[serde(default = "default_blob_sidecar_subnet_count_electra")]
+    #[serde(with = "serde_utils::quoted_u64")]
+    pub blob_sidecar_subnet_count_electra: u64,
+    #[serde(default = "default_max_request_blob_sidecars_electra")]
+    #[serde(with = "serde_utils::quoted_u64")]
+    max_request_blob_sidecars_electra: u64,
 
     #[serde(default = "default_custody_requirement")]
     #[serde(with = "serde_utils::quoted_u64")]
@@ -1505,6 +1546,18 @@ const fn default_max_blobs_per_block() -> u64 {
     6
 }
 
+const fn default_max_blobs_per_block_electra() -> u64 {
+    9
+}
+
+const fn default_blob_sidecar_subnet_count_electra() -> u64 {
+    9
+}
+
+const fn default_max_request_blob_sidecars_electra() -> u64 {
+    1152
+}
+
 const fn default_min_per_epoch_churn_limit_electra() -> u64 {
     128_000_000_000
 }
@@ -1727,6 +1780,9 @@ impl Config {
             min_per_epoch_churn_limit_electra: spec.min_per_epoch_churn_limit_electra,
             max_per_epoch_activation_exit_churn_limit: spec
                 .max_per_epoch_activation_exit_churn_limit,
+            max_blobs_per_block_electra: spec.max_blobs_per_block_electra,
+            blob_sidecar_subnet_count_electra: spec.blob_sidecar_subnet_count_electra,
+            max_request_blob_sidecars_electra: spec.max_request_blob_sidecars_electra,
 
             custody_requirement: spec.custody_requirement,
             data_column_sidecar_subnet_count: spec.data_column_sidecar_subnet_count,
@@ -1802,6 +1858,9 @@ impl Config {
 
             min_per_epoch_churn_limit_electra,
             max_per_epoch_activation_exit_churn_limit,
+            max_blobs_per_block_electra,
+            blob_sidecar_subnet_count_electra,
+            max_request_blob_sidecars_electra,
             custody_requirement,
             data_column_sidecar_subnet_count,
             number_of_columns,
@@ -1869,6 +1928,9 @@ impl Config {
 
             min_per_epoch_churn_limit_electra,
             max_per_epoch_activation_exit_churn_limit,
+            max_blobs_per_block_electra,
+            max_request_blob_sidecars_electra,
+            blob_sidecar_subnet_count_electra,
 
             // We need to re-derive any values that might have changed in the config.
             max_blocks_by_root_request: max_blocks_by_root_request_common(max_request_blocks),