removing last complex fd_types from bank

Author: ibhatt-jumptrading

src/discof/replay/fd_replay_tile.c

@@ -360,29 +360,28 @@ publish_stake_weights( fd_replay_tile_ctx_t * ctx,
   fd_epoch_schedule_t const * epoch_schedule = fd_bank_epoch_schedule_query( slot_ctx->bank );
 
   fd_vote_states_t const * vote_states_prev_prev = fd_bank_vote_states_prev_prev_locking_query( slot_ctx->bank );
-  ulong * stake_weights_msg = fd_chunk_to_laddr( ctx->stake_out->mem, ctx->stake_out->chunk );
-  ulong epoch = fd_slot_to_leader_schedule_epoch( epoch_schedule, fd_bank_slot_get( slot_ctx->bank ) );
-  ulong stake_weights_sz = generate_stake_weight_msg_2( slot_ctx, epoch - 1, vote_states_prev_prev, stake_weights_msg );
-  ulong stake_weights_sig = 4UL;
-  fd_stem_publish( stem, 0UL, stake_weights_sig, ctx->stake_out->chunk, stake_weights_sz, 0UL, 0UL, fd_frag_meta_ts_comp( fd_tickcount() ) );
-  ctx->stake_out->chunk = fd_dcache_compact_next( ctx->stake_out->chunk, stake_weights_sz, ctx->stake_out->chunk0, ctx->stake_out->wmark );
-  FD_LOG_NOTICE(("sending current epoch stake weights - epoch: %lu, stake_weight_cnt: %lu, start_slot: %lu, slot_cnt: %lu", stake_weights_msg[0], stake_weights_msg[1], stake_weights_msg[2], stake_weights_msg[3]));
+  do {
+    ulong * stake_weights_msg = fd_chunk_to_laddr( ctx->stake_out->mem, ctx->stake_out->chunk );
+    ulong epoch               = fd_slot_to_leader_schedule_epoch( epoch_schedule, fd_bank_slot_get( slot_ctx->bank ) );
+    ulong stake_weights_sz    = generate_stake_weight_msg_2( slot_ctx, epoch - 1, vote_states_prev_prev, stake_weights_msg );
+    ulong stake_weights_sig   = 4UL;
+    fd_stem_publish( stem, 0UL, stake_weights_sig, ctx->stake_out->chunk, stake_weights_sz, 0UL, 0UL, fd_frag_meta_ts_comp( fd_tickcount() ) );
+    ctx->stake_out->chunk = fd_dcache_compact_next( ctx->stake_out->chunk, stake_weights_sz, ctx->stake_out->chunk0, ctx->stake_out->wmark );
+    FD_LOG_NOTICE(("sending current epoch stake weights - epoch: %lu, stake_weight_cnt: %lu, start_slot: %lu, slot_cnt: %lu", stake_weights_msg[0], stake_weights_msg[1], stake_weights_msg[2], stake_weights_msg[3]));
+  } while( 0 );
   fd_bank_vote_states_prev_prev_end_locking_query( slot_ctx->bank );
 
-
-  fd_vote_accounts_global_t const * next_epoch_stakes = fd_bank_next_epoch_stakes_locking_query( slot_ctx->bank );
-  fd_vote_accounts_pair_global_t_mapnode_t * next_epoch_stakes_root = fd_vote_accounts_vote_accounts_root_join( next_epoch_stakes );
-
-  if( next_epoch_stakes_root!=NULL ) {
+  fd_vote_states_t const * vote_states_prev = fd_bank_vote_states_prev_locking_query( slot_ctx->bank );
+  do {
     ulong * stake_weights_msg = fd_chunk_to_laddr( ctx->stake_out->mem, ctx->stake_out->chunk );
     ulong   epoch             = fd_slot_to_leader_schedule_epoch( epoch_schedule, fd_bank_slot_get( slot_ctx->bank ) ); /* epoch */
-    ulong stake_weights_sz = generate_stake_weight_msg( slot_ctx, epoch, next_epoch_stakes, stake_weights_msg );
-    ulong stake_weights_sig = 4UL;
+    ulong   stake_weights_sz  = generate_stake_weight_msg_2( slot_ctx, epoch, vote_states_prev, stake_weights_msg );
+    ulong   stake_weights_sig = 4UL;
     fd_stem_publish( stem, 0UL, stake_weights_sig, ctx->stake_out->chunk, stake_weights_sz, 0UL, 0UL, fd_frag_meta_ts_comp( fd_tickcount() ) );
     ctx->stake_out->chunk = fd_dcache_compact_next( ctx->stake_out->chunk, stake_weights_sz, ctx->stake_out->chunk0, ctx->stake_out->wmark );
     FD_LOG_NOTICE(("sending next epoch stake weights - epoch: %lu, stake_weight_cnt: %lu, start_slot: %lu, slot_cnt: %lu", stake_weights_msg[0], stake_weights_msg[1], stake_weights_msg[2], stake_weights_msg[3]));
-  }
-  fd_bank_next_epoch_stakes_end_locking_query( slot_ctx->bank );
+  } while( 0 );
+  fd_bank_vote_states_prev_end_locking_query( slot_ctx->bank );
 }
 
 static void

