Modified withdrawals and proposer slashings for Gloas (Consensys#9940)

Author: StefanBratanov

eth-tests/src/main/java/tech/pegasys/teku/ethtests/finder/ReferenceTestFinder.java

@@ -75,6 +75,8 @@ private static Stream<TestDefinition> findTestTypes(final Path specDirectory) th
                             "fork/fork",
                             "networking/",
                             "rewards/",
+                            "operations/withdrawals",
+                            "operations/proposer_slashing",
                             "operations/execution_payload_bid"))
                     .flatMap(unchecked(finder -> finder.findTests(fork, spec, testsPath)));
               }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java

@@ -498,6 +498,8 @@ protected void processProposerSlashingsNoValidation(
                 "process_proposer_slashings: %s",
                 invalidReason.map(OperationInvalidReason::describe).orElse(""));
 
+            removeBuilderPendingPayment(proposerSlashing, state);
+
             beaconStateMutators.slashValidator(
                 state,
                 proposerSlashing.getHeader1().getMessage().getProposerIndex().intValue(),
@@ -506,6 +508,11 @@ protected void processProposerSlashingsNoValidation(
         });
   }
 
+  protected void removeBuilderPendingPayment(
+      final ProposerSlashing proposerSlashing, final MutableBeaconState state) {
+    // NO-OP until Gloas
+  }
+
   protected BlockValidationResult verifyProposerSlashings(
       final BeaconState state,
       final SszList<ProposerSlashing> proposerSlashings,

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/capella/withdrawals/WithdrawalsHelpersCapella.java

@@ -195,6 +195,8 @@ private void processWithdrawalsUnchecked(
       final int processedPartialWithdrawalsCount,
       final int processedBuilderWithdrawalsCount) {
 
+    setLatestWithdrawalsRoot(expectedWithdrawals, state);
+
     for (final Withdrawal withdrawal : expectedWithdrawals) {
       beaconStateMutators.decreaseBalance(
           state, withdrawal.getValidatorIndex().intValue(), withdrawal.getAmount());
@@ -234,6 +236,10 @@ private void processWithdrawalsUnchecked(
     }
   }
 
+  // NO-OP
+  protected void setLatestWithdrawalsRoot(
+      final List<Withdrawal> expectedWithdrawals, final MutableBeaconState state) {}
+
   // NO-OP
   protected void updatePendingBuilderWithdrawals(
       final MutableBeaconState state, final int processedBuilderWithdrawalsCount) {}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/gloas/block/BlockProcessorGloas.java

@@ -14,6 +14,7 @@
 package tech.pegasys.teku.spec.logic.versions.gloas.block;
 
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.function.Supplier;
 import tech.pegasys.teku.bls.BLSSignatureVerifier;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -27,6 +28,7 @@
 import tech.pegasys.teku.spec.datastructures.epbs.versions.gloas.SignedExecutionPayloadBid;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadSummary;
 import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsDataCodec;
+import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
 import tech.pegasys.teku.spec.datastructures.state.Validator;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.gloas.MutableBeaconStateGloas;
@@ -227,6 +229,28 @@ public void processExecutionPayload(
     throw new UnsupportedOperationException("process_execution_payload has been removed in Gloas");
   }
 
+  // Remove the BuilderPendingPayment corresponding to this proposal if it is still in the 2-epoch
+  // window.
+  @Override
+  protected void removeBuilderPendingPayment(
+      final ProposerSlashing proposerSlashing, final MutableBeaconState state) {
+    final UInt64 slot = proposerSlashing.getHeader1().getMessage().getSlot();
+    final UInt64 proposalEpoch = miscHelpers.computeEpochAtSlot(slot);
+    OptionalInt paymentIndex = OptionalInt.empty();
+    if (proposalEpoch.equals(beaconStateAccessors.getCurrentEpoch(state))) {
+      paymentIndex =
+          OptionalInt.of(
+              specConfig.getSlotsPerEpoch() + slot.mod(specConfig.getSlotsPerEpoch()).intValue());
+    } else if (proposalEpoch.equals(beaconStateAccessors.getPreviousEpoch(state))) {
+      paymentIndex = OptionalInt.of(slot.mod(specConfig.getSlotsPerEpoch()).intValue());
+    }
+    paymentIndex.ifPresent(
+        index ->
+            MutableBeaconStateGloas.required(state)
+                .getBuilderPendingPayments()
+                .set(index, schemaDefinitionsGloas.getBuilderPendingPaymentSchema().getDefault()));
+  }
+
   @Override
   public void processExecutionRequests(
       final MutableBeaconState state,

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/gloas/withdrawals/WithdrawalsHelpersGloas.java

@@ -35,6 +35,7 @@
 public class WithdrawalsHelpersGloas extends WithdrawalsHelpersElectra {
 
   private final PredicatesGloas predicatesGloas;
+  private final SchemaDefinitionsGloas schemaDefinitionsGloas;
 
   public WithdrawalsHelpersGloas(
       final SchemaDefinitionsGloas schemaDefinitions,
@@ -44,6 +45,7 @@ public WithdrawalsHelpersGloas(
       final BeaconStateMutatorsElectra beaconStateMutators) {
     super(schemaDefinitions, miscHelpers, specConfig, predicates, beaconStateMutators);
     this.predicatesGloas = predicates;
+    this.schemaDefinitionsGloas = schemaDefinitions;
   }
 
   @Override
@@ -54,6 +56,18 @@ public void processWithdrawals(final MutableBeaconState state) {
     super.processWithdrawals(state);
   }
 
+  @Override
+  protected void setLatestWithdrawalsRoot(
+      final List<Withdrawal> expectedWithdrawals, final MutableBeaconState state) {
+    MutableBeaconStateGloas.required(state)
+        .setLatestWithdrawalsRoot(
+            schemaDefinitionsGloas
+                .getExecutionPayloadSchema()
+                .getWithdrawalsSchemaRequired()
+                .createFromElements(expectedWithdrawals)
+                .hashTreeRoot());
+  }
+
   @Override
   protected int sweepForBuilderPayments(
       final List<Withdrawal> withdrawals, final BeaconState state) {