From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:16:57 +0000 (+0000) Subject: Merge pull request #3259 from vincenzopalazzo/macros/dummy-tx X-Git-Tag: v0.0.124-rc1~7 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=5e62df7f204d7b5f93eaf7adabe0ec4f68a1e067;p=rust-lightning Merge pull request #3259 from vincenzopalazzo/macros/dummy-tx [RFC] event: store the outpoint when is_manual_broadcast --- 5e62df7f204d7b5f93eaf7adabe0ec4f68a1e067 diff --cc lightning/src/ln/channelmanager.rs index fd9a6cc07,29020c850..b14369c43 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@@ -32,9 -32,10 +32,10 @@@ use bitcoin::secp256k1::{SecretKey,Publ use bitcoin::secp256k1::Secp256k1; use bitcoin::{secp256k1, Sequence}; + use crate::events::FundingInfo; use crate::blinded_path::message::{MessageContext, OffersContext}; use crate::blinded_path::NodeIdLookUp; -use crate::blinded_path::message::{BlindedMessagePath, ForwardNode}; +use crate::blinded_path::message::{BlindedMessagePath, MessageForwardNode}; use crate::blinded_path::payment::{BlindedPaymentPath, Bolt12OfferContext, Bolt12RefundContext, PaymentConstraints, PaymentContext, ReceiveTlvs}; use crate::chain; use crate::chain::{Confirm, ChannelMonitorUpdateStatus, Watch, BestBlock};