Skip to content

Remaining follow-ups from 3921 #4032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 23, 2025
Merged

Remaining follow-ups from 3921 #4032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63abd10
Make `TxBuilder::get_next_commitment_stats` fallible
tankyleo Aug 28, 2025
061a725
Include HTLCs unknown by remote in `can_accept_incoming_htlc` stats
tankyleo Aug 28, 2025
f30fb62
Include any pending fee updates in `can_accept_incoming_htlc` stats
tankyleo Aug 28, 2025
ec13990
Relax feerate requirements in `TxBuilder::get_next_commitment_stats`
tankyleo Aug 28, 2025
6c6361d
Cleanup dust exposure due to excess fees in `get_next_commitment_stats`
tankyleo Aug 28, 2025
1ae5da1
Note that we may want to apply HTLC deletes to the upcoming set of HTLCs
tankyleo Aug 28, 2025
2356e05
Check dust exposure on receiving `commitment_signed`, not `update_fee`
tankyleo Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
//! There are a bunch of these as their handling is relatively error-prone so they are split out
//! here. See also the chanmon_fail_consistency fuzz test.

use crate::chain::chaininterface::LowerBoundedFeeEstimator;
use crate::chain::chainmonitor::ChainMonitor;
use crate::chain::channelmonitor::{ChannelMonitor, MonitorEvent, ANTI_REORG_DELAY};
use crate::chain::transaction::OutPoint;
Expand Down Expand Up @@ -133,9 +134,12 @@ fn test_monitor_and_persister_update_fail() {
let chan_opt = get_channel_ref!(nodes[0], nodes[1], per_peer_lock, peer_state_lock, chan.2);
if let Some(channel) = chan_opt.as_funded_mut() {
assert_eq!(updates.commitment_signed.len(), 1);
if let Ok(Some(update)) =
channel.commitment_signed(&updates.commitment_signed[0], &node_cfgs[0].logger)
{
let feeest = LowerBoundedFeeEstimator::new(&chanmon_cfgs[0].fee_estimator);
if let Ok(Some(update)) = channel.commitment_signed(
&updates.commitment_signed[0],
&feeest,
&node_cfgs[0].logger,
) {
// Check that the persister returns InProgress (and will never actually complete)
// as the monitor update errors.
if let ChannelMonitorUpdateStatus::InProgress =
Expand Down
Loading
Loading