tower: fixes

Author: emwang-jump

src/choreo/tower/fd_tower.c

@@ -236,8 +236,9 @@ switch_check( fd_tower_t const  * tower,
     /* Iterate over all the leaves of all forks */
     fd_tower_leaf_t  * leaf = fd_tower_leaves_dlist_iter_ele( iter, forks->tower_leaves_dlist, forks->tower_leaves_pool );
     ulong candidate_slot = leaf->slot;
+    ulong lca = fd_forks_lowest_common_ancestor( forks, candidate_slot, last_vote_slot );
 
-    if( fd_forks_is_slot_descendant( forks, fd_forks_lowest_common_ancestor( forks, candidate_slot, last_vote_slot ), switch_slot ) ) {
+    if( lca != ULONG_MAX && fd_forks_is_slot_descendant( forks, lca, switch_slot ) ) {
 
       /* This candidate slot may be considered for the switch proof, if
          it passes the following conditions:
@@ -811,6 +812,9 @@ fd_tower_verify( fd_tower_t const * tower ) {
 void
 fd_tower_print( fd_tower_t const * tower, ulong root ) {
   FD_LOG_NOTICE( ( "\n\n[Tower]" ) );
+
+  if( FD_UNLIKELY( fd_tower_empty( tower ) ) ) return;
+
   ulong max_slot = 0;
 
   /* Determine spacing. */

src/choreo/tower/fd_tower_forks.c

@@ -108,7 +108,10 @@ fd_forks_lowest_common_ancestor( fd_forks_t * forks,
     if( fork1->slot > fork2->slot                 ) fork1 = fd_tower_forks_query( forks->tower_forks, fork1->parent_slot, NULL );
     else                                            fork2 = fd_tower_forks_query( forks->tower_forks, fork2->parent_slot, NULL );
   }
-  FD_LOG_CRIT(( "invalid forks" ));
+  /* If we reach here, then one of the slots is on a minority fork who's
+     ancestor that connected it to the main fork has been pruned (i.e.)
+     we have a dangling leaf right now! There is no LCA in this case. */
+  return ULONG_MAX;
 }
 
 fd_hash_t const *

src/choreo/voter/fd_voter.h

@@ -79,8 +79,14 @@ fd_voter_root_slot( uchar const * vote_account_data ) {
   fd_voter_t const * voter = (fd_voter_t const *)fd_type_pun_const( vote_account_data );
   ulong              cnt   = voter->votes_cnt;
   switch( voter->kind ) {
-  case FD_VOTER_V3: { uchar root_option = fd_uchar_load_1_fast( (uchar *)&voter->votes_v3[cnt] ); return root_option ? fd_ulong_load_8_fast( (uchar *)&voter->votes_v3[cnt] ) : ULONG_MAX; }
-  case FD_VOTER_V2: { uchar root_option = fd_uchar_load_1_fast( (uchar *)&voter->votes_v2[cnt] ); return root_option ? fd_ulong_load_8_fast( (uchar *)&voter->votes_v2[cnt] ) : ULONG_MAX; }
+  case FD_VOTER_V3: {
+    uchar  root_option = fd_uchar_load_1_fast( (uchar const *)&voter->votes_v3[cnt] );
+    return root_option ? fd_ulong_load_8_fast( (uchar const *)&voter->votes_v3[cnt] + 1UL ) : ULONG_MAX;
+  }
+  case FD_VOTER_V2: {
+    uchar  root_option = fd_uchar_load_1_fast( (uchar const *)&voter->votes_v2[cnt] );
+    return root_option ? fd_ulong_load_8_fast( (uchar const *)&voter->votes_v2[cnt] + 1UL ) : ULONG_MAX;
+  }
   default: FD_LOG_CRIT(( "unhandled kind %u", voter->kind ));
   }
 }

src/discof/tower/fd_tower_tile.c

@@ -153,7 +153,6 @@ scratch_align( void ) {
 FD_FN_PURE static inline ulong
 scratch_footprint( FD_PARAM_UNUSED fd_topo_tile_t const * tile ) {
   ulong slot_max     = tile->tower.max_live_slots;
-  int   lg_slot_max  = fd_ulong_find_msb( fd_ulong_pow2_up( slot_max ) ) + 1;
   FD_LOG_DEBUG(( "hfork footprint %lu", fd_hfork_footprint( slot_max, FD_VOTER_MAX ) ));
   ulong l = FD_LAYOUT_INIT;
   l = FD_LAYOUT_APPEND( l, alignof(ctx_t),         sizeof(ctx_t)                                        );
@@ -163,10 +162,8 @@ scratch_footprint( FD_PARAM_UNUSED fd_topo_tile_t const * tile ) {
   l = FD_LAYOUT_APPEND( l, fd_tower_align(),       fd_tower_footprint()                                 );
   l = FD_LAYOUT_APPEND( l, fd_tower_accts_align(), fd_tower_accts_footprint( FD_VOTER_MAX )             );
   l = FD_LAYOUT_APPEND( l, fd_forks_align(),       fd_forks_footprint( slot_max, FD_VOTER_MAX )         );
-  l = FD_LAYOUT_APPEND( l, fd_tower_align(),       fd_tower_footprint()                                 );
-  l = FD_LAYOUT_APPEND( l, fd_epoch_stakes_align(), fd_epoch_stakes_footprint( slot_max )               );
-  l = FD_LAYOUT_APPEND( l, fd_tower_forks_align(), fd_tower_forks_footprint( lg_slot_max )              );
   l = FD_LAYOUT_APPEND( l, fd_tower_align(),       fd_tower_footprint()                                 ); /* ctx->tower_spare */
+  l = FD_LAYOUT_APPEND( l, fd_epoch_stakes_align(), fd_epoch_stakes_footprint( slot_max )               );
   l = FD_LAYOUT_APPEND( l, notif_align(),          notif_footprint( slot_max )                          );
   return FD_LAYOUT_FINI( l, scratch_align() );
 }
@@ -474,7 +471,12 @@ replay_slot_completed( ctx_t *                      ctx,
   /* Query our on-chain vote acct and reconcile with our local tower. */
 
   int found = query_vote_state_from_accdb( ctx->accdb, &xid, ctx->vote_account, ctx->our_vote_acct );
-  if( FD_LIKELY( found ) ) fd_tower_reconcile( ctx->tower, ctx->root_slot, ctx->our_vote_acct );
+  if( FD_LIKELY( found ) ) {
+    fd_tower_reconcile( ctx->tower, ctx->root_slot, ctx->our_vote_acct );
+    /* Sanity check that most recent vote in tower exists in tower forks */
+    fd_tower_vote_t const * last_vote = fd_tower_peek_tail_const( ctx->tower );
+    FD_TEST( !last_vote || fd_forks_query( ctx->forks, last_vote->slot ) );
+  }
 
   /* Insert the vote acct addrs and stakes from the bank into accts. */