Rename MAX_CONSOLIDATIONS to MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD (#…

…8391)
Consensys · Jun 21, 2024 · b4ea254 · b4ea254
1 parent a9f9826
commit b4ea254
Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java
@@ -56,7 +56,7 @@ static SpecConfigElectra required(final SpecConfig specConfig) {
 
   int getMaxAttestationsElectra();
 
-  int getMaxConsolidations();
+  int getMaxConsolidationRequestsPerPayload();
 
   int getMaxDepositReceiptsPerPayload();
 

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
@@ -34,7 +34,7 @@ public class SpecConfigElectraImpl extends DelegatingSpecConfigDeneb implements
   private final int whistleblowerRewardQuotientElectra;
   private final int maxAttesterSlashingsElectra;
   private final int maxAttestationsElectra;
-  private final int maxConsolidations;
+  private final int maxConsolidationRequestsPerPayload;
   private final int maxDepositReceiptsPerPayload;
   private final int maxWithdrawalRequestsPerPayload;
   private final int maxPendingPartialsPerWithdrawalsSweep;
@@ -53,7 +53,7 @@ public SpecConfigElectraImpl(
       final int whistleblowerRewardQuotientElectra,
       final int maxAttesterSlashingsElectra,
       final int maxAttestationsElectra,
-      final int maxConsolidations,
+      final int maxConsolidationRequestsPerPayload,
       final int maxDepositReceiptsPerPayload,
       final int maxWithdrawalRequestsPerPayload,
       final int maxPendingPartialsPerWithdrawalsSweep) {
@@ -70,7 +70,7 @@ public SpecConfigElectraImpl(
     this.whistleblowerRewardQuotientElectra = whistleblowerRewardQuotientElectra;
     this.maxAttesterSlashingsElectra = maxAttesterSlashingsElectra;
     this.maxAttestationsElectra = maxAttestationsElectra;
-    this.maxConsolidations = maxConsolidations;
+    this.maxConsolidationRequestsPerPayload = maxConsolidationRequestsPerPayload;
     this.maxDepositReceiptsPerPayload = maxDepositReceiptsPerPayload;
     this.maxWithdrawalRequestsPerPayload = maxWithdrawalRequestsPerPayload;
     this.maxPendingPartialsPerWithdrawalsSweep = maxPendingPartialsPerWithdrawalsSweep;
@@ -137,8 +137,8 @@ public int getMaxAttestationsElectra() {
   }
 
   @Override
-  public int getMaxConsolidations() {
-    return maxConsolidations;
+  public int getMaxConsolidationRequestsPerPayload() {
+    return maxConsolidationRequestsPerPayload;
   }
 
   @Override
@@ -183,7 +183,7 @@ public boolean equals(final Object o) {
         && whistleblowerRewardQuotientElectra == that.whistleblowerRewardQuotientElectra
         && maxAttesterSlashingsElectra == that.maxAttesterSlashingsElectra
         && maxAttestationsElectra == that.maxAttestationsElectra
-        && maxConsolidations == that.maxConsolidations
+        && maxConsolidationRequestsPerPayload == that.maxConsolidationRequestsPerPayload
         && maxDepositReceiptsPerPayload == that.maxDepositReceiptsPerPayload
         && maxWithdrawalRequestsPerPayload == that.maxWithdrawalRequestsPerPayload
         && maxPendingPartialsPerWithdrawalsSweep == that.maxPendingPartialsPerWithdrawalsSweep;
@@ -205,7 +205,7 @@ public int hashCode() {
         whistleblowerRewardQuotientElectra,
         maxAttesterSlashingsElectra,
         maxAttestationsElectra,
-        maxConsolidations,
+        maxConsolidationRequestsPerPayload,
         maxDepositReceiptsPerPayload,
         maxWithdrawalRequestsPerPayload,
         maxPendingPartialsPerWithdrawalsSweep);

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
@@ -41,7 +41,7 @@ public class ElectraBuilder implements ForkConfigBuilder<SpecConfigDeneb, SpecCo
   private Integer whistleblowerRewardQuotientElectra;
   private Integer maxAttesterSlashingsElectra;
   private Integer maxAttestationsElectra;
-  private Integer maxConsolidations;
+  private Integer maxConsolidationRequestsPerPayload;
   private Integer maxDepositReceiptsPerPayload;
   private Integer maxWithdrawalRequestsPerPayload;
   private Integer maxPendingPartialsPerWithdrawalsSweep;
@@ -64,7 +64,7 @@ public SpecConfigElectra build(final SpecConfigDeneb specConfig) {
         whistleblowerRewardQuotientElectra,
         maxAttesterSlashingsElectra,
         maxAttestationsElectra,
-        maxConsolidations,
+        maxConsolidationRequestsPerPayload,
         maxDepositReceiptsPerPayload,
         maxWithdrawalRequestsPerPayload,
         maxPendingPartialsPerWithdrawalsSweep);
@@ -145,9 +145,10 @@ public ElectraBuilder maxAttestationsElectra(final Integer maxAttestationsElectr
     return this;
   }
 
-  public ElectraBuilder maxConsolidations(final Integer maxConsolidations) {
-    checkNotNull(maxConsolidations);
-    this.maxConsolidations = maxConsolidations;
+  public ElectraBuilder maxConsolidationRequestsPerPayload(
+      final Integer maxConsolidationsRequestPerPayload) {
+    checkNotNull(maxConsolidationsRequestPerPayload);
+    this.maxConsolidationRequestsPerPayload = maxConsolidationsRequestPerPayload;
     return this;
   }
 
@@ -202,7 +203,7 @@ public Map<String, Object> getValidationMap() {
     constants.put("whistleblowerRewardQuotientElectra", whistleblowerRewardQuotientElectra);
     constants.put("maxAttesterSlashingsElectra", maxAttesterSlashingsElectra);
     constants.put("maxAttestationsElectra", maxAttestationsElectra);
-    constants.put("maxConsolidations", maxConsolidations);
+    constants.put("maxConsolidationRequestsPerPayload", maxConsolidationRequestsPerPayload);
     constants.put("maxDepositReceiptsPerPayload", maxDepositReceiptsPerPayload);
     constants.put("maxWithdrawalRequestsPerPayload", maxWithdrawalRequestsPerPayload);
     constants.put("maxPendingPartialsPerWithdrawalsSweep", maxPendingPartialsPerWithdrawalsSweep);

diff --git a/...ec/datastructures/blocks/blockbody/versions/electra/BeaconBlockBodySchemaElectraImpl.java b/...ec/datastructures/blocks/blockbody/versions/electra/BeaconBlockBodySchemaElectraImpl.java
@@ -145,7 +145,8 @@ BlockBodyFields.EXECUTION_PAYLOAD, new ExecutionPayloadSchemaElectra(specConfig)
         namedSchema(
             BlockBodyFields.CONSOLIDATIONS,
             SszListSchema.create(
-                SignedConsolidation.SSZ_SCHEMA, specConfig.getMaxConsolidations())));
+                SignedConsolidation.SSZ_SCHEMA,
+                specConfig.getMaxConsolidationRequestsPerPayload())));
   }
 
   @Override

diff --git a/...structures/blocks/blockbody/versions/electra/BlindedBeaconBlockBodySchemaElectraImpl.java b/...structures/blocks/blockbody/versions/electra/BlindedBeaconBlockBodySchemaElectraImpl.java
@@ -145,7 +145,8 @@ public static BlindedBeaconBlockBodySchemaElectraImpl create(
         namedSchema(
             BlockBodyFields.CONSOLIDATIONS,
             SszListSchema.create(
-                SignedConsolidation.SSZ_SCHEMA, specConfig.getMaxConsolidations())));
+                SignedConsolidation.SSZ_SCHEMA,
+                specConfig.getMaxConsolidationRequestsPerPayload())));
   }
 
   @Override

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/electra.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/electra.yaml
@@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATIONS: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/electra.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/electra.yaml
@@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATIONS: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
 
 # Execution
 # ---------------------------------------------------------------

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/electra.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/electra.yaml
@@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATIONS: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
 
 # Execution
 # ---------------------------------------------------------------