src/flamenco/rewards/fd_rewards.c

@@ -1205,12 +1205,9 @@ fd_rewards_recalculate_partitioned_rewards( fd_exec_slot_ctx_t * slot_ctx,
 
     fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
 
-    fd_refresh_vote_accounts( slot_ctx,
-                              stake_history,
-                              new_warmup_cooldown_rate_epoch );
-    // fd_populate_vote_accounts( slot_ctx,
-    //                            stake_history,
-    //                            new_warmup_cooldown_rate_epoch );
+    fd_populate_vote_accounts( slot_ctx,
+                               stake_history,
+                               new_warmup_cooldown_rate_epoch );
     /* In future, the calculation will be cached in the snapshot, but for now we just re-calculate it
         (as Agave does). */
     fd_calculate_stake_vote_rewards_result_t calculate_stake_vote_rewards_result[1];

src/flamenco/runtime/context/fd_exec_slot_ctx.c

@@ -167,53 +167,6 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
     return 0;
   }
 
-  /* Move next EpochStakes */
-
-  fd_vote_accounts_global_t * next_epoch_stakes = fd_bank_next_epoch_stakes_locking_modify( slot_ctx->bank );
-  uchar * next_epoch_stakes_pool_mem = (uchar *)fd_ulong_align_up( (ulong)next_epoch_stakes + sizeof(fd_vote_accounts_global_t), fd_vote_accounts_pair_global_t_map_align() );
-  fd_vote_accounts_pair_global_t_mapnode_t * next_epoch_stakes_pool = fd_vote_accounts_pair_global_t_map_join( fd_vote_accounts_pair_global_t_map_new( next_epoch_stakes_pool_mem, 50000UL ) );
-  fd_vote_accounts_pair_global_t_mapnode_t * next_epoch_stakes_root = NULL;
-
-  fd_vote_accounts_pair_global_t_mapnode_t * pool = vote_accounts_next_stakes_pool;
-  fd_vote_accounts_pair_global_t_mapnode_t * root = vote_accounts_next_stakes_root;
-
-  uchar * acc_region_curr = (uchar *)fd_ulong_align_up( (ulong)next_epoch_stakes_pool + fd_vote_accounts_pair_global_t_map_footprint( 50000UL ), 8UL );
-
-  for( fd_vote_accounts_pair_global_t_mapnode_t * n = fd_vote_accounts_pair_global_t_map_minimum( pool, root );
-        n;
-        n = fd_vote_accounts_pair_global_t_map_successor( pool, n ) ) {
-
-    fd_vote_accounts_pair_global_t_mapnode_t * elem = fd_vote_accounts_pair_global_t_map_acquire( next_epoch_stakes_pool );
-    FD_TEST( elem );
-
-    elem->elem.stake = n->elem.stake;
-    elem->elem.key   = n->elem.key;
-
-    elem->elem.value.lamports    = n->elem.value.lamports;
-    elem->elem.value.data_len    = 0UL;
-    elem->elem.value.data_offset = 0UL;
-    elem->elem.value.owner       = n->elem.value.owner;
-    elem->elem.value.executable  = n->elem.value.executable;
-    elem->elem.value.rent_epoch  = n->elem.value.rent_epoch;
-
-    elem->elem.value.data_offset = (ulong)(acc_region_curr - (uchar *)&elem->elem.value);;
-    elem->elem.value.data_len = n->elem.value.data_len;
-
-    uchar * manifest_data = fd_solana_account_data_join( &n->elem.value );
-    memcpy( acc_region_curr, manifest_data, n->elem.value.data_len );
-    acc_region_curr += n->elem.value.data_len;
-
-    fd_vote_accounts_pair_global_t_map_insert(
-      next_epoch_stakes_pool,
-      &next_epoch_stakes_root,
-      elem );
-
-  }
-  fd_vote_accounts_vote_accounts_pool_update( next_epoch_stakes, next_epoch_stakes_pool );
-  fd_vote_accounts_vote_accounts_root_update( next_epoch_stakes, next_epoch_stakes_root );
-  fd_bank_next_epoch_stakes_end_locking_modify( slot_ctx->bank );
-
-
   /* Copy the vote states for the previous epoch E-2 */
 
   fd_vote_states_t * vote_states_prev_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank ), FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
