X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fpackage.rs;h=bd983ecd9163589b19b12f85199c9d851d0fb5f0;hb=258a2385fcd38ed8c0ed963fff93fdb06b94f24d;hp=9e92e2031bc1afe90c0d90d1c7f2a9322b298521;hpb=f492a192ff6c076985bfb665c99f4589604cd6ae;p=rust-lightning

diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs
index 9e92e2031..bd983ecd9 100644
--- a/lightning/src/chain/package.rs
+++ b/lightning/src/chain/package.rs
@@ -213,21 +213,33 @@ impl_writeable_tlv_based!(CounterpartyReceivedHTLCOutput, {
 pub(crate) struct HolderHTLCOutput {
 	preimage: Option<PaymentPreimage>,
 	amount: u64,
+	/// Defaults to 0 for HTLC-Success transactions, which have no expiry
+	cltv_expiry: u32,
 }
 
 impl HolderHTLCOutput {
-	pub(crate) fn build(preimage: Option<PaymentPreimage>, amount: u64) -> Self {
+	pub(crate) fn build_offered(amount: u64, cltv_expiry: u32) -> Self {
 		HolderHTLCOutput {
-			preimage,
-			amount
+			preimage: None,
+			amount,
+			cltv_expiry,
+		}
+	}
+
+	pub(crate) fn build_accepted(preimage: PaymentPreimage, amount: u64) -> Self {
+		HolderHTLCOutput {
+			preimage: Some(preimage),
+			amount,
+			cltv_expiry: 0,
 		}
 	}
 }
 
 impl_writeable_tlv_based!(HolderHTLCOutput, {
 	(0, amount),
+	(2, cltv_expiry),
 }, {
-	(2, preimage),
+	(4, preimage),
 }, {});
 
 /// A struct to describe the channel output on the funding transaction.
@@ -375,68 +387,32 @@ impl PackageSolvingData {
 			_ => { panic!("API Error!"); }
 		}
 	}
-}
-
-impl Writeable for PackageSolvingData {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		match self {
-			PackageSolvingData::RevokedOutput(ref revoked_outp) => {
-				0u8.write(writer)?;
-				revoked_outp.write(writer)?;
-			},
-			PackageSolvingData::RevokedHTLCOutput(ref revoked_outp) => {
-				1u8.write(writer)?;
-				revoked_outp.write(writer)?;
-			},
-			PackageSolvingData::CounterpartyOfferedHTLCOutput(ref counterparty_outp) => {
-				2u8.write(writer)?;
-				counterparty_outp.write(writer)?;
-			},
-			PackageSolvingData::CounterpartyReceivedHTLCOutput(ref counterparty_outp) => {
-				3u8.write(writer)?;
-				counterparty_outp.write(writer)?;
-			},
-			PackageSolvingData::HolderHTLCOutput(ref holder_outp) => {
-				4u8.write(writer)?;
-				holder_outp.write(writer)?;
-			},
-			PackageSolvingData::HolderFundingOutput(ref funding_outp) => {
-				5u8.write(writer)?;
-				funding_outp.write(writer)?;
-			}
-		}
-		Ok(())
-	}
-}
-
-impl Readable for PackageSolvingData {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let byte = <u8 as Readable>::read(reader)?;
-		let solving_data = match byte {
-			0 => {
-				PackageSolvingData::RevokedOutput(Readable::read(reader)?)
-			},
-			1 => {
-				PackageSolvingData::RevokedHTLCOutput(Readable::read(reader)?)
-			},
-			2 => {
-				PackageSolvingData::CounterpartyOfferedHTLCOutput(Readable::read(reader)?)
-			},
-			3 => {
-				PackageSolvingData::CounterpartyReceivedHTLCOutput(Readable::read(reader)?)
-			},
-			4 => {
-				PackageSolvingData::HolderHTLCOutput(Readable::read(reader)?)
-			},
-			5 => {
-				PackageSolvingData::HolderFundingOutput(Readable::read(reader)?)
-			}
-			_ => return Err(DecodeError::UnknownVersion)
+	fn absolute_tx_timelock(&self, output_conf_height: u32) -> u32 {
+		// Get the absolute timelock at which this output can be spent given the height at which
+		// this output was confirmed. We use `output_conf_height + 1` as a safe default as we can
+		// be confirmed in the next block and transactions with time lock `current_height + 1`
+		// always propagate.
+		let absolute_timelock = match self {
+			PackageSolvingData::RevokedOutput(_) => output_conf_height + 1,
+			PackageSolvingData::RevokedHTLCOutput(_) => output_conf_height + 1,
+			PackageSolvingData::CounterpartyOfferedHTLCOutput(_) => output_conf_height + 1,
+			PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => std::cmp::max(outp.htlc.cltv_expiry, output_conf_height + 1),
+			PackageSolvingData::HolderHTLCOutput(ref outp) => std::cmp::max(outp.cltv_expiry, output_conf_height + 1),
+			PackageSolvingData::HolderFundingOutput(_) => output_conf_height + 1,
 		};
-		Ok(solving_data)
+		absolute_timelock
 	}
 }
 
+impl_writeable_tlv_based_enum!(PackageSolvingData, ;
+	(0, RevokedOutput),
+	(1, RevokedHTLCOutput),
+	(2, CounterpartyOfferedHTLCOutput),
+	(3, CounterpartyReceivedHTLCOutput),
+	(4, HolderHTLCOutput),
+	(5, HolderFundingOutput),
+);
+
 /// A malleable package might be aggregated with other packages to save on fees.
 /// A untractable package has been counter-signed and aggregable will break cached counterparty
 /// signatures.
@@ -586,6 +562,10 @@ impl PackageTemplate {
 		}
 		amounts
 	}
+	pub(crate) fn package_timelock(&self) -> u32 {
+		self.inputs.iter().map(|(_, outp)| outp.absolute_tx_timelock(self.height_original))
+			.max().expect("There must always be at least one output to spend in a PackageTemplate")
+	}
 	pub(crate) fn package_weight(&self, destination_script: &Script) -> usize {
 		let mut inputs_weight = 0;
 		let mut witnesses_weight = 2; // count segwit flags
@@ -879,7 +859,7 @@ mod tests {
 		() => {
 			{
 				let preimage = PaymentPreimage([2;32]);
-				PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(Some(preimage), 0))
+				PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build_accepted(preimage, 0))
 			}
 		}
 	}