Add blobs increase params (#8883)

* add blobs increase params Co-authored-by: Lucas Saldanha <[email protected]>
Consensys · Dec 17, 2024 · f6875c8 · f6875c8
1 parent 4bcc4db
commit f6875c8
Show file tree

Hide file tree

Showing 23 changed files with 323 additions and 138 deletions.
diff --git a/...rces/tech/pegasys/teku/beaconrestapi/handlers/tekuv1/beacon/getAllBlobSidecarsAtSlot.json b/...rces/tech/pegasys/teku/beaconrestapi/handlers/tekuv1/beacon/getAllBlobSidecarsAtSlot.json
diff --git a/...rc/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/beacon/getBlobSidecars.json b/...rc/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/beacon/getBlobSidecars.json
diff --git a/.../src/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/config/mainnetConfig.json b/.../src/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/config/mainnetConfig.json
@@ -43,7 +43,6 @@
 "MIN_SLASHING_PENALTY_QUOTIENT" : "128",
 "MAX_BLS_TO_EXECUTION_CHANGES" : "16",
 "GOSSIP_MAX_SIZE" : "10485760",
-"TARGET_BLOBS_PER_BLOCK_ELECTRA" : "3",
 "DOMAIN_BEACON_ATTESTER" : "0x01000000",
 "EPOCHS_PER_SUBNET_SUBSCRIPTION" : "256",
 "PENDING_DEPOSITS_LIMIT" : "134217728",
@@ -106,7 +105,7 @@
 "WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA" : "4096",
 "HISTORICAL_ROOTS_LIMIT" : "16777216",
 "ATTESTATION_PROPAGATION_SLOT_RANGE" : "32",
-"MAX_BLOBS_PER_BLOCK_ELECTRA" : "6",
+"MAX_BLOBS_PER_BLOCK_ELECTRA" : "9",
 "SYNC_COMMITTEE_SIZE" : "512",
 "ATTESTATION_SUBNET_PREFIX_BITS" : "6",
 "PROPORTIONAL_SLASHING_MULTIPLIER" : "1",
@@ -121,8 +120,8 @@
 "BYTES_PER_LOGS_BLOOM" : "256",
 "MAX_DEPOSIT_REQUESTS_PER_PAYLOAD" : "8192",
 "MIN_GENESIS_ACTIVE_VALIDATOR_COUNT" : "16384",
-"MAX_REQUEST_BLOB_SIDECARS_ELECTRA" : "768",
-"BLOB_SIDECAR_SUBNET_COUNT_ELECTRA" : "6",
+"MAX_REQUEST_BLOB_SIDECARS_ELECTRA" : "1152",
+"BLOB_SIDECAR_SUBNET_COUNT_ELECTRA" : "9",
 "MAX_ATTESTATIONS" : "128",
 "MIN_EPOCHS_FOR_BLOCK_REQUESTS" : "33024",
 "DENEB_FORK_VERSION" : "0x04000000",

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigDeneb.java
@@ -61,11 +61,6 @@ public int getMaxBlobsPerBlock() {
     return specConfigDeneb.getMaxBlobsPerBlock();
   }
 
-  @Override
-  public int getTargetBlobsPerBlock() {
-    return specConfigDeneb.getTargetBlobsPerBlock();
-  }
-
   @Override
   public int getKzgCommitmentInclusionProofDepth() {
     return specConfigDeneb.getKzgCommitmentInclusionProofDepth();

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigDeneb.java
@@ -54,8 +54,6 @@ static SpecConfigDeneb required(final SpecConfig specConfig) {
 
   int getMaxBlobsPerBlock();
 
-  int getTargetBlobsPerBlock();
-
   int getKzgCommitmentInclusionProofDepth();
 
   int getEpochsStoreBlobs();

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigDenebImpl.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigDenebImpl.java
@@ -94,11 +94,6 @@ public int getMaxBlobsPerBlock() {
     return maxBlobsPerBlock;
   }
 
-  @Override
-  public int getTargetBlobsPerBlock() {
-    return maxBlobsPerBlock / 2;
-  }
-
   @Override
   public int getKzgCommitmentInclusionProofDepth() {
     return kzgCommitmentInclusionProofDepth;

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java
@@ -41,7 +41,6 @@ public class SpecConfigElectraImpl extends DelegatingSpecConfigDeneb implements
   private final int maxPendingPartialsPerWithdrawalsSweep;
   private final int maxPendingDepositsPerEpoch;
   private final int maxBlobsPerBlockElectra;
-  private final int targetBlobsPerBlockElectra;
   private final int maxRequestBlobSidecarsElectra;
   private final int blobSidecarSubnetCountElectra;
 
@@ -65,7 +64,6 @@ public SpecConfigElectraImpl(
       final int maxPendingPartialsPerWithdrawalsSweep,
       final int maxPendingDepositsPerEpoch,
       final int maxBlobsPerBlockElectra,
-      final int targetBlobsPerBlockElectra,
       final int maxRequestBlobSidecarsElectra,
       final int blobSidecarSubnetCountElectra) {
     super(specConfig);
@@ -87,7 +85,6 @@ public SpecConfigElectraImpl(
     this.maxPendingPartialsPerWithdrawalsSweep = maxPendingPartialsPerWithdrawalsSweep;
     this.maxPendingDepositsPerEpoch = maxPendingDepositsPerEpoch;
     this.maxBlobsPerBlockElectra = maxBlobsPerBlockElectra;
-    this.targetBlobsPerBlockElectra = targetBlobsPerBlockElectra;
     this.maxRequestBlobSidecarsElectra = maxRequestBlobSidecarsElectra;
     this.blobSidecarSubnetCountElectra = blobSidecarSubnetCountElectra;
   }
@@ -182,11 +179,6 @@ public int getMaxBlobsPerBlock() {
     return maxBlobsPerBlockElectra;
   }
 
-  @Override
-  public int getTargetBlobsPerBlock() {
-    return targetBlobsPerBlockElectra;
-  }
-
   @Override
   public int getBlobSidecarSubnetCount() {
     return blobSidecarSubnetCountElectra;
@@ -235,7 +227,6 @@ public boolean equals(final Object o) {
         && maxPendingPartialsPerWithdrawalsSweep == that.maxPendingPartialsPerWithdrawalsSweep
         && maxPendingDepositsPerEpoch == that.maxPendingDepositsPerEpoch
         && maxBlobsPerBlockElectra == that.maxBlobsPerBlockElectra
-        && targetBlobsPerBlockElectra == that.targetBlobsPerBlockElectra
         && maxRequestBlobSidecarsElectra == that.maxRequestBlobSidecarsElectra
         && blobSidecarSubnetCountElectra == that.blobSidecarSubnetCountElectra;
   }
@@ -262,7 +253,6 @@ public int hashCode() {
         maxPendingPartialsPerWithdrawalsSweep,
         maxPendingDepositsPerEpoch,
         maxBlobsPerBlockElectra,
-        targetBlobsPerBlockElectra,
         maxRequestBlobSidecarsElectra,
         blobSidecarSubnetCountElectra);
   }

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/ElectraBuilder.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/ElectraBuilder.java
@@ -49,7 +49,6 @@ public class ElectraBuilder implements ForkConfigBuilder<SpecConfigDeneb, SpecCo
   private Integer maxPendingPartialsPerWithdrawalsSweep;
   private Integer maxPendingDepositsPerEpoch;
   private Integer maxBlobsPerBlockElectra;
-  private Integer targetBlobsPerBlockElectra;
   private Integer maxRequestBlobSidecarsElectra;
   private Integer blobSidecarSubnetCountElectra;
 
@@ -79,7 +78,6 @@ public SpecConfigAndParent<SpecConfigElectra> build(
             maxPendingPartialsPerWithdrawalsSweep,
             maxPendingDepositsPerEpoch,
             maxBlobsPerBlockElectra,
-            targetBlobsPerBlockElectra,
             maxRequestBlobSidecarsElectra,
             blobSidecarSubnetCountElectra),
         specConfigAndParent);
@@ -199,12 +197,6 @@ public ElectraBuilder maxBlobsPerBlockElectra(final Integer maxBlobsPerBlockElec
     return this;
   }
 
-  public ElectraBuilder targetBlobsPerBlockElectra(final Integer targetBlobsPerBlockElectra) {
-    checkNotNull(targetBlobsPerBlockElectra);
-    this.targetBlobsPerBlockElectra = targetBlobsPerBlockElectra;
-    return this;
-  }
-
   public ElectraBuilder maxRequestBlobSidecarsElectra(final Integer maxRequestBlobSidecarsElectra) {
     checkNotNull(maxRequestBlobSidecarsElectra);
     this.maxRequestBlobSidecarsElectra = maxRequestBlobSidecarsElectra;
@@ -254,7 +246,6 @@ public Map<String, Object> getValidationMap() {
     constants.put("maxPendingPartialsPerWithdrawalsSweep", maxPendingPartialsPerWithdrawalsSweep);
     constants.put("maxPendingDepositsPerEpoch", maxPendingDepositsPerEpoch);
     constants.put("maxBlobsPerBlockElectra", maxBlobsPerBlockElectra);
-    constants.put("targetBlobsPerBlockElectra", targetBlobsPerBlockElectra);
     constants.put("maxRequestBlobSidecarsElectra", maxRequestBlobSidecarsElectra);
     constants.put("blobSidecarSubnetCountElectra", blobSidecarSubnetCountElectra);
 

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml
@@ -128,18 +128,19 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**14` (= 16384 epochs, ~15 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml
@@ -117,22 +117,23 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# 2**7 * 10**9 (= 128,000,000,000)
+MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000
+# 2**8 * 10**9 (= 256,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
-
-# [New in Electra:EIP7251]
-MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
-MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 # 2**8 * 10**9 (= 256,000,000,000)
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml
@@ -127,18 +127,19 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**14` (= 16384 epochs, ~15 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/holesky.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/holesky.yaml
@@ -119,18 +119,19 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `uint64(6)`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml
@@ -130,18 +130,19 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml
@@ -149,18 +149,23 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# 2**7 * 10**9 (= 128,000,000,000)
+MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000
+# 2**8 * 10**9 (= 256,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
@@ -136,22 +136,23 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# 2**7 * 10**9 (= 128,000,000,000)
+MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000
+# 2**8 * 10**9 (= 256,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
-
-# [New in Electra:EIP7251]
-MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
-MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 # 2**8 * 10**9 (= 256,000,000,000)
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
@@ -136,22 +136,23 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
 # Deneb
 # `2**7` (=128)
 MAX_REQUEST_BLOCKS_DENEB: 128
-# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
-MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
 # `6`
 MAX_BLOBS_PER_BLOCK: 6
+# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
+MAX_REQUEST_BLOB_SIDECARS: 768
 
 # Electra
-MAX_BLOBS_PER_BLOCK_ELECTRA: 6
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 3
+# 2**6 * 10**9 (= 64,000,000,000)
+MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 64000000000
+# 2**7 * 10**9 (= 128,000,000,000)
+MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 128000000000
+# `9`
+BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
+# `uint64(9)`
+MAX_BLOBS_PER_BLOCK_ELECTRA: 9
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
-MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 768
-BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 6
-
-# [New in Electra:EIP7251]
-MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 64000000000 # 2**6 * 10**9 (= 64,000,000,000)
-MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
+MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152