zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #951 from nuttycom/wallet/balance_for_all_accounts 

zcash_client_sqlite: Return a balance for every account from `get_wallet_summary`
This commit is contained in:
Kris Nuttycombe 2023-09-07 11:49:23 -06:00 committed by GitHub
parent 8dfab23683 2131cd547e
commit 341379ee8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zcash_client_backend/src/data_api.rs
View File

@ -102,6 +102,12 @@ pub struct AccountBalance {
} }
impl AccountBalance { impl AccountBalance {
/// The [`Balance`] value having zero values for all its fields.
pub const ZERO: Self = Self {
sapling_balance: Balance::ZERO,
unshielded: NonNegativeAmount::ZERO,
};
/// Returns the total value of funds belonging to the account. /// Returns the total value of funds belonging to the account.
pub fn total(&self) -> NonNegativeAmount { pub fn total(&self) -> NonNegativeAmount {
(self.sapling_balance.total() + self.unshielded) (self.sapling_balance.total() + self.unshielded)

57
zcash_client_sqlite/src/wallet.rs
View File

@ -73,7 +73,7 @@ use std::convert::TryFrom;
use std::io::{self, Cursor}; use std::io::{self, Cursor};
use std::num::NonZeroU32; use std::num::NonZeroU32;
use tracing::debug; use tracing::debug;
use zcash_client_backend::data_api::{AccountBalance, Balance, Ratio, WalletSummary}; use zcash_client_backend::data_api::{AccountBalance, Ratio, WalletSummary};
use zcash_primitives::transaction::components::amount::NonNegativeAmount; use zcash_primitives::transaction::components::amount::NonNegativeAmount;
use zcash_client_backend::data_api::{ use zcash_client_backend::data_api::{
@ -626,6 +626,15 @@ pub(crate) fn get_wallet_summary(
|row| row.get::<_, bool>(0), |row| row.get::<_, bool>(0),
)?; )?;
let mut stmt_accounts = conn.prepare_cached("SELECT account FROM accounts")?;
let mut account_balances = stmt_accounts
.query([])?
.mapped(|row| {
row.get::<_, u32>(0)
.map(|a| (AccountId::from(a), AccountBalance::ZERO))
})
.collect::<Result<BTreeMap<AccountId, AccountBalance>, _>>()?;
let mut stmt_select_notes = conn.prepare_cached( let mut stmt_select_notes = conn.prepare_cached(
"SELECT n.account, n.value, n.is_change, scan_state.max_priority, t.block "SELECT n.account, n.value, n.is_change, scan_state.max_priority, t.block
FROM sapling_received_notes n FROM sapling_received_notes n
@ -641,7 +650,6 @@ pub(crate) fn get_wallet_summary(
)", )",
)?; )?;
let mut account_balances: BTreeMap<AccountId, AccountBalance> = BTreeMap::new();
let mut rows = let mut rows =
stmt_select_notes.query(named_params![":summary_height": u32::from(summary_height)])?; stmt_select_notes.query(named_params![":summary_height": u32::from(summary_height)])?;
while let Some(row) = rows.next()? { while let Some(row) = rows.next()? {
@ -689,27 +697,17 @@ pub(crate) fn get_wallet_summary(
} }
}; };
account_balances account_balances.entry(account).and_modify(|bal| {
.entry(account) bal.sapling_balance.spendable_value = (bal.sapling_balance.spendable_value
.and_modify(|bal| { + spendable_value)
bal.sapling_balance.spendable_value = (bal.sapling_balance.spendable_value .expect("Spendable value cannot overflow");
+ spendable_value) bal.sapling_balance.change_pending_confirmation =
.expect("Spendable value cannot overflow"); (bal.sapling_balance.change_pending_confirmation + change_pending_confirmation)
bal.sapling_balance.change_pending_confirmation = .expect("Pending change value cannot overflow");
(bal.sapling_balance.change_pending_confirmation + change_pending_confirmation) bal.sapling_balance.value_pending_spendability =
.expect("Pending change value cannot overflow"); (bal.sapling_balance.value_pending_spendability + value_pending_spendability)
bal.sapling_balance.value_pending_spendability = .expect("Value pending spendability cannot overflow");
(bal.sapling_balance.value_pending_spendability + value_pending_spendability) });
.expect("Value pending spendability cannot overflow");
})
.or_insert(AccountBalance {
sapling_balance: Balance {
spendable_value,
change_pending_confirmation,
value_pending_spendability,
},
unshielded: NonNegativeAmount::ZERO,
});
} }
#[cfg(feature = "transparent-inputs")] #[cfg(feature = "transparent-inputs")]
@ -734,16 +732,9 @@ pub(crate) fn get_wallet_summary(
SqliteClientError::CorruptedData(format!("Negative UTXO value {:?}", raw_value)) SqliteClientError::CorruptedData(format!("Negative UTXO value {:?}", raw_value))
})?; })?;
account_balances account_balances.entry(account).and_modify(|bal| {
.entry(account) bal.unshielded = (bal.unshielded + value).expect("Unshielded value cannot overflow")
.and_modify(|bal| { });
bal.unshielded =
(bal.unshielded + value).expect("Unshielded value cannot overflow")
})
.or_insert(AccountBalance {
sapling_balance: Balance::ZERO,
unshielded: value,
});
} }
} }