Skip to content

runtime: minor epoch boundary cleanup [wip] #6673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

runtime: minor epoch boundary cleanup [wip] #6673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f526e3b
a
ibhatt-jumptrading Oct 9, 2025
7c259fb
wip
ibhatt-jumptrading Oct 9, 2025
1c48d98
cleanup
ibhatt-jumptrading Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 135 additions & 70 deletions src/flamenco/rewards/fd_rewards.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,21 +247,71 @@ redeem_rewards( fd_stake_history_t const * stake_history,
}

/* https://github.com/anza-xyz/agave/blob/cbc8320d35358da14d79ebcada4dfb6756ffac79/programs/stake/src/points.rs#L70 */
static int
static void
calculate_points( fd_stake_delegation_t const * stake,
fd_vote_state_ele_t const * vote_state,
fd_stake_history_t const * stake_history,
ulong * new_rate_activation_epoch,
uint128 * result ) {
fd_calculated_stake_points_t stake_point_result;
calculate_stake_points_and_credits( stake_history,
stake,
vote_state,
new_rate_activation_epoch,
&stake_point_result );
*result = stake_point_result.points;
ulong credits_in_stake = stake->credits_observed;
ulong credits_in_vote = 0UL;
if( FD_LIKELY( vote_state->credits_cnt>0UL ) ) {
credits_in_vote = vote_state->credits[vote_state->credits_cnt-1UL];
}

return FD_EXECUTOR_INSTR_SUCCESS;
/* If the Vote account has less credits observed than the Stake
account, something is wrong and we need to force an update.

https://github.com/anza-xyz/agave/blob/cbc8320d35358da14d79ebcada4dfb6756ffac79/programs/stake/src/points.rs#L142 */
if( FD_UNLIKELY( credits_in_vote<credits_in_stake ) ) {
*result = 0;
return;
}

/* If the Vote account has the same amount of credits observed as the
Stake account, then the Vote account hasn't earned any credits so
there is nothing to update.

https://github.com/anza-xyz/agave/blob/cbc8320d35358da14d79ebcada4dfb6756ffac79/programs/stake/src/points.rs#L148 */
if( FD_UNLIKELY( credits_in_vote==credits_in_stake ) ) {
*result = 0;
return;
}

/* Calculate the points for each epoch credit */
uint128 points = 0;
ulong new_credits_observed = credits_in_stake;
for( ulong i=0UL; i<vote_state->credits_cnt; i++ ) {

ulong final_epoch_credits = vote_state->credits[i];
ulong initial_epoch_credits = vote_state->prev_credits[i];
uint128 earned_credits = 0UL;
if( FD_LIKELY( credits_in_stake < initial_epoch_credits ) ) {
earned_credits = (uint128)(final_epoch_credits - initial_epoch_credits);
} else if( FD_UNLIKELY( credits_in_stake < final_epoch_credits ) ) {
earned_credits = (uint128)(final_epoch_credits - new_credits_observed);
}

new_credits_observed = fd_ulong_max( new_credits_observed, final_epoch_credits );

fd_delegation_t delegation = {
.voter_pubkey = stake->vote_account,
.stake = stake->stake,
.activation_epoch = stake->activation_epoch,
.deactivation_epoch = stake->deactivation_epoch,
.warmup_cooldown_rate = stake->warmup_cooldown_rate,
};

ulong stake_amount = fd_stake_activating_and_deactivating(
&delegation,
vote_state->epoch[i],
stake_history,
new_rate_activation_epoch ).effective;

points += (uint128)stake_amount * earned_credits;

}
*result = points;
}

