runtime: removing stake account keys from bank

Author: ibhatt-jumptrading

src/discof/replay/fd_replay_tile.c

@@ -640,6 +640,13 @@ init_after_snapshot( fd_replay_tile_ctx_t * ctx,
                      fd_stem_context_t *    stem ) {
   /* Do not modify order! */
 
+  /* Now that the snapshot has been loaded in, we have to refresh the
+     stake delegations since the manifest does not contain the full set
+     of data required for the stake delegations. See
+     fd_stake_delegations.h for why this is required. */
+
+  fd_refresh_stake_delegations( ctx->slot_ctx );
+
   /* After both snapshots have been loaded in, we can determine if we should
      start distributing rewards. */
 

src/flamenco/rewards/fd_rewards.c

@@ -927,6 +927,21 @@ distribute_epoch_reward_to_stake_acc( fd_exec_slot_ctx_t * slot_ctx,
   stake_state->inner.stake.stake.delegation.stake = fd_ulong_sat_add( stake_state->inner.stake.stake.delegation.stake,
                                                                       reward_lamports );
 
+  /* The stake account has just been updated, so we need to update the
+     stake delegations stored in the bank. */
+
+  fd_stake_delegations_t * stake_delegations = fd_bank_stake_delegations_locking_modify( slot_ctx->bank );
+  fd_stake_delegations_update(
+      stake_delegations,
+      stake_pubkey,
+      &stake_state->inner.stake.stake.delegation.voter_pubkey,
+      stake_state->inner.stake.stake.delegation.stake,
+      stake_state->inner.stake.stake.delegation.activation_epoch,
+      stake_state->inner.stake.stake.delegation.deactivation_epoch,
+      stake_state->inner.stake.stake.credits_observed,
+      stake_state->inner.stake.stake.delegation.warmup_cooldown_rate );
+  fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
+
   if( capture_ctx ) {
     fd_solcap_write_stake_account_payout( capture_ctx->capture,
         stake_pubkey,

src/flamenco/runtime/context/fd_exec_slot_ctx.c

@@ -318,13 +318,14 @@ fd_exec_slot_ctx_recover( fd_exec_slot_ctx_t *                slot_ctx,
        n = fd_delegation_pair_t_map_successor( stake_pool, n ) ) {
 
     fd_stake_delegations_update(
-      stake_delegations,
-      &n->elem.account,
-      &n->elem.delegation.voter_pubkey,
-      n->elem.delegation.stake,
-      n->elem.delegation.activation_epoch,
-      n->elem.delegation.deactivation_epoch,
-      n->elem.delegation.warmup_cooldown_rate );
+        stake_delegations,
+        &n->elem.account,
+        &n->elem.delegation.voter_pubkey,
+        n->elem.delegation.stake,
+        n->elem.delegation.activation_epoch,
+        n->elem.delegation.deactivation_epoch,
+        0UL,
+        n->elem.delegation.warmup_cooldown_rate );
   }
 
   fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );

src/flamenco/runtime/fd_bank.h

@@ -140,10 +140,9 @@ FD_PROTOTYPES_BEGIN
 /* Define additional fields to the bank struct here. If trying to add
    a CoW field to the bank, define a pool for it as done below. */
 
-#define FD_BANKS_ITER(X)                                                                                                                                                                                                                                \
+#define FD_BANKS_ITER(X)                                                                                                                                                                                                                               \
   /* type,                             name,                        footprint,                                 align,                                      CoW, limit fork width, has lock */                                                          \
   X(fd_clock_timestamp_votes_global_t, clock_timestamp_votes,       5000000UL,                                 128UL,                                      1,   0,                1    )  /* TODO: This needs to get sized out */                      \
-  X(fd_account_keys_global_t,          stake_account_keys,          100000000UL,                               128UL,                                      1,   0,                1    )  /* Supports roughly 3M stake accounts */                     \
   X(fd_account_keys_global_t,          vote_account_keys,           3200000UL,                                 128UL,                                      1,   0,                1    )  /* Supports roughly 100k vote accounts */                    \
   X(fd_blockhashes_t,                  block_hash_queue,            sizeof(fd_blockhashes_t),                  alignof(fd_blockhashes_t),                  0,   0,                0    )  /* Block hash queue */                                       \
   X(fd_fee_rate_governor_t,            fee_rate_governor,           sizeof(fd_fee_rate_governor_t),            alignof(fd_fee_rate_governor_t),            0,   0,                0    )  /* Fee rate governor */                                      \
@@ -245,12 +244,6 @@ FD_PROTOTYPES_BEGIN
 #undef POOL_NAME
 #undef POOL_T
 
-#define POOL_NAME fd_bank_stake_account_keys_pool
-#define POOL_T    fd_bank_stake_account_keys_t
-#include "../../util/tmpl/fd_pool.c"
-#undef POOL_NAME
-#undef POOL_T
-
 #define POOL_NAME fd_bank_vote_account_keys_pool
 #define POOL_T    fd_bank_vote_account_keys_t
 #include "../../util/tmpl/fd_pool.c"

src/flamenco/runtime/fd_runtime.c

@@ -1447,7 +1447,7 @@ fd_runtime_finalize_txn( fd_funk_t *         funk,
 
       if( dirty_stake_acc && 0==memcmp( fd_txn_account_get_owner( acc_rec ), &fd_solana_stake_program_id, sizeof(fd_pubkey_t) ) ) {
         // TODO: does this correctly handle stake account close?
-        fd_store_stake_delegation( acc_rec, bank );
+        fd_update_stake_delegation( acc_rec, bank );
       }
 
       fd_runtime_save_account( funk, funk_txn, &txn_ctx->accounts[i], bank, txn_ctx->spad_wksp, capture_ctx );
@@ -1607,25 +1607,12 @@ fd_update_stake_delegations( fd_exec_slot_ctx_t * slot_ctx,
         temp_info->stake_infos[idx].stake.delegation.stake,
         temp_info->stake_infos[idx].stake.delegation.activation_epoch,
         temp_info->stake_infos[idx].stake.delegation.deactivation_epoch,
+        temp_info->stake_infos[idx].stake.credits_observed,
         temp_info->stake_infos[idx].stake.delegation.warmup_cooldown_rate
     );
   }
 
   fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
-
-  /* At the epoch boundary, release all of the stake account keys
-     because at this point all of the changes have been applied to the
-     stakes. */
-  fd_account_keys_global_t * stake_account_keys = fd_bank_stake_account_keys_locking_modify( slot_ctx->bank );
-  fd_account_keys_pair_t_mapnode_t * account_keys_pool = fd_account_keys_account_keys_pool_join( stake_account_keys );
-  fd_account_keys_pair_t_mapnode_t * account_keys_root = fd_account_keys_account_keys_root_join( stake_account_keys );
-
-  fd_account_keys_pair_t_map_release_tree( account_keys_pool, account_keys_root );
-  account_keys_root = NULL;
-
-  fd_account_keys_account_keys_pool_update( stake_account_keys, account_keys_pool );
-  fd_account_keys_account_keys_root_update( stake_account_keys, account_keys_root );
-  fd_bank_stake_account_keys_end_locking_modify( slot_ctx->bank );
 }
 
 /* Replace the stakes in T-2 (epoch_stakes) by the stakes at T-1 (next_epoch_stakes) */
@@ -1877,7 +1864,7 @@ fd_migrate_builtin_to_core_bpf( fd_exec_slot_ctx_t * slot_ctx,
   FD_TXN_ACCOUNT_DECL( source_buffer_account );
   fd_funk_rec_prepare_t source_buffer_prepare = {0};
   if( FD_UNLIKELY( fd_txn_account_init_from_funk_mutable( source_buffer_account, source_buffer_address, slot_ctx->funk, slot_ctx->funk_txn, 0, 0UL, &source_buffer_prepare )!=FD_ACC_MGR_SUCCESS ) ) {
-    FD_LOG_WARNING(( "Buffer account %s does not exist, skipping migration...", FD_BASE58_ENC_32_ALLOCA( source_buffer_address ) ));
+    FD_LOG_NOTICE(( "Buffer account %s does not exist, skipping migration...", FD_BASE58_ENC_32_ALLOCA( source_buffer_address ) ));
     return;
   }
 
@@ -2559,6 +2546,7 @@ fd_runtime_init_bank_from_genesis( fd_exec_slot_ctx_t *        slot_ctx,
           stake_state.inner.stake.stake.delegation.stake,
           stake_state.inner.stake.stake.delegation.activation_epoch,
           stake_state.inner.stake.stake.delegation.deactivation_epoch,
+          stake_state.inner.stake.stake.credits_observed,
           stake_state.inner.stake.stake.delegation.warmup_cooldown_rate );
 
       } FD_SPAD_FRAME_END;
@@ -2855,18 +2843,8 @@ fd_runtime_read_genesis( fd_exec_slot_ctx_t *   slot_ctx,
     }
   }
 
-
-  fd_account_keys_global_t *         stake_account_keys      = fd_bank_stake_account_keys_locking_modify( slot_ctx->bank );
-  uchar *                            pool_mem                = (uchar *)fd_ulong_align_up( (ulong)stake_account_keys + sizeof(fd_account_keys_global_t), fd_account_keys_pair_t_map_align() );
-  fd_account_keys_pair_t_mapnode_t * stake_account_keys_pool = fd_account_keys_pair_t_map_join( fd_account_keys_pair_t_map_new( pool_mem, 100000UL ) );
-  fd_account_keys_pair_t_mapnode_t * stake_account_keys_root = NULL;
-
-  fd_account_keys_account_keys_pool_update( stake_account_keys, stake_account_keys_pool );
-  fd_account_keys_account_keys_root_update( stake_account_keys, stake_account_keys_root );
-  fd_bank_stake_account_keys_end_locking_modify( slot_ctx->bank );
-
   fd_account_keys_global_t *         vote_account_keys      = fd_bank_vote_account_keys_locking_modify( slot_ctx->bank );
-                                     pool_mem               = (uchar *)fd_ulong_align_up( (ulong)vote_account_keys + sizeof(fd_account_keys_global_t), fd_account_keys_pair_t_map_align() );
+  uchar *                            pool_mem               = (uchar *)fd_ulong_align_up( (ulong)vote_account_keys + sizeof(fd_account_keys_global_t), fd_account_keys_pair_t_map_align() );
   fd_account_keys_pair_t_mapnode_t * vote_account_keys_pool = fd_account_keys_pair_t_map_join( fd_account_keys_pair_t_map_new( pool_mem, 100000UL ) );
   fd_account_keys_pair_t_mapnode_t * vote_account_keys_root = NULL;
 

