-f Dry-up height_original from OnchainRequest to PackageTemplate

Antoine Riard · Antoine Riard · commit b3592198418d · 2021-04-21T20:29:48.000-04:00
diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
@@ -1582,8 +1582,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 			for (idx, outp) in tx.output.iter().enumerate() {
 				if outp.script_pubkey == revokeable_p2wsh {
 					let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, outp.value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);
-					let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None);
-					claimable_outpoints.push(OnchainRequest { height_original: height, content: justice_package});
+					let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None, height);
+					claimable_outpoints.push(OnchainRequest { content: justice_package});
 				}
 			}
 
@@ -1596,8 +1596,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 							return (claimable_outpoints, (commitment_txid, watch_outputs)); // Corrupted per_commitment_data, fuck this user
 						}
 						let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, if htlc.offered { InputDescriptors::RevokedOfferedHTLC } else { InputDescriptors::RevokedReceivedHTLC }, htlc.amount_msat / 1000, Some(htlc.clone()), self.counterparty_tx_cache.on_counterparty_tx_csv);
-						let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, htlc.cltv_expiry, true, 0, None);
-						claimable_outpoints.push(OnchainRequest { height_original: height, content: justice_package});
+						let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, htlc.cltv_expiry, true, 0, None, height);
+						claimable_outpoints.push(OnchainRequest { content: justice_package});
 					}
 				}
 			}
@@ -1745,8 +1745,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 							let preimage = if htlc.offered { if let Some(p) = self.payment_preimages.get(&htlc.payment_hash) { Some(*p) } else { None } } else { None };
 							if preimage.is_some() || !htlc.offered {
 								let counterparty_htlc_outp = CounterpartyHTLCOutput::build(*revocation_point, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, preimage, htlc.clone());
-								let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::CounterpartyHTLCOutput(counterparty_htlc_outp), PackageMalleability::Malleable, htlc.cltv_expiry, if !htlc.offered { false } else { true }, 0, None);
-								claimable_outpoints.push(OnchainRequest { height_original: /*XXX(ariard) Option<height> */ 0, content: counterparty_package });
+								let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::CounterpartyHTLCOutput(counterparty_htlc_outp), PackageMalleability::Malleable, htlc.cltv_expiry, if !htlc.offered { false } else { true }, 0, None, 0);
+								claimable_outpoints.push(OnchainRequest { content: counterparty_package });
 							}
 						}
 					}
@@ -1778,8 +1778,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 
 		log_trace!(logger, "Counterparty HTLC broadcast {}:{}", htlc_txid, 0);
 		let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, tx.output[0].value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);
-		let justice_package = PackageTemplate::build_package(htlc_txid, 0, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None);
-		let claimable_outpoints = vec!(OnchainRequest { height_original: height, content: justice_package });
+		let justice_package = PackageTemplate::build_package(htlc_txid, 0, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None, height);
+		let claimable_outpoints = vec!(OnchainRequest { content: justice_package });
 		let outputs = vec![(0, tx.output[0].clone())];
 		(claimable_outpoints, Some((htlc_txid, outputs)))
 	}
@@ -1803,8 +1803,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 						continue;
 					}
 				} else { None }, htlc.amount_msat);
-				let htlc_package = PackageTemplate::build_package(holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), PackageMalleability::Untractable, height, false, 0, None);
-				claim_requests.push(OnchainRequest { height_original: height, content: htlc_package });
+				let htlc_package = PackageTemplate::build_package(holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), PackageMalleability::Untractable, height, false, 0, None, height);
+				claim_requests.push(OnchainRequest { content: htlc_package });
 			}
 		}
 
@@ -2077,8 +2077,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		let should_broadcast = self.would_broadcast_at_height(height, &logger);
 		if should_broadcast {
 			let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());
-			let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), PackageMalleability::Untractable, height, false, 0, None);
-			claimable_outpoints.push(OnchainRequest { height_original: height, content: commitment_package });
+			let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), PackageMalleability::Untractable, height, false, 0, None, height);
+			claimable_outpoints.push(OnchainRequest { content: commitment_package });
 			self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));
 			let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);
 			self.holder_tx_signed = true;
