* cli-output: Add option sigverify status to `println_transaction()` output (cherry picked from commita2aea0ca33
) * cli: Add sigverify status to `decode-transaction` output (cherry picked from commitd547585041
) * CLI: Modernize `decode-transaction` about message (cherry picked from commitfddbfe1052
) Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
@@ -18,7 +18,7 @@ use solana_clap_utils::{
|
||||
};
|
||||
use solana_cli_output::{
|
||||
display::{build_balance_message, println_name_value, println_transaction},
|
||||
return_signers, CliAccount, CliSignature, OutputFormat,
|
||||
return_signers, CliAccount, CliSignature, CliSignatureVerificationStatus, OutputFormat,
|
||||
};
|
||||
use solana_client::{
|
||||
blockhash_query::BlockhashQuery,
|
||||
@@ -1011,6 +1011,7 @@ fn process_confirm(
|
||||
.expect("Successful decode"),
|
||||
&confirmed_transaction.transaction.meta,
|
||||
" ",
|
||||
None,
|
||||
);
|
||||
}
|
||||
Err(err) => {
|
||||
@@ -1043,7 +1044,8 @@ fn process_confirm(
|
||||
|
||||
#[allow(clippy::unnecessary_wraps)]
|
||||
fn process_decode_transaction(transaction: &Transaction) -> ProcessResult {
|
||||
println_transaction(transaction, &None, "");
|
||||
let sig_stats = CliSignatureVerificationStatus::verify_transaction(&transaction);
|
||||
println_transaction(transaction, &None, "", Some(&sig_stats));
|
||||
Ok("".to_string())
|
||||
}
|
||||
|
||||
@@ -1932,7 +1934,7 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
|
||||
)
|
||||
.subcommand(
|
||||
SubCommand::with_name("decode-transaction")
|
||||
.about("Decode a base-58 binary transaction")
|
||||
.about("Decode a serialized transaction")
|
||||
.arg(
|
||||
Arg::with_name("transaction")
|
||||
.index(1)
|
||||
|
@@ -967,6 +967,7 @@ pub fn process_get_block(
|
||||
&transaction_with_meta.transaction.decode().unwrap(),
|
||||
&transaction_with_meta.meta,
|
||||
" ",
|
||||
None,
|
||||
);
|
||||
}
|
||||
Ok("".to_string())
|
||||
@@ -1840,6 +1841,7 @@ pub fn process_transaction_history(
|
||||
.expect("Successful decode"),
|
||||
&confirmed_transaction.transaction.meta,
|
||||
" ",
|
||||
None,
|
||||
);
|
||||
}
|
||||
Err(err) => println!(" Unable to get confirmed transaction details: {}", err),
|
||||
|
Reference in New Issue
Block a user