not passing vectors

Author: ibhatt-jumptrading

src/discof/restore/utils/fd_ssload.c

@@ -136,23 +136,6 @@ fd_ssload_recover( fd_snapshot_manifest_t * manifest,
   fd_bank_execution_fees_set( slot_ctx->bank, manifest->collector_fees );
   fd_bank_priority_fees_set( slot_ctx->bank, 0UL );
 
-  /* FIXME: Remove the magic number here. */
-  fd_clock_timestamp_votes_global_t * clock_timestamp_votes = fd_bank_clock_timestamp_votes_locking_modify( slot_ctx->bank );
-  uchar * clock_pool_mem = (uchar *)fd_ulong_align_up( (ulong)clock_timestamp_votes + sizeof(fd_clock_timestamp_votes_global_t), fd_clock_timestamp_vote_t_map_align() );
-  fd_clock_timestamp_vote_t_mapnode_t * clock_pool = fd_clock_timestamp_vote_t_map_join( fd_clock_timestamp_vote_t_map_new(clock_pool_mem, 30000UL ) );
-  clock_timestamp_votes->votes_pool_offset = (ulong)fd_clock_timestamp_vote_t_map_leave( clock_pool) - (ulong)clock_timestamp_votes;
-  clock_timestamp_votes->votes_root_offset = 0UL;
-  fd_bank_clock_timestamp_votes_end_locking_modify( slot_ctx->bank );
-
-  for( ulong i=0UL; i<manifest->vote_accounts_len; i++ ) {
-    fd_snapshot_manifest_vote_account_t * account = &manifest->vote_accounts[ i ];
-    fd_pubkey_t vote_account_pubkey;
-    fd_memcpy( vote_account_pubkey.uc, account->vote_account_pubkey, 32UL );
-    if( FD_LIKELY( account->last_slot || account->stake ) ) {
-      fd_vote_record_timestamp_vote_with_slot( &vote_account_pubkey, account->last_timestamp, account->last_slot, slot_ctx->bank );
-    }
-  }
-
   /* Update last restart slot
      https://github.com/solana-labs/solana/blob/30531d7a5b74f914dde53bfbb0bc2144f2ac92bb/runtime/src/bank.rs#L2152
 

src/discof/writer/fd_writer_tile.c

@@ -275,7 +275,6 @@ after_frag( fd_writer_tile_ctx_t * ctx,
           ctx->funk,
           ctx->funk_txn,
           txn_ctx,
-          ctx->spad,
           ctx->bank,
           ctx->capture_ctx );
 

src/flamenco/runtime/fd_runtime.c

@@ -163,13 +163,16 @@ fd_runtime_update_leaders( fd_bank_t * bank,
         epoch_weights,
         0UL,
         vote_keyed_lsched ) );
-    fd_bank_epoch_leaders_end_locking_modify( bank );
     if( FD_UNLIKELY( !leaders ) ) {
       FD_LOG_ERR(( "Unable to init and join fd_epoch_leaders" ));
     }
+    FD_TEST( leaders );
+    fd_bank_epoch_leaders_end_locking_modify( bank );
   }
-
   } FD_SPAD_FRAME_END;
+
+  FD_TEST( fd_bank_epoch_leaders_locking_query( bank ) );
+  fd_bank_epoch_leaders_end_locking_query( bank );
 }
 
 /******************************************************************************/
@@ -1148,7 +1151,6 @@ void
 fd_runtime_finalize_txn( fd_funk_t *         funk,
                          fd_funk_txn_t *     funk_txn,
                          fd_exec_txn_ctx_t * txn_ctx,
-                         fd_spad_t *         finalize_spad,
                          fd_bank_t *         bank,
                          fd_capture_ctx_t *  capture_ctx ) {
 
@@ -1205,38 +1207,6 @@ fd_runtime_finalize_txn( fd_funk_t *         funk,
 
       if( dirty_vote_acc && 0==memcmp( fd_txn_account_get_owner( acc_rec ), &fd_solana_vote_program_id, sizeof(fd_pubkey_t) ) ) {
         fd_vote_store_account( acc_rec, bank );
-        FD_SPAD_FRAME_BEGIN( finalize_spad ) {
-          int err;
-          fd_vote_state_versioned_t * vsv = fd_bincode_decode_spad(
-              vote_state_versioned, finalize_spad,
-              fd_txn_account_get_data( acc_rec ),
-              fd_txn_account_get_data_len( acc_rec ),
-              &err );
-          if( FD_UNLIKELY( err ) ) {
-            FD_LOG_WARNING(( "failed to decode vote state versioned" ));
-            continue;
-          }
-
-          fd_vote_block_timestamp_t const * ts = NULL;
-          switch( vsv->discriminant ) {
-          case fd_vote_state_versioned_enum_v0_23_5:
-            ts = &vsv->inner.v0_23_5.last_timestamp;
-            break;
-          case fd_vote_state_versioned_enum_v1_14_11:
-            ts = &vsv->inner.v1_14_11.last_timestamp;
-            break;
-          case fd_vote_state_versioned_enum_current:
-            ts = &vsv->inner.current.last_timestamp;
-            break;
-          default:
-            __builtin_unreachable();
-          }
-
-          fd_vote_record_timestamp_vote_with_slot( acc_rec->pubkey,
-                                                   ts->timestamp,
-                                                   ts->slot,
-                                                   bank );
-        } FD_SPAD_FRAME_END;
       }
 
       if( dirty_stake_acc && 0==memcmp( fd_txn_account_get_owner( acc_rec ), &fd_solana_stake_program_id, sizeof(fd_pubkey_t) ) ) {
@@ -2419,13 +2389,6 @@ fd_runtime_init_bank_from_genesis( fd_exec_slot_ctx_t *        slot_ctx,
   fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
 
   fd_bank_capitalization_set( slot_ctx->bank, capitalization );
-
-  fd_clock_timestamp_votes_global_t * clock_timestamp_votes = fd_bank_clock_timestamp_votes_locking_modify( slot_ctx->bank );
-  uchar * clock_pool_mem = (uchar *)fd_ulong_align_up( (ulong)clock_timestamp_votes + sizeof(fd_clock_timestamp_votes_global_t), fd_clock_timestamp_vote_t_map_align() );
-  fd_clock_timestamp_vote_t_mapnode_t * clock_pool = fd_clock_timestamp_vote_t_map_join( fd_clock_timestamp_vote_t_map_new(clock_pool_mem, 30000UL ) );
-  clock_timestamp_votes->votes_pool_offset = (ulong)fd_clock_timestamp_vote_t_map_leave( clock_pool) - (ulong)clock_timestamp_votes;
-  clock_timestamp_votes->votes_root_offset = 0UL;
-  fd_bank_clock_timestamp_votes_end_locking_modify( slot_ctx->bank );
 }
 
 static int

src/flamenco/runtime/fd_runtime.h

@@ -530,7 +530,6 @@ void
 fd_runtime_finalize_txn( fd_funk_t *         funk,
                          fd_funk_txn_t *     funk_txn,
                          fd_exec_txn_ctx_t * txn_ctx,
-                         fd_spad_t *         finalize_spad,
                          fd_bank_t *         bank,
                          fd_capture_ctx_t *  capture_ctx );
 

src/flamenco/runtime/program/fd_vote_program.c

@@ -2124,44 +2124,6 @@ fd_vote_decode_compact_update( fd_compact_vote_state_update_t * compact_update,
   return 1;
 }
 
-void
-fd_vote_record_timestamp_vote_with_slot( fd_pubkey_t const *  vote_acc,
-                                         long                 timestamp,
-                                         ulong                slot,
-                                         fd_bank_t *          bank ) {
-
-  fd_clock_timestamp_votes_global_t * clock_timestamp_votes = fd_bank_clock_timestamp_votes_locking_modify( bank );
-
-  fd_clock_timestamp_vote_t_mapnode_t * pool = fd_clock_timestamp_votes_votes_pool_join( clock_timestamp_votes );
-  fd_clock_timestamp_vote_t_mapnode_t * root = fd_clock_timestamp_votes_votes_root_join( clock_timestamp_votes );
-
-  if( FD_UNLIKELY( !pool ) ) {
-    FD_LOG_ERR(( "Timestamp vote account pool not allocated" ));
-  }
-
-  fd_clock_timestamp_vote_t timestamp_vote = {
-      .pubkey    = *vote_acc,
-      .timestamp = (long)timestamp,
-      .slot      = slot,
-  };
-  fd_clock_timestamp_vote_t_mapnode_t   key = { .elem = timestamp_vote };
-  fd_clock_timestamp_vote_t_mapnode_t * node =
-      fd_clock_timestamp_vote_t_map_find( pool, root, &key );
-  if( NULL != node ) {
-    node->elem = timestamp_vote;
-  } else {
-    node = fd_clock_timestamp_vote_t_map_acquire( pool );
-    FD_TEST( node != NULL );
-    node->elem = timestamp_vote;
-    fd_clock_timestamp_vote_t_map_insert( pool, &root, node );
-  }
-
-  fd_clock_timestamp_votes_votes_pool_update( clock_timestamp_votes, pool );
-  fd_clock_timestamp_votes_votes_root_update( clock_timestamp_votes, root );
-
-  fd_bank_clock_timestamp_votes_end_locking_modify( bank );
-}
-
 /// returns commission split as (voter_portion, staker_portion, was_split) tuple
 ///
 ///  if commission calculation is 100% one way or other, indicate with false for was_split

src/flamenco/runtime/program/fd_vote_program.h

@@ -69,12 +69,6 @@ void
 fd_vote_convert_to_current( fd_vote_state_versioned_t * self,
                             fd_spad_t *                 spad );
 
-void
-fd_vote_record_timestamp_vote_with_slot( fd_pubkey_t const *  vote_acc,
-                                         long                 timestamp,
-                                         ulong                slot,
-                                         fd_bank_t *          bank );
-
 struct fd_commission_split {
   ulong voter_portion;
   ulong staker_portion;

src/flamenco/runtime/tests/harness/fd_block_harness.c

@@ -33,6 +33,7 @@ fd_runtime_fuzz_block_refresh_vote_accounts( fd_vote_accounts_pair_global_t_mapn
    for the vote account */
 static void
 fd_runtime_fuzz_block_register_vote_account( fd_exec_slot_ctx_t *                        slot_ctx,
+                                             fd_vote_states_t *                          vote_states,
                                              fd_vote_accounts_pair_global_t_mapnode_t *  pool,
                                              fd_vote_accounts_pair_global_t_mapnode_t ** root,
                                              fd_pubkey_t *                               pubkey,
@@ -88,23 +89,8 @@ fd_runtime_fuzz_block_register_vote_account( fd_exec_slot_ctx_t *
 
   fd_vote_accounts_pair_global_t_map_insert( pool, root, node_to_insert );
 
-  /* Record a timestamp for the vote account */
-  fd_vote_block_timestamp_t const * ts = NULL;
-  switch( vsv->discriminant ) {
-    case fd_vote_state_versioned_enum_v0_23_5:
-      ts = &vsv->inner.v0_23_5.last_timestamp;
-      break;
-    case fd_vote_state_versioned_enum_v1_14_11:
-      ts = &vsv->inner.v1_14_11.last_timestamp;
-      break;
-    case fd_vote_state_versioned_enum_current:
-      ts = &vsv->inner.current.last_timestamp;
-      break;
-    default:
-      __builtin_unreachable();
-  }
-
-  fd_vote_record_timestamp_vote_with_slot( pubkey, ts->timestamp, ts->slot, slot_ctx->bank );
+  fd_vote_states_update_from_account( vote_states, pubkey, data, account_dlen );
+  fd_vote_states_update_stake( vote_states, pubkey, node_to_insert->elem.stake );
 }
 
 /* Stores an entry in the stake delegations cache for the given vote account. Deserializes and uses the present
@@ -155,6 +141,7 @@ fd_runtime_fuzz_block_register_stake_delegation( fd_exec_slot_ctx_t *     slot_c
 static void
 fd_runtime_fuzz_block_update_prev_epoch_votes_cache( fd_vote_accounts_pair_global_t_mapnode_t *  pool,
                                                      fd_vote_accounts_pair_global_t_mapnode_t ** root,
+                                                     fd_vote_states_t *                   vote_states,
                                                      fd_exec_test_vote_account_t *        vote_accounts,
                                                      pb_size_t                            vote_accounts_cnt,
                                                      fd_spad_t *                          spad ) {
@@ -176,6 +163,9 @@ fd_runtime_fuzz_block_update_prev_epoch_votes_cache( fd_vote_accounts_pair_globa
     fd_solana_account_data_update( &vote_node->elem.value, data );
 
     fd_vote_accounts_pair_global_t_map_insert( pool, root, vote_node );
+
+    fd_vote_states_update_from_account( vote_states, &vote_node->elem.key, data, vote_node->elem.value.data_len );
+    fd_vote_states_update_stake( vote_states, &vote_node->elem.key, stake );
   }
 }
 
@@ -229,16 +219,6 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
 
   /* All bank mgr stuff here. */
 
-  /* Initialize vote timestamps cache */
-  fd_clock_timestamp_votes_global_t * clock_timestamp_votes = fd_bank_clock_timestamp_votes_locking_modify( slot_ctx->bank );
-  uchar * pool_mem = (uchar *)fd_ulong_align_up( (ulong)clock_timestamp_votes + sizeof(fd_clock_timestamp_votes_global_t), fd_clock_timestamp_vote_t_map_align() );
-  fd_clock_timestamp_vote_t_mapnode_t * clock_pool = fd_clock_timestamp_vote_t_map_join( fd_clock_timestamp_vote_t_map_new( pool_mem, 15000UL ) );
-  fd_clock_timestamp_vote_t_mapnode_t * clock_root = NULL;
-
-  fd_clock_timestamp_votes_votes_pool_update( clock_timestamp_votes, clock_pool );
-  fd_clock_timestamp_votes_votes_root_update( clock_timestamp_votes, clock_root );
-  fd_bank_clock_timestamp_votes_end_locking_modify( slot_ctx->bank );
-
   slot_ctx->bank->slot_ = slot;
 
   fd_bank_block_height_set( slot_ctx->bank, test_ctx->slot_ctx.block_height );
@@ -285,8 +265,16 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   vote_states = fd_vote_states_join( fd_vote_states_new( vote_states, FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
   fd_bank_vote_states_end_locking_modify( slot_ctx->bank );
 
+  fd_vote_states_t * vote_states_prev = fd_bank_vote_states_prev_locking_modify( slot_ctx->bank );
+  vote_states_prev = fd_vote_states_join( fd_vote_states_new( vote_states_prev, FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
+  fd_bank_vote_states_prev_end_locking_modify( slot_ctx->bank );
+
+  fd_vote_states_t * vote_states_prev_prev = fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank );
+  vote_states_prev_prev = fd_vote_states_join( fd_vote_states_new( vote_states_prev_prev, FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
+  fd_bank_vote_states_prev_prev_end_locking_modify( slot_ctx->bank );
+
   fd_vote_accounts_global_t * curr_stakes = fd_bank_curr_epoch_stakes_locking_modify( slot_ctx->bank );
-  pool_mem = (uchar *)fd_ulong_align_up( (ulong)curr_stakes + sizeof(fd_vote_accounts_global_t), fd_vote_accounts_pair_t_map_align() );
+  uchar * pool_mem = (uchar *)fd_ulong_align_up( (ulong)curr_stakes + sizeof(fd_vote_accounts_global_t), fd_vote_accounts_pair_t_map_align() );
   fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_pool = fd_vote_accounts_pair_global_t_map_join( fd_vote_accounts_pair_global_t_map_new( pool_mem, vote_acct_max ) );
   fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_root = NULL;
 
@@ -301,11 +289,14 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
     /* Update vote accounts cache for epoch T */
     fd_pubkey_t pubkey;
     memcpy( &pubkey, test_ctx->acct_states[i].address, sizeof(fd_pubkey_t) );
+    vote_states = fd_bank_vote_states_locking_modify( slot_ctx->bank );
     fd_runtime_fuzz_block_register_vote_account( slot_ctx,
+                                                 vote_states,
                                                  vote_accounts_pool,
                                                  &vote_accounts_root,
                                                  &pubkey,
                                                  runner->spad );
+    fd_bank_vote_states_end_locking_modify( slot_ctx->bank );
 
     /* Update the stake delegations cache for epoch T */
     fd_runtime_fuzz_block_register_stake_delegation( slot_ctx,
@@ -347,11 +338,14 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   vote_accounts_root = NULL;
 
   /* Update vote cache for epoch T-1 */
+  vote_states_prev = fd_bank_vote_states_prev_locking_modify( slot_ctx->bank );
   fd_runtime_fuzz_block_update_prev_epoch_votes_cache( vote_accounts_pool,
                                                        &vote_accounts_root,
+                                                       vote_states_prev,
                                                        test_ctx->epoch_ctx.vote_accounts_t_1,
                                                        test_ctx->epoch_ctx.vote_accounts_t_1_count,
                                                        runner->spad );
+  fd_bank_vote_states_prev_end_locking_modify( slot_ctx->bank );
 
   fd_vote_accounts_vote_accounts_pool_update( vote_accounts, vote_accounts_pool );
   fd_vote_accounts_vote_accounts_root_update( vote_accounts, vote_accounts_root );
@@ -364,11 +358,14 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   vote_accounts_pool = fd_vote_accounts_pair_global_t_map_join( fd_vote_accounts_pair_global_t_map_new( pool_mem, vote_acct_max ) );
   vote_accounts_root = NULL;
 
+  vote_states_prev_prev = fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank );
   fd_runtime_fuzz_block_update_prev_epoch_votes_cache( vote_accounts_pool,
                                                        &vote_accounts_root,
+                                                       vote_states_prev_prev,
                                                        test_ctx->epoch_ctx.vote_accounts_t_2,
                                                        test_ctx->epoch_ctx.vote_accounts_t_2_count,
                                                        runner->spad );
+  fd_bank_vote_states_prev_prev_end_locking_modify( slot_ctx->bank );
 
   fd_vote_accounts_vote_accounts_pool_update( vote_accounts, vote_accounts_pool );
   fd_vote_accounts_vote_accounts_root_update( vote_accounts, vote_accounts_root );
@@ -555,7 +552,6 @@ fd_runtime_fuzz_block_ctx_exec( fd_runtime_fuzz_runner_t * runner,
           slot_ctx->funk,
           slot_ctx->funk_txn,
           txn_ctx,
-          runner->spad,
           slot_ctx->bank,
           capture_ctx );