@@ -222,17 +175,21 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
         n = fd_vote_accounts_pair_global_t_map_successor( vote_accounts_curr_stakes_pool, n ) ) {
       uchar * account_data     = fd_solana_account_data_join( &n->elem.value );
       ulong   account_data_len = n->elem.value.data_len;
-      fd_vote_states_update_from_account( vote_states_prev_prev, &n->elem.key, account_data, account_data_len );
+      fd_vote_states_update_from_account(
+          vote_states_prev_prev,
+          &n->elem.key,
+          account_data,
+          account_data_len );
       fd_vote_states_update_stake( vote_states_prev_prev, &n->elem.key, n->elem.stake );
   }
   fd_bank_vote_states_prev_prev_end_locking_modify( slot_ctx->bank );
 
   /* Copy the vote states for the previous epoch E-1 */
 
   fd_vote_states_t * vote_states_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_locking_modify( slot_ctx->bank ), FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
-  for( fd_vote_accounts_pair_global_t_mapnode_t * n = fd_vote_accounts_pair_global_t_map_minimum( pool, root );
+  for( fd_vote_accounts_pair_global_t_mapnode_t * n = fd_vote_accounts_pair_global_t_map_minimum( vote_accounts_next_stakes_pool, vote_accounts_next_stakes_root );
         n;
-        n = fd_vote_accounts_pair_global_t_map_successor( pool, n ) ) {
+        n = fd_vote_accounts_pair_global_t_map_successor( vote_accounts_next_stakes_pool, n ) ) {
       uchar * account_data     = fd_solana_account_data_join( &n->elem.value );
       ulong   account_data_len = n->elem.value.data_len;
       fd_vote_states_update_from_account(
@@ -248,10 +205,6 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
   /* Copy the vote states for the current epoch E */
 
   fd_vote_states_t * vote_states = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_locking_modify( slot_ctx->bank ), FD_RUNTIME_MAX_VOTE_ACCOUNTS ) );
-  if( FD_UNLIKELY( !vote_states ) ) {
-    FD_LOG_CRIT(( "unable to join vote states" ));
-  }
-
   for( fd_vote_accounts_pair_global_t_mapnode_t * n = fd_vote_accounts_pair_global_t_map_minimum( manifest_vote_accounts_pool, manifest_vote_accounts_root );
        n;
        n = fd_vote_accounts_pair_global_t_map_successor( manifest_vote_accounts_pool, n ) ) {
@@ -293,8 +246,6 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
   }
 
   fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
-
-
   return slot_ctx;
 }
 

src/flamenco/runtime/fd_runtime.c