src/flamenco/runtime/program/fd_stake_program.c

@@ -3289,114 +3289,3 @@ fd_stake_activating_and_deactivating( fd_delegation_t const *    self,
   return stake_activating_and_deactivating(
     self, target_epoch, stake_history, new_rate_activation_epoch );
 }
-
-/* Removes stake delegation from epoch stakes and updates vote account */
-static void
-fd_stakes_remove_stake_delegation( fd_txn_account_t *   stake_account,
-                                   fd_bank_t *          bank ) {
-
-  fd_account_keys_global_t *         stake_account_keys = fd_bank_stake_account_keys_locking_modify( bank );
-  fd_account_keys_pair_t_mapnode_t * account_keys_pool  = fd_account_keys_account_keys_pool_join( stake_account_keys );
-  fd_account_keys_pair_t_mapnode_t * account_keys_root  = fd_account_keys_account_keys_root_join( stake_account_keys );
-
-  fd_account_keys_pair_t_mapnode_t key;
-  fd_memcpy( key.elem.key.uc, stake_account->pubkey->uc, sizeof(fd_pubkey_t) );
-  if( FD_UNLIKELY( account_keys_pool==NULL ) ) {
-    /* TODO: Should this be a LOG_ERR/LOG_CRIT? */
-    fd_bank_stake_account_keys_end_locking_modify( bank );
-    FD_LOG_DEBUG(("Stake accounts pool does not exist"));
-    return;
-  }
-  fd_account_keys_pair_t_mapnode_t * entry = fd_account_keys_pair_t_map_find( account_keys_pool, account_keys_root, &key );
-  if( FD_UNLIKELY( entry ) ) {
-    fd_account_keys_pair_t_map_remove( account_keys_pool, &account_keys_root, entry );
-    // TODO: do we need a release here?
-  }
-
-  fd_account_keys_account_keys_pool_update( stake_account_keys, account_keys_pool );
-  fd_account_keys_account_keys_root_update( stake_account_keys, account_keys_root );
-
-  fd_bank_stake_account_keys_end_locking_modify( bank );
-}
-
-/* Updates stake delegation in epoch stakes */
-static void
-fd_stakes_upsert_stake_delegation( fd_txn_account_t *   stake_account,
-                                   fd_bank_t *          bank ) {
-  FD_TEST( fd_txn_account_get_lamports( stake_account )!=0 );
-
-  fd_delegation_pair_t_mapnode_t key;
-  fd_memcpy(&key.elem.account, stake_account->pubkey->uc, sizeof(fd_pubkey_t));
-
-  fd_account_keys_global_t * stake_account_keys = fd_bank_stake_account_keys_locking_modify( bank );
-
-  fd_account_keys_pair_t_mapnode_t * account_keys_pool = NULL;
-  fd_account_keys_pair_t_mapnode_t * account_keys_root = NULL;
-  if( stake_account_keys->account_keys_pool_offset==0 ) {
-    uchar * pool_mem = (uchar *)fd_ulong_align_up( (ulong)stake_account_keys + sizeof(fd_account_keys_global_t), fd_account_keys_pair_t_map_align() );
-    account_keys_pool = fd_account_keys_pair_t_map_join( fd_account_keys_pair_t_map_new( pool_mem, 100000UL ) );
-    account_keys_root = NULL;
-  } else {
-    account_keys_pool = fd_account_keys_account_keys_pool_join( stake_account_keys );
-    account_keys_root = fd_account_keys_account_keys_root_join( stake_account_keys );
-  }
-
-  /* TODO: When stake delegations are combined with account keys,
-     actually create the stake delegation map here. */
-  fd_stake_delegations_t const * stake_delegations = fd_bank_stake_delegations_locking_query( bank );
-  fd_stake_delegation_t const *  entry             = !!stake_delegations ? fd_stake_delegations_query( stake_delegations, stake_account->pubkey ) : NULL;
-
-  if( FD_UNLIKELY( !entry ) ) {
-    fd_account_keys_pair_t_mapnode_t key;
-    fd_memcpy( key.elem.key.uc, stake_account->pubkey->uc, sizeof(fd_pubkey_t) );
-    if( account_keys_pool==NULL ) {
-      FD_LOG_DEBUG(( "Stake accounts pool does not exist" ));
-      fd_bank_stake_account_keys_end_locking_query( bank );
-      fd_bank_stake_delegations_end_locking_query( bank );
-      return;
-    }
-    fd_account_keys_pair_t_mapnode_t * stake_entry = fd_account_keys_pair_t_map_find( account_keys_pool, account_keys_root, &key );
-    if( stake_entry ) {
-      stake_entry->elem.exists = 1;
-    } else {
-      fd_account_keys_pair_t_mapnode_t * new_node = fd_account_keys_pair_t_map_acquire( account_keys_pool );
-      ulong size = fd_account_keys_pair_t_map_size( account_keys_pool, account_keys_root );
-      if( new_node==NULL ) {
-        FD_LOG_ERR(("Stake accounts keys map full %lu", size));
-      }
-      new_node->elem.exists = 1;
-      fd_memcpy( new_node->elem.key.uc, stake_account->pubkey->uc, sizeof(fd_pubkey_t) );
-      fd_account_keys_pair_t_map_insert( account_keys_pool, &account_keys_root, new_node );
-    }
-  }
-
-  fd_account_keys_account_keys_pool_update( stake_account_keys, account_keys_pool );
-  fd_account_keys_account_keys_root_update( stake_account_keys, account_keys_root );
-
-  fd_bank_stake_account_keys_end_locking_modify( bank );
-
-  fd_bank_stake_delegations_end_locking_query( bank );
-}
-
-void
-fd_store_stake_delegation( fd_txn_account_t *   stake_account,
-                           fd_bank_t *          bank ) {
-  fd_pubkey_t const * owner = fd_txn_account_get_owner( stake_account );
-
-  if( memcmp( owner->uc, fd_solana_stake_program_id.key, sizeof(fd_pubkey_t) ) ) {
-      return;
-  }
-
-  int is_empty  = fd_txn_account_get_lamports( stake_account )==0;
-  int is_uninit = 1;
-  if( fd_txn_account_get_data_len( stake_account )>=4UL ) {
-    uint prefix = FD_LOAD( uint, fd_txn_account_get_data( stake_account ) );
-    is_uninit = ( prefix==fd_stake_state_v2_enum_uninitialized );
-  }
-
-  if( is_empty || is_uninit ) {
-    fd_stakes_remove_stake_delegation( stake_account, bank );
-  } else {
-    fd_stakes_upsert_stake_delegation( stake_account, bank );
-  }
-}

