alpha.1

Author: StefanBratanov

build.gradle

@@ -331,7 +331,7 @@ allprojects {
 }
 
 def nightly = System.getenv("NIGHTLY") != null
-def refTestVersion = nightly ? "nightly" : "v1.7.0-alpha.0"
+def refTestVersion = nightly ? "nightly" : "v1.7.0-alpha.1"
 def blsRefTestVersion = 'v0.1.2'
 def slashingProtectionInterchangeRefTestVersion = 'v5.3.0'
 def refTestBaseUrl = 'https://github.com/ethereum/consensus-specs/releases/download'

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

@@ -171,8 +171,7 @@ public void processWithdrawals(
         expectedWithdrawals.withdrawals(),
         expectedWithdrawals.processedBuilderWithdrawalsCount(),
         expectedWithdrawals.processedPartialWithdrawalsCount(),
-        expectedWithdrawals.processedBuildersSweepCount(),
-        expectedWithdrawals.processedValidatorsSweepCount());
+        expectedWithdrawals.processedBuildersSweepCount());
   }
 
   private void assertWithdrawalsInExecutionPayloadMatchExpected(
@@ -208,17 +207,15 @@ public void processWithdrawals(final MutableBeaconState state) {
         expectedWithdrawals.withdrawals(),
         expectedWithdrawals.processedBuilderWithdrawalsCount(),
         expectedWithdrawals.processedPartialWithdrawalsCount(),
-        expectedWithdrawals.processedBuildersSweepCount(),
-        expectedWithdrawals.processedValidatorsSweepCount());
+        expectedWithdrawals.processedBuildersSweepCount());
   }
 
   private void processWithdrawalsUnchecked(
       final MutableBeaconState state,
       final List<Withdrawal> withdrawals,
       final int processedBuilderWithdrawalsCount,
       final int processedPartialWithdrawalsCount,
-      final int processedBuildersSweepCount,
-      final int processedValidatorsSweepCount) {
+      final int processedBuildersSweepCount) {
 
     applyWithdrawals(state, withdrawals);
 
@@ -236,7 +233,7 @@ private void processWithdrawalsUnchecked(
 
     updateNextWithdrawalBuilderIndex(state, processedBuildersSweepCount);
 
-    updateNextWithdrawalValidatorIndex(state, processedValidatorsSweepCount);
+    updateNextWithdrawalValidatorIndex(state, withdrawals);
   }
 
   protected void applyWithdrawals(
@@ -274,12 +271,22 @@ protected void updateNextWithdrawalBuilderIndex(
       final MutableBeaconState state, final int processedBuildersSweepCount) {}
 
   protected void updateNextWithdrawalValidatorIndex(
-      final MutableBeaconState state, final int processedValidatorsSweepCount) {
+      final MutableBeaconState state, final List<Withdrawal> withdrawals) {
     final MutableBeaconStateCapella stateCapella = MutableBeaconStateCapella.required(state);
-    // Update the next validator index to start the next withdrawal sweep
-    final UInt64 nextIndex =
-        stateCapella.getNextWithdrawalValidatorIndex().plus(processedValidatorsSweepCount);
-    final UInt64 nextValidatorIndex = nextIndex.mod(state.getValidators().size());
-    stateCapella.setNextWithdrawalValidatorIndex(nextValidatorIndex);
+
+    if (withdrawals.size() == specConfig.getMaxWithdrawalsPerPayload()) {
+      // Next sweep starts after the latest withdrawal's validator index
+      final UInt64 nextValidatorIndex =
+          withdrawals.getLast().getValidatorIndex().plus(1).mod(state.getValidators().size());
+      stateCapella.setNextWithdrawalValidatorIndex(nextValidatorIndex);
+    } else {
+      // Advance sweep by the max length of the sweep if there was not a full set of withdrawals
+      final UInt64 nextIndex =
+          stateCapella
+              .getNextWithdrawalValidatorIndex()
+              .plus(specConfig.getMaxValidatorsPerWithdrawalSweep());
+      final UInt64 nextValidatorIndex = nextIndex.mod(state.getValidators().size());
+      stateCapella.setNextWithdrawalValidatorIndex(nextValidatorIndex);
+    }
   }
 }