split notes into spent and unspent

This commit is contained in:
Aditya Kulkarni
2019-09-10 14:33:12 -07:00
parent 8cfa4401c0
commit c205f138f8

View File

@@ -138,23 +138,39 @@ impl LightClient {
// Return a list of all notes, spent and unspent // Return a list of all notes, spent and unspent
pub fn do_list_notes(&self) -> JsonValue { pub fn do_list_notes(&self) -> JsonValue {
JsonValue::Array( let mut unspent_notes: Vec<JsonValue> = vec![];
self.wallet.txs.read().unwrap().iter() let mut spent_notes : Vec<JsonValue> = vec![];
.flat_map( |(txid, wtx)| { let mut pending_notes: Vec<JsonValue> = vec![];
wtx.notes.iter().map(move |nd|
object!{ self.wallet.txs.read().unwrap().iter()
"created_in_block" => wtx.block, .flat_map( |(txid, wtx)| {
"created_in_txid" => format!("{}", txid), wtx.notes.iter().map(move |nd|
"value" => nd.note.value, object!{
"is_change" => nd.is_change, "created_in_block" => wtx.block,
"address" => LightWallet::address_from_extfvk(&nd.extfvk, nd.diversifier), "created_in_txid" => format!("{}", txid),
"spent" => nd.spent.map(|spent_txid| format!("{}", spent_txid)), "value" => nd.note.value,
"unconfirmed_spent" => nd.unconfirmed_spent.map(|spent_txid| format!("{}", spent_txid)), "is_change" => nd.is_change,
} "address" => LightWallet::address_from_extfvk(&nd.extfvk, nd.diversifier),
) "spent" => nd.spent.map(|spent_txid| format!("{}", spent_txid)),
}) "unconfirmed_spent" => nd.unconfirmed_spent.map(|spent_txid| format!("{}", spent_txid)),
.collect::<Vec<JsonValue>>() }
) )
})
.for_each( |note| {
if note["spent"].is_null() && note["unconfirmed_spent"].is_null() {
unspent_notes.push(note);
} else if !note["spent"].is_null() {
spent_notes.push(note);
} else {
pending_notes.push(note);
}
});
object!{
"spent_notes" => spent_notes,
"unspent_notes" => unspent_notes,
"pending_notes" => pending_notes
}
} }
pub fn do_list_transactions(&self) -> JsonValue { pub fn do_list_transactions(&self) -> JsonValue {