]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #3259 from vincenzopalazzo/macros/dummy-tx
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 27 Aug 2024 19:16:57 +0000 (19:16 +0000)
committerGitHub <noreply@github.com>
Tue, 27 Aug 2024 19:16:57 +0000 (19:16 +0000)
[RFC] event: store the outpoint when is_manual_broadcast

1  2 
lightning/src/events/mod.rs
lightning/src/ln/channelmanager.rs

Simple merge
index fd9a6cc07d63ff6830bb5c401f7eaf22998d8704,29020c8503833865d476e3b5d6dce307a9455cf7..b14369c432a42273e168220c2f6617b339994bee
@@@ -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};