mirror of
https://github.com/Qortal/piratewallet-light-cli.git
synced 2025-02-11 17:55:47 +00:00
Merge branch 'master' of github.com:adityapk00/zecwallet-lite-lib
This commit is contained in:
commit
b928d5f096
@ -712,7 +712,11 @@ impl LightClient {
|
|||||||
|
|
||||||
// Add in all mempool txns
|
// Add in all mempool txns
|
||||||
tx_list.extend(wallet.mempool_txs.read().unwrap().iter().map( |(_, wtx)| {
|
tx_list.extend(wallet.mempool_txs.read().unwrap().iter().map( |(_, wtx)| {
|
||||||
let amount = wtx.outgoing_metadata.iter().map(|om| om.value).sum::<u64>();
|
use zcash_primitives::transaction::components::amount::DEFAULT_FEE;
|
||||||
|
use std::convert::TryInto;
|
||||||
|
|
||||||
|
let amount: u64 = wtx.outgoing_metadata.iter().map(|om| om.value).sum::<u64>();
|
||||||
|
let fee: u64 = DEFAULT_FEE.try_into().unwrap();
|
||||||
|
|
||||||
// Collect outgoing metadata
|
// Collect outgoing metadata
|
||||||
let outgoing_json = wtx.outgoing_metadata.iter()
|
let outgoing_json = wtx.outgoing_metadata.iter()
|
||||||
@ -727,7 +731,8 @@ impl LightClient {
|
|||||||
"block_height" => wtx.block,
|
"block_height" => wtx.block,
|
||||||
"datetime" => wtx.datetime,
|
"datetime" => wtx.datetime,
|
||||||
"txid" => format!("{}", wtx.txid),
|
"txid" => format!("{}", wtx.txid),
|
||||||
"amount" => -1 * amount as i64,
|
"amount" => -1 * (fee + amount) as i64,
|
||||||
|
"unconfirmed" => true,
|
||||||
"outgoing_metadata" => outgoing_json,
|
"outgoing_metadata" => outgoing_json,
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user