Import export trie log

besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java

@@ -42,8 +42,6 @@ public class DataStorageOptions implements CLIOptions<DataStorageConfiguration>
   private static final String BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD =
       "--bonsai-historical-block-limit";
 
-
-
   // Use Bonsai DB
   @Option(
       names = {DATA_STORAGE_FORMAT},
@@ -64,10 +62,12 @@ public class DataStorageOptions implements CLIOptions<DataStorageConfiguration>
   private final DataStorageOptions.Unstable unstableOptions = new Unstable();
 
   static class Unstable {
-    private static final String BONSAI_LIMIT_TRIE_LOGS_ENABLED = "--Xbonsai-limit-trie-logs-enabled";
+    private static final String BONSAI_LIMIT_TRIE_LOGS_ENABLED =
+        "--Xbonsai-limit-trie-logs-enabled";
     private static final String BONSAI_TRIE_LOGS_RETENTION_THRESHOLD =
         "--Xbonsai-trie-logs-retention-threshold";
     private static final String BONSAI_TRIE_LOG_PRUNING_LIMIT = "--Xbonsai-trie-logs-pruning-limit";
+
     @CommandLine.Option(
         hidden = true,
         names = {BONSAI_LIMIT_TRIE_LOGS_ENABLED},

besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogHelper.java

@@ -16,7 +16,6 @@
 package org.hyperledger.besu.cli.subcommands.storage;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Collections.singletonList;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
 
 import org.hyperledger.besu.datatypes.Hash;
@@ -352,13 +351,9 @@ static void printCount(final PrintWriter out, final TrieLogCount count) {
   }
 
   static void importTrieLog(
-      final BonsaiWorldStateKeyValueStorage rootWorldStateStorage,
-      final Path dataDirectoryPath,
-      final Hash trieLogHash) {
-    final String trieLogFile =
-        dataDirectoryPath.resolve(DATABASE_PATH).resolve(trieLogHash.toString()).toString();
+      final BonsaiWorldStateKeyValueStorage rootWorldStateStorage, final Path trieLogFilePath) {
 
-    var trieLog = readTrieLogsFromFile(trieLogFile);
+    var trieLog = readTrieLogsFromFile(trieLogFilePath.toString());
 
     var updater = rootWorldStateStorage.updater();
     trieLog.forEach((key, value) -> updater.getTrieLogStorageTransaction().put(key, value));
@@ -367,13 +362,12 @@ static void importTrieLog(
 
   static void exportTrieLog(
       final BonsaiWorldStateKeyValueStorage rootWorldStateStorage,
-      final Path dataDirectoryPath,
-      final Hash trieLogHash)
+      final List<Hash> trieLogHash,
+      final Path directoryPath)
       throws IOException {
-    final String trieLogFile =
-        dataDirectoryPath.resolve(DATABASE_PATH).resolve(trieLogHash.toString()).toString();
+    final String trieLogFile = directoryPath.toString();
 
-    saveTrieLogsInFile(singletonList(trieLogHash), rootWorldStateStorage, trieLogFile);
+    saveTrieLogsInFile(trieLogHash, rootWorldStateStorage, trieLogFile);
   }
 
   record TrieLogCount(int total, int canonicalCount, int forkCount, int orphanCount) {}

besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogSubCommand.java

@@ -31,6 +31,7 @@
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -147,21 +148,38 @@ static class ExportTrieLog implements Runnable {
 
     @CommandLine.Option(
         names = "--trie-log-block-hash",
-        description = "The hash of the block you want to export the trie log of.",
+        description = "The hash of the block you want to import the trie log of",
+        split = " {0,1}, {0,1}",
+        arity = "1..*")
+    private List<String> trieLogBlockHashList;
+
+    @CommandLine.Option(
+        names = "--trie-log-file-path",
+        description = "The hash of the block you want to import the trie log of",
         arity = "1..1")
-    private String trieLogBlockHash;
+    private Path trieLogFilePath = null;
 
     @Override
     public void run() {
+      if (trieLogFilePath == null) {
+        trieLogFilePath =
+            Paths.get(
+                TrieLogSubCommand.parentCommand
+                    .parentCommand
+                    .dataDir()
+                    .resolve("trie-logs.bin")
+                    .toAbsolutePath()
+                    .toString());
+      }
+
       TrieLogContext context = getTrieLogContext();
-      final Path dataDirectoryPath =
-          Paths.get(
-              TrieLogSubCommand.parentCommand.parentCommand.dataDir().toAbsolutePath().toString());
+
+      final List<Hash> listOfBlockHashes =
+          trieLogBlockHashList.stream().map(Hash::fromHexString).toList();
+
       try {
         TrieLogHelper.exportTrieLog(
-            context.rootWorldStateStorage(),
-            dataDirectoryPath,
-            Hash.fromHexString(trieLogBlockHash));
+            context.rootWorldStateStorage(), listOfBlockHashes, trieLogFilePath);
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
@@ -184,19 +202,27 @@ static class ImportTrieLog implements Runnable {
     private CommandLine.Model.CommandSpec spec; // Picocli injects reference to command spec
 
     @CommandLine.Option(
-        names = "--trie-log-block-hash",
+        names = "--trie-log-file-path",
         description = "The hash of the block you want to import the trie log of",
         arity = "1..1")
-    private String trieLogBlockHash;
+    private Path trieLogFilePath = null;
 
     @Override
     public void run() {
+      if (trieLogFilePath == null) {
+        trieLogFilePath =
+            Paths.get(
+                TrieLogSubCommand.parentCommand
+                    .parentCommand
+                    .dataDir()
+                    .resolve("trie-logs.bin")
+                    .toAbsolutePath()
+                    .toString());
+      }
+
       TrieLogContext context = getTrieLogContext();
-      final Path dataDirectoryPath =
-          Paths.get(
-              TrieLogSubCommand.parentCommand.parentCommand.dataDir().toAbsolutePath().toString());
-      TrieLogHelper.importTrieLog(
-          context.rootWorldStateStorage(), dataDirectoryPath, Hash.fromHexString(trieLogBlockHash));
+
+      TrieLogHelper.importTrieLog(context.rootWorldStateStorage(), trieLogFilePath);
     }
   }
 

besu/src/test/java/org/hyperledger/besu/cli/subcommands/storage/TrieLogHelperTest.java

@@ -15,6 +15,7 @@
 
 package org.hyperledger.besu.cli.subcommands.storage;
 
+import static java.util.Collections.singletonList;
 import static org.hyperledger.besu.ethereum.worldstate.DataStorageFormat.BONSAI;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,7 +40,6 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -93,17 +93,6 @@ public void setup() throws IOException {
         .getTrieLogStorageTransaction()
         .put(blockHeader5.getHash().toArrayUnsafe(), Bytes.fromHexString("0x05").toArrayUnsafe());
     updater.getTrieLogStorageTransaction().commit();
-
-    createDirectory();
-  }
-
-  static void createDirectory() throws IOException {
-    Files.createDirectories(dataDir.resolve("database"));
-  }
-
-  @AfterEach
-  void deleteDirectory() throws IOException {
-    Files.deleteIfExists(dataDir.resolve("database"));
   }
 
   void mockBlockchainBase() {
@@ -113,7 +102,8 @@ void mockBlockchainBase() {
   }
 
   @Test
-  public void prune() {
+  public void prune() throws IOException {
+    Files.createDirectories(dataDir.resolve("database"));
 
     DataStorageConfiguration dataStorageConfiguration =
         ImmutableDataStorageConfiguration.builder()
@@ -268,18 +258,20 @@ public void exceptionWhileSavingFileStopsPruneProcess() throws IOException {
 
   @Test
   public void exportedTrieMatchesDbTrieLog() throws IOException {
-    TrieLogHelper.exportTrieLog(inMemoryWorldState, dataDir, blockHeader1.getHash());
-    Path trieLogFile = dataDir.resolve("database").resolve(blockHeader1.getHash().toString());
+    TrieLogHelper.exportTrieLog(
+        inMemoryWorldState,
+        singletonList(blockHeader1.getHash()),
+        dataDir.resolve("trie-log-dump"));
 
     var trieLog =
-        TrieLogHelper.readTrieLogsFromFile(trieLogFile.toString()).entrySet().stream()
+        TrieLogHelper.readTrieLogsFromFile(dataDir.resolve("trie-log-dump").toString())
+            .entrySet()
+            .stream()
             .findFirst()
             .get();
 
     assertArrayEquals(trieLog.getKey(), blockHeader1.getHash().toArrayUnsafe());
     assertArrayEquals(trieLog.getValue(), Bytes.fromHexString("0x01").toArrayUnsafe());
-
-    Files.delete(trieLogFile);
   }
 
   @Test
@@ -288,10 +280,12 @@ public void importedTrieLogMatchesDbTrieLog() throws IOException {
     BonsaiWorldStateKeyValueStorage inMemoryWorldState2 =
         new BonsaiWorldStateKeyValueStorage(tempStorageProvider, new NoOpMetricsSystem());
 
-    TrieLogHelper.exportTrieLog(inMemoryWorldState, dataDir, blockHeader1.getHash());
-    Path trieLogFile = dataDir.resolve("database").resolve(blockHeader1.getHash().toString());
+    TrieLogHelper.exportTrieLog(
+        inMemoryWorldState,
+        singletonList(blockHeader1.getHash()),
+        dataDir.resolve("trie-log-dump"));
 
-    var trieLog = TrieLogHelper.readTrieLogsFromFile(trieLogFile.toString());
+    var trieLog = TrieLogHelper.readTrieLogsFromFile(dataDir.resolve("trie-log-dump").toString());
     var updater = inMemoryWorldState2.updater();
 
     trieLog.forEach((k, v) -> updater.getTrieLogStorageTransaction().put(k, v));
@@ -301,7 +295,5 @@ public void importedTrieLogMatchesDbTrieLog() throws IOException {
     assertArrayEquals(
         inMemoryWorldState2.getTrieLog(blockHeader1.getHash()).get(),
         Bytes.fromHexString("0x01").toArrayUnsafe());
-
-    Files.delete(trieLogFile);
   }
 }