diff --git a/lightning/src/chain/onchain_utils.rs b/lightning/src/chain/onchain_utils.rs
@@ -494,6 +494,8 @@ pub(crate) struct PackageTemplate {
 	// At every block tick, used to check if pending claiming tx is taking too
 	// much time for confirmation and we need to bump it.
 	height_timer: Option<u32>,
+	// Tracked in case of reorg to wipe out now-superflous request.
+	height_original: u32,
 }
 
 impl PackageTemplate {
@@ -536,6 +538,7 @@ impl PackageTemplate {
 				let aggregation = self.aggregation;
 				let feerate_previous = self.feerate_previous;
 				let height_timer = self.height_timer;
+				let height_original = self.height_original;
 				self.inputs.retain(|outp| {
 					if *split_outp == outp.0 {
 						split_package = Some(PackageTemplate {
@@ -545,6 +548,7 @@ impl PackageTemplate {
 							aggregation,
 							feerate_previous,
 							height_timer,
+							height_original,
 						});
 						return false;
 					}
@@ -563,6 +567,7 @@ impl PackageTemplate {
 		}
 	}
 	pub(crate) fn merge_package(&mut self, mut merge_from: PackageTemplate) {
+		assert_eq!(self.height_original, merge_from.height_original);
 		if self.malleability == PackageMalleability::Untractable || merge_from.malleability == PackageMalleability::Untractable {
 			panic!("Merging template on untractable packages");
 		}
@@ -657,7 +662,7 @@ impl PackageTemplate {
 			},
 		}
 	}
-	pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, malleability: PackageMalleability, absolute_timelock: u32, aggregation: bool, feerate_previous: u64, height_timer: Option<u32>) -> Self {
+	pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, malleability: PackageMalleability, absolute_timelock: u32, aggregation: bool, feerate_previous: u64, height_timer: Option<u32>, height_original: u32) -> Self {
 		let mut inputs = Vec::with_capacity(1);
 		inputs.push((BitcoinOutPoint { txid, vout }, input_solving_data));
 		PackageTemplate {
@@ -667,6 +672,7 @@ impl PackageTemplate {
 			aggregation,
 			feerate_previous,
 			height_timer,
+			height_original,
 		}
 	}
 }
@@ -683,6 +689,7 @@ impl Writeable for PackageTemplate {
 		self.aggregation.write(writer)?;
 		self.feerate_previous.write(writer)?;
 		self.height_timer.write(writer)?;
+		self.height_original.write(writer)?;
 		Ok(())
 	}
 }
@@ -701,13 +708,15 @@ impl Readable for PackageTemplate {
 		let aggregation = Readable::read(reader)?;
 		let feerate_previous = Readable::read(reader)?;
 		let height_timer = Readable::read(reader)?;
+		let height_original = Readable::read(reader)?;
 		Ok(PackageTemplate {
 			inputs,
 			malleability,
 			absolute_timelock,
 			aggregation,
 			feerate_previous,
 			height_timer,
+			height_original,
 		})
 	}
 }
