Merge branch 'main' into jsonrpc_ipc

hyperledger · Apr 25, 2022 · 2e8f3c3 · 2e8f3c3
2 parents 376a3c0 + 714c538
commit 2e8f3c3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/...eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java b/...eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java
@@ -82,7 +82,8 @@ public CompletableFuture<FastSyncState> start() {
   protected CompletableFuture<FastSyncState> start(final FastSyncState fastSyncState) {
     LOG.info("Starting fast sync.");
     if (worldStateStorage instanceof BonsaiWorldStateKeyValueStorage) {
-      worldStateStorage.clear();
+      LOG.info("Clearing bonsai flat account db");
+      worldStateStorage.clearFlatDatabase();
     }
     return findPivotBlock(fastSyncState, fss -> downloadChainAndWorldState(fastSyncActions, fss));
   }

diff --git a/...rg/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/AccountTrieNodeDataRequest.java b/...rg/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/AccountTrieNodeDataRequest.java
@@ -43,7 +43,12 @@ protected void doPersist(final Updater updater) {
 
   @Override
   public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
-    return worldStateStorage.getAccountTrieNodeData(getLocation().orElse(Bytes.EMPTY), getHash());
+    return getLocation()
+        .flatMap(
+            location ->
+                worldStateStorage
+                    .getAccountStateTrieNode(location, getHash())
+                    .filter(data -> Hash.hash(data).equals(getHash())));
   }
 
   @Override

diff --git a/...ava/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastDownloaderFactory.java b/...ava/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastDownloaderFactory.java
@@ -86,7 +86,7 @@ public static Optional<FastSyncDownloader<?>> create(
       return Optional.empty();
     }
     if (worldStateStorage instanceof BonsaiWorldStateKeyValueStorage) {
-      worldStateStorage.clear();
+      worldStateStorage.clearFlatDatabase();
     } else {
       final Path queueDataDir = fastSyncDataDirectory.resolve("statequeue");
       if (queueDataDir.toFile().exists()) {

diff --git a/...rg/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StorageTrieNodeDataRequest.java b/...rg/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StorageTrieNodeDataRequest.java
@@ -46,8 +46,15 @@ protected void doPersist(final Updater updater) {
 
   @Override
   public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
-    return worldStateStorage.getAccountStorageTrieNode(
-        getAccountHash().orElse(Hash.EMPTY), getLocation().orElse(Hash.EMPTY), getHash());
+    return getAccountHash()
+        .flatMap(
+            accountHash ->
+                getLocation()
+                    .flatMap(
+                        location ->
+                            worldStateStorage
+                                .getAccountStorageTrieNode(accountHash, location, getHash())
+                                .filter(data -> Hash.hash(data).equals(getHash()))));
   }
 
   @Override