Merge remote-tracking branch 'upstream/master' into initial-canonical…

…-block-root

teku/src/main/java/tech/pegasys/teku/cli/subcommand/debug/DebugDbCommand.java

@@ -446,6 +446,37 @@ public int dumpHotBlocks(
     return 0;
   }
 
+  @Command(
+      name = "get-hot-block-slot-to-root",
+      description = "Writes all the slots and roots of stored hot blocks, will be in hash order.",
+      mixinStandardHelpOptions = true,
+      showDefaultValues = true,
+      abbreviateSynopsis = true,
+      versionProvider = PicoCliVersionProvider.class,
+      synopsisHeading = "%n",
+      descriptionHeading = "%nDescription:%n%n",
+      optionListHeading = "%nOptions:%n",
+      footerHeading = "%n",
+      footer = "Teku is licensed under the Apache License 2.0")
+  public int getHotBlockSlotToRoot(
+      @Mixin final BeaconNodeDataOptions beaconNodeDataOptions,
+      @Mixin final Eth2NetworkOptions eth2NetworkOptions)
+      throws Exception {
+    try (final Database database = createDatabase(beaconNodeDataOptions, eth2NetworkOptions);
+        final Stream<Map.Entry<Bytes, Bytes>> hotBlockStream = database.streamHotBlocksAsSsz()) {
+      for (final Iterator<Map.Entry<Bytes, Bytes>> hotBlockIterator = hotBlockStream.iterator();
+          hotBlockIterator.hasNext(); ) {
+        final Map.Entry<Bytes, Bytes> rootAndHotBlock = hotBlockIterator.next();
+        final Bytes32 hotBlockRoot = Bytes32.wrap(rootAndHotBlock.getKey());
+        final Optional<SignedBeaconBlock> hotBlock = database.getHotBlock(hotBlockRoot);
+        System.out.println(
+            String.format(
+                "%s, %s", hotBlock.orElseThrow().getSlot().toString(), hotBlockRoot.toHexString()));
+      }
+    }
+    return 0;
+  }
+
   @Command(
       name = "dump-blob-sidecars",
       description = "Writes all blob sidecars in the database as a zip of SSZ files",