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

Add UiTransactionEncoding::Raw

Browse Source 
(cherry picked from commit a4a5438b6d)
This commit is contained in:
Michael Vines
2020-07-10 11:04:03 -07:00
parent 07d14f6f07
commit bcc890e705
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,9 +173,10 @@ pub struct TransactionWithStatusMeta {
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub enum UiTransactionEncoding { pub enum UiTransactionEncoding {
Binary, Binary, // base58 encoded raw transaction
Json, Json,
JsonParsed, JsonParsed,
Raw,
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@ -183,6 +184,7 @@ pub enum UiTransactionEncoding {
pub enum EncodedTransaction { pub enum EncodedTransaction {
Binary(String), Binary(String),
Json(UiTransaction), Json(UiTransaction),
Raw(Transaction),
} }
impl EncodedTransaction { impl EncodedTransaction {
@ -191,6 +193,7 @@ impl EncodedTransaction {
UiTransactionEncoding::Binary => EncodedTransaction::Binary( UiTransactionEncoding::Binary => EncodedTransaction::Binary(
bs58::encode(bincode::serialize(&transaction).unwrap()).into_string(), bs58::encode(bincode::serialize(&transaction).unwrap()).into_string(),
), ),
UiTransactionEncoding::Raw => EncodedTransaction::Raw(transaction),
_ => { _ => {
let message = if encoding == UiTransactionEncoding::Json { let message = if encoding == UiTransactionEncoding::Json {
UiMessage::Raw(UiRawMessage { UiMessage::Raw(UiRawMessage {
@ -247,6 +250,7 @@ impl EncodedTransaction {
.into_vec() .into_vec()
.ok() .ok()
.and_then(|bytes| bincode::deserialize(&bytes).ok()), .and_then(|bytes| bincode::deserialize(&bytes).ok()),
EncodedTransaction::Raw(transaction) => Some(transaction.clone()),
} }
} }
} }