Move onchain* to chain/

Author: Antoine Riard

lightning/src/chain/channelmonitor.rs

@@ -38,13 +38,13 @@ use ln::msgs::DecodeError;
 use ln::chan_utils;
 use ln::chan_utils::{CounterpartyCommitmentSecrets, HTLCOutputInCommitment, HTLCType, ChannelTransactionParameters, HolderCommitmentTransaction};
 use ln::channelmanager::{BestBlock, HTLCSource};
-use ln::onchaintx::OnchainTxHandler;
-use ln::onchain_utils::{CounterpartyHTLCOutput, HolderFundingOutput, HolderHTLCOutput, InputDescriptors, PackageMalleability, PackageSolvingData, PackageTemplate, RevokedOutput};
 use chain;
 use chain::{Block, WatchedOutput};
 use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use chain::transaction::{OutPoint, TransactionData};
 use chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface};
+use chain::onchaintx::OnchainTxHandler;
+use chain::onchain_utils::{CounterpartyHTLCOutput, HolderFundingOutput, HolderHTLCOutput, InputDescriptors, PackageMalleability, PackageSolvingData, PackageTemplate, RevokedOutput};
 use chain::Filter;
 use util::logger::Logger;
 use util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, U48};
@@ -2902,11 +2902,11 @@ mod tests {
 	use bitcoin::network::constants::Network;
 	use hex;
 	use chain::channelmonitor::ChannelMonitor;
+	use chain::onchain_utils;
+	use chain::onchain_utils::InputDescriptors;
 	use chain::transaction::OutPoint;
 	use ln::{PaymentPreimage, PaymentHash};
 	use ln::channelmanager::BestBlock;
-	use ln::onchain_utils;
-	use ln::onchain_utils::InputDescriptors;
 	use ln::chan_utils;
 	use ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, ChannelTransactionParameters, HolderCommitmentTransaction, CounterpartyChannelTransactionParameters};
 	use util::test_utils::{TestLogger, TestBroadcaster, TestFeeEstimator};

lightning/src/chain/mod.rs

@@ -23,6 +23,8 @@ pub mod chainmonitor;
 pub mod channelmonitor;
 pub mod transaction;
 pub mod keysinterface;
+pub(crate) mod onchaintx;
+pub(crate) mod onchain_utils;
 
 /// An error when accessing the chain via [`Access`].
 #[derive(Clone)]

lightning/src/ln/onchain_utils.rs renamed to lightning/src/chain/onchain_utils.rs

@@ -23,9 +23,9 @@ use ln::PaymentPreimage;
 use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment};
 use ln::chan_utils;
 use ln::msgs::DecodeError;
-use ln::onchaintx::OnchainTxHandler;
 use chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
 use chain::keysinterface::Sign;
+use chain::onchaintx::OnchainTxHandler;
 use util::byte_utils;
 use util::logger::Logger;
 use util::ser::{Readable, Writer, Writeable};
@@ -231,7 +231,12 @@ impl Writeable for CounterpartyHTLCOutput {
 		self.per_commitment_point.write(writer)?;
 		self.counterparty_delayed_payment_base_key.write(writer)?;
 		self.counterparty_htlc_base_key.write(writer)?;
-		self.preimage.write(writer)?;
+		if let Some(preimage) = self.preimage {
+			writer.write_all(&[0; 1])?;
+			preimage.write(writer)?;
+		} else {
+			writer.write_all(&[1;1])?;
+		}
 		self.htlc.write(writer)?;
 		Ok(())
 	}
@@ -242,7 +247,15 @@ impl Readable for CounterpartyHTLCOutput {
 		let per_commitment_point = Readable::read(reader)?;
 		let counterparty_delayed_payment_base_key = Readable::read(reader)?;
 		let counterparty_htlc_base_key = Readable::read(reader)?;
-		let preimage = Readable::read(reader)?;
+		let preimage = match <u8 as Readable>::read(reader)? {
+			0 => {
+				let preimage = Readable::read(reader)?;
+				Some(preimage)
+			},
+			1 => { None },
+			_ => return Err(DecodeError::InvalidValue),
+		};
+
 		let htlc = Readable::read(reader)?;
 		Ok(CounterpartyHTLCOutput {
 			per_commitment_point,

lightning/src/ln/onchaintx.rs renamed to lightning/src/chain/onchaintx.rs

@@ -24,11 +24,11 @@ use bitcoin::secp256k1;
 use ln::msgs::DecodeError;
 use ln::PaymentPreimage;
 use ln::chan_utils::{ChannelTransactionParameters, HolderCommitmentTransaction};
-use ln::onchain_utils;
-use ln::onchain_utils::PackageTemplate;
 use chain::chaininterface::{FeeEstimator, BroadcasterInterface};
 use chain::channelmonitor::{ANTI_REORG_DELAY, CLTV_SHARED_CLAIM_BUFFER};
 use chain::keysinterface::{Sign, KeysInterface};
+use chain::onchain_utils::PackageTemplate;
+use chain::onchain_utils;
 use util::logger::Logger;
 use util::ser::{Readable, ReadableArgs, Writer, Writeable, VecWriter};
 use util::byte_utils;

lightning/src/ln/mod.rs

@@ -27,8 +27,6 @@ pub mod msgs;
 pub mod peer_handler;
 pub mod chan_utils;
 pub mod features;
-pub mod onchaintx;
-pub mod onchain_utils;
 
 #[cfg(feature = "fuzztarget")]
 pub mod peer_channel_encryptor;