f - Handle height decreases in ChannelMonitor::update_best_block

Author: jkczyz

lightning/src/chain/channelmonitor.rs

@@ -2084,9 +2084,16 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 	{
 		let block_hash = header.block_hash();
 		log_trace!(logger, "New best block {} at height {}", block_hash, height);
-		self.best_block = BestBlock::new(block_hash, height);
 
-		self.block_confirmed(height, vec![], vec![], vec![], broadcaster, fee_estimator, logger)
+		if height > self.best_block.height() {
+			self.best_block = BestBlock::new(block_hash, height);
+			self.block_confirmed(height, vec![], vec![], vec![], broadcaster, fee_estimator, logger)
+		} else {
+			self.best_block = BestBlock::new(block_hash, height);
+			self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.height <= height);
+			self.onchain_tx_handler.block_disconnected(height + 1, broadcaster, fee_estimator, logger);
+			Vec::new()
+		}
 	}
 
 	fn transactions_confirmed<B: Deref, F: Deref, L: Deref>(
@@ -2275,7 +2282,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		//We may discard:
 		//- htlc update there as failure-trigger tx (revoked commitment tx, non-revoked commitment tx, HTLC-timeout tx) has been disconnected
 		//- maturing spendable output has transaction paying us has been disconnected
-		self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.height != height);
+		self.onchain_events_waiting_threshold_conf.retain(|ref entry| entry.height < height);
 
 		self.onchain_tx_handler.block_disconnected(height, broadcaster, fee_estimator, logger);
 

lightning/src/ln/onchaintx.rs

@@ -848,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());
 				}
 			}
@@ -878,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 {
@@ -912,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 });