publish despite already seen in gossip rule

Consensys · Oct 3, 2024 · 00cd375 · 00cd375
1 parent 6ffea1e
commit 00cd375
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/...c/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java b/...c/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
@@ -244,9 +244,8 @@ public synchronized void onNewBlobSidecar(
   }
 
   private void publishBlobSidecar(final BlobSidecar blobSidecar) {
-    if (gossipValidatorSupplier.get().markAsSeen(blobSidecar)) {
-      blobSidecarGossipPublisher.accept(blobSidecar);
-    }
+    gossipValidatorSupplier.get().markForEquivocation(blobSidecar);
+    blobSidecarGossipPublisher.accept(blobSidecar);
   }
 
   private void countBlobSidecar(final RemoteOrigin origin) {

diff --git a/...rc/main/java/tech/pegasys/teku/statetransition/validation/BlobSidecarGossipValidator.java b/...rc/main/java/tech/pegasys/teku/statetransition/validation/BlobSidecarGossipValidator.java
@@ -262,7 +262,7 @@ public SafeFuture<InternalValidationResult> validate(final BlobSidecar blobSidec
                * [IGNORE] The sidecar is the first sidecar for the tuple (block_header.slot, block_header.proposer_index, blob_sidecar.index)
                *  with valid header signature, sidecar inclusion proof, and kzg proof.
                */
-              if (!markAsSeen(blockHeader, blobSidecar.getIndex())) {
+              if (!markForEquivocation(blockHeader, blobSidecar.getIndex())) {
                 return ignore(
                     "BlobSidecar is not the first valid for its slot and index. It will be dropped.");
               }
@@ -273,14 +273,14 @@ public SafeFuture<InternalValidationResult> validate(final BlobSidecar blobSidec
             });
   }
 
-  private boolean markAsSeen(final BeaconBlockHeader blockHeader, final UInt64 index) {
+  private boolean markForEquivocation(final BeaconBlockHeader blockHeader, final UInt64 index) {
     return receivedValidBlobSidecarInfoSet.add(
         new SlotProposerIndexAndBlobIndex(
             blockHeader.getSlot(), blockHeader.getProposerIndex(), index));
   }
 
-  public boolean markAsSeen(final BlobSidecar blobSidecar) {
-    return markAsSeen(
+  public boolean markForEquivocation(final BlobSidecar blobSidecar) {
+    return markForEquivocation(
         blobSidecar.getSignedBeaconBlockHeader().getMessage(), blobSidecar.getIndex());
   }
 
@@ -317,7 +317,7 @@ private SafeFuture<InternalValidationResult> validateBlobSidecarWithKnownValidHe
      * [IGNORE] The sidecar is the first sidecar for the tuple (block_header.slot, block_header.proposer_index, blob_sidecar.index)
      *  with valid header signature, sidecar inclusion proof, and kzg proof.
      */
-    if (!markAsSeen(blockHeader, blobSidecar.getIndex())) {
+    if (!markForEquivocation(blockHeader, blobSidecar.getIndex())) {
       return SafeFuture.completedFuture(
           ignore("BlobSidecar is not the first valid for its slot and index. It will be dropped."));
     }

diff --git a/...st/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java b/...st/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java
@@ -208,7 +208,7 @@ public void onNewBlobSidecar_shouldIgnoreDuplicates() {
   }
 
   @Test
-  public void onNewBlobSidecar_shouldMarkAsSeenAndPublishWhenOriginIsLocalEL() {
+  public void onNewBlobSidecar_shouldMarkForEquivocationAndPublishWhenOriginIsLocalEL() {
     final BlobSidecar blobSidecar1 =
         dataStructureUtil
             .createRandomBlobSidecarBuilder()
@@ -225,7 +225,7 @@ public void onNewBlobSidecar_shouldMarkAsSeenAndPublishWhenOriginIsLocalEL() {
             .signedBeaconBlockHeader(dataStructureUtil.randomSignedBeaconBlockHeader(currentSlot))
             .build();
 
-    when(blobSidecarGossipValidator.markAsSeen(blobSidecar1)).thenReturn(true);
+    when(blobSidecarGossipValidator.markForEquivocation(blobSidecar1)).thenReturn(true);
 
     blockBlobSidecarsTrackersPool.onNewBlobSidecar(blobSidecar1, RemoteOrigin.LOCAL_EL);
     blockBlobSidecarsTrackersPool.onNewBlobSidecar(blobSidecar2, RemoteOrigin.GOSSIP);
@@ -234,12 +234,12 @@ public void onNewBlobSidecar_shouldMarkAsSeenAndPublishWhenOriginIsLocalEL() {
     assertBlobSidecarsCount(3);
     assertBlobSidecarsTrackersCount(3);
 
-    verify(blobSidecarGossipValidator).markAsSeen(blobSidecar1);
+    verify(blobSidecarGossipValidator).markForEquivocation(blobSidecar1);
     verify(blobSidecarPublisher, times(1)).accept(blobSidecar1);
   }
 
   @Test
-  public void onNewBlobSidecar_shouldNotPublishWhenOriginIsLocalELButAlreadySeen() {
+  public void onNewBlobSidecar_shouldPublishEvenWhenOriginIsLocalELButEquivocating() {
     final BlobSidecar blobSidecar1 =
         dataStructureUtil
             .createRandomBlobSidecarBuilder()
@@ -256,7 +256,7 @@ public void onNewBlobSidecar_shouldNotPublishWhenOriginIsLocalELButAlreadySeen()
             .signedBeaconBlockHeader(dataStructureUtil.randomSignedBeaconBlockHeader(currentSlot))
             .build();
 
-    when(blobSidecarGossipValidator.markAsSeen(blobSidecar1)).thenReturn(false);
+    when(blobSidecarGossipValidator.markForEquivocation(blobSidecar1)).thenReturn(false);
 
     blockBlobSidecarsTrackersPool.onNewBlobSidecar(blobSidecar1, RemoteOrigin.LOCAL_EL);
     blockBlobSidecarsTrackersPool.onNewBlobSidecar(blobSidecar2, RemoteOrigin.GOSSIP);
@@ -265,8 +265,8 @@ public void onNewBlobSidecar_shouldNotPublishWhenOriginIsLocalELButAlreadySeen()
     assertBlobSidecarsCount(3);
     assertBlobSidecarsTrackersCount(3);
 
-    verify(blobSidecarGossipValidator).markAsSeen(blobSidecar1);
-    verify(blobSidecarPublisher, never()).accept(blobSidecar1);
+    verify(blobSidecarGossipValidator).markForEquivocation(blobSidecar1);
+    verify(blobSidecarPublisher, times(1)).accept(blobSidecar1);
   }
 
   @Test

diff --git a/...est/java/tech/pegasys/teku/statetransition/validation/BlobSidecarGossipValidatorTest.java b/...est/java/tech/pegasys/teku/statetransition/validation/BlobSidecarGossipValidatorTest.java
@@ -279,10 +279,10 @@ void shouldTrackValidInfoSet() {
   }
 
   @TestTemplate
-  void shouldMarkAsSeen() {
-    assertThat(blobSidecarValidator.markAsSeen(blobSidecar)).isTrue();
+  void shouldMarkForEquivocation() {
+    assertThat(blobSidecarValidator.markForEquivocation(blobSidecar)).isTrue();
 
-    assertThat(blobSidecarValidator.markAsSeen(blobSidecar)).isFalse();
+    assertThat(blobSidecarValidator.markForEquivocation(blobSidecar)).isFalse();
 
     SafeFutureAssert.assertThatSafeFuture(blobSidecarValidator.validate(blobSidecar))
         .isCompletedWithValueMatching(InternalValidationResult::isIgnore);