@@ -731,22 +740,18 @@ impl Readable for PackageTemplate {
 /// Content embeds transactions elements to generate transaction. See PackageTemplate.
 #[derive(PartialEq, Clone)]
 pub struct OnchainRequest {
-	// Tracked in case of reorg to wipe out now-superflous request.
-	pub(crate) height_original: u32,
 	// Content of request.
 	pub(crate) content: PackageTemplate,
 }
 
 impl OnchainRequest {
 	pub(crate) fn request_merge(&mut self, req: OnchainRequest) {
-		assert_eq!(self.height_original, req.height_original);
 		self.content.merge_package(req.content);
 	}
 }
 
 impl Writeable for OnchainRequest {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.height_original.write(writer)?;
 		self.content.write(writer)?;
 
 		Ok(())
@@ -755,11 +760,9 @@ impl Writeable for OnchainRequest {
 
 impl Readable for OnchainRequest {
 	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let height_original = Readable::read(reader)?;
 		let content = Readable::read(reader)?;
 
 		Ok(OnchainRequest {
-			height_original,
 			content
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -1582,8 +1582,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`1582`	`1582`	`for (idx, outp) in tx.output.iter().enumerate() {`
`1583`	`1583`	`if outp.script_pubkey == revokeable_p2wsh {`
`1584`	`1584`	`let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, outp.value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);`
`1585`		`- let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None);`
`1586`		`- claimable_outpoints.push(OnchainRequest { height_original: height, content: justice_package});`
	`1585`	`+ let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None, height);`
	`1586`	`+ claimable_outpoints.push(OnchainRequest { content: justice_package});`
`1587`	`1587`	`}`
`1588`	`1588`	`}`
`1589`	`1589`
`@@ -1596,8 +1596,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`1596`	`1596`	`return (claimable_outpoints, (commitment_txid, watch_outputs)); // Corrupted per_commitment_data, fuck this user`
`1597`	`1597`	`}`
`1598`	`1598`	`let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, if htlc.offered { InputDescriptors::RevokedOfferedHTLC } else { InputDescriptors::RevokedReceivedHTLC }, htlc.amount_msat / 1000, Some(htlc.clone()), self.counterparty_tx_cache.on_counterparty_tx_csv);`
`1599`		`- let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, htlc.cltv_expiry, true, 0, None);`
`1600`		`- claimable_outpoints.push(OnchainRequest { height_original: height, content: justice_package});`
	`1599`	`+ let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, htlc.cltv_expiry, true, 0, None, height);`
	`1600`	`+ claimable_outpoints.push(OnchainRequest { content: justice_package});`
`1601`	`1601`	`}`
`1602`	`1602`	`}`
`1603`	`1603`	`}`
`@@ -1745,8 +1745,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`1745`	`1745`	`let preimage = if htlc.offered { if let Some(p) = self.payment_preimages.get(&htlc.payment_hash) { Some(*p) } else { None } } else { None };`
`1746`	`1746`	`if preimage.is_some() \|\| !htlc.offered {`
`1747`	`1747`	`let counterparty_htlc_outp = CounterpartyHTLCOutput::build(*revocation_point, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, preimage, htlc.clone());`
`1748`		`- let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::CounterpartyHTLCOutput(counterparty_htlc_outp), PackageMalleability::Malleable, htlc.cltv_expiry, if !htlc.offered { false } else { true }, 0, None);`
`1749`		`- claimable_outpoints.push(OnchainRequest { height_original: /XXX(ariard) Option<height> / 0, content: counterparty_package });`
	`1748`	`+ let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::CounterpartyHTLCOutput(counterparty_htlc_outp), PackageMalleability::Malleable, htlc.cltv_expiry, if !htlc.offered { false } else { true }, 0, None, 0);`
	`1749`	`+ claimable_outpoints.push(OnchainRequest { content: counterparty_package });`
`1750`	`1750`	`}`
`1751`	`1751`	`}`
`1752`	`1752`	`}`
`@@ -1778,8 +1778,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`1778`	`1778`
`1779`	`1779`	`log_trace!(logger, "Counterparty HTLC broadcast {}:{}", htlc_txid, 0);`
`1780`	`1780`	`let revk_outp = RevokedOutput::build(per_commitment_point, per_commitment_key, self.counterparty_tx_cache.counterparty_delayed_payment_base_key, self.counterparty_tx_cache.counterparty_htlc_base_key, InputDescriptors::RevokedOutput, tx.output[0].value, None, self.counterparty_tx_cache.on_counterparty_tx_csv);`
`1781`		`- let justice_package = PackageTemplate::build_package(htlc_txid, 0, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None);`
`1782`		`- let claimable_outpoints = vec!(OnchainRequest { height_original: height, content: justice_package });`
	`1781`	`+ let justice_package = PackageTemplate::build_package(htlc_txid, 0, PackageSolvingData::RevokedOutput(revk_outp), PackageMalleability::Malleable, height + self.counterparty_tx_cache.on_counterparty_tx_csv as u32, true, 0, None, height);`
	`1782`	`+ let claimable_outpoints = vec!(OnchainRequest { content: justice_package });`
`1783`	`1783`	`let outputs = vec![(0, tx.output[0].clone())];`
`1784`	`1784`	`(claimable_outpoints, Some((htlc_txid, outputs)))`
`1785`	`1785`	`}`
`@@ -1803,8 +1803,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`1803`	`1803`	`continue;`
`1804`	`1804`	`}`
`1805`	`1805`	`} else { None }, htlc.amount_msat);`
`1806`		`- let htlc_package = PackageTemplate::build_package(holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), PackageMalleability::Untractable, height, false, 0, None);`
`1807`		`- claim_requests.push(OnchainRequest { height_original: height, content: htlc_package });`
	`1806`	`+ let htlc_package = PackageTemplate::build_package(holder_tx.txid, transaction_output_index, PackageSolvingData::HolderHTLCOutput(htlc_output), PackageMalleability::Untractable, height, false, 0, None, height);`
	`1807`	`+ claim_requests.push(OnchainRequest { content: htlc_package });`
`1808`	`1808`	`}`
`1809`	`1809`	`}`
`1810`	`1810`
`@@ -2077,8 +2077,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {`
`2077`	`2077`	`let should_broadcast = self.would_broadcast_at_height(height, &logger);`
`2078`	`2078`	`if should_broadcast {`
`2079`	`2079`	`let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone());`
`2080`		`- let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), PackageMalleability::Untractable, height, false, 0, None);`
`2081`		`- claimable_outpoints.push(OnchainRequest { height_original: height, content: commitment_package });`
	`2080`	`+ let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), PackageMalleability::Untractable, height, false, 0, None, height);`
	`2081`	`+ claimable_outpoints.push(OnchainRequest { content: commitment_package });`
`2082`	`2082`	`self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));`
`2083`	`2083`	`let commitment_tx = self.onchain_tx_handler.get_fully_signed_holder_tx(&self.funding_redeemscript);`
`2084`	`2084`	`self.holder_tx_signed = true;`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,8 @@ pub(crate) struct PackageTemplate {`
`494`	`494`	`// At every block tick, used to check if pending claiming tx is taking too`
`495`	`495`	`// much time for confirmation and we need to bump it.`
`496`	`496`	`height_timer: Option<u32>,`
	`497`	`+ // Tracked in case of reorg to wipe out now-superflous request.`
	`498`	`+ height_original: u32,`
