[EIP-7917] Add deterministic proposer lookahead changes to Fulu

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 }
 
 plugins {
-  id 'com.diffplug.spotless' version '7.0.3'
+  id 'com.diffplug.spotless' version '7.0.4'
   id 'com.github.ben-manes.versions' version '0.52.0'
   id 'com.github.jk1.dependency-license-report' version '2.9'
   id 'io.spring.dependency-management' version '1.1.7'
@@ -327,7 +327,7 @@ allprojects {
 }
 
 def nightly = System.getenv("NIGHTLY") != null
-def refTestVersion = nightly ? "nightly" : "v1.6.0-alpha.0"
+def refTestVersion = nightly ? "nightly" : "v1.6.0-alpha.1"
 def blsRefTestVersion = 'v0.1.2'
 def slashingProtectionInterchangeRefTestVersion = 'v5.3.0'
 def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download'

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconStateFulu.json

@@ -0,0 +1,238 @@
+{
+  "title" : "BeaconStateFulu",
+  "type" : "object",
+  "required" : [ "genesis_time", "genesis_validators_root", "slot", "fork", "latest_block_header", "block_roots", "state_roots", "historical_roots", "eth1_data", "eth1_data_votes", "eth1_deposit_index", "validators", "balances", "randao_mixes", "slashings", "previous_epoch_participation", "current_epoch_participation", "justification_bits", "previous_justified_checkpoint", "current_justified_checkpoint", "finalized_checkpoint", "inactivity_scores", "current_sync_committee", "next_sync_committee", "latest_execution_payload_header", "next_withdrawal_index", "next_withdrawal_validator_index", "historical_summaries", "deposit_requests_start_index", "deposit_balance_to_consume", "exit_balance_to_consume", "earliest_exit_epoch", "consolidation_balance_to_consume", "earliest_consolidation_epoch", "pending_deposits", "pending_partial_withdrawals", "pending_consolidations", "proposer_lookahead" ],
+  "properties" : {
+    "genesis_time" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "genesis_validators_root" : {
+      "type" : "string",
+      "description" : "Bytes32 hexadecimal",
+      "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+      "format" : "byte"
+    },
+    "slot" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "fork" : {
+      "$ref" : "#/components/schemas/Fork"
+    },
+    "latest_block_header" : {
+      "$ref" : "#/components/schemas/BeaconBlockHeader"
+    },
+    "block_roots" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "Bytes32 hexadecimal",
+        "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+        "format" : "byte"
+      }
+    },
+    "state_roots" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "Bytes32 hexadecimal",
+        "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+        "format" : "byte"
+      }
+    },
+    "historical_roots" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "Bytes32 hexadecimal",
+        "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+        "format" : "byte"
+      }
+    },
+    "eth1_data" : {
+      "$ref" : "#/components/schemas/Eth1Data"
+    },
+    "eth1_data_votes" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/Eth1Data"
+      }
+    },
+    "eth1_deposit_index" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "validators" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/Validator"
+      }
+    },
+    "balances" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "unsigned 64 bit integer",
+        "example" : "1",
+        "format" : "uint64"
+      }
+    },
+    "randao_mixes" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "Bytes32 hexadecimal",
+        "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
+        "format" : "byte"
+      }
+    },
+    "slashings" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "unsigned 64 bit integer",
+        "example" : "1",
+        "format" : "uint64"
+      }
+    },
+    "previous_epoch_participation" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "example" : "1",
+        "description" : "unsigned 8 bit integer, max value 255",
+        "format" : "uint8"
+      }
+    },
+    "current_epoch_participation" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "example" : "1",
+        "description" : "unsigned 8 bit integer, max value 255",
+        "format" : "uint8"
+      }
+    },
+    "justification_bits" : {
+      "type" : "string",
+      "pattern" : "^0x[a-fA-F0-9]{2,}$",
+      "description" : "SSZ hexadecimal",
+      "format" : "bytes"
+    },
+    "previous_justified_checkpoint" : {
+      "$ref" : "#/components/schemas/Checkpoint"
+    },
+    "current_justified_checkpoint" : {
+      "$ref" : "#/components/schemas/Checkpoint"
+    },
+    "finalized_checkpoint" : {
+      "$ref" : "#/components/schemas/Checkpoint"
+    },
+    "inactivity_scores" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "unsigned 64 bit integer",
+        "example" : "1",
+        "format" : "uint64"
+      }
+    },
+    "current_sync_committee" : {
+      "$ref" : "#/components/schemas/SyncCommittee"
+    },
+    "next_sync_committee" : {
+      "$ref" : "#/components/schemas/SyncCommittee"
+    },
+    "latest_execution_payload_header" : {
+      "$ref" : "#/components/schemas/ExecutionPayloadHeaderDeneb"
+    },
+    "next_withdrawal_index" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "next_withdrawal_validator_index" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "historical_summaries" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/HistoricalSummary"
+      }
+    },
+    "deposit_requests_start_index" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "deposit_balance_to_consume" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "exit_balance_to_consume" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "earliest_exit_epoch" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "consolidation_balance_to_consume" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "earliest_consolidation_epoch" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
+    },
+    "pending_deposits" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/PendingDeposit"
+      }
+    },
+    "pending_partial_withdrawals" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/PendingPartialWithdrawal"
+      }
+    },
+    "pending_consolidations" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/components/schemas/PendingConsolidation"
+      }
+    },
+    "proposer_lookahead" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string",
+        "description" : "unsigned 64 bit integer",
+        "example" : "1",
+        "format" : "uint64"
+      }
+    }
+  }
+}

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetStateV2Response.json

