Fix blockImportCompleted (#8653)

Consensys · Sep 29, 2024 · ac6ee63 · ac6ee63
1 parent 214a9a5
commit ac6ee63
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,4 +20,5 @@
 - Updated LUKSO configuration with Deneb fork scheduled for epoch 123075 (November 20, 2024, 16:20:00 UTC)
 
 ### Bug Fixes
- - removed a warning from logs about non blinded blocks being requested (#8562)
+ - Removed a warning from logs about non blinded blocks being requested (#8562)
+ - Fixed `blockImportCompleted` log message timing [#8653](https://github.com/Consensys/teku/pull/8653)
diff --git a/...c/main/java/tech/pegasys/teku/validator/coordinator/publisher/AbstractBlockPublisher.java b/...c/main/java/tech/pegasys/teku/validator/coordinator/publisher/AbstractBlockPublisher.java
@@ -70,7 +70,7 @@ public SafeFuture<SendSignedBlockResult> sendSignedBlock(
               return gossipAndImportUnblindedSignedBlockAndBlobSidecars(
                   signedBlock, blobSidecars, broadcastValidationLevel, blockPublishingPerformance);
             })
-        .thenCompose(result -> calculateResult(blockContainer, result));
+        .thenCompose(result -> calculateResult(blockContainer, result, blockPublishingPerformance));
   }
 
   private SafeFuture<BlockImportAndBroadcastValidationResults>
@@ -133,7 +133,8 @@ abstract void publishBlockAndBlobSidecars(
 
   private SafeFuture<SendSignedBlockResult> calculateResult(
       final SignedBlockContainer maybeBlindedBlockContainer,
-      final BlockImportAndBroadcastValidationResults blockImportAndBroadcastValidationResults) {
+      final BlockImportAndBroadcastValidationResults blockImportAndBroadcastValidationResults,
+      final BlockPublishingPerformance blockPublishingPerformance) {
 
     // broadcast validation can fail earlier than block import.
     // The assumption is that in that block import will fail but not as fast
@@ -155,6 +156,7 @@ private SafeFuture<SendSignedBlockResult> calculateResult(
                   .blockImportResult()
                   .thenApply(
                       importResult -> {
+                        blockPublishingPerformance.blockImportCompleted();
                         if (importResult.isSuccessful()) {
                           LOG.trace(
                               "Successfully imported proposed block: {}",

diff --git a/.../src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherDeneb.java b/.../src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherDeneb.java
@@ -56,9 +56,7 @@ SafeFuture<BlockImportAndBroadcastValidationResults> importBlockAndBlobSidecars(
       final BlockPublishingPerformance blockPublishingPerformance) {
     // provide blobs for the block before importing it
     blockBlobSidecarsTrackersPool.onCompletedBlockAndBlobSidecars(block, blobSidecars);
-    return blockImportChannel
-        .importBlock(block, broadcastValidationLevel)
-        .thenPeek(__ -> blockPublishingPerformance.blockImportCompleted());
+    return blockImportChannel.importBlock(block, broadcastValidationLevel);
   }
 
   @Override

diff --git a/...src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherPhase0.java b/...src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherPhase0.java
@@ -45,9 +45,7 @@ SafeFuture<BlockImportAndBroadcastValidationResults> importBlockAndBlobSidecars(
       final List<BlobSidecar> blobSidecars,
       final BroadcastValidationLevel broadcastValidationLevel,
       final BlockPublishingPerformance blockPublishingPerformance) {
-    return blockImportChannel
-        .importBlock(block, broadcastValidationLevel)
-        .thenPeek(__ -> blockPublishingPerformance.blockImportCompleted());
+    return blockImportChannel.importBlock(block, broadcastValidationLevel);
   }
 
   @Override