`497`	`499`	`}`
`498`	`500`
`499`	`501`	`impl PackageTemplate {`
`@@ -536,6 +538,7 @@ impl PackageTemplate {`
`536`	`538`	`let aggregation = self.aggregation;`
`537`	`539`	`let feerate_previous = self.feerate_previous;`
`538`	`540`	`let height_timer = self.height_timer;`
	`541`	`+ let height_original = self.height_original;`
`539`	`542`	`self.inputs.retain(\|outp\| {`
`540`	`543`	`if *split_outp == outp.0 {`
`541`	`544`	`split_package = Some(PackageTemplate {`
`@@ -545,6 +548,7 @@ impl PackageTemplate {`
`545`	`548`	`aggregation,`
`546`	`549`	`feerate_previous,`
`547`	`550`	`height_timer,`
	`551`	`+ height_original,`
`548`	`552`	`});`
`549`	`553`	`return false;`
`550`	`554`	`}`
`@@ -563,6 +567,7 @@ impl PackageTemplate {`
`563`	`567`	`}`
`564`	`568`	`}`
`565`	`569`	`pub(crate) fn merge_package(&mut self, mut merge_from: PackageTemplate) {`
	`570`	`+ assert_eq!(self.height_original, merge_from.height_original);`
`566`	`571`	`if self.malleability == PackageMalleability::Untractable \|\| merge_from.malleability == PackageMalleability::Untractable {`
`567`	`572`	`panic!("Merging template on untractable packages");`
`568`	`573`	`}`
`@@ -657,7 +662,7 @@ impl PackageTemplate {`
`657`	`662`	`},`
`658`	`663`	`}`
`659`	`664`	`}`
`660`		`- pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, malleability: PackageMalleability, absolute_timelock: u32, aggregation: bool, feerate_previous: u64, height_timer: Option<u32>) -> Self {`
	`665`	`+ pub (crate) fn build_package(txid: Txid, vout: u32, input_solving_data: PackageSolvingData, malleability: PackageMalleability, absolute_timelock: u32, aggregation: bool, feerate_previous: u64, height_timer: Option<u32>, height_original: u32) -> Self {`