@@ -28,6 +28,8 @@
         "$ref" : "#/components/schemas/BeaconStateDeneb"
       }, {
         "$ref" : "#/components/schemas/BeaconStateElectra"
+      },{
+        "$ref" : "#/components/schemas/BeaconStateFulu"
       }  ]
     }
   }

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/epoch_processing/EpochOperation.java

@@ -28,5 +28,6 @@ public enum EpochOperation {
   PROCESS_HISTORICAL_SUMMARIES_UPDATE,
   PENDING_DEPOSITS,
   PENDING_CONSOLIDATIONS,
-  INACTIVITY_UPDATES
+  INACTIVITY_UPDATES,
+  PROPOSER_LOOKAHEAD
 }

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/epoch_processing/EpochProcessingExecutor.java

@@ -47,6 +47,7 @@ public void executeOperation(final EpochOperation operation, final MutableBeacon
       case INACTIVITY_UPDATES -> processInactivityUpdates(state);
       case PENDING_DEPOSITS -> processPendingDeposits(state);
       case PENDING_CONSOLIDATIONS -> processPendingConsolidations(state);
+      case PROPOSER_LOOKAHEAD -> epochProcessor.processProposerLookahead(state);
       default ->
           throw new UnsupportedOperationException(
               "Attempted to execute unknown operation type: " + operation);

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/epoch_processing/EpochProcessingTestExecutor.java

@@ -84,6 +84,9 @@ public class EpochProcessingTestExecutor implements TestExecutor {
           .put(
               "epoch_processing/pending_deposits",
               new EpochProcessingTestExecutor(EpochOperation.PENDING_DEPOSITS))
+          .put(
+              "epoch_processing/proposer_lookahead",
+              new EpochProcessingTestExecutor(EpochOperation.PROPOSER_LOOKAHEAD))
           .build();
 
   private final EpochOperation operation;

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java

@@ -204,18 +204,37 @@ private void initProgressiveBalances(
   private void verifyProgressiveBalances(
       final TestDefinition testDefinition, final BeaconState result)
       throws SlotProcessingException, EpochProcessingException {
-    if (testDefinition.getSpec().atSlot(result.getSlot()).getMilestone() == SpecMilestone.PHASE0) {
-      // Progressive balances not used in Phase0
+    final Spec spec = testDefinition.getSpec();
+    if (shouldSkipProgressiveBalancesVerification(spec, result)) {
+      // Skip verification if progressive balances are not used
       return;
     }
-    final Spec spec = testDefinition.getSpec();
+
     assertTotalBalances(spec, result);
-    final UInt64 firstSlotOfNextEpoch =
-        spec.computeStartSlotAtEpoch(spec.computeEpochAtSlot(result.getSlot()).plus(1));
+    final UInt64 nextEpoch = spec.computeEpochAtSlot(result.getSlot()).plus(1);
+    final UInt64 firstSlotOfNextEpoch = spec.computeStartSlotAtEpoch(nextEpoch);
     final BeaconState nextEpochState = spec.processSlots(result, firstSlotOfNextEpoch);
     assertTotalBalances(spec, nextEpochState);
   }
 
+  private boolean shouldSkipProgressiveBalancesVerification(
+      final Spec spec, final BeaconState state) {
+    if (spec.atSlot(state.getSlot()).getMilestone() == SpecMilestone.PHASE0) {
+      // Progressive balances not used in Phase0
+      return true;
+    }
+
+    if (spec.atSlot(state.getSlot())
+        .beaconStateAccessors()
+        .getActiveValidatorIndices(state, spec.getCurrentEpoch(state))
+        .isEmpty()) {
+      // No active validators, we can't check, epoch transition will break
+      return true;
+    }
+
+    return false;
+  }
+
   private void assertTotalBalances(final Spec spec, final BeaconState state) {
     final Optional<TotalBalances> maybeProgressiveBalances =
         BeaconStateCache.getTransitionCaches(state)

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

@@ -29,15 +29,15 @@ public class ReferenceTestFinder {
   // Can be overridden with -Dteku.ref-test-module.override-root="<path>"
   private static final Path TEST_PATH_FROM_MODULE =
       Path.of("src", "referenceTest", "resources", "consensus-spec-tests", "tests");
-  // TODO: re-add Fulu in https://github.com/Consensys/teku/pull/9501
   private static final List<String> SUPPORTED_FORKS =
       List.of(
           TestFork.PHASE0,
           TestFork.ALTAIR,
           TestFork.BELLATRIX,
           TestFork.CAPELLA,
           TestFork.DENEB,
-          TestFork.ELECTRA);
+          TestFork.ELECTRA,
+          TestFork.FULU);
 
   @MustBeClosed
   public static Stream<TestDefinition> findReferenceTests() throws IOException {

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/BeaconState.java

@@ -40,6 +40,7 @@
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.capella.BeaconStateCapella;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.deneb.BeaconStateDeneb;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra.BeaconStateElectra;
+import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.fulu.BeaconStateFulu;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.phase0.BeaconStatePhase0;
 
 public interface BeaconState extends SszContainer, ValidatorStats {
@@ -192,4 +193,8 @@ default Optional<BeaconStateDeneb> toVersionDeneb() {
   default Optional<BeaconStateElectra> toVersionElectra() {
     return Optional.empty();
   }
+
+  default Optional<BeaconStateFulu> toVersionFulu() {
+    return Optional.empty();
+  }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/MutableBeaconState.java

@@ -41,6 +41,7 @@
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.capella.MutableBeaconStateCapella;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.deneb.MutableBeaconStateDeneb;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra.MutableBeaconStateElectra;
+import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.fulu.MutableBeaconStateFulu;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.phase0.MutableBeaconStatePhase0;
 
 public interface MutableBeaconState extends BeaconState, SszMutableRefContainer {
@@ -223,4 +224,8 @@ default Optional<MutableBeaconStateDeneb> toMutableVersionDeneb() {
   default Optional<MutableBeaconStateElectra> toMutableVersionElectra() {
     return Optional.empty();
   }
+
+  default Optional<MutableBeaconStateFulu> toMutableVersionFulu() {
+    return Optional.empty();
+  }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/common/BeaconStateFields.java

@@ -78,7 +78,9 @@ public enum BeaconStateFields implements SszFieldName {
   EARLIEST_CONSOLIDATION_EPOCH,
   PENDING_DEPOSITS,
   PENDING_PARTIAL_WITHDRAWALS,
-  PENDING_CONSOLIDATIONS;
+  PENDING_CONSOLIDATIONS,
+  // Fulu fields
+  PROPOSER_LOOKAHEAD;
 
   private final String sszFieldName;