remove target blob count

Consensys · Dec 16, 2024 · 9c8b6a9 · 9c8b6a9
1 parent e645de9
commit 9c8b6a9
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 58 deletions.
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",

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
@@ -142,7 +142,5 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -135,7 +135,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -141,7 +141,5 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -133,7 +133,5 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -144,7 +144,5 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -167,7 +167,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -154,7 +154,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 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
@@ -154,7 +154,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 128000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml
@@ -130,7 +130,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
@@ -149,7 +149,5 @@ MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 128000000000
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152
diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigElectraTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigElectraTest.java
@@ -75,7 +75,6 @@ public void shouldOverrideBlobRelatedValuesValues() {
                   b.electraBuilder(
                       eb ->
                           eb.maxBlobsPerBlockElectra(8)
-                              .targetBlobsPerBlockElectra(5)
                               .blobSidecarSubnetCountElectra(10)
                               .maxRequestBlobSidecarsElectra(13));
                 });
@@ -87,12 +86,10 @@ public void shouldOverrideBlobRelatedValuesValues() {
         specConfigAndParent.forMilestone(SpecMilestone.ELECTRA).toVersionDeneb().orElseThrow();
 
     assertThat(denebConfig.getMaxBlobsPerBlock()).isEqualTo(4);
-    assertThat(denebConfig.getTargetBlobsPerBlock()).isEqualTo(2);
     assertThat(denebConfig.getBlobSidecarSubnetCount()).isEqualTo(8);
     assertThat(denebConfig.getMaxRequestBlobSidecars()).isEqualTo(16);
 
     assertThat(electraConfig.getMaxBlobsPerBlock()).isEqualTo(8);
-    assertThat(electraConfig.getTargetBlobsPerBlock()).isEqualTo(5);
     assertThat(electraConfig.getBlobSidecarSubnetCount()).isEqualTo(10);
     assertThat(electraConfig.getMaxRequestBlobSidecars()).isEqualTo(13);
   }
@@ -140,7 +137,6 @@ private SpecConfigElectra createRandomElectraConfig(
         dataStructureUtil.randomPositiveInt(8),
         dataStructureUtil.randomPositiveInt(16),
         dataStructureUtil.randomPositiveInt(8),
-        dataStructureUtil.randomPositiveInt(4),
         dataStructureUtil.randomPositiveInt(1024),
         dataStructureUtil.randomPositiveInt(8)) {};
   }

diff --git a/...esources/minimal/operations/block_header/pyspec_tests/basic_block_header/block.ssz_snappy b/...esources/minimal/operations/block_header/pyspec_tests/basic_block_header/block.ssz_snappy
diff --git a/...resources/minimal/operations/block_header/pyspec_tests/basic_block_header/post.ssz_snappy b/...resources/minimal/operations/block_header/pyspec_tests/basic_block_header/post.ssz_snappy
diff --git a/.../resources/minimal/operations/block_header/pyspec_tests/basic_block_header/pre.ssz_snappy b/.../resources/minimal/operations/block_header/pyspec_tests/basic_block_header/pre.ssz_snappy
diff --git a/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_0.ssz_snappy b/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_0.ssz_snappy
diff --git a/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_1.ssz_snappy b/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_1.ssz_snappy
diff --git a/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/post.ssz_snappy b/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/post.ssz_snappy
diff --git a/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/pre.ssz_snappy b/fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/pre.ssz_snappy
diff --git a/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml b/teku/src/test/resources/tech/pegasys/teku/cli/subcommand/deneb_config.yaml
@@ -147,7 +147,5 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9
 # `uint64(9)`
 MAX_BLOBS_PER_BLOCK_ELECTRA: 9
-# `uint64(6)`
-TARGET_BLOBS_PER_BLOCK_ELECTRA: 6
 # MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA
 MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152