From cba0696cca342d88b64ccd513688de489e7ce1dd Mon Sep 17 00:00:00 2001 From: Enrico Del Fante Date: Fri, 28 Feb 2025 14:31:02 +0100 Subject: [PATCH] tmp --- .../forkchoice/ForkChoice.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoice.java b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoice.java index 94a2bef6e02..039f8724fb3 100644 --- a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoice.java +++ b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoice.java @@ -73,7 +73,6 @@ import tech.pegasys.teku.spec.logic.versions.deneb.blobs.BlobSidecarsAvailabilityChecker; import tech.pegasys.teku.statetransition.attestation.DeferredAttestations; import tech.pegasys.teku.statetransition.blobs.BlobSidecarManager; -import tech.pegasys.teku.statetransition.blobs.BlobSidecarManager.RemoteOrigin; import tech.pegasys.teku.statetransition.block.BlockImportPerformance; import tech.pegasys.teku.statetransition.util.DebugDataDumper; import tech.pegasys.teku.statetransition.validation.AttestationStateSelector; @@ -594,17 +593,19 @@ private BlockImportResult importBlockAndState( blobSidecars, earliestBlobSidecarsSlot); - final boolean reorg; - if (recentChainData.getBestBlockRoot().map(root -> !root.equals(block.getParentRoot())).orElse(false)) { - LOG.info("Reorg detected. Parent block root: {}", block.getParentRoot()); - reorg = true; + if (recentChainData + .getBestBlockRoot() + .map(root -> !root.equals(block.getParentRoot())) + .orElse(false)) { + LOG.info("Reorg detected. Parent block root: {}", block.getParentRoot()); + reorg = true; } else { - reorg = false; + reorg = false; } - if(shouldApplyProposerBoost(block, transaction)) { - LOG.info("Applying proposer boost for block at slot {}", block.getSlot()); + if (shouldApplyProposerBoost(block, transaction)) { + LOG.info("Applying proposer boost for block at slot {}", block.getSlot()); transaction.setProposerBoostRoot(block.getRoot()); } @@ -637,8 +638,8 @@ private BlockImportResult importBlockAndState( updateForkChoiceForImportedBlock(block, result, forkChoiceStrategy); notifyForkChoiceUpdatedAndOptimisticSyncingChanged(Optional.empty()); - if(reorg) { - processHead(block.getSlot()).ifExceptionGetsHereRaiseABug(); + if (reorg) { + processHead(block.getSlot()).ifExceptionGetsHereRaiseABug(); } return result; @@ -649,7 +650,10 @@ private boolean shouldApplyProposerBoost( final SignedBeaconBlock block, final StoreTransaction transaction) { // get_current_slot(store) == block.slot - LOG.info("shouldApplyProposerBoost - current slot: {}, block slot: {}", spec.getCurrentSlot(transaction), block.getSlot()); + LOG.info( + "shouldApplyProposerBoost - current slot: {}, block slot: {}", + spec.getCurrentSlot(transaction), + block.getSlot()); if (!spec.getCurrentSlot(transaction).equals(block.getSlot())) { return false; }