rebase fixes

StefanBratanov · Dec 16, 2024 · 9126d62 · 9126d62
1 parent a8a6b33
commit 9126d62
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/...c/src/main/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/MiscHelpersDeneb.java b/...c/src/main/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/MiscHelpersDeneb.java
@@ -279,15 +279,21 @@ public BlobSidecar constructBlobSidecarFromBlobAndProof(
     final SszKZGCommitment sszKZGCommitment =
         beaconBlockBodyDeneb.getBlobKzgCommitments().get(blobIdentifier.getIndex().intValue());
 
-    return blobSidecarSchema.create(
-        blobIdentifier.getIndex(),
-        blobAndProof.blob(),
-        sszKZGCommitment,
-        new SszKZGProof(blobAndProof.proof()),
-        signedBeaconBlockHeader,
-        computeKzgCommitmentInclusionProof(blobIdentifier.getIndex(), beaconBlockBodyDeneb));
-
-
+    final BlobSidecar blobSidecar =
+        blobSidecarSchema.create(
+            blobIdentifier.getIndex(),
+            blobAndProof.blob(),
+            sszKZGCommitment,
+            new SszKZGProof(blobAndProof.proof()),
+            signedBeaconBlockHeader,
+            computeKzgCommitmentInclusionProof(blobIdentifier.getIndex(), beaconBlockBodyDeneb));
+
+    blobSidecar.markSignatureAsValidated();
+    blobSidecar.markKzgCommitmentInclusionProofAsValidated();
+    // assume kzg validation done by local EL
+    blobSidecar.markKzgAsValidated();
+
+    return blobSidecar;
   }
 
   public boolean verifyBlobKzgCommitmentInclusionProof(final BlobSidecar blobSidecar) {

diff --git a/...nsition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlobSidecarManagerImpl.java b/...nsition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlobSidecarManagerImpl.java
@@ -66,9 +66,7 @@ public BlobSidecarManagerImpl(
         invalidBlobSidecarRoots,
         (tracker) ->
             new ForkChoiceBlobSidecarsAvailabilityChecker(spec, recentChainData, tracker, kzg),
-        // we don't care to set maxBlobsPerBlock since it isn't used with this immediate validation
-        // flow
-        (block) -> new BlockBlobSidecarsTracker(block.getSlotAndBlockRoot(), UInt64.ZERO));
+        (block) -> new BlockBlobSidecarsTracker(block.getSlotAndBlockRoot()));
   }
 
   @VisibleForTesting

diff --git a/...c/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java b/...c/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java
@@ -493,7 +493,7 @@ private BlockBlobSidecarsTracker internalOnNewBlock(
                 // if we attempted to fetch this block via RPC, we missed the opportunity to
                 // complete the blob sidecars via local EL and RPC (since the block is required to
                 // be known) Let's try now
-                if (!existingTracker.isCompleted()) {
+                if (!existingTracker.isComplete()) {
                   fetchMissingContent(slotAndBlockRoot).finish(this::logMissingContentFetchFailure);
                 }
               }