eip-7251 updated config, epochProcessor interface (Consensys#8210)

 - renamed getChurnLimit -> getBalanceChurnLimit
 - added getMaxPerEpochActivationExitChurnLimit and defaulted value.
 - added PredicatesElectra.required logic
 - added queue_entire_balance
 - added the epochProcessor interface, but haven't built out the electra versions

 now that more of this is actually merged it should hopefully start to stabilize a bit...

 Working on the dev (consensus-specs) version, not on PR versions any longer.

Signed-off-by: Paul Harris <[email protected]>

Author: rolfyone

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfig.java

@@ -71,6 +71,11 @@ public int getMinPerEpochChurnLimit() {
     return specConfig.getMinPerEpochChurnLimit();
   }
 
+  @Override
+  public UInt64 getMaxPerEpochActivationExitChurnLimit() {
+    return specConfig.getMaxPerEpochActivationExitChurnLimit();
+  }
+
   @Override
   public int getChurnLimitQuotient() {
     return specConfig.getChurnLimitQuotient();

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfig.java

@@ -62,6 +62,8 @@ default int getMillisPerSlot() {
 
   int getMinPerEpochChurnLimit();
 
+  UInt64 getMaxPerEpochActivationExitChurnLimit();
+
   int getChurnLimitQuotient();
 
   // Config: Fork choice

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectra.java

@@ -53,9 +53,9 @@ static SpecConfigElectra required(final SpecConfig specConfig) {
 
   int getMaxPartialWithdrawalsPerPayload();
 
-  UInt64 getMinPerEpochChurnLimitElectra();
+  int getMaxWithdrawalRequestsPerPayload();
 
-  UInt64 getMaxPerEpochActivationExitChurnLimit();
+  UInt64 getMinPerEpochChurnLimitElectra();
 
   Bytes4 getElectraForkVersion();
 

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigElectraImpl.java

@@ -23,7 +23,6 @@ public class SpecConfigElectraImpl extends DelegatingSpecConfigDeneb implements
   private final Bytes4 electraForkVersion;
   private final UInt64 electraForkEpoch;
   private final UInt64 minPerEpochChurnLimitElectra;
-  private final UInt64 maxPerEpochActivationExitChurnLimit;
 
   private final int maxDepositReceiptsPerPayload;
   private final int maxExecutionLayerExits;
@@ -39,14 +38,15 @@ public class SpecConfigElectraImpl extends DelegatingSpecConfigDeneb implements
   private final int maxAttestationsElectra;
   private final int maxConsolidations;
 
+  private final int maxWithdrawalRequestsPerPayload;
+
   public SpecConfigElectraImpl(
       final SpecConfigDeneb specConfig,
       final Bytes4 electraForkVersion,
       final UInt64 electraForkEpoch,
       final int maxDepositReceiptsPerPayload,
       final int maxExecutionLayerExits,
       final UInt64 minPerEpochChurnLimitElectra,
-      final UInt64 maxPerEpochActivationExitChurnLimit,
       final UInt64 minActivationBalance,
       final UInt64 maxEffectiveBalanceElectra,
       final int pendingBalanceDepositsLimit,
@@ -57,14 +57,14 @@ public SpecConfigElectraImpl(
       final int maxPartialWithdrawalsPerPayload,
       final int maxAttesterSlashingsElectra,
       final int maxAttestationsElectra,
-      final int maxConsolidations) {
+      final int maxConsolidations,
+      final int maxWithdrawalRequestsPerPayload) {
     super(specConfig);
     this.electraForkVersion = electraForkVersion;
     this.electraForkEpoch = electraForkEpoch;
     this.maxDepositReceiptsPerPayload = maxDepositReceiptsPerPayload;
     this.maxExecutionLayerExits = maxExecutionLayerExits;
     this.minPerEpochChurnLimitElectra = minPerEpochChurnLimitElectra;
-    this.maxPerEpochActivationExitChurnLimit = maxPerEpochActivationExitChurnLimit;
     this.minActivationBalance = minActivationBalance;
     this.maxEffectiveBalanceElectra = maxEffectiveBalanceElectra;
     this.pendingBalanceDepositsLimit = pendingBalanceDepositsLimit;
@@ -76,6 +76,7 @@ public SpecConfigElectraImpl(
     this.maxAttesterSlashingsElectra = maxAttesterSlashingsElectra;
     this.maxAttestationsElectra = maxAttestationsElectra;
     this.maxConsolidations = maxConsolidations;
+    this.maxWithdrawalRequestsPerPayload = maxWithdrawalRequestsPerPayload;
   }
 
   @Override
@@ -159,13 +160,13 @@ public UInt64 getMinPerEpochChurnLimitElectra() {
   }
 
   @Override
-  public UInt64 getMaxPerEpochActivationExitChurnLimit() {
-    return maxPerEpochActivationExitChurnLimit;
+  public Optional<SpecConfigElectra> toVersionElectra() {
+    return Optional.of(this);
   }
 
   @Override
-  public Optional<SpecConfigElectra> toVersionElectra() {
-    return Optional.of(this);
+  public int getMaxWithdrawalRequestsPerPayload() {
+    return maxWithdrawalRequestsPerPayload;
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigPhase0.java

@@ -120,6 +120,8 @@ public class SpecConfigPhase0 implements SpecConfig {
   private final int reorgHeadWeightThreshold;
   private final int reorgParentWeightThreshold;
 
+  private final UInt64 maxPerEpochActivationExitChurnLimit;
+
   public SpecConfigPhase0(
       final Map<String, Object> rawConfig,
       final UInt64 eth1FollowDistance,
@@ -188,7 +190,8 @@ public SpecConfigPhase0(
       final int attestationSubnetPrefixBits,
       final int reorgMaxEpochsSinceFinalization,
       final int reorgHeadWeightThreshold,
-      final int reorgParentWeightThreshold) {
+      final int reorgParentWeightThreshold,
+      final UInt64 maxPerEpochActivationExitChurnLimit) {
     this.rawConfig = rawConfig;
     this.eth1FollowDistance = eth1FollowDistance;
     this.maxCommitteesPerSlot = maxCommitteesPerSlot;
@@ -258,6 +261,7 @@ public SpecConfigPhase0(
     this.reorgMaxEpochsSinceFinalization = reorgMaxEpochsSinceFinalization;
     this.reorgHeadWeightThreshold = reorgHeadWeightThreshold;
     this.reorgParentWeightThreshold = reorgParentWeightThreshold;
+    this.maxPerEpochActivationExitChurnLimit = maxPerEpochActivationExitChurnLimit;
   }
 
   @Override
@@ -305,6 +309,11 @@ public int getMinPerEpochChurnLimit() {
     return minPerEpochChurnLimit;
   }
 
+  @Override
+  public UInt64 getMaxPerEpochActivationExitChurnLimit() {
+    return maxPerEpochActivationExitChurnLimit;
+  }
+
   @Override
   public int getChurnLimitQuotient() {
     return churnLimitQuotient;

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/ElectraBuilder.java

@@ -32,8 +32,6 @@ public class ElectraBuilder implements ForkConfigBuilder<SpecConfigDeneb, SpecCo
   private UInt64 electraForkEpoch;
   // TODO: remove default when EIP-7251 become part of the Electra
   private UInt64 minPerEpochChurnLimitElectra = UInt64.ZERO;
-  // TODO: remove default when EIP-7251 become part of the Electra
-  private UInt64 maxPerEpochActivationExitChurnLimit = UInt64.ZERO;
   private Integer maxDepositReceiptsPerPayload;
   private Integer maxExecutionLayerExits;
   private UInt64 minActivationBalance;
@@ -44,6 +42,7 @@ public class ElectraBuilder implements ForkConfigBuilder<SpecConfigDeneb, SpecCo
   private Integer whistleblowerRewardQuotientElectra;
   private Integer minSlashingPenaltyQuotientElectra;
   private Integer maxPartialWithdrawalsPerPayload;
+  private Integer maxWithdrawalRequestsPerPayload;
   private Integer maxAttesterSlashingsElectra;
   private Integer maxAttestationsElectra;
   private Integer maxConsolidations;
@@ -59,7 +58,6 @@ public SpecConfigElectra build(final SpecConfigDeneb specConfig) {
         maxDepositReceiptsPerPayload,
         maxExecutionLayerExits,
         minPerEpochChurnLimitElectra,
-        maxPerEpochActivationExitChurnLimit,
         minActivationBalance,
         maxEffectiveBalanceElectra,
         pendingBalanceDepositsLimit,
@@ -70,7 +68,8 @@ public SpecConfigElectra build(final SpecConfigDeneb specConfig) {
         maxPartialWithdrawalsPerPayload,
         maxAttesterSlashingsElectra,
         maxAttestationsElectra,
-        maxConsolidations);
+        maxConsolidations,
+        maxWithdrawalRequestsPerPayload);
   }
 
   public ElectraBuilder electraForkEpoch(final UInt64 electraForkEpoch) {
@@ -103,13 +102,6 @@ public ElectraBuilder minPerEpochChurnLimitElectra(final UInt64 minPerEpochChurn
     return this;
   }
 
-  public ElectraBuilder maxPerEpochActivationExitChurnLimit(
-      final UInt64 maxPerEpochActivationExitChurnLimit) {
-    checkNotNull(maxPerEpochActivationExitChurnLimit);
-    this.maxPerEpochActivationExitChurnLimit = maxPerEpochActivationExitChurnLimit;
-    return this;
-  }
-
   public ElectraBuilder minActivationBalance(final UInt64 minActivationBalance) {
     checkNotNull(minActivationBalance);
     this.minActivationBalance = minActivationBalance;
@@ -162,6 +154,13 @@ public ElectraBuilder maxPartialWithdrawalsPerPayload(
     return this;
   }
 
+  public ElectraBuilder maxWithdrawalRequestsPerPayload(
+      final Integer maxWithdrawalRequestsPerPayload) {
+    checkNotNull(maxWithdrawalRequestsPerPayload);
+    this.maxWithdrawalRequestsPerPayload = maxWithdrawalRequestsPerPayload;
+    return this;
+  }
+
   public ElectraBuilder maxAttesterSlashingsElectra(final Integer maxAttesterSlashingsElectra) {
     checkNotNull(maxAttesterSlashingsElectra);
     this.maxAttesterSlashingsElectra = maxAttesterSlashingsElectra;

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/SpecConfigBuilder.java

@@ -130,6 +130,7 @@ public class SpecConfigBuilder {
 
   private Integer reorgParentWeightThreshold = 160;
 
+  private UInt64 maxPerEpochActivationExitChurnLimit = UInt64.valueOf(256000000000L);
   private final BuilderChain<SpecConfig, SpecConfigElectra> builderChain =
       BuilderChain.create(new AltairBuilder())
           .appendBuilder(new BellatrixBuilder())
@@ -214,7 +215,8 @@ public SpecConfig build() {
             attestationSubnetPrefixBits,
             reorgMaxEpochsSinceFinalization,
             reorgHeadWeightThreshold,
-            reorgParentWeightThreshold);
+            reorgParentWeightThreshold,
+            maxPerEpochActivationExitChurnLimit);
 
     return builderChain.build(config);
   }
@@ -537,6 +539,13 @@ public SpecConfigBuilder proposerRewardQuotient(final UInt64 proposerRewardQuoti
     return this;
   }
 
+  public SpecConfigBuilder maxPerEpochActivationExitChurnLimit(
+      final UInt64 maxPerEpochActivationExitChurnLimit) {
+    checkNotNull(maxPerEpochActivationExitChurnLimit);
+    this.maxPerEpochActivationExitChurnLimit = maxPerEpochActivationExitChurnLimit;
+    return this;
+  }
+
   public SpecConfigBuilder inactivityPenaltyQuotient(final UInt64 inactivityPenaltyQuotient) {
     checkNotNull(inactivityPenaltyQuotient);
     this.inactivityPenaltyQuotient = inactivityPenaltyQuotient;

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/helpers/Predicates.java

@@ -16,12 +16,14 @@
 import static tech.pegasys.teku.infrastructure.crypto.Hash.getSha256Instance;
 import static tech.pegasys.teku.spec.constants.WithdrawalPrefixes.ETH1_ADDRESS_WITHDRAWAL_BYTE;
 
+import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.infrastructure.crypto.Sha256;
 import tech.pegasys.teku.infrastructure.ssz.collections.SszBytes32Vector;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.datastructures.state.Validator;
+import tech.pegasys.teku.spec.logic.versions.electra.helpers.PredicatesElectra;
 
 public class Predicates {
 
@@ -133,4 +135,8 @@ public boolean isPartiallyWithdrawableValidatorEth1CredentialsChecked(
 
     return hasMaxEffectiveBalance && hasExcessBalance;
   }
+
+  public Optional<PredicatesElectra> toVersionElectra() {
+    return Optional.empty();
+  }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/statetransition/epoch/AbstractEpochProcessor.java

@@ -118,6 +118,8 @@ protected void processEpoch(final BeaconState preState, final MutableBeaconState
     processRegistryUpdates(state, validatorStatuses.getStatuses());
     processSlashings(state, validatorStatuses);
     processEth1DataReset(state);
+    processPendingBalanceDeposits(state);
+    processPendingConsolidations(state);
     processEffectiveBalanceUpdates(state, validatorStatuses.getStatuses());
     processSlashingsReset(state);
     processRandaoMixesReset(state);

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/statetransition/epoch/EpochProcessor.java

@@ -99,4 +99,8 @@ void processRegistryUpdates(MutableBeaconState state, List<ValidatorStatus> stat
   void processHistoricalSummariesUpdate(MutableBeaconState state);
 
   void processSyncCommitteeUpdates(MutableBeaconState state);
+
+  void processPendingBalanceDeposits(MutableBeaconState state);
+
+  void processPendingConsolidations(MutableBeaconState state);
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/altair/statetransition/epoch/EpochProcessorAltair.java

@@ -129,6 +129,12 @@ public void processSyncCommitteeUpdates(final MutableBeaconState genericState) {
     }
   }
 
+  @Override
+  public void processPendingBalanceDeposits(final MutableBeaconState state) {}
+
+  @Override
+  public void processPendingConsolidations(final MutableBeaconState state) {}
+
   /**
    * Replaces the progressive total balances in the state transition caches with an altair one if
    * not already in use. This handles both upgrading on milestone transition and switching from the

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java

@@ -46,11 +46,15 @@
 import tech.pegasys.teku.spec.logic.versions.altair.helpers.BeaconStateAccessorsAltair;
 import tech.pegasys.teku.spec.logic.versions.deneb.block.BlockProcessorDeneb;
 import tech.pegasys.teku.spec.logic.versions.deneb.helpers.MiscHelpersDeneb;
+import tech.pegasys.teku.spec.logic.versions.electra.helpers.PredicatesElectra;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsDeneb;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsElectra;
 
 public class BlockProcessorElectra extends BlockProcessorDeneb {
 
+  @SuppressWarnings("unused")
+  private final PredicatesElectra predicatesElectra;
+
   public BlockProcessorElectra(
       final SpecConfigElectra specConfig,
       final Predicates predicates,
@@ -77,6 +81,7 @@ public BlockProcessorElectra(
         validatorsUtil,
         operationValidator,
         SchemaDefinitionsDeneb.required(schemaDefinitions));
+    this.predicatesElectra = PredicatesElectra.required(predicates);
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/BeaconStateAccessorsElectra.java

@@ -49,7 +49,7 @@ public BeaconStateAccessorsElectra(
    * @return Return the churn limit for the current epoch dedicated to activations and exits.
    */
   public UInt64 getActivationExitChurnLimit(final BeaconStateElectra state) {
-    return getChurnLimit(state).min(configElectra.getMaxPerEpochActivationExitChurnLimit());
+    return getBalanceChurnLimit(state).min(configElectra.getMaxPerEpochActivationExitChurnLimit());
   }
 
   /**
@@ -84,12 +84,12 @@ public UInt64 getPendingBalanceToWithdraw(
   }
 
   /**
-   * get_churn_limit
+   * get_balance_churn_limit
    *
    * @param state the state to read active balance from
    * @return Return the churn limit for the current epoch.
    */
-  public UInt64 getChurnLimit(final BeaconStateElectra state) {
+  public UInt64 getBalanceChurnLimit(final BeaconStateElectra state) {
     final UInt64 churn =
         configElectra
             .getMinPerEpochChurnLimitElectra()
@@ -104,7 +104,7 @@ public UInt64 getChurnLimit(final BeaconStateElectra state) {
    * @return
    */
   public UInt64 getConsolidationChurnLimit(final BeaconStateElectra state) {
-    return getChurnLimit(state).minusMinZero(getActivationExitChurnLimit(state));
+    return getBalanceChurnLimit(state).minusMinZero(getActivationExitChurnLimit(state));
   }
 
   public static BeaconStateAccessorsElectra required(

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/PredicatesElectra.java

@@ -15,6 +15,7 @@
 
 import static tech.pegasys.teku.spec.constants.WithdrawalPrefixes.COMPOUNDING_WITHDRAWAL_BYTE;
 
+import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.config.SpecConfig;
@@ -30,6 +31,21 @@ public PredicatesElectra(SpecConfig specConfig) {
     this.configElectra = SpecConfigElectra.required(specConfig);
   }
 
+  public static PredicatesElectra required(final Predicates predicates) {
+    return predicates
+        .toVersionElectra()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Expected Electra predicates but got "
+                        + predicates.getClass().getSimpleName()));
+  }
+
+  @Override
+  public Optional<PredicatesElectra> toVersionElectra() {
+    return Optional.of(this);
+  }
+
   /**
    * is_partially_withdrawable_validator
    *