reset bad blocks manager on resync

Signed-off-by: garyschulte <[email protected]>
hyperledger · Jan 10, 2023 · 0346dad · 0346dad
1 parent 9dd82ae
commit 0346dad
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugResyncWorldstate.java b/...ava/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugResyncWorldstate.java
@@ -1,16 +1,39 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 public class DebugResyncWorldstate implements JsonRpcMethod {
   private final Synchronizer synchronizer;
+  private final ProtocolSchedule protocolSchedule;
+  private final Blockchain blockchain;
 
-  public DebugResyncWorldstate(final Synchronizer synchronizer) {
+  public DebugResyncWorldstate(
+      final ProtocolSchedule protocolSchedule,
+      final Blockchain blockchain,
+      final Synchronizer synchronizer) {
     this.synchronizer = synchronizer;
+    this.protocolSchedule = protocolSchedule;
+    this.blockchain = blockchain;
   }
 
   @Override
@@ -20,6 +43,10 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext request) {
+    protocolSchedule
+        .getByBlockNumber(blockchain.getChainHeadBlockNumber())
+        .getBadBlocksManager()
+        .reset();
     return new JsonRpcSuccessResponse(
         request.getRequest().getId(), synchronizer.resyncWorldState());
   }

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java b/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java
@@ -93,7 +93,7 @@ protected Map<String, JsonRpcMethod> create() {
         new DebugAccountRange(blockchainQueries),
         new DebugStorageRangeAt(blockchainQueries, blockReplay),
         new DebugMetrics(metricsSystem),
-        new DebugResyncWorldstate(synchronizer),
+        new DebugResyncWorldstate(protocolSchedule, protocolContext.getBlockchain(), synchronizer),
         new DebugTraceBlock(
             () -> new BlockTracer(blockReplay),
             ScheduleBasedBlockHeaderFunctions.create(protocolSchedule),

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java
@@ -49,6 +49,12 @@ public void addBadBlock(final Block badBlock, final Optional<Throwable> cause) {
     }
   }
 
+  public void reset() {
+    this.badBlocks.invalidateAll();
+    this.badHeaders.invalidateAll();
+    this.latestValidHashes.invalidateAll();
+  }
+
   /**
    * Return all invalid blocks
    *