Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-07-30 20:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark pending utxos

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-09-13 19:42:24 -07:00
parent b75da8724e
commit 09ac9eea52
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rust-lightclient/src/lightclient.rs
View File

@@ -208,10 +208,33 @@ impl LightClient {
}) })
.collect::<Vec<JsonValue>>(); .collect::<Vec<JsonValue>>();
// Collect pending UTXOs
let pending_utxos = self.wallet.txs.read().unwrap().iter()
.flat_map( |(txid, wtx)| {
wtx.utxos.iter().filter_map(move |utxo|
if utxo.unconfirmed_spent.is_some() {
Some(object!{
"created_in_block" => wtx.block,
"created_in_txid" => format!("{}", txid),
"value" => utxo.value,
"scriptkey" => hex::encode(utxo.script.clone()),
"is_change" => false, // TODO: Identify notes as change
"address" => utxo.address.clone(),
"spent" => utxo.spent.map(|spent_txid| format!("{}", spent_txid)),
"unconfirmed_spent" => utxo.unconfirmed_spent.map(|spent_txid| format!("{}", spent_txid)),
})
} else {
None
}
)
})
.collect::<Vec<JsonValue>>();;
let mut res = object!{ let mut res = object!{
"unspent_notes" => unspent_notes, "unspent_notes" => unspent_notes,
"pending_notes" => pending_notes, "pending_notes" => pending_notes,
"utxos" => utxos, "utxos" => utxos,
"pending_utxos" => pending_utxos,
}; };
if all_notes { if all_notes {

8
rust-lightclient/src/lightwallet.rs
View File

@@ -913,6 +913,7 @@ impl LightWallet {
match spent_utxo { match spent_utxo {
Some(su) => { Some(su) => {
su.spent = Some(txid.clone()); su.spent = Some(txid.clone());
su.unconfirmed_spent = None;
su.value // Return the value of the note su.value // Return the value of the note
}, },
None => 0 None => 0
@@ -1212,6 +1213,13 @@ impl LightWallet {
.map(|utxo| { .map(|utxo| {
let outpoint: OutPoint = utxo.to_outpoint(); let outpoint: OutPoint = utxo.to_outpoint();
// Mark this utxo as uncofirmed spent
let mut txs = self.txs.write().unwrap();
let mut spent_utxo = txs.get_mut(&utxo.txid).unwrap().utxos.iter_mut()
.find(|u| utxo.txid == u.txid && utxo.output_index == u.output_index)
.unwrap();
spent_utxo.unconfirmed_spent = Some(utxo.txid);
let coin = TxOut { let coin = TxOut {
value: Amount::from_u64(utxo.value).unwrap(), value: Amount::from_u64(utxo.value).unwrap(),
script_pubkey: Script { 0: utxo.script.clone() }, script_pubkey: Script { 0: utxo.script.clone() },