blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ledger-tool slot to output tx even when tx status is missing (#25434)

This commit is contained in:
steviez 2022-05-20 20:56:06 -06:00 committed by GitHub
parent e263be2000
commit d65aab4d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ledger-tool/src/main.rs
View File

@ -67,7 +67,6 @@ use {
transaction::{MessageHash, SanitizedTransaction, SimpleAddressLoader}, transaction::{MessageHash, SanitizedTransaction, SimpleAddressLoader},
}, },
solana_stake_program::stake_state::{self, PointValue}, solana_stake_program::stake_state::{self, PointValue},
solana_transaction_status::VersionedTransactionWithStatusMeta,
solana_vote_program::{ solana_vote_program::{
self, self,
vote_state::{self, VoteState}, vote_state::{self, VoteState},
@ -150,7 +149,7 @@ fn output_entry(
for (transactions_index, transaction) in entry.transactions.into_iter().enumerate() { for (transactions_index, transaction) in entry.transactions.into_iter().enumerate() {
println!(" Transaction {}", transactions_index); println!(" Transaction {}", transactions_index);
let tx_signature = transaction.signatures[0]; let tx_signature = transaction.signatures[0];
let tx_with_meta = blockstore let tx_status_meta = blockstore
.read_transaction_status((tx_signature, slot)) .read_transaction_status((tx_signature, slot))
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
eprintln!( eprintln!(
@ -159,18 +158,15 @@ fn output_entry(
); );
None None
}) })
.map(|meta| VersionedTransactionWithStatusMeta { transaction, meta }); .map(|meta| meta.into());
if let Some(tx_with_meta) = tx_with_meta { solana_cli_output::display::println_transaction(
let status = tx_with_meta.meta.into(); &transaction,
solana_cli_output::display::println_transaction( tx_status_meta.as_ref(),
&tx_with_meta.transaction, " ",
Some(&status), None,
" ", None,
None, );
None,
);
}
} }
} }
LedgerOutputMethod::Json => { LedgerOutputMethod::Json => {