feat(hfork): rewrite hard fork detector based on #7087

Author: lidatong

book/api/metrics-generated.md

@@ -1195,5 +1195,9 @@
 | <span class="metrics-name">tower_&#8203;lockout_&#8203;fail</span> | counter | Locked out (can't vote) |
 | <span class="metrics-name">tower_&#8203;threshold_&#8203;fail</span> | counter | Did not pass threshold check (can't vote) |
 | <span class="metrics-name">tower_&#8203;propagated_&#8203;fail</span> | counter | Prev leader block did not propagate (can't vote) |
+| <span class="metrics-name">tower_&#8203;hard_&#8203;forks_&#8203;seen</span> | counter | Number of hard forks we've seen (block ids with multiple candidate bank hashes) |
+| <span class="metrics-name">tower_&#8203;hard_&#8203;forks_&#8203;pruned</span> | counter | Number of hard forks (candidate bank hashes) we've pruned |
+| <span class="metrics-name">tower_&#8203;hard_&#8203;forks_&#8203;active</span> | gauge | Currently active hard forks |
+| <span class="metrics-name">tower_&#8203;hard_&#8203;forks_&#8203;max_&#8203;width</span> | gauge | The max width of hard forks (block id with most candidate bank hashes) we've ever seen |
 
 </div>

src/app/firedancer/config/default.toml

@@ -1371,15 +1371,15 @@ user = ""
     [tiles.tower]
         # Solana reaches consensus via replay, but can "cluster confirm"
         # slots ahead of the replay tip by listening to vote txns from
-        # gossip or TPU.  The larger max_lookahead_conf, the further
+        # gossip or TPU.  The larger max_vote_lookahead, the further
         # ahead slots can be cluster confirmed before they are replayed.
         #
         # Specifically, tower will ignore gossip or TPU votes that are
-        # more than max_lookahead_conf slots ahead of the root.
+        # more than max_vote_lookahead slots ahead of the root.
         #
-        # Note max_lookahead_conf must be >= max_live_slots and
+        # Note max_vote_lookahead must be >= max_live_slots and
         # Firedancer will ignore a value where this is not the case.
-        max_lookahead_conf = 4096
+        max_vote_lookahead = 4096
 
     [tiles.send]
         # The port the send tile uses for QUIC, to send votes and other

src/app/firedancer/topology.c

@@ -345,7 +345,6 @@ fd_topo_initialize( config_t * config ) {
 
   fd_topob_wksp( topo, "funk"         );
   fd_topob_wksp( topo, "progcache"    );
-  fd_topob_wksp( topo, "bh_cmp"       );
   fd_topob_wksp( topo, "fec_sets"     );
   fd_topob_wksp( topo, "txncache"     );
   fd_topob_wksp( topo, "banks"        );
@@ -1199,9 +1198,9 @@ fd_topo_configure_tile( fd_topo_tile_t * tile,
 
   } else if( FD_UNLIKELY( !strcmp( tile->name, "tower" ) ) ) {
 
-    tile->tower.fork_fatal         = config->firedancer.development.hard_fork_fatal;
+    tile->tower.hard_fork_fatal    = config->firedancer.development.hard_fork_fatal;
     tile->tower.max_live_slots     = config->firedancer.runtime.max_live_slots;
-    tile->tower.max_lookahead_conf = config->tiles.tower.max_lookahead_conf;
+    tile->tower.max_vote_lookahead = config->tiles.tower.max_vote_lookahead;
     strncpy( tile->tower.identity_key, config->paths.identity_key, sizeof(tile->tower.identity_key) );
     strncpy( tile->tower.vote_account, config->paths.vote_account, sizeof(tile->tower.vote_account) );
     strncpy( tile->tower.base_path, config->paths.base, sizeof(tile->tower.base_path) );

src/app/shared/fd_config.h

@@ -490,7 +490,7 @@ struct fd_config {
     } shredcap;
 
     struct {
-      ulong max_lookahead_conf;
+      ulong max_vote_lookahead;
     } tower;
 
   } tiles;

src/app/shared/fd_config_parse.c

@@ -259,7 +259,7 @@ fd_config_extract_pod( uchar *       pod,
 
   CFG_POP      ( ushort, tiles.send.send_src_port                         );
 
-  CFG_POP      ( ulong,  tiles.tower.max_lookahead_conf                   );
+  CFG_POP      ( ulong,  tiles.tower.max_vote_lookahead                   );
 
   CFG_POP      ( bool,   tiles.archiver.enabled                           );
   CFG_POP      ( ulong,  tiles.archiver.end_slot                          );

src/choreo/fd_choreo_base.h

@@ -36,5 +36,6 @@ typedef uchar fd_block_id_t[ 32UL ];
 typedef fd_slot_hash_t fd_slot_pubkey_t;
 
 static const fd_pubkey_t pubkey_null = {{ 0 }};
+static const fd_hash_t hash_null = {{ 0 }};
 
 #endif /* HEADER_fd_src_choreo_fd_choreo_base_h */

src/choreo/ghost/fd_ghost.c

@@ -271,18 +271,18 @@ fd_ghost_insert( fd_ghost_t      * ghost,
 void
 fd_ghost_count_vote( fd_ghost_t *        ghost,
                      fd_ghost_blk_t *    blk,
-                     fd_pubkey_t const * vtr_addr,
+                     fd_pubkey_t const * vote_acc,
                      ulong               stake,
                      ulong               slot ) {
 
   fd_ghost_blk_t const * root = fd_ghost_root( ghost );
   fd_ghost_blk_t *       pool = ghost->pool;
-  fd_ghost_vtr_t *       vtr  = vtr_map_query( ghost->vtr_map, *vtr_addr, NULL );
+  fd_ghost_vtr_t *       vtr  = vtr_map_query( ghost->vtr_map, *vote_acc, NULL );
 
   if( FD_UNLIKELY( slot == ULONG_MAX  ) ) return; /* hasn't voted */
   if( FD_UNLIKELY( slot <  root->slot ) ) return; /* vote older than root */
 
-  if( FD_UNLIKELY( !vtr ) ) vtr = vtr_map_insert( ghost->vtr_map, *vtr_addr );
+  if( FD_UNLIKELY( !vtr ) ) vtr = vtr_map_insert( ghost->vtr_map, *vote_acc );
   else {
 
     /* Only process the vote if it is not the same as the previous vote

src/choreo/hfork/Local.mk

@@ -0,0 +1,8 @@
+$(call add-hdrs,fd_hfork.h)
+$(call add-objs,fd_hfork,fd_choreo)
+ifdef FD_HAS_HOSTED
+ifdef FD_HAS_SECP256K1
+$(call make-unit-test,test_hfork,test_hfork,fd_choreo fd_flamenco fd_tango fd_ballet fd_util)
+$(call run-unit-test,test_hfork)
+endif
+endif