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

Speed up `bigtable transaction-history` command

This commit is contained in:
Michael Vines 2020-09-09 20:21:52 -07:00 committed by mergify[bot]
parent 1db5c9d346
commit 10ce839ec0
3 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/rpc.rs
View File

@ -902,8 +902,8 @@ impl JsonRpcRequestProcessor {
), ),
); );
match bigtable_results { match bigtable_results {
Ok(mut bigtable_results) => { Ok(bigtable_results) => {
results.append(&mut bigtable_results); results.extend(bigtable_results.into_iter().map(|x| x.0));
} }
Err(err) => { Err(err) => {
warn!("{:?}", err); warn!("{:?}", err);

59
ledger-tool/src/bigtable.rs
View File

@ -138,6 +138,7 @@ pub async fn transaction_history(
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
let bigtable = solana_storage_bigtable::LedgerStorage::new(true).await?; let bigtable = solana_storage_bigtable::LedgerStorage::new(true).await?;
let mut loaded_block: Option<(Slot, solana_transaction_status::ConfirmedBlock)> = None;
while limit > 0 { while limit > 0 {
let results = bigtable let results = bigtable
.get_confirmed_signatures_for_address( .get_confirmed_signatures_for_address(
@ -151,11 +152,11 @@ pub async fn transaction_history(
if results.is_empty() { if results.is_empty() {
break; break;
} }
before = Some(results.last().unwrap().signature); before = Some(results.last().unwrap().0.signature);
assert!(limit >= results.len()); assert!(limit >= results.len());
limit = limit.saturating_sub(results.len()); limit = limit.saturating_sub(results.len());
for result in results { for (result, index) in results {
if verbose { if verbose {
println!( println!(
"{}, slot={}, memo=\"{}\", status={}", "{}, slot={}, memo=\"{}\", status={}",
@ -172,23 +173,45 @@ pub async fn transaction_history(
} }
if show_transactions { if show_transactions {
match bigtable // Instead of using `bigtable.get_confirmed_transaction()`, fetch the entire block
.get_confirmed_transaction(&result.signature, UiTransactionEncoding::Base64) // and keep it around. This helps reduce BigTable query traffic and speeds up the
.await // results for high-volume addresses
{ loop {
Ok(Some(confirmed_transaction)) => { if let Some((slot, block)) = &loaded_block {
println_transaction( if *slot == result.slot {
&confirmed_transaction match block.transactions.get(index as usize) {
.transaction None => {
.transaction println!(
.decode() " Transaction info for {} is corrupt",
.expect("Successful decode"), result.signature
&confirmed_transaction.transaction.meta, );
" ", }
); Some(transaction_with_meta) => {
println_transaction(
&transaction_with_meta
.transaction
.decode()
.expect("Successful decode"),
&transaction_with_meta.meta,
" ",
);
}
}
break;
}
}
match bigtable
.get_confirmed_block(result.slot, UiTransactionEncoding::Base64)
.await
{
Err(err) => {
println!(" Unable to get confirmed transaction details: {}", err);
break;
}
Ok(block) => {
loaded_block = Some((result.slot, block));
}
} }
Ok(None) => println!(" Confirmed transaction details not available"),
Err(err) => println!(" Unable to get confirmed transaction details: {}", err),
} }
println!(); println!();
} }

22
storage-bigtable/src/lib.rs
View File

@ -367,7 +367,12 @@ impl LedgerStorage {
before_signature: Option<&Signature>, before_signature: Option<&Signature>,
until_signature: Option<&Signature>, until_signature: Option<&Signature>,
limit: usize, limit: usize,
) -> Result<Vec<(ConfirmedTransactionStatusWithSignature, u32 /*slot index*/)>> { ) -> Result<
Vec<(
ConfirmedTransactionStatusWithSignature,
u32, /*slot index*/
)>,
> {
let mut bigtable = self.connection.client(); let mut bigtable = self.connection.client();
let address_prefix = format!("{}/", address); let address_prefix = format!("{}/", address);
@ -436,12 +441,15 @@ impl LedgerStorage {
if slot == last_slot && tx_by_addr_info.index <= until_transaction_index { if slot == last_slot && tx_by_addr_info.index <= until_transaction_index {
continue; continue;
} }
infos.push((ConfirmedTransactionStatusWithSignature { infos.push((
signature: tx_by_addr_info.signature, ConfirmedTransactionStatusWithSignature {
slot, signature: tx_by_addr_info.signature,
err: tx_by_addr_info.err, slot,
memo: tx_by_addr_info.memo, err: tx_by_addr_info.err,
}, tx_by_addr_info.index)); memo: tx_by_addr_info.memo,
},
tx_by_addr_info.index,
));
// Respect limit // Respect limit
if infos.len() >= limit { if infos.len() >= limit {
break 'outer; break 'outer;