@@ -1372,7 +1372,6 @@ fd_update_epoch_stakes( fd_exec_slot_ctx_t * slot_ctx ) {
 /* Copy stakes->vote_accounts into next_epoch_stakes. */
 static void
 fd_update_next_epoch_stakes( fd_exec_slot_ctx_t * slot_ctx ) {
-
   fd_vote_states_t *       vote_states_prev = fd_bank_vote_states_prev_locking_modify( slot_ctx->bank );
   fd_vote_states_t const * vote_states      = fd_bank_vote_states_locking_query( slot_ctx->bank );
   fd_memcpy( vote_states_prev, vote_states, fd_bank_vote_states_footprint );

src/flamenco/runtime/program/fd_vote_program.c

@@ -1913,24 +1913,6 @@ do_process_vote_state_update( fd_vote_state_t *           vote_state,
                                  ctx );
 }
 
-// ??
-ulong
-fd_query_pubkey_stake( fd_pubkey_t const * pubkey, fd_vote_accounts_global_t const * vote_accounts ) {
-  fd_vote_accounts_pair_global_t_mapnode_t key  = { 0 };
-  key.elem.key                                  = *pubkey;
-
-  fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_pool = fd_vote_accounts_vote_accounts_pool_join( vote_accounts );
-  fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_root = fd_vote_accounts_vote_accounts_root_join( vote_accounts );
-
-  if( !vote_accounts_pool && !vote_accounts_root ) {
-    return 0;
-  }
-
-  fd_vote_accounts_pair_global_t_mapnode_t * vote_node = fd_vote_accounts_pair_global_t_map_find(
-      vote_accounts_pool, vote_accounts_root, &key );
-  return vote_node ? vote_node->elem.stake : 0;
-}
-
 static int
 process_vote_state_update( fd_borrowed_account_t *       vote_account,
                            fd_slot_hash_t const *        slot_hashes,

src/flamenco/runtime/program/fd_vote_program.h

@@ -51,11 +51,6 @@ fd_vote_program_execute( fd_exec_instr_ctx_t * ctx );
 uint
 fd_vote_state_versions_is_correct_and_initialized( fd_txn_account_t * vote_account );
 
-/* Queries the delegated stake amount for the given vote account pubkey,
-   given the vote accounts map. Returns 0 if nonexistent. */
-ulong
-fd_query_pubkey_stake( fd_pubkey_t const * pubkey, fd_vote_accounts_global_t const * vote_accounts );
-
 /* An implementation of solana_sdk::transaction_context::BorrowedAccount::get_state
    for setting the vote state.
 

src/flamenco/runtime/tests/fd_dump_pb.c

@@ -404,12 +404,9 @@ create_block_context_protobuf_from_block( fd_exec_test_block_context_t * block_c
   fd_bank_vote_states_end_locking_query( slot_ctx->bank );
 
 
-  fd_vote_accounts_global_t const * next_epoch_stakes = fd_bank_next_epoch_stakes_locking_query( slot_ctx->bank );
-  fd_vote_accounts_pair_global_t_mapnode_t * next_epoch_stakes_pool = fd_vote_accounts_vote_accounts_pool_join( next_epoch_stakes );
-  fd_vote_accounts_pair_global_t_mapnode_t * next_epoch_stakes_root = fd_vote_accounts_vote_accounts_root_join( next_epoch_stakes );
-  ulong vote_account_t_1_cnt  = fd_vote_accounts_pair_global_t_map_size( next_epoch_stakes_pool,
-                                                                         next_epoch_stakes_root );
-  fd_bank_next_epoch_stakes_end_locking_query( slot_ctx->bank );
+  fd_vote_states_t const * vote_states_prev = fd_bank_vote_states_prev_locking_query( slot_ctx->bank );
+  ulong vote_account_t_1_cnt  = fd_vote_states_cnt( vote_states_prev );
+  fd_bank_vote_states_prev_end_locking_query( slot_ctx->bank );
 
   fd_vote_states_t const * vote_states_prev_prev = fd_bank_vote_states_prev_prev_locking_query( slot_ctx->bank );
   ulong vote_account_t_2_cnt = fd_vote_states_cnt( vote_states_prev_prev );
@@ -507,7 +504,7 @@ create_block_context_protobuf_from_block( fd_exec_test_block_context_t * block_c
   fd_bank_vote_states_end_locking_query( slot_ctx->bank );
 
   // BlockContext -> EpochContext -> vote_accounts_t_1 (vote accounts at epoch T-1)
-  fd_vote_states_t const * vote_states_prev = fd_bank_vote_states_prev_locking_query( slot_ctx->bank );
+  vote_states_prev = fd_bank_vote_states_prev_locking_query( slot_ctx->bank );
   dump_vote_accounts( slot_ctx,
                       vote_states_prev,
                       spad,

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

@@ -178,9 +178,6 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   fd_funk_txn_t * funk_txn = fd_funk_txn_prepare( funk, NULL, xid, 1 );
   fd_funk_txn_end_write( funk );
 
-  /* Allocate contexts */
-  ulong vote_acct_max = fd_ulong_max( 128UL, test_ctx->acct_states_count );
-
   /* Restore feature flags */
   fd_features_t features = {0};
   if( !fd_runtime_fuzz_restore_features( &features, &test_ctx->epoch_ctx.features ) ) {
@@ -298,26 +295,16 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   /* Refresh the program cache */
   fd_runtime_fuzz_refresh_program_cache( slot_ctx, test_ctx->acct_states, test_ctx->acct_states_count, runner->spad );
 
-  fd_vote_accounts_global_t * vote_accounts = fd_bank_next_epoch_stakes_locking_modify( slot_ctx->bank );
-  uchar * pool_mem = (uchar *)fd_ulong_align_up( (ulong)vote_accounts + sizeof(fd_vote_accounts_global_t), fd_vote_accounts_pair_global_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;
-
   /* 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,
+  fd_runtime_fuzz_block_update_prev_epoch_votes_cache( NULL,
+                                                       NULL,
                                                        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 );
-
-  fd_bank_next_epoch_stakes_end_locking_modify( slot_ctx->bank );
-
   /* Update vote cache for epoch T-2 */
   vote_states_prev_prev = fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank );
   fd_runtime_fuzz_block_update_prev_epoch_votes_cache( NULL,

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

@@ -59,13 +59,25 @@ fd_runtime_fuzz_instr_ctx_create( fd_runtime_fuzz_runner_t *           runner,
     return 0;
   }
 
-  /* Setup vote states dummy account */
+  /* Setup vote states accounts */
   fd_vote_states_t * vote_states = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_locking_modify( slot_ctx->bank ), 10000UL ) );
   if( FD_UNLIKELY( !vote_states ) ) {
     return 0;
   }
   fd_bank_vote_states_end_locking_modify( slot_ctx->bank );
 
+  fd_vote_states_t * vote_states_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_locking_modify( slot_ctx->bank ), 10000UL ) );
+  if( FD_UNLIKELY( !vote_states_prev ) ) {
+    return 0;
+  }
+  fd_bank_vote_states_prev_end_locking_modify( slot_ctx->bank );
+
+  fd_vote_states_t * vote_states_prev_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank ), 10000UL ) );
+  if( FD_UNLIKELY( !vote_states_prev_prev ) ) {
+    return 0;
+  }
+  fd_bank_vote_states_prev_prev_end_locking_modify( slot_ctx->bank );
+
   /* Set up epoch context. Defaults obtained from GenesisConfig::Default() */
 
   fd_rent_t * rent_bm = fd_bank_rent_modify( slot_ctx->bank );

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

@@ -147,6 +147,21 @@ fd_runtime_fuzz_txn_ctx_create( fd_runtime_fuzz_runner_t *         runner,
   }
   fd_bank_vote_states_end_locking_modify( slot_ctx->bank );
 
+  /* Setup vote states dummy account */
+  fd_vote_states_t * vote_states_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_locking_modify( slot_ctx->bank ), 10000UL ) );
+  if( FD_UNLIKELY( !vote_states_prev ) ) {
+    return NULL;
+  }
+  fd_bank_vote_states_prev_end_locking_modify( slot_ctx->bank );
+
+  /* Setup vote states dummy account */
+  fd_vote_states_t * vote_states_prev_prev = fd_vote_states_join( fd_vote_states_new( fd_bank_vote_states_prev_prev_locking_modify( slot_ctx->bank ), 10000UL ) );
+  if( FD_UNLIKELY( !vote_states_prev_prev ) ) {
+    return NULL;
+  }
+  fd_bank_vote_states_prev_prev_end_locking_modify( slot_ctx->bank );
+
+
   /* Provide a default clock if not present */
   fd_sol_sysvar_clock_t clock_[1];
   fd_sol_sysvar_clock_t const * clock = fd_sysvar_clock_read( funk, funk_txn, clock_ );