]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #3045 from TheBlueMatt/2024-03-fees-are-dust
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 7 May 2024 15:50:46 +0000 (08:50 -0700)
committerGitHub <noreply@github.com>
Tue, 7 May 2024 15:50:46 +0000 (08:50 -0700)
Include excess counterparty commitment transaction fees in dust exposure

1  2 
lightning/src/ln/channel.rs
lightning/src/ln/channelmanager.rs
lightning/src/ln/functional_tests.rs
lightning/src/ln/monitor_tests.rs
lightning/src/ln/onion_route_tests.rs

Simple merge
Simple merge
Simple merge
index 52bda8185837eab9a5543467e48ce7abf8bae532,83d22c4deea35583b54863367c9e75252aae97dc..761d4b5316c69b4a728c60f654733ccf5330ab3b
@@@ -15,11 -15,9 +15,10 @@@ use crate::chain::transaction::OutPoint
  use crate::chain::chaininterface::{LowerBoundedFeeEstimator, compute_feerate_sat_per_1000_weight};
  use crate::events::bump_transaction::{BumpTransactionEvent, WalletSource};
  use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
 -use crate::ln::{channel, ChannelId};
 +use crate::ln::channel;
 +use crate::ln::types::ChannelId;
  use crate::ln::channelmanager::{BREAKDOWN_TIMEOUT, PaymentId, RecipientOnionFields};
  use crate::ln::msgs::ChannelMessageHandler;
- use crate::util::config::UserConfig;
  use crate::crypto::utils::sign;
  use crate::util::ser::Writeable;
  use crate::util::scid_utils::block_from_scid;
Simple merge