f Track latest spend generation height individually

Author: tnull

lightning/src/util/sweep.rs

@@ -53,6 +53,10 @@ pub struct TrackedSpendableOutput {
 	///
 	/// Will be `None` if it hasn't been broadcast yet.
 	pub latest_broadcast_height: Option<u32>,
+	/// The best height when we last (re-)generated a transaction spending this output.
+	///
+	/// Will be `None` if it hasn't been broadcast yet.
+	pub latest_spend_generation_height: Option<u32>,
 	/// The transaction spending this output we last broadcast.
 	///
 	/// After confirmation, this will be set to the confirmed transaction.
@@ -111,6 +115,7 @@ impl TrackedSpendableOutput {
 
 impl_writeable_tlv_based!(TrackedSpendableOutput, {
 	(0, id, required),
+	(1, latest_spend_generation_height, option),
 	(2, descriptor, required),
 	(4, channel_id, option),
 	(6, first_broadcast_hash, option),
@@ -339,6 +344,7 @@ where
 					channel_id,
 					first_broadcast_hash: None,
 					latest_broadcast_height: None,
+					latest_spend_generation_height: None,
 					latest_spending_tx: None,
 					confirmation_height: None,
 					confirmation_hash: None,
@@ -377,13 +383,21 @@ where
 					continue;
 				}
 
-				if let Some(latest_broadcast_height) = output_info.latest_broadcast_height {
+				if let Some(latest_spend_generation_height) = output_info.latest_spend_generation_height {
+					debug_assert!(output_info.latest_broadcast_height.is_some(),
+						"If we had spent before, we should have broadcast, too.");
+					debug_assert!(output_info.latest_spending_tx.is_some(),
+						"If we had spent before, we should have a spending_tx set.");
+
 					// Re-generate spending tx after regenerate_spend_threshold, rebroadcast
 					// after every block
-					if latest_broadcast_height + self.regenerate_spend_threshold >= cur_height {
+					if latest_spend_generation_height + self.regenerate_spend_threshold <= cur_height {
+						log_debug!(self.logger,
+							"Regeneration threshold was reached, will regenerate sweeping transaction.");
+
 						respend_descriptors.push(output_info.descriptor.clone());
 						respend_ids.push(output_info.id);
-					} else if latest_broadcast_height < cur_height {
+					} else if output_info.latest_broadcast_height < Some(cur_height) {
 						if let Some(latest_spending_tx) = output_info.latest_spending_tx.as_ref() {
 							log_debug!(self.logger, "Rebroadcasting output sweeping transaction {}",
 								latest_spending_tx.txid());
@@ -399,7 +413,7 @@ where
 						}
 					}
 				} else {
-					// Our first broadcast.
+					// Our first spend generation + broadcast.
 					respend_descriptors.push(output_info.descriptor.clone());
 					respend_ids.push(output_info.id);
 					output_info.first_broadcast_hash = Some(cur_hash);
@@ -428,6 +442,7 @@ where
 
 							output_info.latest_spending_tx = Some(spending_tx.clone());
 							output_info.latest_broadcast_height = Some(cur_height);
+							output_info.latest_spend_generation_height = Some(cur_height);
 							self.persist_info(&output_info).unwrap_or_else(|e| {
 								log_error!(
 									self.logger,