f Default to cur_hash if no first_broadcast_hash is set

Author: tnull

lightning/src/util/sweep.rs

@@ -46,22 +46,23 @@ pub struct TrackedSpendableOutput {
 }
 
 impl TrackedSpendableOutput {
-	fn to_watched_output(&self) -> WatchedOutput {
+	fn to_watched_output(&self, cur_hash: BlockHash) -> WatchedOutput {
+		let block_hash = self.status.first_broadcast_hash().or(Some(cur_hash));
 		match &self.descriptor {
 			SpendableOutputDescriptor::StaticOutput { outpoint, output, channel_keys_id: _ } => {
 				WatchedOutput {
-					block_hash: self.status.first_broadcast_hash(),
+					block_hash,
 					outpoint: *outpoint,
 					script_pubkey: output.script_pubkey.clone(),
 				}
 			},
 			SpendableOutputDescriptor::DelayedPaymentOutput(output) => WatchedOutput {
-				block_hash: self.status.first_broadcast_hash(),
+				block_hash,
 				outpoint: output.outpoint,
 				script_pubkey: output.output.script_pubkey.clone(),
 			},
 			SpendableOutputDescriptor::StaticPaymentOutput(output) => WatchedOutput {
-				block_hash: self.status.first_broadcast_hash(),
+				block_hash,
 				outpoint: output.outpoint,
 				script_pubkey: output.output.script_pubkey.clone(),
 			},
@@ -372,7 +373,7 @@ where
 	) -> Self {
 		if let Some(filter) = chain_data_source.as_ref() {
 			for output_info in &outputs {
-				let watched_output = output_info.to_watched_output();
+				let watched_output = output_info.to_watched_output(best_block.block_hash);
 				filter.register_output(watched_output);
 			}
 		}
@@ -506,7 +507,7 @@ where
 		let respend_outputs = sweeper_state.outputs.iter_mut().filter(|o| filter_fn(&**o));
 		for output_info in respend_outputs {
 			if let Some(filter) = self.chain_data_source.as_ref() {
-				let watched_output = output_info.to_watched_output();
+				let watched_output = output_info.to_watched_output(cur_hash);
 				filter.register_output(watched_output);
 			}