patch

Author: ibhatt-jumptrading

src/flamenco/runtime/program/fd_vote_program.c

@@ -2043,10 +2043,7 @@ process_tower_sync( fd_borrowed_account_t *       vote_account,
       FD_LOG_CRIT(( "vote_states is NULL" ));
     }
     fd_vote_state_ele_t * vote_state_ele = fd_vote_states_query( vote_states, vote_account->acct->pubkey );
-    if( !vote_state_ele ) {
-      FD_LOG_CRIT(( "vote_state_ele is NULL" ));
-    }
-    if( FD_LIKELY( lockout && bank_hash_cmp ) ) {
+    if( FD_LIKELY( lockout && bank_hash_cmp && vote_state_ele ) ) {
       fd_bank_hash_cmp_lock( bank_hash_cmp );
       fd_bank_hash_cmp_insert(
           bank_hash_cmp,

src/flamenco/runtime/sysvar/fd_sysvar_clock.c

@@ -123,6 +123,11 @@ estimate_timestamp( fd_bank_t * bank ) {
   /* TODO: actually take the stake-weighted median. For now, just use a node. */
   fd_vote_states_t const * vote_states = fd_bank_vote_states_locking_query( bank );
 
+  if( !fd_vote_states_cnt( vote_states ) ) {
+    fd_bank_vote_states_end_locking_query( bank );
+    return timestamp_from_genesis( bank );
+  }
+
   fd_vote_state_ele_t * vote_state_pool = fd_vote_states_get_pool( vote_states );
   fd_vote_state_map_t * vote_state_map  = fd_vote_states_get_map( vote_states );
 
@@ -134,10 +139,10 @@ estimate_timestamp( fd_bank_t * bank ) {
     ulong slots = fd_bank_slot_get( bank ) - vote_state->last_vote_slot;
     uint128 ns_correction = fd_bank_ns_per_slot_get( bank ) * slots;
 
-    fd_bank_vote_states_end_locking_query( bank );
     return vote_state->last_vote_timestamp + (long)(ns_correction / NS_IN_S);
   }
 
+  fd_bank_vote_states_end_locking_query( bank );
   FD_LOG_CRIT(( "unreachable" ));
 }
 

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

@@ -6,6 +6,7 @@
 static void
 fd_runtime_fuzz_block_refresh_vote_accounts( fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_pool,
                                              fd_vote_accounts_pair_global_t_mapnode_t * vote_accounts_root,
+                                             fd_vote_states_t *                         vote_states,
                                              fd_stake_delegations_t *                   stake_delegations ) {
   fd_stake_delegation_map_t * map  = fd_stake_delegations_get_map( stake_delegations );
   fd_stake_delegation_t *     pool = fd_stake_delegations_get_pool( stake_delegations );
@@ -25,6 +26,10 @@ fd_runtime_fuzz_block_refresh_vote_accounts( fd_vote_accounts_pair_global_t_mapn
     if( FD_LIKELY( found_node ) ) {
       found_node->elem.stake += stake;
     }
+    fd_vote_state_ele_t * vote_state = fd_vote_states_query( vote_states, voter_pubkey );
+    ulong vote_stake = vote_state->stake;
+    fd_vote_states_update_stake( vote_states, voter_pubkey, vote_stake + stake );
+
   }
 }
 
@@ -282,21 +287,20 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   stake_delegations = fd_stake_delegations_join( fd_stake_delegations_new( stake_delegations, FD_RUNTIME_MAX_STAKE_ACCOUNTS ) );
 
   /* Load in all accounts with > 0 lamports provided in the context. The input expects unique account pubkeys. */
+  vote_states = fd_bank_vote_states_locking_modify( slot_ctx->bank );
   for( ushort i=0; i<test_ctx->acct_states_count; i++ ) {
     FD_TXN_ACCOUNT_DECL(acc);
     fd_runtime_fuzz_load_account( acc, funk, funk_txn, &test_ctx->acct_states[i], 1 );
 
     /* 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,
@@ -307,14 +311,14 @@ fd_runtime_fuzz_block_ctx_create( fd_runtime_fuzz_runner_t *           runner,
   /* Refresh vote accounts to calculate stake delegations */
   fd_runtime_fuzz_block_refresh_vote_accounts( vote_accounts_pool,
                                                vote_accounts_root,
+                                               vote_states,
                                                stake_delegations );
+  fd_bank_vote_states_end_locking_modify( slot_ctx->bank );
+
 
   fd_vote_accounts_vote_accounts_pool_update( curr_stakes, vote_accounts_pool );
   fd_vote_accounts_vote_accounts_root_update( curr_stakes, vote_accounts_root );
 
-  // fd_vote_accounts_stake_delegations_pool_update( curr_stakes, stake_delegations_pool );
-  // fd_vote_accounts_stake_delegations_root_update( curr_stakes, stake_delegations_root );
-
   fd_bank_curr_epoch_stakes_end_locking_modify( slot_ctx->bank );
   fd_bank_stake_delegations_end_locking_modify( slot_ctx->bank );
 

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

@@ -59,6 +59,13 @@ fd_runtime_fuzz_instr_ctx_create( fd_runtime_fuzz_runner_t *           runner,
     return 0;
   }
 
+  /* Setup vote states dummy account */
+  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 );
+
   /* 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

@@ -140,6 +140,13 @@ fd_runtime_fuzz_txn_ctx_create( fd_runtime_fuzz_runner_t *         runner,
     fd_sysvar_last_restart_slot_init( slot_ctx );
   }
 
+  /* Setup vote states dummy account */
+  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 NULL;
+  }
+  fd_bank_vote_states_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_ );