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

transaction-history now searches over the entire history by default (#10145) 

automerge
This commit is contained in:
Michael Vines 2020-05-20 14:15:31 -07:00 committed by GitHub
parent 276815bd33
commit 357a00d2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/cli.rs
View File

@ -244,8 +244,8 @@ pub enum CliCommand {
}, },
TransactionHistory { TransactionHistory {
address: Pubkey, address: Pubkey,
end_slot: Option<Slot>, // None == latest slot end_slot: Option<Slot>, // None == latest slot
slot_limit: u64, slot_limit: Option<u64>, // None == search full history
}, },
// Nonce commands // Nonce commands
AuthorizeNonceAccount { AuthorizeNonceAccount {

29
cli/src/cluster_query.rs
View File

@ -453,8 +453,7 @@ pub fn parse_transaction_history(
) -> Result<CliCommandInfo, CliError> { ) -> Result<CliCommandInfo, CliError> {
let address = pubkey_of_signer(matches, "address", wallet_manager)?.unwrap(); let address = pubkey_of_signer(matches, "address", wallet_manager)?.unwrap();
let end_slot = value_t!(matches, "end_slot", Slot).ok(); let end_slot = value_t!(matches, "end_slot", Slot).ok();
let slot_limit = value_t!(matches, "limit", u64) let slot_limit = value_t!(matches, "limit", u64).ok();
.unwrap_or(MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE);
Ok(CliCommandInfo { Ok(CliCommandInfo {
command: CliCommand::TransactionHistory { command: CliCommand::TransactionHistory {
@ -1265,7 +1264,7 @@ pub fn process_transaction_history(
rpc_client: &RpcClient, rpc_client: &RpcClient,
address: &Pubkey, address: &Pubkey,
end_slot: Option<Slot>, // None == use latest slot end_slot: Option<Slot>, // None == use latest slot
slot_limit: u64, slot_limit: Option<u64>,
) -> ProcessResult { ) -> ProcessResult {
let end_slot = { let end_slot = {
if let Some(end_slot) = end_slot { if let Some(end_slot) = end_slot {
@ -1274,18 +1273,30 @@ pub fn process_transaction_history(
rpc_client.get_slot_with_commitment(CommitmentConfig::max())? rpc_client.get_slot_with_commitment(CommitmentConfig::max())?
} }
}; };
let start_slot = end_slot.saturating_sub(slot_limit); let mut start_slot = match slot_limit {
Some(slot_limit) => end_slot.saturating_sub(slot_limit),
None => rpc_client.minimum_ledger_slot()?,
};
println!( println!(
"Transactions affecting {} within slots [{},{}]", "Transactions affecting {} within slots [{},{}]",
address, start_slot, end_slot address, start_slot, end_slot
); );
let signatures =
rpc_client.get_confirmed_signatures_for_address(address, start_slot, end_slot)?; let mut transaction_count = 0;
for signature in &signatures { while start_slot < end_slot {
println!("{}", signature); let signatures = rpc_client.get_confirmed_signatures_for_address(
address,
start_slot,
(start_slot + MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE).min(end_slot),
)?;
for signature in &signatures {
println!("{}", signature);
}
transaction_count += signatures.len();
start_slot += MAX_GET_CONFIRMED_SIGNATURES_FOR_ADDRESS_SLOT_RANGE;
} }
Ok(format!("{} transactions found", signatures.len(),)) Ok(format!("{} transactions found", transaction_count))
} }
#[cfg(test)] #[cfg(test)]