/* Returns the length of the given epoch in slots
Expand Down Expand Up @@ -312,50 +362,47 @@ get_minimum_stake_delegation( fd_bank_t * bank ) {
return 1;
}

static uint128
calculate_points_all( fd_bank_t * bank,
fd_stake_delegations_t const * stake_delegations,
fd_stake_history_t const * stake_history,
ulong * new_warmup_cooldown_rate_epoch,
ulong minimum_stake_delegation ) {
// static uint128
// calculate_points_all( fd_bank_t * bank,
// fd_stake_delegations_t const * stake_delegations,
// fd_stake_history_t const * stake_history,
// ulong * new_warmup_cooldown_rate_epoch,
// ulong minimum_stake_delegation ) {

uint128 total_points = 0;
// uint128 total_points = 0;

fd_vote_states_t const * vote_states = fd_bank_vote_states_locking_query( bank );
// fd_vote_states_t const * vote_states = fd_bank_vote_states_locking_query( bank );

fd_stake_delegations_iter_t iter_[1];
for( fd_stake_delegations_iter_t * iter = fd_stake_delegations_iter_init( iter_, stake_delegations );
!fd_stake_delegations_iter_done( iter );
fd_stake_delegations_iter_next( iter ) ) {
fd_stake_delegation_t const * stake_delegation = fd_stake_delegations_iter_ele( iter );
// fd_stake_delegations_iter_t iter_[1];
// for( fd_stake_delegations_iter_t * iter = fd_stake_delegations_iter_init( iter_, stake_delegations );
// !fd_stake_delegations_iter_done( iter );
// fd_stake_delegations_iter_next( iter ) ) {
// fd_stake_delegation_t const * stake_delegation = fd_stake_delegations_iter_ele( iter );

if( FD_UNLIKELY( stake_delegation->stake<minimum_stake_delegation ) ) {
continue;
}
// if( FD_UNLIKELY( stake_delegation->stake<minimum_stake_delegation ) ) {
// continue;
// }

fd_vote_state_ele_t * vote_state_ele = fd_vote_states_query( vote_states, &stake_delegation->vote_account );
if( FD_UNLIKELY( !vote_state_ele ) ) {
continue;
}
// fd_vote_state_ele_t * vote_state_ele = fd_vote_states_query( vote_states, &stake_delegation->vote_account );
// if( FD_UNLIKELY( !vote_state_ele ) ) {
// continue;
// }

uint128 account_points;
int err = calculate_points(
stake_delegation,
vote_state_ele,
stake_history,
new_warmup_cooldown_rate_epoch, &account_points );
if( FD_UNLIKELY( err ) ) {
FD_LOG_DEBUG(( "failed to calculate points" ));
continue;
}
// uint128 account_points;
// calculate_points(
// stake_delegation,
// vote_state_ele,
// stake_history,
// new_warmup_cooldown_rate_epoch,
// &account_points );

total_points += account_points;
}
// total_points += account_points;
// }

fd_bank_vote_states_end_locking_query( bank );
// fd_bank_vote_states_end_locking_query( bank );

return total_points;
}
// return total_points;
// }

/* Calculates epoch reward points from stake/vote accounts.
https://github.com/anza-xyz/agave/blob/cbc8320d35358da14d79ebcada4dfb6756ffac79/runtime/src/bank/partitioned_epoch_rewards/calculation.rs#L472 */
Expand All @@ -381,15 +428,40 @@ calculate_reward_points_partitioned( fd_bank_t * bank,
new_warmup_cooldown_rate_epoch = NULL;
}

uint128 points = calculate_points_all(
bank,
stake_delegations,
stake_history,
new_warmup_cooldown_rate_epoch,
minimum_stake_delegation );
uint128 total_points = 0;

fd_vote_states_t const * vote_states = fd_bank_vote_states_locking_query( bank );

fd_stake_delegations_iter_t iter_[1];
for( fd_stake_delegations_iter_t * iter = fd_stake_delegations_iter_init( iter_, stake_delegations );
!fd_stake_delegations_iter_done( iter );
fd_stake_delegations_iter_next( iter ) ) {
fd_stake_delegation_t const * stake_delegation = fd_stake_delegations_iter_ele( iter );

if( FD_UNLIKELY( stake_delegation->stake<minimum_stake_delegation ) ) {
continue;
}

fd_vote_state_ele_t * vote_state_ele = fd_vote_states_query( vote_states, &stake_delegation->vote_account );
if( FD_UNLIKELY( !vote_state_ele ) ) {
continue;
}

uint128 account_points;
calculate_points(
stake_delegation,
vote_state_ele,
stake_history,
new_warmup_cooldown_rate_epoch,
&account_points );

total_points += account_points;
}

if( points > 0 ) {
result->points = points;
fd_bank_vote_states_end_locking_query( bank );

if( FD_LIKELY( total_points>0 ) ) {
result->points = total_points;
result->rewards = rewards;
}
}
Expand Down Expand Up @@ -669,6 +741,8 @@ calculate_validator_rewards( fd_bank_t * bank,
FD_LOG_ERR(( "Unable to read and decode stake history sysvar" ));
}

long b = fd_log_wallclock();

/* Calculate the epoch reward points from stake/vote accounts */
calculate_reward_points_partitioned(
bank,
Expand All @@ -686,7 +760,10 @@ calculate_validator_rewards( fd_bank_t * bank,
result->point_value.points );
}

/* Calculate the stake and vote rewards for each account. We want to
long c = fd_log_wallclock();
FD_LOG_NOTICE(("calculate_reward_points_partitioned took %ld ns", c - b));

/* Calculate the stake and vote rewards for each account. We want to
use the vote states from the end of the current_epoch. */
calculate_stake_vote_rewards(
bank,
Expand All @@ -698,6 +775,9 @@ calculate_validator_rewards( fd_bank_t * bank,
&result->calculate_stake_vote_rewards_result,
runtime_spad,
0 );

long d = fd_log_wallclock();
FD_LOG_NOTICE(("calculate_stake_vote_rewards took %ld ns", d - c));
}