`661`	`666`	`let mut inputs = Vec::with_capacity(1);`
`662`	`667`	`inputs.push((BitcoinOutPoint { txid, vout }, input_solving_data));`
`663`	`668`	`PackageTemplate {`
`@@ -667,6 +672,7 @@ impl PackageTemplate {`
`667`	`672`	`aggregation,`
`668`	`673`	`feerate_previous,`
`669`	`674`	`height_timer,`
	`675`	`+ height_original,`
`670`	`676`	`}`
`671`	`677`	`}`
`672`	`678`	`}`
`@@ -683,6 +689,7 @@ impl Writeable for PackageTemplate {`
`683`	`689`	`self.aggregation.write(writer)?;`
`684`	`690`	`self.feerate_previous.write(writer)?;`
`685`	`691`	`self.height_timer.write(writer)?;`
	`692`	`+ self.height_original.write(writer)?;`
`686`	`693`	`Ok(())`
`687`	`694`	`}`
`688`	`695`	`}`
`@@ -701,13 +708,15 @@ impl Readable for PackageTemplate {`
`701`	`708`	`let aggregation = Readable::read(reader)?;`
`702`	`709`	`let feerate_previous = Readable::read(reader)?;`
`703`	`710`	`let height_timer = Readable::read(reader)?;`
	`711`	`+ let height_original = Readable::read(reader)?;`
`704`	`712`	`Ok(PackageTemplate {`
`705`	`713`	`inputs,`
`706`	`714`	`malleability,`
`707`	`715`	`absolute_timelock,`
`708`	`716`	`aggregation,`
`709`	`717`	`feerate_previous,`
`710`	`718`	`height_timer,`
	`719`	`+ height_original,`
`711`	`720`	`})`
`712`	`721`	`}`
`713`	`722`	`}`
`@@ -731,22 +740,18 @@ impl Readable for PackageTemplate {`
`731`	`740`	`/// Content embeds transactions elements to generate transaction. See PackageTemplate.`
`732`	`741`	`#[derive(PartialEq, Clone)]`
`733`	`742`	`pub struct OnchainRequest {`
`734`		`- // Tracked in case of reorg to wipe out now-superflous request.`
`735`		`- pub(crate) height_original: u32,`
`736`	`743`	`// Content of request.`
`737`	`744`	`pub(crate) content: PackageTemplate,`
`738`	`745`	`}`
`739`	`746`
`740`	`747`	`impl OnchainRequest {`
`741`	`748`	`pub(crate) fn request_merge(&mut self, req: OnchainRequest) {`
`742`		`- assert_eq!(self.height_original, req.height_original);`
`743`	`749`	`self.content.merge_package(req.content);`
`744`	`750`	`}`
`745`	`751`	`}`
`746`	`752`
`747`	`753`	`impl Writeable for OnchainRequest {`
`748`	`754`	`fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {`
`749`		`- self.height_original.write(writer)?;`
`750`	`755`	`self.content.write(writer)?;`
`751`	`756`
`752`	`757`	`Ok(())`
`@@ -755,11 +760,9 @@ impl Writeable for OnchainRequest {`
`755`	`760`
`756`	`761`	`impl Readable for OnchainRequest {`
`757`	`762`	`fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {`
`758`		`- let height_original = Readable::read(reader)?;`
`759`	`763`	`let content = Readable::read(reader)?;`
`760`	`764`
`761`	`765`	`Ok(OnchainRequest {`
`762`		`- height_original,`
`763`	`766`	`content`
`764`	`767`	`})`
`765`	`768`	`}`