Skip to content
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

Jump to bottom

v1.18: RPC: fix numNonVoteTransactions in getPerformanceSamples (backport of #1189) #1208

Merged
merged 1 commit into from
May 9, 2024
Merged

v1.18: RPC: fix numNonVoteTransactions in getPerformanceSamples (backport of #1189) #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,12 +687,13 @@ pub struct Bank {
/// slots to hard fork at
hard_forks: Arc<RwLock<HardForks>>,

/// The number of transactions processed without error
/// The number of committed transactions since genesis.
transaction_count: AtomicU64,

/// The number of non-vote transactions processed without error since the most recent boot from
/// snapshot or genesis. This value is not shared though the network, nor retained within
/// snapshots, but is preserved in `Bank::new_from_parent`.
/// The number of non-vote transactions committed since the most
/// recent boot from snapshot or genesis. This value is only stored in
/// blockstore for the RPC method "getPerformanceSamples". It is not
/// retained within snapshots, but is preserved in `Bank::new_from_parent`.
non_vote_transaction_count_since_restart: AtomicU64,

/// The number of transaction errors in this slot
Expand Down Expand Up @@ -5360,13 +5361,14 @@ impl Bank {
// replay could occur
signature_count += u64::from(tx.message().header().num_required_signatures);
executed_transactions_count += 1;

if !is_vote {
executed_non_vote_transactions_count += 1;
}
}

match execution_result.flattened_result() {
Ok(()) => {
if !is_vote {
executed_non_vote_transactions_count += 1;
}
executed_with_successful_result_count += 1;
}
Err(err) => {
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/bank/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2398,7 +2398,7 @@ fn test_insufficient_funds() {
// transaction_count returns the count of all committed transactions since
// bank_transaction_count_fix was activated, regardless of success
assert_eq!(bank.transaction_count(), 2);
assert_eq!(bank.non_vote_transaction_count_since_restart(), 1);
assert_eq!(bank.non_vote_transaction_count_since_restart(), 2);

let mint_pubkey = mint_keypair.pubkey();
assert_eq!(bank.get_balance(&mint_pubkey), mint_amount - amount);
Expand Down
Loading