clean up PR

Signed-off-by: stefan.pingel@consensys.net <stefan.pingel@consensys.net>

Author: pinges

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java

@@ -127,8 +127,6 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
             forkChoice.getHeadBlockHash(), forkChoice.getFinalizedBlockHash());
 
     // Return SYNCING if we don't have the header OR if we're still syncing
-    // During initial sync (e.g., backward header download), we may download headers before world
-    // state
     if (maybeNewHead.isEmpty() || mergeContext.get().isSyncing()) {
       LOG.debug(
           "Node is syncing or block header not yet available for {}, returning SYNCING response",

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java

@@ -527,10 +527,14 @@ public synchronized void storeBlock(
   }
 
   @Override
-  public void importHeader(final BlockHeader blockHeader) {
+  public void storeBlockHeaders(final List<BlockHeader> blockHeaders) {
     final BlockchainStorage.Updater updater = blockchainStorage.updater();
-    updater.putBlockHeader(blockHeader.getHash(), blockHeader);
-    updater.putBlockHash(blockHeader.getNumber(), blockHeader.getBlockHash());
+    blockHeaders.forEach(
+        header -> {
+          final Hash hash = header.getHash();
+          updater.putBlockHeader(hash, header);
+          updater.putBlockHash(header.getNumber(), hash);
+        });
     updater.commit();
   }
 
@@ -616,13 +620,16 @@ private void appendSyncBlockHelper(
       final List<TransactionReceipt> receipts,
       final boolean transactionIndexing) {
 
+    if (blockIsAlreadyTracked(block.getHeader())) {
+      return;
+    }
+
     final Hash hash = block.getHash();
-    final BlockHeader header = block.getHeader();
-    final Difficulty td = calculateTotalDifficultyForSyncing(header);
+    final Difficulty td = calculateTotalDifficultyForSyncing(block.getHeader());
 
     final BlockchainStorage.Updater updater = blockchainStorage.updater();
 
-    updater.putBlockHeader(hash, header);
+    updater.putBlockHeader(hash, block.getHeader());
     updater.putSyncBlockBody(hash, block.getBody());
     updater.putTransactionReceipts(hash, receipts);
     updater.putTotalDifficulty(hash, td);
@@ -664,8 +671,8 @@ public synchronized void unsafeImportSyncBodyAndReceipts(
     final BlockchainStorage.Updater updater = blockchainStorage.updater();
     for (final SyncBlockWithReceipts blockAndReceipts : blocksAndReceipts) {
       final SyncBlock block = blockAndReceipts.getBlock();
-      final Hash blockHash = block.getHash();
       final BlockHeader header = block.getHeader();
+      final Hash blockHash = header.getHash();
       final SyncBlockBody body = block.getBody();
       updater.putBlockHash(header.getNumber(), blockHash);
       updater.putSyncBlockBody(blockHash, body);

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java

@@ -119,17 +119,23 @@ void unsafeImportBlock(
       final List<TransactionReceipt> receipts,
       final Optional<Difficulty> maybeTotalDifficulty);
 
+  /**
+   * Import blocks and receipts during syncing and update the chain state
+   *
+   * @param blocksAndReceipts The blocks and receipts to import
+   * @param indexTransactions Boolean whether to index transactions
+   */
   void unsafeImportSyncBodyAndReceipts(
       List<SyncBlockWithReceipts> blocksAndReceipts, boolean indexTransactions);
 
   void unsafeSetChainHead(final BlockHeader blockHeader, final Difficulty totalDifficulty);
 
   /**
-   * Adds a block header to the blockchain, without updating the chain state.
+   * Stores block headers, without updating the chain state.
    *
-   * @param blockHeader The block to append.
+   * @param blockHeaders The block headers to store.
    */
-  void importHeader(BlockHeader blockHeader);
+  void storeBlockHeaders(List<BlockHeader> blockHeaders);
 
   Difficulty calculateTotalDifficulty(final BlockHeader blockHeader);
 

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java

@@ -65,7 +65,7 @@
 public class EthPeer implements Comparable<EthPeer> {
   private static final Logger LOG = LoggerFactory.getLogger(EthPeer.class);
 
-  private static final int MAX_OUTSTANDING_REQUESTS = 3;
+  private static final int MAX_OUTSTANDING_REQUESTS = 5;
 
   private PeerConnection connection;
 

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java

@@ -656,16 +656,6 @@ private void checkIsSnapServer(final EthPeer peer, final BlockHeader peersHeadBl
             .log();
       }
     }
-    // Log overall snap peer status after each check
-    logSnapPeerStatus();
-  }
-
-  public void logSnapPeerStatus() {
-    long snapPeerCount =
-        streamAvailablePeers().filter(EthPeerImmutableAttributes::isServingSnap).count();
-    long totalPeerCount = streamAvailablePeers().count();
-
-    LOG.info("AAAAA SNAP_PEERS: {}/{} peers marked as serving snap", snapPeerCount, totalPeerCount);
   }
 
   private int comparePeerPriorities(final EthPeer p1, final EthPeer p2) {

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetAccountRangeFromPeerTask.java

@@ -32,11 +32,13 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GetAccountRangeFromPeerTask
     extends AbstractPeerRequestTask<AccountRangeMessage.AccountRangeData> {
 
-  //  private static final Logger LOG = LoggerFactory.getLogger(GetAccountRangeFromPeerTask.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GetAccountRangeFromPeerTask.class);
 
   private final Bytes32 startKeyHash;
   private final Bytes32 endKeyHash;
@@ -71,22 +73,19 @@ protected PendingPeerRequest sendRequest() {
           @Override
           public RequestManager.ResponseStream sendRequest(final EthPeer peer)
               throws PeerConnection.PeerNotConnected {
-            //            LOG.atInfo()
-            //                .setMessage(
-            //                    "WSD: Requesting account range [{} ,{}] for state root {} from
-            // peer {} .")
-            //                .addArgument(startKeyHash)
-            //                .addArgument(endKeyHash)
-            //                .addArgument(blockHeader.getStateRoot())
-            //                .addArgument(peer.getLoggableId())
-            //                .log();
+            LOG.atTrace()
+                .setMessage("Requesting account range [{} ,{}] for state root {} from peer {} .")
+                .addArgument(startKeyHash)
+                .addArgument(endKeyHash)
+                .addArgument(blockHeader)
+                .addArgument(peer)
+                .log();
             if (!peer.isServingSnap()) {
-              //              LOG.atInfo()
-              //                  .setMessage("WSD: EthPeer that is not serving snap called in {},
-              // peer: {}")
-              //                  .addArgument(GetAccountRangeFromPeerTask.class)
-              //                  .addArgument(peer)
-              //                  .log();
+              LOG.atDebug()
+                  .setMessage("EthPeer that is not serving snap called in {}, peer: {}")
+                  .addArgument(GetAccountRangeFromPeerTask.class)
+                  .addArgument(peer)
+                  .log();
               throw new RuntimeException(
                   "EthPeer that is not serving snap called in "
                       + GetAccountRangeFromPeerTask.class);
@@ -109,16 +108,11 @@ protected Optional<AccountRangeMessage.AccountRangeData> processResponse(
     if (streamClosed) {
       // We don't record this as a useless response because it's impossible to know if a peer has
       // the data we're requesting.
-      //      LOG.info("WSD: Peer {} closed stream before receiving account range data", peer);
       return Optional.empty();
     }
     final AccountRangeMessage accountRangeMessage = AccountRangeMessage.readFrom(message);
     final AccountRangeMessage.AccountRangeData accountRangeData =
         accountRangeMessage.accountData(true);
-    //    LOG.info(
-    //        "WSD: Received account range data from peer {}, data size {}",
-    //        peer,
-    //        accountRangeData.accounts().size());
     return Optional.of(accountRangeData);
   }
 }

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetAccountRangeFromPeerTask.java

@@ -30,9 +30,6 @@
 public class RetryingGetAccountRangeFromPeerTask
     extends AbstractRetryingSwitchingPeerTask<AccountRangeMessage.AccountRangeData> {
 
-  //  private static final Logger LOG =
-  //      LoggerFactory.getLogger(RetryingGetAccountRangeFromPeerTask.class);
-
   public static final int MAX_RETRIES = 4;
 
   private final EthContext ethContext;
@@ -52,9 +49,6 @@ private RetryingGetAccountRangeFromPeerTask(
         metricsSystem,
         data -> data.accounts().isEmpty() && data.proofs().isEmpty(),
         MAX_RETRIES);
-    //    LOG.info(
-    //        "WSD: created RetryingGetAccountRangeFromPeerTask for {} to {}", startKeyHash,
-    // endKeyHash);
     this.ethContext = ethContext;
     this.startKeyHash = startKeyHash;
     this.endKeyHash = endKeyHash;
@@ -78,8 +72,6 @@ protected CompletableFuture<AccountRangeMessage.AccountRangeData> executeTaskOnC
     final GetAccountRangeFromPeerTask task =
         GetAccountRangeFromPeerTask.forAccountRange(
             ethContext, startKeyHash, endKeyHash, blockHeader, metricsSystem);
-    //    task.assignPeer(peer);
-    //    LOG.info("WSD: starting task for {} to {} on peer {}", startKeyHash, endKeyHash, peer);
     return executeSubTask(task::run)
         .thenApply(
             peerResult -> {

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetBytecodeFromPeerTask.java

@@ -63,7 +63,6 @@ public static EthTask<Map<Bytes32, Bytes>> forByteCode(
   protected CompletableFuture<Map<Bytes32, Bytes>> executeTaskOnCurrentPeer(final EthPeer peer) {
     final GetBytecodeFromPeerTask task =
         GetBytecodeFromPeerTask.forBytecode(ethContext, codeHashes, blockHeader, metricsSystem);
-    //    task.assignPeer(peer);
     return executeSubTask(task::run)
         .thenApply(
             peerResult -> {

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetStorageRangeFromPeerTask.java

@@ -77,7 +77,6 @@ protected CompletableFuture<StorageRangeMessage.SlotRangeData> executeTaskOnCurr
     final GetStorageRangeFromPeerTask task =
         GetStorageRangeFromPeerTask.forStorageRange(
             ethContext, accountHashes, startKeyHash, endKeyHash, blockHeader, metricsSystem);
-    //    task.assignPeer(peer);
     return executeSubTask(task::run)
         .thenApply(
             peerResult -> {

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetTrieNodeFromPeerTask.java

@@ -62,7 +62,6 @@ public static EthTask<Map<Bytes, Bytes>> forTrieNodes(
   protected CompletableFuture<Map<Bytes, Bytes>> executeTaskOnCurrentPeer(final EthPeer peer) {
     final GetTrieNodeFromPeerTask task =
         GetTrieNodeFromPeerTask.forTrieNodes(ethContext, paths, blockHeader, metricsSystem);
-    //    task.assignPeer(peer);
     return executeSubTask(task::run)
         .thenApply(
             peerResult -> {