Revert "Fix for backward sync wrongly thinking it is done after a Bes…

…u restart" This reverts commit e7ac9e5. # Conflicts: # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java
hyperledger · Mar 7, 2023 · 7476309 · 7476309
1 parent c2c88b1
commit 7476309
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...rc/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java b/...rc/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java
@@ -116,7 +116,9 @@ public synchronized void updateHead(final Hash headHash) {
   }
 
   public synchronized CompletableFuture<Void> syncBackwardsUntil(final Hash newBlockHash) {
-    backwardChain.addNewHash(newBlockHash);
+    if (!isTrusted(newBlockHash)) {
+      backwardChain.addNewHash(newBlockHash);
+    }
 
     final Status status = getOrStartSyncSession();
     backwardChain
@@ -131,7 +133,9 @@ public synchronized CompletableFuture<Void> syncBackwardsUntil(final Block newPi
       backwardChain.appendTrustedBlock(newPivot);
     }
 
-    return syncBackwardsUntil(newPivot.getHeader().getParentHash());
+    final Status status = getOrStartSyncSession();
+    status.updateTargetHeight(newPivot.getHeader().getNumber());
+    return status.currentFuture;
   }
 
   private Status getOrStartSyncSession() {