Merge branch 'master' into remove-ttd-check

zilm13 · Jan 6, 2025 · c12b91e · c12b91e
2 parents 8f46715 + b4f7c2d
commit c12b91e
Show file tree

Hide file tree

Showing 43 changed files with 261 additions and 1,046 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,5 +10,6 @@
 
 ### Additions and Improvements
 - Optimized blobs validation pipeline
+- Remove delay when fetching blobs from the local EL on block arrival
 
 ### Bug Fixes
diff --git a/...n/pow/src/main/java/tech/pegasys/teku/beacon/pow/api/MinGenesisTimeBlockEventChannel.java b/...n/pow/src/main/java/tech/pegasys/teku/beacon/pow/api/MinGenesisTimeBlockEventChannel.java
diff --git a/data/serializer/build.gradle b/data/serializer/build.gradle
@@ -3,11 +3,9 @@ dependencies {
   api 'io.swagger.core.v3:swagger-annotations'
 
   implementation project(':ethereum:execution-types')
-  implementation project(':ethereum:jackson-deserializers')
   implementation project(':ethereum:spec')
   implementation project(':infrastructure:bls')
   implementation project(':infrastructure:bytes')
-  implementation project(':infrastructure:jackson')
   implementation project(':infrastructure:async')
 
   implementation 'io.tmio:tuweni-units'

diff --git a/.../serializer/src/main/java/tech/pegasys/teku/api/schema/interfaces/SignedBlindedBlock.java b/.../serializer/src/main/java/tech/pegasys/teku/api/schema/interfaces/SignedBlindedBlock.java
diff --git a/ethereum/execution-types/build.gradle b/ethereum/execution-types/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     implementation project(':infrastructure:crypto')
     implementation project(':infrastructure:json')
 
-    testFixturesApi project(':infrastructure:jackson')
+    testFixturesApi 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation project(':ethereum:json-types')
 
     testImplementation testFixtures(project(':infrastructure:json'))

diff --git a/ethereum/jackson-deserializers/build.gradle b/ethereum/jackson-deserializers/build.gradle
diff --git a/...serializers/src/main/java/tech/pegasys/teku/ethereum/jackson/Eth1AddressDeserializer.java b/...serializers/src/main/java/tech/pegasys/teku/ethereum/jackson/Eth1AddressDeserializer.java
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
@@ -37,8 +37,12 @@
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecarSchema;
 import tech.pegasys.teku.spec.datastructures.blocks.BeaconBlock;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
+import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlockHeader;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.BeaconBlockBody;
+import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.deneb.BeaconBlockBodyDeneb;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.deneb.BeaconBlockBodySchemaDeneb;
+import tech.pegasys.teku.spec.datastructures.execution.BlobAndProof;
+import tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc.BlobIdentifier;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
 import tech.pegasys.teku.spec.logic.common.helpers.MiscHelpers;
@@ -266,6 +270,32 @@ public BlobSidecar constructBlobSidecar(
         index, blob, commitment, proof, signedBeaconBlock.asHeader(), kzgCommitmentInclusionProof);
   }
 
+  public BlobSidecar constructBlobSidecarFromBlobAndProof(
+      final BlobIdentifier blobIdentifier,
+      final BlobAndProof blobAndProof,
+      final BeaconBlockBodyDeneb beaconBlockBodyDeneb,
+      final SignedBeaconBlockHeader signedBeaconBlockHeader) {
+
+    final SszKZGCommitment sszKZGCommitment =
+        beaconBlockBodyDeneb.getBlobKzgCommitments().get(blobIdentifier.getIndex().intValue());
+
+    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) {
     if (blobSidecar.isKzgCommitmentInclusionProofValidated()) {
       return true;

diff --git a/...testFixtures/java/tech/pegasys/teku/spec/propertytest/suppliers/type/Bytes32Supplier.java b/...testFixtures/java/tech/pegasys/teku/spec/propertytest/suppliers/type/Bytes32Supplier.java
diff --git a/.../testFixtures/java/tech/pegasys/teku/spec/propertytest/suppliers/type/UInt64Supplier.java b/.../testFixtures/java/tech/pegasys/teku/spec/propertytest/suppliers/type/UInt64Supplier.java
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