From 12afbcee19116447a9623a94b80d44af4fa8cc05 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Thu, 16 Nov 2023 23:31:29 -0600 Subject: [PATCH 1/2] Unfilter force cloes balance --- mutiny-core/src/nodemanager.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mutiny-core/src/nodemanager.rs b/mutiny-core/src/nodemanager.rs index a63be4ca0..705bcf021 100644 --- a/mutiny-core/src/nodemanager.rs +++ b/mutiny-core/src/nodemanager.rs @@ -37,7 +37,6 @@ use bitcoin::{Address, Network, OutPoint, Transaction, Txid}; use core::time::Duration; use esplora_client::Builder; use futures::{future::join_all, lock::Mutex}; -use lightning::chain::channelmonitor::Balance; use lightning::chain::Confirm; use lightning::events::ClosureReason; use lightning::ln::channelmanager::{ChannelDetails, PhantomRouteHints}; @@ -1357,13 +1356,14 @@ impl NodeManager { n.chain_monitor.get_claimable_balances(&ignored_channels) }) // need to filter out pending mutual closes, these are counted in the on-chain balance - .filter(|b| { - !matches!( - b, - Balance::ClaimableOnChannelClose { .. } - | Balance::ClaimableAwaitingConfirmations { .. } - ) - }) + // comment out for now until https://github.com/lightningdevkit/rust-lightning/issues/2738 + // .filter(|b| { + // !matches!( + // b, + // Balance::ClaimableOnChannelClose { .. } + // | Balance::ClaimableAwaitingConfirmations { .. } + // ) + // }) .map(|bal| bal.claimable_amount_satoshis()) .sum(); From 121e5be2daf4d7eac25ea94ba95c39ca872834f8 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Thu, 16 Nov 2023 23:32:56 -0600 Subject: [PATCH 2/2] Add channel closing to testing list --- docs/Testing.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/Testing.md b/docs/Testing.md index 49b3f975e..ee715242f 100644 --- a/docs/Testing.md +++ b/docs/Testing.md @@ -27,3 +27,6 @@ Things to test before cutting a release: - Restoring with an encryption password - Export logs - Try with and without encryption password +- Mutual Close Channel + - Known Issue: balance will be double counted until 6 confirmations +- Force Close Channel