add unit tests

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/phase0/util/AttestationUtilPhase0.java

@@ -30,7 +30,6 @@
 
 public class AttestationUtilPhase0 extends AttestationUtil {
 
-  /** Attestations with a slot > current_slot + the value of this constant would be ignored */
   private static final UInt64 MAX_FUTURE_SLOT_ALLOWANCE = UInt64.valueOf(3);
 
   public AttestationUtilPhase0(
@@ -77,7 +76,7 @@ protected boolean isCurrentTimeBeforeMinimumAttestationBroadcastTime(
 
   protected boolean isFromFarFuture(
       final Attestation attestation, final UInt64 genesisTime, final UInt64 currentTimeMillis) {
-    final UInt64 attestationSlotTimeMillis =
+    final UInt64 attestationForkChoiceEligibleTimeMillis =
         secondsToMillis(
             genesisTime.plus(
                 attestation
@@ -87,7 +86,7 @@ protected boolean isFromFarFuture(
     final UInt64 discardAttestationsAfterMillis =
         currentTimeMillis.plus(
             secondsToMillis(MAX_FUTURE_SLOT_ALLOWANCE.times(specConfig.getSecondsPerSlot())));
-    return attestationSlotTimeMillis.isGreaterThan(discardAttestationsAfterMillis);
+    return attestationForkChoiceEligibleTimeMillis.isGreaterThan(discardAttestationsAfterMillis);
   }
 
   private boolean isCurrentTimeAfterAttestationPropagationSlotRange(

ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/AggregateAttestationValidatorTest.java

@@ -69,10 +69,21 @@
  * network. (We define the following for convenience -- aggregate_and_proof =
  * signed_aggregate_and_proof.message and aggregate = aggregate_and_proof.aggregate)
  *
- * <p>aggregate.data.slot is within the last ATTESTATION_PROPAGATION_SLOT_RANGE slots (with a
- * MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. aggregate.data.slot +
- * ATTESTATION_PROPAGATION_SLOT_RANGE >= current_slot >= aggregate.data.slot (a client MAY queue
- * future aggregates for processing at the appropriate slot).
+ * <ul>
+ *   <li>Phase 0
+ *       <p>aggregate.data.slot is within the last ATTESTATION_PROPAGATION_SLOT_RANGE slots (with a
+ *       MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. aggregate.data.slot +
+ *       ATTESTATION_PROPAGATION_SLOT_RANGE >= current_slot >= aggregate.data.slot (a client MAY
+ *       queue future aggregates for processing at the appropriate slot).
+ *   <li>Deneb
+ *       <p>aggregate.data.slot is equal to or earlier than the current_slot (with a
+ *       MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. aggregate.data.slot <= current_slot (a
+ *       client MAY queue future aggregates for processing at the appropriate slot).
+ *       <p>the epoch of aggregate.data.slot is either the current or previous epoch (with a
+ *       MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e.
+ *       compute_epoch_at_slot(aggregate.data.slot) in (get_previous_epoch(state),
+ *       get_current_epoch(state))
+ * </ul>
  *
  * <p>The aggregate attestation defined by hash_tree_root(aggregate) has not already been seen (via
  * aggregate gossip, within a block, or through the creation of an equivalent aggregate locally).

ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/validation/AttestationValidatorTest.java

@@ -70,10 +70,21 @@
  *
  * <p>The attestation's committee index (attestation.data.index) is for the correct subnet.
  *
- * <p>attestation.data.slot is within the last ATTESTATION_PROPAGATION_SLOT_RANGE slots (within a
- * MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. attestation.data.slot +
- * ATTESTATION_PROPAGATION_SLOT_RANGE >= current_slot >= attestation.data.slot (a client MAY queue
- * future attestations for processing at the appropriate slot).
+ * <ul>
+ *   <li>Phase 0
+ *       <p>attestation.data.slot is within the last ATTESTATION_PROPAGATION_SLOT_RANGE slots
+ *       (within a * MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. attestation.data.slot + *
+ *       ATTESTATION_PROPAGATION_SLOT_RANGE >= current_slot >= attestation.data.slot (a client MAY
+ *       queue * future attestations for processing at the appropriate slot).
+ *   <li>Deneb
+ *       <p>attestation.data.slot is equal to or earlier than the current_slot (with a
+ *       MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. attestation.data.slot <= current_slot (a
+ *       client MAY queue future attestation for processing at the appropriate slot).
+ *       <p>the epoch of attestation.data.slot is either the current or previous epoch (with a
+ *       MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e.
+ *       compute_epoch_at_slot(attestation.data.slot) in (get_previous_epoch(state),
+ *       get_current_epoch(state))
+ * </ul>
  *
  * <p>The attestation is unaggregated -- that is, it has exactly one participating validator
  * (len([bit for bit in attestation.aggregation_bits if bit == 0b1]) == 1).
@@ -158,7 +169,7 @@ public void shouldRejectAttestationWithIncorrectAggregateBitsSize() {
   }
 
   @Test
-  public void shouldRejectAttestationFromBeforeAttestationPropagationSlotRange() {
+  public void shouldIgnoreAttestationFromBeforeAttestationPropagationSlotRange() {
     final Attestation attestation =
         attestationGenerator.validAttestation(storageSystem.getChainHead());
 
@@ -172,6 +183,39 @@ public void shouldRejectAttestationFromBeforeAttestationPropagationSlotRange() {
     assertThat(validate(attestation).code()).isEqualTo(IGNORE);
   }
 
+  @Test
+  public void postDeneb_shouldIgnoreAttestationAfterCurrentSlot() {
+    final Spec spec = TestSpecFactory.createMinimalDeneb();
+
+    final AttestationValidator validator =
+        new AttestationValidator(spec, recentChainData, signatureVerifier, new StubMetricsSystem());
+
+    // attestation will be fork choice eligible in 12 slots, so more than MAX_FUTURE_SLOT_ALLOWANCE
+    final Attestation attestation =
+        attestationGenerator.validAttestation(storageSystem.getChainHead(), UInt64.valueOf(11));
+
+    chainUpdater.setCurrentSlot(ZERO);
+
+    assertThat(validate(validator, attestation).code()).isEqualTo(IGNORE);
+  }
+
+  @Test
+  public void postDeneb_shouldIgnoreAttestationNotInCurrentOrPreviousEpoch() {
+    final Spec spec = TestSpecFactory.createMinimalDeneb();
+
+    final AttestationValidator validator =
+        new AttestationValidator(spec, recentChainData, signatureVerifier, new StubMetricsSystem());
+
+    // attestation in epoch 0
+    final Attestation attestation =
+        attestationGenerator.validAttestation(storageSystem.getChainHead());
+
+    // current epoch is 3
+    chainUpdater.setCurrentSlot(UInt64.valueOf(25));
+
+    assertThat(validate(validator, attestation).code()).isEqualTo(IGNORE);
+  }
+
   @Test
   public void shouldAcceptAttestationWithinClockDisparityOfEarliestPropagationSlot() {
     final Attestation attestation =
@@ -197,6 +241,22 @@ public void shouldDeferAttestationFromAfterThePropagationSlotRange() {
     assertThat(validate(attestation).code()).isEqualTo(SAVE_FOR_FUTURE);
   }
 
+  @Test
+  public void postDeneb_shouldDeferAttestationAfterCurrentSlotButNotTooFarInTheFuture() {
+    final Spec spec = TestSpecFactory.createMinimalDeneb();
+
+    final AttestationValidator validator =
+        new AttestationValidator(spec, recentChainData, signatureVerifier, new StubMetricsSystem());
+
+    // attestation will be fork choice eligible in 3 slots, so within MAX_FUTURE_SLOT_ALLOWANCE
+    final Attestation attestation =
+        attestationGenerator.validAttestation(storageSystem.getChainHead(), UInt64.valueOf(2));
+
+    chainUpdater.setCurrentSlot(ZERO);
+
+    assertThat(validate(validator, attestation).code()).isEqualTo(SAVE_FOR_FUTURE);
+  }
+
   @Test
   public void shouldAcceptAttestationWithinClockDisparityOfLatestPropagationSlot() {
     final Attestation attestation =
@@ -406,6 +466,11 @@ private Predicate<? super CompletableFuture<InternalValidationResult>> rejected(
   }
 
   private InternalValidationResult validate(final Attestation attestation) {
+    return validate(validator, attestation);
+  }
+
+  private InternalValidationResult validate(
+      final AttestationValidator validator, final Attestation attestation) {
     final BeaconState state = safeJoin(recentChainData.getBestState().orElseThrow());
 
     return validator