src/flamenco/runtime/program/fd_stake_program.h

@@ -48,10 +48,6 @@ fd_stake_activating_and_deactivating( fd_delegation_t const *    self,
                                       fd_stake_history_t const * stake_history,
                                       ulong *                    new_rate_activation_epoch );
 
-void
-fd_store_stake_delegation( fd_txn_account_t * stake_account,
-                           fd_bank_t *        bank );
-
 FD_PROTOTYPES_END
 
 #endif /* HEADER_fd_src_flamenco_runtime_program_fd_stake_program_h */

src/flamenco/runtime/test_bank.c

@@ -124,10 +124,9 @@ main( int argc, char ** argv ) {
 
   FD_TEST( fd_bank_vote_account_keys_pool_free( fd_bank_get_vote_account_keys_pool( bank9 ) ) == 15UL );
 
-  fd_account_keys_global_t * keys2 = fd_bank_stake_account_keys_locking_modify( bank9 );
-  keys2->account_keys_pool_offset = 101UL;
-  keys2->account_keys_root_offset = 101UL;
-  fd_bank_stake_account_keys_end_locking_modify( bank9 );
+  fd_stake_delegations_t * keys2 = fd_bank_stake_delegations_locking_modify( bank9 );
+  keys2->magic = 101UL;
+  fd_bank_stake_delegations_end_locking_modify( bank9 );
 
   /* Verify that the bank is published and that it is indeed bank7 */
 
@@ -176,10 +175,9 @@ main( int argc, char ** argv ) {
   FD_TEST( keys3->account_keys_root_offset == 100UL );
   fd_bank_vote_account_keys_end_locking_query( bank11 );
 
-  fd_account_keys_global_t const * keys4 = fd_bank_stake_account_keys_locking_query( bank11 );
-  FD_TEST( keys4->account_keys_pool_offset == 101UL );
-  FD_TEST( keys4->account_keys_root_offset == 101UL );
-  fd_bank_stake_account_keys_end_locking_query( bank11 );
+  fd_stake_delegations_t const * keys4 = fd_bank_stake_delegations_locking_query( bank11 );
+  FD_TEST( keys4->magic == 101UL );
+  fd_bank_stake_delegations_end_locking_query( bank11 );
 
   keys = fd_bank_vote_account_keys_locking_modify( bank11 );
   keys->account_keys_pool_offset = 200UL;
@@ -219,10 +217,9 @@ main( int argc, char ** argv ) {
   FD_TEST( keys3->account_keys_root_offset == 200UL );
   fd_bank_vote_account_keys_end_locking_query( bank11 );
 
-  keys4 = fd_bank_stake_account_keys_locking_query( bank11 );
-  FD_TEST( keys4->account_keys_pool_offset == 101UL );
-  FD_TEST( keys4->account_keys_root_offset == 101UL );
-  fd_bank_stake_account_keys_end_locking_query( bank11 );
+  keys4 = fd_bank_stake_delegations_locking_query( bank11 );
+  FD_TEST( keys4->magic == 101UL );
+  fd_bank_stake_delegations_end_locking_query( bank11 );
 
   votes_const = fd_bank_clock_timestamp_votes_locking_query( bank11 );
   FD_TEST( votes->votes_pool_offset == 102UL );
@@ -247,10 +244,9 @@ main( int argc, char ** argv ) {
   FD_TEST( keys3->account_keys_root_offset == 100UL );
   fd_bank_vote_account_keys_end_locking_query( bank11 );
 
-  keys4 = fd_bank_stake_account_keys_locking_query( bank11 );
-  FD_TEST( keys4->account_keys_pool_offset == 101UL );
-  FD_TEST( keys4->account_keys_root_offset == 101UL );
-  fd_bank_stake_account_keys_end_locking_query( bank11 );
+  keys4 = fd_bank_stake_delegations_locking_query( bank11 );
+  FD_TEST( keys4->magic == 101UL );
+  fd_bank_stake_delegations_end_locking_query( bank11 );
 
   votes_const = fd_bank_clock_timestamp_votes_locking_query( bank11 );
   FD_TEST( !votes_const );