Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-01-30 18:42:15 +00:00
Code Issues Projects Releases Wiki Activity

Add "unconfirmed_zbalance" to the balance command.

Browse Source 
Fixes #46
This commit is contained in:
Aditya Kulkarni 2020-08-06 11:33:32 -07:00
parent fb1cf996e5
commit 263ec19476
3 changed files with 119 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/lightclient.rs
View File

@ -679,8 +679,9 @@ impl LightClient {
object!{
"address" => zaddress.clone(),
"zbalance" => wallet.zbalance(Some(zaddress.clone())),
"verified_zbalance" => wallet.verified_zbalance(Some(zaddress.clone())),
"spendable_zbalance" => wallet.spendable_zbalance(Some(zaddress.clone()))
"verified_zbalance" => wallet.verified_zbalance(Some(zaddress.clone())),
"spendable_zbalance" => wallet.spendable_zbalance(Some(zaddress.clone())),
"unconfirmed_zbalance" => wallet.unconfirmed_zbalance(Some(zaddress.clone()))
}
}).collect::<Vec<JsonValue>>();
@ -699,6 +700,7 @@ impl LightClient {
"zbalance" => wallet.zbalance(None),
"verified_zbalance" => wallet.verified_zbalance(None),
"spendable_zbalance" => wallet.spendable_zbalance(None),
"unconfirmed_zbalance" => wallet.unconfirmed_zbalance(None),
"tbalance" => wallet.tbalance(None),
"z_addresses" => z_addresses,
"t_addresses" => t_addresses,

38
lib/src/lightwallet.rs
View File

@ -976,6 +976,44 @@ impl LightWallet {
.sum::<u64>()
}
pub fn unconfirmed_zbalance(&self, addr: Option<String>) -> u64 {
let anchor_height = match self.get_target_height_and_anchor_offset() {
Some((height, anchor_offset)) => height - anchor_offset as u32 - 1,
None => return 0,
};
self.txs
.read()
.unwrap()
.values()
.map(|tx| {
tx.notes
.iter()
.filter(|nd| nd.spent.is_none() && nd.unconfirmed_spent.is_none())
.filter(|nd| { // TODO, this whole section is shared with verified_balance. Refactor it.
match addr.clone() {
Some(a) => a == encode_payment_address(
self.config.hrp_sapling_address(),
&nd.extfvk.fvk.vk
.to_payment_address(nd.diversifier, &JUBJUB).unwrap()
),
None => true
}
})
.map(|nd| {
if tx.block as u32 <= anchor_height {
// If confirmed, then unconfirmed is 0
0
} else {
// If confirmed but dont have anchor yet, it is unconfirmed
nd.note.value
}
})
.sum::<u64>()
})
.sum::<u64>()
}
pub fn verified_zbalance(&self, addr: Option<String>) -> u64 {
let anchor_height = match self.get_target_height_and_anchor_offset() {
Some((height, anchor_offset)) => height - anchor_offset as u32 - 1,

77
lib/src/lightwallet/tests.rs
View File

@ -699,6 +699,7 @@ fn get_test_wallet(amount: u64) -> (LightWallet, TxId, BlockHash) {
}
assert_eq!(wallet.verified_zbalance(None), amount);
assert_eq!(wallet.unconfirmed_zbalance(None), 0);
// Create a new block so that the note is now verified to be spent
let cb2 = FakeCompactBlock::new(1, cb1.hash());
@ -707,6 +708,82 @@ fn get_test_wallet(amount: u64) -> (LightWallet, TxId, BlockHash) {
(wallet, txid1, cb2.hash())
}
#[test]
fn test_unconfirmed_txns() {
let config = LightClientConfig {
server: "0.0.0.0:0".parse().unwrap(),
chain_name: "test".to_string(),
sapling_activation_height: 0,
consensus_branch_id: "000000".to_string(),
anchor_offset: 5, // offset = 5
data_dir: None,
};
let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap();
let (ss, so) = get_sapling_params().unwrap();
let fee: u64 = DEFAULT_FEE.try_into().unwrap();
let amount = 50000;
let wallet = LightWallet::new(None, &config, 0).unwrap();
let mut block = FakeCompactBlock::new(0, BlockHash([0; 32]));
let (_, _txid) = block.add_tx_paying(wallet.zkeys.read().unwrap()[0].extfvk.clone(), amount);
wallet.scan_block(&block.as_bytes()).unwrap();
// Construct 5 blocks so that we can get started
for i in 0..5 {
block = FakeCompactBlock::new(1+i, block.hash());
wallet.scan_block(&block.as_bytes()).unwrap();
}
// Make sure the starting balances are correct
assert_eq!(wallet.verified_zbalance(None), amount);
assert_eq!(wallet.unconfirmed_zbalance(None), 0);
// Now spend some of the money, paying our own address
let zaddr1 = encode_payment_address(wallet.config.hrp_sapling_address(), &wallet.zkeys.read().unwrap().get(0).unwrap().zaddress);
let zaddr2 = wallet.add_zaddr();
const AMOUNT_SENT: u64 = 50;
let (_, raw_tx) = wallet.send_to_address(branch_id, &ss, &so,
vec![(&zaddr2, AMOUNT_SENT, None)], |_| Ok(' '.to_string())).unwrap();
let sent_tx = Transaction::read(&raw_tx[..]).unwrap();
block = FakeCompactBlock::new(6, block.hash());
block.add_tx(&sent_tx);
wallet.scan_block(&block.as_bytes()).unwrap();
// pending tx
assert_eq!(wallet.unconfirmed_zbalance(Some(zaddr1.clone())), amount - AMOUNT_SENT - fee);
assert_eq!(wallet.verified_zbalance(Some(zaddr1.clone())), 0);
assert_eq!(wallet.spendable_zbalance(Some(zaddr1.clone())), 0);
assert_eq!(wallet.unconfirmed_zbalance(None), amount - fee);
assert_eq!(wallet.verified_zbalance(None), 0);
assert_eq!(wallet.spendable_zbalance(None), 0);
assert_eq!(wallet.unconfirmed_zbalance(Some(zaddr2.clone())), AMOUNT_SENT);
assert_eq!(wallet.verified_zbalance(Some(zaddr2.clone())), 0);
assert_eq!(wallet.spendable_zbalance(Some(zaddr2.clone())), 0);
// Mine 5 blocks, so it becomes confirmed
for i in 0..5 {
block = FakeCompactBlock::new(7+i, block.hash());
wallet.scan_block(&block.as_bytes()).unwrap();
}
assert_eq!(wallet.unconfirmed_zbalance(Some(zaddr1.clone())), 0);
assert_eq!(wallet.verified_zbalance(Some(zaddr1.clone())), amount - AMOUNT_SENT - fee);
assert_eq!(wallet.spendable_zbalance(Some(zaddr1.clone())), amount - AMOUNT_SENT - fee);
assert_eq!(wallet.unconfirmed_zbalance(None), 0);
assert_eq!(wallet.verified_zbalance(None), amount - fee);
assert_eq!(wallet.spendable_zbalance(None), amount - fee);
assert_eq!(wallet.unconfirmed_zbalance(Some(zaddr2.clone())), 0);
assert_eq!(wallet.verified_zbalance(Some(zaddr2.clone())), AMOUNT_SENT);
assert_eq!(wallet.spendable_zbalance(Some(zaddr2.clone())), AMOUNT_SENT);
}
#[test]
fn test_witness_updates() {
const AMOUNT1: u64 = 50000;