Merge branch 'master' into graffiti-management

Author: courtneyeh

.circleci/config.yml

@@ -148,7 +148,7 @@ commands:
           name: "Publish Docker Images"
           command: |
             docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
-            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" uploadDocker
+            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH} -PincludeCommitHash=<< pipeline.parameters.include_commit_hash >>" uploadDocker
 
   notify:
     description: "Notify Slack"
@@ -157,6 +157,12 @@ commands:
           mentions: "team-centaur"
           fail_only: true
           only_for_branches: 'master'
+
+parameters:
+  include_commit_hash:
+    type: boolean
+    default: false
+
 jobs:
   assemble:
     executor: large_executor
@@ -431,6 +437,10 @@ jobs:
       - notify
 
   publishDockerAmd64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_amd64
     steps:
       - prepare
@@ -441,6 +451,10 @@ jobs:
       - notify
 
   publishDockerArm64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_arm64
     steps:
       - prepare
@@ -497,7 +511,7 @@ jobs:
           paths:
             - .openapidoc/spec/teku.json
 
-  # longish story here: we store the openapi json spec in the `gh-pages` branch of teku on Github 
+  # longish story here: we store the openapi json spec in the `gh-pages` branch of teku on Github
   # The reason we don't use GHA and instead use Circle to push to GHA is:
   # 1. We need assemble -> extractAPISpec -> publishAPISpec and this takes circa 10 mins to build in GHA,
   # 2. We publish artifacts (openapi, docker, binaries etc) only after ALL tests and we can't check for all the jobs passing to kick this one off

CHANGELOG.md

@@ -17,5 +17,6 @@ the [releases page](https://github.com/Consensys/teku/releases).
 - Deposit tree snapshots will be loaded from database as a default unless custom snapshot has been provided.
 - Added hidden option `--Xdeposit-contract-logs-syncing-enabled` to allow disabling the syncing of the deposit contract logs from the EL. This is useful when running a non-validating node. It is advisable to be used alongside with `--Xeth1-missing-deposits-event-logging-enabled=false` to avoid unnecessary logging of missing deposits.
 - Updated the bootnodes for Chiado and Gnosis networks
+- Added hidden option `--Xp2p-dumps-to-file-enabled` to enable saving p2p dumps to file.
 
 ### Bug Fixes

build.gradle

@@ -532,6 +532,16 @@ def executableAndArg = System.getProperty('os.name').toLowerCase().contains('win
 task distDocker  {
   dependsOn dockerDistUntar
   def dockerBuildVersion = 'develop'
+
+  if (project.hasProperty('includeCommitHash') && project.property('includeCommitHash').toBoolean()) {
+    def commitHash = new ByteArrayOutputStream()
+    exec {
+      commandLine 'git', 'rev-parse', '--short', 'HEAD'
+      standardOutput = commitHash
+    }
+    dockerBuildVersion += '-' + commitHash
+  }
+
   doLast {
     for (def variant in dockerJdkVariants) {
       copy {

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java

@@ -15,6 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.mock;
 import static tech.pegasys.teku.infrastructure.async.SafeFutureAssert.safeJoin;
 import static tech.pegasys.teku.infrastructure.time.TimeUtilities.secondsToMillis;
 
@@ -69,6 +70,7 @@
 import tech.pegasys.teku.statetransition.forkchoice.MergeTransitionBlockValidator;
 import tech.pegasys.teku.statetransition.forkchoice.NoopForkChoiceNotifier;
 import tech.pegasys.teku.statetransition.forkchoice.TickProcessor;
+import tech.pegasys.teku.statetransition.util.DebugDataDumper;
 import tech.pegasys.teku.statetransition.validation.BlockBroadcastValidator;
 import tech.pegasys.teku.statetransition.validation.InternalValidationResult;
 import tech.pegasys.teku.storage.client.RecentChainData;
@@ -139,6 +141,7 @@ spec, new SignedBlockAndState(anchorBlock, anchorState)),
             new TickProcessor(spec, recentChainData),
             transitionBlockValidator,
             true,
+            mock(DebugDataDumper.class),
             storageSystem.getMetricsSystem());
     final ExecutionLayerChannelStub executionLayer =
         new ExecutionLayerChannelStub(spec, false, Optional.empty());

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/ssz_generic/containers/SszUInt16.java

@@ -15,7 +15,7 @@
 
 import tech.pegasys.teku.infrastructure.ssz.impl.AbstractSszPrimitive;
 
-public class SszUInt16 extends AbstractSszPrimitive<Integer, SszUInt16> {
+public class SszUInt16 extends AbstractSszPrimitive<Integer> {
 
   public static SszUInt16 of(Integer val) {
     return new SszUInt16(val);

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