aljaz/breez-sdk-liquid
1
0
Fork 0
mirror of https://github.com/aljazceru/breez-sdk-liquid.git synced 2026-02-23 06:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deduct send amount if tx not seen yet (#736)

Browse Source 
* Deduct send amount if tx not seen

* Reuse NETWORK_PROPAGATION_GRACE_PERIOD_SEC to determine a new tx

* Use the payment event to update the wallet info
This commit is contained in:
Ross Savage
2025-02-13 13:59:51 +01:00
committed by GitHub
parent a1fcf60d24
commit c686e44dfe
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/core/src/sdk.rs
View File

@@ -2850,6 +2850,10 @@ impl LiquidSdk {
.map(|am| (am.asset_id.clone(), am))
.collect();
let transactions = self.onchain_wallet.transactions().await?;
let tx_ids = transactions
.iter()
.map(|tx| tx.txid.to_string())
.collect::<Vec<_>>();
let asset_balances = transactions
.into_iter()
.fold(BTreeMap::<AssetId, i64>::new(), |mut acc, tx| {
@@ -2875,12 +2879,11 @@ impl LiquidSdk {
}
})
.collect::<Vec<AssetBalance>>();
let balance_sat = asset_balances
let mut balance_sat = asset_balances
.clone()
.into_iter()
.find(|ab| ab.asset_id.eq(&self.config.lbtc_asset_id()))
.map_or(0, |ab| ab.balance_sat);
debug!("Onchain wallet balance: {balance_sat} sats");
let mut pending_send_sat = 0;
let mut pending_receive_sat = 0;
@@ -2902,12 +2905,21 @@ impl LiquidSdk {
match payment.payment_type {
PaymentType::Send => match payment.details.get_refund_tx_amount_sat() {
Some(refund_tx_amount_sat) => pending_receive_sat += refund_tx_amount_sat,
None => pending_send_sat += total_sat,
None => {
if let Some(tx_id) = payment.tx_id {
if !tx_ids.contains(&tx_id) {
debug!("Deducting {total_sat} sats from balance");
balance_sat = balance_sat.saturating_sub(total_sat);
}
}
pending_send_sat += total_sat
}
},
PaymentType::Receive => pending_receive_sat += total_sat,
}
}
debug!("Onchain wallet balance: {balance_sat} sats");
let info_response = WalletInfo {
balance_sat,
pending_send_sat,