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

decode-transaction now supports binary64

Browse Source
This commit is contained in:
Michael Vines
2020-08-15 17:26:00 -07:00
parent b5f3ced860
commit 2ebc68a9e2
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cli/src/cli.rs
View File

@ -10,7 +10,7 @@ use crate::{
validator_info::*, validator_info::*,
vote::*, vote::*,
}; };
use clap::{App, AppSettings, Arg, ArgMatches, SubCommand}; use clap::{App, AppSettings, Arg, ArgMatches, SubCommand, value_t_or_exit};
use log::*; use log::*;
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use serde_json::{self, json, Value}; use serde_json::{self, json, Value};
@ -821,8 +821,16 @@ pub fn parse_command(
_ => Err(CliError::BadParameter("Invalid signature".to_string())), _ => Err(CliError::BadParameter("Invalid signature".to_string())),
}, },
("decode-transaction", Some(matches)) => { ("decode-transaction", Some(matches)) => {
let blob = value_t_or_exit!(matches, "transaction", String);
let encoding = match matches.value_of("encoding").unwrap() {
"binary" => UiTransactionEncoding::Binary,
"binary64" => UiTransactionEncoding::Binary64,
_ => unreachable!()
};
let encoded_transaction = EncodedTransaction::Binary( let encoded_transaction = EncodedTransaction::Binary(
matches.value_of("base58_transaction").unwrap().to_string(), blob,
encoding,
); );
if let Some(transaction) = encoded_transaction.decode() { if let Some(transaction) = encoded_transaction.decode() {
Ok(CliCommandInfo { Ok(CliCommandInfo {
@ -2155,12 +2163,22 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
SubCommand::with_name("decode-transaction") SubCommand::with_name("decode-transaction")
.about("Decode a base-58 binary transaction") .about("Decode a base-58 binary transaction")
.arg( .arg(
Arg::with_name("base58_transaction") Arg::with_name("transaction")
.index(1) .index(1)
.value_name("BASE58_TRANSACTION") .value_name("TRANSACTION")
.takes_value(true) .takes_value(true)
.required(true) .required(true)
.help("The transaction to decode"), .help("transaction to decode"),
)
.arg(
Arg::with_name("encoding")
.index(2)
.value_name("ENCODING")
.possible_values(&["binary", "binary64"]) // Subset of `UiTransactionEncoding` enum
.default_value("binary")
.takes_value(true)
.required(true)
.help("transaction encoding"),
), ),
) )
.subcommand( .subcommand(

19
transaction-status/src/lib.rs
View File

@ -308,15 +308,16 @@ impl EncodedTransaction {
.into_vec() .into_vec()
.ok() .ok()
.and_then(|bytes| bincode::deserialize(&bytes).ok()), .and_then(|bytes| bincode::deserialize(&bytes).ok()),
EncodedTransaction::Binary(blob, encoding) => { EncodedTransaction::Binary(blob, encoding) => match *encoding {
if *encoding == UiTransactionEncoding::Binary64 { UiTransactionEncoding::Binary64 => base64::decode(blob)
base64::decode(blob) .ok()
.ok() .and_then(|bytes| bincode::deserialize(&bytes).ok()),
.and_then(|bytes| bincode::deserialize(&bytes).ok()) UiTransactionEncoding::Binary => bs58::decode(blob)
} else { .into_vec()
None .ok()
} .and_then(|bytes| bincode::deserialize(&bytes).ok()),
} UiTransactionEncoding::Json | UiTransactionEncoding::JsonParsed => None,
},
} }
} }
} }