X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonchaintx.rs;h=67a82a480848aeec8d86325be36c6841c261cc8d;hb=8e3744813a8730a0b4fa6219d314635167947f27;hp=83dc968c6ca549cdb8a4f49978445f583664490b;hpb=a89996564cdc9e8708b147b2a5e7b11b59adfc8e;p=rust-lightning

diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
index 83dc968c..67a82a48 100644
--- a/lightning/src/ln/onchaintx.rs
+++ b/lightning/src/ln/onchaintx.rs
@@ -39,11 +39,13 @@ use std::mem::replace;
 
 const MAX_ALLOC_SIZE: usize = 64*1024;
 
-/// An entry for an [`OnchainEvent`], stating the block height when the event was observed.
+/// An entry for an [`OnchainEvent`], stating the block height when the event was observed and the
+/// transaction causing it.
 ///
 /// Used to determine when the on-chain event can be considered safe from a chain reorganization.
 #[derive(PartialEq)]
 struct OnchainEventEntry {
+	txid: Txid,
 	height: u32,
 	event: OnchainEvent,
 }
@@ -54,7 +56,7 @@ impl OnchainEventEntry {
 	}
 
 	fn has_reached_confirmation_threshold(&self, height: u32) -> bool {
-		self.confirmation_threshold() == height
+		height >= self.confirmation_threshold()
 	}
 }
 
@@ -338,6 +340,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 
 		writer.write_all(&byte_utils::be64_to_array(self.onchain_events_waiting_threshold_conf.len() as u64))?;
 		for ref entry in self.onchain_events_waiting_threshold_conf.iter() {
+			entry.txid.write(writer)?;
 			writer.write_all(&byte_utils::be32_to_array(entry.height))?;
 			match entry.event {
 				OnchainEvent::Claim { ref claim_request } => {
@@ -395,6 +398,7 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler<K::Signer> {
 		let waiting_threshold_conf_len: u64 = Readable::read(reader)?;
 		let mut onchain_events_waiting_threshold_conf = Vec::with_capacity(cmp::min(waiting_threshold_conf_len as usize, MAX_ALLOC_SIZE / 128));
 		for _ in 0..waiting_threshold_conf_len {
+			let txid = Readable::read(reader)?;
 			let height = Readable::read(reader)?;
 			let event = match <u8 as Readable>::read(reader)? {
 				0 => {
@@ -413,7 +417,7 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler<K::Signer> {
 				}
 				_ => return Err(DecodeError::InvalidValue),
 			};
-			onchain_events_waiting_threshold_conf.push(OnchainEventEntry { height, event });
+			onchain_events_waiting_threshold_conf.push(OnchainEventEntry { txid, height, event });
 		}
 		let latest_height = Readable::read(reader)?;
 
@@ -768,6 +772,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 						macro_rules! clean_claim_request_after_safety_delay {
 							() => {
 								let entry = OnchainEventEntry {
+									txid: tx.txid(),
 									height,
 									event: OnchainEvent::Claim { claim_request: first_claim_txid_height.0.clone() }
 								};
@@ -807,6 +812,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 			}
 			for (outpoint, input_material) in claimed_outputs_material.drain(..) {
 				let entry = OnchainEventEntry {
+					txid: tx.txid(),
 					height,
 					event: OnchainEvent::ContentiousOutpoint { outpoint, input_material },
 				};
@@ -842,8 +848,8 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 
 		// Check if any pending claim request must be rescheduled
 		for (first_claim_txid, ref claim_data) in self.pending_claim_requests.iter() {
-			if let Some(h) = claim_data.height_timer {
-				if h == height {
+			if let Some(height_timer) = claim_data.height_timer {
+				if height >= height_timer {
 					bump_candidates.insert(*first_claim_txid, (*claim_data).clone());
 				}
 			}
@@ -872,7 +878,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		let onchain_events_waiting_threshold_conf =
 			self.onchain_events_waiting_threshold_conf.drain(..).collect::<Vec<_>>();
 		for entry in onchain_events_waiting_threshold_conf {
-			if entry.height == height {
+			if entry.height >= height {
 				//- our claim tx on a commitment tx output
 				//- resurect outpoint back in its claimable set and regenerate tx
 				match entry.event {
@@ -906,7 +912,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		// right now if one of the outpoint get disconnected, just erase whole pending claim request.
 		let mut remove_request = Vec::new();
 		self.claimable_outpoints.retain(|_, ref v|
-			if v.1 == height {
+			if v.1 >= height {
 			remove_request.push(v.0.clone());
 			false
 			} else { true });