Make accessible OnchainTxHandler signing fields to onchain_utils.rs

Author: Antoine Riard

lightning/src/chain/channelmonitor.rs

@@ -20,7 +20,7 @@
 //! security-domain-separated system design, you should consider having multiple paths for
 //! ChannelMonitors to get out of the HSM and onto monitoring devices.
 
-use bitcoin::blockdata::block::{Block, BlockHeader};
+use bitcoin::blockdata::block::BlockHeader;
 use bitcoin::blockdata::transaction::{TxOut,Transaction};
 use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
 use bitcoin::blockdata::script::{Script, Builder};
@@ -42,7 +42,7 @@ use ln::channelmanager::{BestBlock, HTLCSource};
 use ln::onchaintx::OnchainTxHandler;
 use ln::onchain_utils::InputDescriptors;
 use chain;
-use chain::WatchedOutput;
+use chain::{Block, WatchedOutput};
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use chain::transaction::{OutPoint, TransactionData};
 use chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface};
@@ -353,7 +353,7 @@ pub(crate) enum InputMaterial {
 	}
 }
 
-impl Writeable for InputMaterial  {
+impl Writeable for InputMaterial {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
 		match self {
 			&InputMaterial::Revoked { ref per_commitment_point, ref counterparty_delayed_payment_base_key, ref counterparty_htlc_base_key, ref per_commitment_key, ref input_descriptor, ref amount, ref htlc, ref on_counterparty_tx_csv} => {

lightning/src/ln/onchaintx.rs

@@ -217,7 +217,7 @@ pub struct OnchainTxHandler<ChannelSigner: Sign> {
 	prev_holder_commitment: Option<HolderCommitmentTransaction>,
 	prev_holder_htlc_sigs: Option<Vec<Option<(usize, Signature)>>>,
 
-	signer: ChannelSigner,
+	pub(crate) signer: ChannelSigner,
 	pub(crate) channel_transaction_parameters: ChannelTransactionParameters,
 
 	// Used to track claiming requests. If claim tx doesn't confirm before height timer expiration we need to bump
@@ -251,7 +251,7 @@ pub struct OnchainTxHandler<ChannelSigner: Sign> {
 
 	latest_height: u32,
 
-	secp_ctx: Secp256k1<secp256k1::All>,
+	pub(crate) secp_ctx: Secp256k1<secp256k1::All>,
 }
 
 impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {