gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nonce naming cleanup (#21336)

Browse Source
This commit is contained in:
Jack May
2021-11-18 16:07:17 -08:00
committed by GitHub
parent 1a7cefded7
commit 03c36d240a
7 changed files with 342 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rpc/src/transaction_status_service.rs
View File

@ -5,7 +5,7 @@ use {
blockstore::Blockstore,
blockstore_processor::{TransactionStatusBatch, TransactionStatusMessage},
},
solana_runtime::bank::{Bank, InnerInstructionsList, TransactionLogMessages},
solana_runtime::bank::{Bank, InnerInstructionsList, NonceInfo, TransactionLogMessages},
solana_transaction_status::{
extract_and_fmt_memos, InnerInstructions, Reward, TransactionStatusMeta,
},
@ -83,7 +83,7 @@ impl TransactionStatusService {
};
for (
transaction,
(status, nonce_rollback),
(status, nonce),
pre_balances,
post_balances,
pre_token_balances,
@ -103,8 +103,8 @@ impl TransactionStatusService {
rent_debits,
) {
if Bank::can_commit(&status) {
let lamports_per_signature = nonce_rollback
.map(|nonce_rollback| nonce_rollback.lamports_per_signature())
let lamports_per_signature = nonce
.map(|nonce| nonce.lamports_per_signature())
.unwrap_or_else(|| {
bank.get_lamports_per_signature_for_blockhash(
transaction.message().recent_blockhash(),