Merge branch 'master' into graffiti-management

Author: courtneyeh

.circleci/config.yml

@@ -464,7 +464,7 @@ jobs:
       - run:
           name: Create and publish docker manifest
           command: |
-            ./gradlew --no-daemon --parallel manifestDocker
+            ./gradlew --no-daemon --parallel -PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >> manifestDocker
       - notify
 
   extractAPISpec:

beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java

@@ -63,6 +63,7 @@
 import tech.pegasys.teku.spec.schemas.SchemaDefinitions;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsDeneb;
+import tech.pegasys.teku.spec.schemas.SchemaDefinitionsElectra;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
 import tech.pegasys.teku.statetransition.attestation.AttestationForkChecker;
@@ -173,12 +174,21 @@ public Function<BeaconBlockBodyBuilder, SafeFuture<Void>> createSelector(
             blsToExecutionChangePool.getItemsForBlock(blockSlotState));
       }
 
+      final SchemaDefinitions schemaDefinitions =
+          spec.atSlot(blockSlotState.getSlot()).getSchemaDefinitions();
+
+      // Post-electra: consolidations supported
+      if (bodyBuilder.supportsConsolidations()) {
+        // devnet0 blocks are empty of consolidations, so just default their list.
+        bodyBuilder.consolidations(
+            SchemaDefinitionsElectra.required(schemaDefinitions)
+                .getConsolidationsSchema()
+                .createFromElements(List.of()));
+      }
+
       // Execution Payload / Execution Payload Header / KZG Commitments
       final SafeFuture<Void> blockProductionComplete;
       if (bodyBuilder.supportsExecutionPayload()) {
-        final SchemaDefinitionsBellatrix schemaDefinitions =
-            SchemaDefinitionsBellatrix.required(
-                spec.atSlot(blockSlotState.getSlot()).getSchemaDefinitions());
         blockProductionComplete =
             forkChoiceNotifier
                 .getPayloadId(parentRoot, blockSlotState.getSlot())
@@ -189,7 +199,7 @@ public Function<BeaconBlockBodyBuilder, SafeFuture<Void>> createSelector(
                             bodyBuilder,
                             requestedBlinded,
                             requestedBuilderBoostFactor,
-                            schemaDefinitions,
+                            SchemaDefinitionsBellatrix.required(schemaDefinitions),
                             blockSlotState,
                             blockProductionPerformance));
       } else {

beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java

@@ -102,6 +102,7 @@
 class BlockOperationSelectorFactoryTest {
   private final Spec spec = TestSpecFactory.createMinimalDeneb();
   private final Spec specBellatrix = TestSpecFactory.createMinimalBellatrix();
+  final Spec specElectra = TestSpecFactory.createMinimalElectra();
   private final DataStructureUtil dataStructureUtil = new DataStructureUtil(spec);
 
   private final Function<UInt64, BeaconBlockBodySchema<?>> beaconBlockSchemaSupplier =
@@ -182,11 +183,25 @@ class BlockOperationSelectorFactoryTest {
           .getHeaderOfDefaultPayload();
 
   private final CapturingBeaconBlockBodyBuilder bodyBuilder =
-      new CapturingBeaconBlockBodyBuilder(false);
+      new CapturingBeaconBlockBodyBuilder(false, false);
 
   private final GraffitiBuilder graffitiBuilder =
       new GraffitiBuilder(ClientGraffitiAppendFormat.DISABLED, Optional.empty());
 
+  private final BlockOperationSelectorFactory factoryElectra =
+      new BlockOperationSelectorFactory(
+          specElectra,
+          attestationPool,
+          attesterSlashingPool,
+          proposerSlashingPool,
+          voluntaryExitPool,
+          blsToExecutionChangePool,
+          contributionPool,
+          depositProvider,
+          eth1DataCache,
+          graffitiBuilder,
+          forkChoiceNotifier,
+          executionLayer);
   private final BlockOperationSelectorFactory factory =
       new BlockOperationSelectorFactory(
           spec,
@@ -622,7 +637,8 @@ void shouldIncludeExecutionPayloadIfRequestedBlindedIsEmptyAndBuilderFlowFallsBa
 
     final UInt256 blockExecutionValue = dataStructureUtil.randomUInt256();
 
-    final CapturingBeaconBlockBodyBuilder bodyBuilder = new CapturingBeaconBlockBodyBuilder(true);
+    final CapturingBeaconBlockBodyBuilder bodyBuilder =
+        new CapturingBeaconBlockBodyBuilder(true, false);
 
     when(forkChoiceNotifier.getPayloadId(any(), any()))
         .thenReturn(SafeFuture.completedFuture(Optional.of(executionPayloadContext)));
@@ -696,7 +712,8 @@ void shouldIncludeKzgCommitmentsInBlock() {
         blobsBundle,
         blockExecutionValue);
 
-    final CapturingBeaconBlockBodyBuilder bodyBuilder = new CapturingBeaconBlockBodyBuilder(true);
+    final CapturingBeaconBlockBodyBuilder bodyBuilder =
+        new CapturingBeaconBlockBodyBuilder(true, false);
 
     safeJoin(
         factory
@@ -718,6 +735,37 @@ void shouldIncludeKzgCommitmentsInBlock() {
         .hasSameElementsAs(blobsBundle.getCommitments());
   }
 
+  @Test
+  void shouldIncludeConsolidationsInBlock() {
+    final BeaconState blockSlotState = dataStructureUtil.randomBeaconState();
+    final ExecutionPayload randomExecutionPayload = dataStructureUtil.randomExecutionPayload();
+    final UInt256 blockExecutionValue = dataStructureUtil.randomUInt256();
+    final BlobsBundle blobsBundle = dataStructureUtil.randomBlobsBundle();
+
+    prepareBlockAndBlobsProduction(
+        randomExecutionPayload,
+        executionPayloadContext,
+        blockSlotState,
+        blobsBundle,
+        blockExecutionValue);
+
+    final CapturingBeaconBlockBodyBuilder bodyBuilder =
+        new CapturingBeaconBlockBodyBuilder(true, true);
+    safeJoin(
+        factoryElectra
+            .createSelector(
+                parentRoot,
+                blockSlotState,
+                dataStructureUtil.randomSignature(),
+                Optional.empty(),
+                Optional.of(false),
+                Optional.empty(),
+                BlockProductionPerformance.NOOP)
+            .apply(bodyBuilder));
+
+    assertThat(bodyBuilder.consolidations).isEmpty();
+  }
+
   @Test
   void shouldIncludeKzgCommitmentsInBlindedBlock() {
     final BeaconState blockSlotState = dataStructureUtil.randomBeaconState();
@@ -737,7 +785,8 @@ void shouldIncludeKzgCommitmentsInBlindedBlock() {
         blobKzgCommitments,
         blockExecutionValue);
 
-    final CapturingBeaconBlockBodyBuilder bodyBuilder = new CapturingBeaconBlockBodyBuilder(true);
+    final CapturingBeaconBlockBodyBuilder bodyBuilder =
+        new CapturingBeaconBlockBodyBuilder(true, false);
 
     safeJoin(
         factory
@@ -1180,6 +1229,7 @@ private void prepareCachedFallbackData(
   private static class CapturingBeaconBlockBodyBuilder implements BeaconBlockBodyBuilder {
 
     private final boolean supportsKzgCommitments;
+    private final boolean supportsConsolidations;
 
     protected BLSSignature randaoReveal;
     protected Bytes32 graffiti;
@@ -1195,8 +1245,10 @@ private static class CapturingBeaconBlockBodyBuilder implements BeaconBlockBodyB
     @SuppressWarnings("unused")
     protected SszList<SignedConsolidation> consolidations;
 
-    public CapturingBeaconBlockBodyBuilder(final boolean supportsKzgCommitments) {
+    public CapturingBeaconBlockBodyBuilder(
+        final boolean supportsKzgCommitments, final boolean supportsConsolidations) {
       this.supportsKzgCommitments = supportsKzgCommitments;
+      this.supportsConsolidations = supportsConsolidations;
     }
 
     @Override
@@ -1293,6 +1345,11 @@ public Boolean supportsKzgCommitments() {
       return supportsKzgCommitments;
     }
 
+    @Override
+    public Boolean supportsConsolidations() {
+      return supportsConsolidations;
+    }
+
     @Override
     public BeaconBlockBodyBuilder blobKzgCommitments(
         final SszList<SszKZGCommitment> blobKzgCommitments) {

build.gradle

@@ -633,10 +633,10 @@ task manifestDocker {
       }
 
       for (def tag in tags) {
-        platforms.forEach { platform -> cmd += "${tag}-${platform} " }
+        platforms.forEach { platform -> cmd += "${tag}-${platform}${commitHashTag} " }
         exec {
           executable executableAndArg[0]
-          args executableAndArg[1], "docker manifest create ${tag} ${cmd} && docker manifest push ${tag}"
+          args executableAndArg[1], "docker manifest create ${tag}${commitHashTag} ${cmd} && docker manifest push ${tag}${commitHashTag}"
         }
       }
     }

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

@@ -138,6 +138,10 @@ public boolean isPartiallyWithdrawableValidatorEth1CredentialsChecked(
     return hasMaxEffectiveBalance && hasExcessBalance;
   }
 
+  public UInt64 getValidatorMaxEffectiveBalance(final Validator validator) {
+    return specConfig.getMaxEffectiveBalance();
+  }
+
   public Optional<PredicatesElectra> toVersionElectra() {
     return Optional.empty();
   }

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

@@ -463,8 +463,10 @@ public void processEffectiveBalanceUpdates(
               hysteresisUpwardMultiplier,
               maxEffectiveBalance)) {
         final Validator validator = validators.get(index);
+        final UInt64 effectiveBalanceLimit = getEffectiveBalanceLimitForValidator(validator);
         final UInt64 newEffectiveBalance =
-            balance.minus(balance.mod(effectiveBalanceIncrement)).min(maxEffectiveBalance);
+            effectiveBalanceLimit.min(
+                balance.minus(balance.mod(effectiveBalanceIncrement)).min(maxEffectiveBalance));
         BeaconStateCache.getTransitionCaches(state)
             .getProgressiveTotalBalances()
             .onEffectiveBalanceChange(status, newEffectiveBalance);
@@ -473,6 +475,10 @@ public void processEffectiveBalanceUpdates(
     }
   }
 
+  protected UInt64 getEffectiveBalanceLimitForValidator(final Validator validator) {
+    return specConfig.getMaxEffectiveBalance();
+  }
+
   private boolean shouldIncreaseEffectiveBalance(
       final UInt64 balance,
       final UInt64 hysteresisIncrement,

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

@@ -116,4 +116,15 @@ public static BeaconStateAccessorsElectra required(
         beaconStateAccessors.getClass());
     return (BeaconStateAccessorsElectra) beaconStateAccessors;
   }
+
+  /**
+   * implements get_validator_max_effective_balance state accessor
+   *
+   * @param validator - a validator from a state.
+   * @return the max effective balance for the specified validator based on its withdrawal
+   *     credentials.
+   */
+  public UInt64 getValidatorMaxEffectiveBalance(final Validator validator) {
+    return predicatesElectra.getValidatorMaxEffectiveBalance(validator);
+  }
 }

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

@@ -13,6 +13,7 @@
 
 package tech.pegasys.teku.spec.logic.versions.electra.helpers;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static tech.pegasys.teku.spec.config.SpecConfig.FAR_FUTURE_EPOCH;
 
 import java.util.function.Supplier;
@@ -24,6 +25,7 @@
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra.MutableBeaconStateElectra;
 import tech.pegasys.teku.spec.logic.common.helpers.BeaconStateAccessors;
+import tech.pegasys.teku.spec.logic.common.helpers.BeaconStateMutators;
 import tech.pegasys.teku.spec.logic.common.helpers.MiscHelpers;
 import tech.pegasys.teku.spec.logic.versions.bellatrix.helpers.BeaconStateMutatorsBellatrix;
 
@@ -33,6 +35,15 @@ public class BeaconStateMutatorsElectra extends BeaconStateMutatorsBellatrix {
 
   private final SpecConfigElectra specConfigElectra;
 
+  public static BeaconStateMutatorsElectra required(final BeaconStateMutators beaconStateMutators) {
+    checkArgument(
+        beaconStateMutators instanceof BeaconStateMutatorsElectra,
+        "Expected %s but it was %s",
+        BeaconStateMutatorsElectra.class,
+        beaconStateMutators.getClass());
+    return (BeaconStateMutatorsElectra) beaconStateMutators;
+  }
+
   public BeaconStateMutatorsElectra(
       final SpecConfig specConfig,
       final MiscHelpers miscHelpers,

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

@@ -115,6 +115,7 @@ public boolean isCompoundingWithdrawalCredential(final Bytes32 withdrawalCredent
    * @return the max effective balance for the specified validator based on its withdrawal
    *     credentials.
    */
+  @Override
   public UInt64 getValidatorMaxEffectiveBalance(final Validator validator) {
     return hasCompoundingWithdrawalCredential(validator)
         ? configElectra.getMaxEffectiveBalanceElectra()