removing last fd_types complicated field

Author: ibhatt-jumptrading

src/discof/replay/fd_replay_tile.c

@@ -359,30 +359,29 @@ publish_stake_weights( fd_replay_tile_ctx_t * ctx,
                        fd_exec_slot_ctx_t *   slot_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]));
-  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 );
+  do {
+    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]));
+    fd_bank_vote_states_prev_prev_end_locking_query( slot_ctx->bank );
+  } while( 0 );
 
-  if( next_epoch_stakes_root!=NULL ) {
+  do {
+    fd_vote_states_t const * vote_states_prev = fd_bank_vote_states_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 ) ); /* epoch */
-    ulong stake_weights_sz = generate_stake_weight_msg( slot_ctx, epoch, next_epoch_stakes, stake_weights_msg );
+    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 );
+    fd_bank_vote_states_end_locking_query( slot_ctx->bank );
+  } while( 0 );
 }
 
 static void

src/flamenco/rewards/fd_rewards.c

@@ -1205,12 +1205,10 @@ 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 ) );
@@ -230,9 +183,9 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
   /* 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(

src/flamenco/runtime/fd_bank.h

@@ -179,12 +179,6 @@ FD_PROTOTYPES_BEGIN
   X(fd_rent_t,                         rent,                        sizeof(fd_rent_t),                         alignof(fd_rent_t),                         0,   0,                0    )  /* Rent */                                                   \
   X(fd_slot_lthash_t,                  lthash,                      sizeof(fd_slot_lthash_t),                  alignof(fd_slot_lthash_t),                  0,   0,                1    )  /* LTHash */                                                 \
   X(fd_sysvar_cache_t,                 sysvar_cache,                sizeof(fd_sysvar_cache_t),                 alignof(fd_sysvar_cache_t),                 0,   0,                0    )  /* Sysvar cache */                                           \
-  X(fd_vote_accounts_global_t,         next_epoch_stakes,           200000000UL,                               128UL,                                      1,   0,                1    )  /* Next epoch stakes, ~4K per account * 50k vote accounts */ \
-                                                                                                                                                                                          /* These are the stakes that determine the leader */         \
-                                                                                                                                                                                          /* schedule for the upcoming epoch.  If we are executing */  \
-                                                                                                                                                                                          /* in epoch E, these are the stakes at the end of epoch */   \
-                                                                                                                                                                                          /* E-1 and they determined the leader schedule for epoch */  \
-                                                                                                                                                                                          /* E+1. */                                                   \
   X(fd_epoch_rewards_t,                epoch_rewards,               FD_EPOCH_REWARDS_FOOTPRINT,                FD_EPOCH_REWARDS_ALIGN,                     1,   1,                1    )  /* Epoch rewards */                                          \
   X(fd_epoch_leaders_t,                epoch_leaders,               FD_RUNTIME_MAX_EPOCH_LEADERS,              FD_EPOCH_LEADERS_ALIGN,                     1,   1,                1    )  /* Epoch leaders. If our system supports 100k vote accs, */  \
                                                                                                                                                                                           /* then there can be 100k unique leaders in the worst */     \
@@ -241,10 +235,6 @@ FD_PROTOTYPES_BEGIN
 #undef HAS_COW_0
 #undef HAS_COW_1
 
-#define POOL_NAME fd_bank_next_epoch_stakes_pool
-#define POOL_T    fd_bank_next_epoch_stakes_t
-#include "../../util/tmpl/fd_pool.c"
-
 #define POOL_NAME fd_bank_epoch_leaders_pool
 #define POOL_T    fd_bank_epoch_leaders_t
 #include "../../util/tmpl/fd_pool.c"

src/flamenco/runtime/fd_runtime.c

@@ -1966,9 +1966,6 @@ fd_runtime_process_new_epoch( fd_exec_slot_ctx_t * slot_ctx,
     new_rate_activation_epoch = NULL;
   }
 
-  fd_epoch_info_t temp_info = {0};
-  fd_epoch_info_new( &temp_info );
-
   /* If appropiate, use the stakes at T-1 to generate the leader schedule instead of T-2.
       This is due to a subtlety in how Agave's stake caches interact when loading from snapshots.
       See the comment in fd_exec_slot_ctx_recover_. */

src/flamenco/runtime/program/fd_vote_program.c

@@ -1913,22 +1913,11 @@ 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_query_pubkey_stake( fd_pubkey_t const * pubkey, fd_vote_states_t const * vote_states ) {
 
-  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;
+  fd_vote_state_ele_t * vote_state_ele = fd_vote_states_query( vote_states, pubkey );
+  return vote_state_ele ? vote_state_ele->stake : 0;
 }
 
 static int

src/flamenco/runtime/program/fd_vote_program.h

@@ -54,7 +54,7 @@ fd_vote_state_versions_is_correct_and_initialized( fd_txn_account_t * vote_accou
 /* 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 );
+fd_query_pubkey_stake( fd_pubkey_t const * pubkey, fd_vote_states_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

@@ -403,13 +403,9 @@ create_block_context_protobuf_from_block( fd_exec_test_block_context_t * block_c
   ulong vote_account_t_cnt    = fd_vote_states_cnt( vote_states );
   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 +503,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,