X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fonchaintx.rs;h=45968c57e537077c2d583a24fe9702300d19a8cb;hb=a9d49aee5f1e24281cedd8ac8177d700359b86d0;hp=2d5c85cd477e56660f5a32cfd2a7b95318ba1c57;hpb=c3de782a2baab0c742332bea4783c393edb83311;p=rust-lightning diff --git a/lightning/src/chain/onchaintx.rs b/lightning/src/chain/onchaintx.rs index 2d5c85cd..45968c57 100644 --- a/lightning/src/chain/onchaintx.rs +++ b/lightning/src/chain/onchaintx.rs @@ -23,7 +23,7 @@ use bitcoin::hash_types::{Txid, BlockHash}; use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature}; use bitcoin::secp256k1; -use crate::chain::keysinterface::{ChannelSigner, EntropySource, SignerProvider}; +use crate::sign::{ChannelSigner, EntropySource, SignerProvider}; use crate::ln::msgs::DecodeError; use crate::ln::PaymentPreimage; #[cfg(anchors)] @@ -33,7 +33,7 @@ use crate::ln::chan_utils::{ChannelTransactionParameters, HolderCommitmentTransa use crate::chain::chaininterface::ConfirmationTarget; use crate::chain::chaininterface::{FeeEstimator, BroadcasterInterface, LowerBoundedFeeEstimator}; use crate::chain::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER}; -use crate::chain::keysinterface::WriteableEcdsaChannelSigner; +use crate::sign::WriteableEcdsaChannelSigner; #[cfg(anchors)] use crate::chain::package::PackageSolvingData; use crate::chain::package::PackageTemplate; @@ -513,7 +513,7 @@ impl OnchainTxHandler OnchainClaim::Tx(tx) => { let log_start = if bumped_feerate { "Broadcasting RBF-bumped" } else { "Rebroadcasting" }; log_info!(logger, "{} onchain {}", log_start, log_tx!(tx)); - broadcaster.broadcast_transaction(&tx); + broadcaster.broadcast_transactions(&[&tx]); }, #[cfg(anchors)] OnchainClaim::Event(event) => { @@ -767,7 +767,7 @@ impl OnchainTxHandler let package_id = match claim { OnchainClaim::Tx(tx) => { log_info!(logger, "Broadcasting onchain {}", log_tx!(tx)); - broadcaster.broadcast_transaction(&tx); + broadcaster.broadcast_transactions(&[&tx]); tx.txid().into_inner() }, #[cfg(anchors)] @@ -960,7 +960,7 @@ impl OnchainTxHandler match bump_claim { OnchainClaim::Tx(bump_tx) => { log_info!(logger, "Broadcasting RBF-bumped onchain {}", log_tx!(bump_tx)); - broadcaster.broadcast_transaction(&bump_tx); + broadcaster.broadcast_transactions(&[&bump_tx]); }, #[cfg(anchors)] OnchainClaim::Event(claim_event) => { @@ -1046,7 +1046,7 @@ impl OnchainTxHandler match bump_claim { OnchainClaim::Tx(bump_tx) => { log_info!(logger, "Broadcasting onchain {}", log_tx!(bump_tx)); - broadcaster.broadcast_transaction(&bump_tx); + broadcaster.broadcast_transactions(&[&bump_tx]); }, #[cfg(anchors)] OnchainClaim::Event(claim_event) => {