/* Calculate the number of blocks required to distribute rewards to all stake accounts.
Expand Down Expand Up @@ -1084,6 +1164,8 @@ fd_distribute_partitioned_epoch_rewards( fd_bank_t * bank,
return;
}

FD_LOG_WARNING(( "distributing rewards" ));

ulong height = fd_bank_block_height_get( bank );
ulong distribution_starting_block_height = fd_epoch_rewards_get_starting_block_height( epoch_rewards );
ulong distribution_end_exclusive = fd_epoch_rewards_get_exclusive_ending_block_height( epoch_rewards );
Expand Down Expand Up @@ -1229,24 +1311,11 @@ fd_rewards_recalculate_partitioned_rewards( fd_banks_t * banks,
fd_point_value_t point_value = { .points = epoch_rewards->total_points,
.rewards = epoch_rewards->total_rewards };

fd_stake_history_entry_t _accumulator = {
.effective = 0UL,
.activating = 0UL,
.deactivating = 0UL
};

fd_stake_delegations_t const * stake_delegations = fd_bank_stake_delegations_frontier_query( banks, bank );
if( FD_UNLIKELY( !stake_delegations ) ) {
FD_LOG_CRIT(( "stake_delegations is NULL" ));
}

fd_accumulate_stake_infos(
epoch,
stake_delegations,
stake_history,
new_warmup_cooldown_rate_epoch,
&_accumulator );

/* Make sure is_recalculation is ==1 since we are booting up in the
middle of rewards distribution (so we should use the epoch
stakes for the end of epoch E-1 since we are still distributing
Expand All @@ -1263,10 +1332,6 @@ fd_rewards_recalculate_partitioned_rewards( fd_banks_t * banks,
runtime_spad,
1 /* is_recalculation */ );

/* The vote reward map isn't actually used in this code path and
will only be freed after rewards have been distributed. */


/* Use the epoch rewards sysvar parent_blockhash and num_partitions.
https://github.com/anza-xyz/agave/blob/v2.2.14/runtime/src/bank/partitioned_epoch_rewards/calculation.rs#L579 */
hash_rewards_into_partitions(
Expand Down
25 changes: 12 additions & 13 deletions src/flamenco/runtime/fd_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,25 +1526,16 @@ fd_runtime_process_new_epoch( fd_banks_t * banks,
new_rate_activation_epoch = NULL;
}

/* Updates stake history sysvar accumulated values. */
/* The first thing that needs to be done is to calculate the value of
the stake history entry that needs to be inserted into the stake
history sysvar. At this point, we need to calculate the stakes for
*/
fd_stakes_activate_epoch( bank, funk, xid, capture_ctx, stake_delegations, new_rate_activation_epoch, runtime_spad );

/* Refresh vote accounts in stakes cache using updated stake weights, and merges slot bank vote accounts with the epoch bank vote accounts.
https://github.com/anza-xyz/agave/blob/v2.1.6/runtime/src/stakes.rs#L363-L370 */
fd_stake_history_t const * history = fd_sysvar_stake_history_read( funk, xid, runtime_spad );
if( FD_UNLIKELY( !history ) ) {
FD_LOG_ERR(( "StakeHistory sysvar could not be read and decoded" ));
}

/* Now increment the epoch */

fd_bank_epoch_set( bank, fd_bank_epoch_get( bank ) + 1UL );

fd_refresh_vote_accounts( bank,
stake_delegations,
history,
new_rate_activation_epoch );

/* Distribute rewards */

fd_hash_t parent_blockhash = {0};
Expand All @@ -1555,6 +1546,7 @@ fd_runtime_process_new_epoch( fd_banks_t * banks,
parent_blockhash = *bhq_last;
}

long e = fd_log_wallclock();
fd_begin_partitioned_rewards( bank,
funk,
xid,
Expand All @@ -1563,7 +1555,10 @@ fd_runtime_process_new_epoch( fd_banks_t * banks,
&parent_blockhash,
parent_epoch,
runtime_spad );
long f = fd_log_wallclock();
FD_LOG_NOTICE(("fd_begin_partitioned_rewards took %ld ns", f - e));

long g = fd_log_wallclock();

/* Update vote_states_prev_prev with vote_states_prev */

Expand All @@ -1580,6 +1575,10 @@ fd_runtime_process_new_epoch( fd_banks_t * banks,
FD_LOG_NOTICE(( "fd_process_new_epoch end" ));

long end = fd_log_wallclock();

long h = fd_log_wallclock();
FD_LOG_NOTICE(("fd_update_vote_states_prev took %ld ns", h - g));

FD_LOG_NOTICE(("fd_process_new_epoch took %ld ns", end - start));

} FD_SPAD_FRAME_END;
Expand Down
Loading
Loading