frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bdk_chain_redesign] Fix calculation bugs.

Browse Source 
* `IndexedTxGraph::try_balance` should include "confirmed and spendable"
  into `confirmed` balance.
* `TxGraph::try_list_chain_unspents` filter logic should be reversed.
This commit is contained in:
rajarshimaitra 2023-04-27 19:38:25 +05:30 committed by 志宇
parent e536307e5c
commit 911af34f50
No known key found for this signature in database
GPG Key ID: F6345C9837C2BDE8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/chain/src/indexed_tx_graph.rs
View File

@ -229,14 +229,12 @@ impl<A: Anchor, I: OwnedIndexer> IndexedTxGraph<A, I> {
match &txout.chain_position { match &txout.chain_position {
ObservedAs::Confirmed(_) => { ObservedAs::Confirmed(_) => {
if txout.is_on_coinbase { if txout.is_confirmed_and_spendable(tip_height) {
if txout.is_mature(tip_height) {
confirmed += txout.txout.value; confirmed += txout.txout.value;
} else { } else if !txout.is_mature(tip_height) {
immature += txout.txout.value; immature += txout.txout.value;
} }
} }
}
ObservedAs::Unconfirmed(_) => { ObservedAs::Unconfirmed(_) => {
if should_trust(&txout.txout.script_pubkey) { if should_trust(&txout.txout.script_pubkey) {
trusted_pending += txout.txout.value; trusted_pending += txout.txout.value;

2
crates/chain/src/tx_graph.rs
View File

@ -860,7 +860,7 @@ impl<A: Anchor> TxGraph<A> {
chain_tip: BlockId, chain_tip: BlockId,
) -> impl Iterator<Item = Result<FullTxOut<ObservedAs<A>>, C::Error>> + 'a { ) -> impl Iterator<Item = Result<FullTxOut<ObservedAs<A>>, C::Error>> + 'a {
self.try_list_chain_txouts(chain, chain_tip) self.try_list_chain_txouts(chain, chain_tip)
.filter(|r| !matches!(r, Ok(txo) if txo.spent_by.is_none())) .filter(|r| matches!(r, Ok(txo) if txo.spent_by.is_none()))
} }
/// List unspent outputs (UTXOs) that are in `chain` with `chain_tip`. /// List unspent outputs (UTXOs) that are in `chain` with `chain_tip`.