f set proper error height in HTLC time outs

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3066,7 +3066,12 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 					// number of blocks we generally consider it to take to do a commitment update,
 					// just give up on it and fail he HTLC.
 					if height >= htlc.cltv_expiry - CLTV_CLAIM_BUFFER - LATENCY_GRACE_PERIOD_BLOCKS {
-						timed_out_htlcs.push((HTLCSource::PreviousHopData(htlc.prev_hop.clone()), payment_hash.clone(), htlc.value));
+						let mut htlc_msat_height_data = byte_utils::be64_to_array(htlc.value).to_vec();
+						htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(height));
+						timed_out_htlcs.push((HTLCSource::PreviousHopData(htlc.prev_hop.clone()), payment_hash.clone(), HTLCFailReason::Reason {
+							failure_code: 0x4000 | 15,
+							data: htlc_msat_height_data
+						}));
 						false
 					} else { true }
 				});
@@ -3077,17 +3082,10 @@ impl<ChanSigner: ChannelKeys, M: Deref + Sync + Send, T: Deref + Sync + Send, K:
 			self.finish_force_close_channel(failure);
 		}
 
-		for (source, payment_hash, value) in timed_out_htlcs.drain(..) {
+		for (source, payment_hash, reason) in timed_out_htlcs.drain(..) {
 			// Call it incorrect_or_unknown_payment_details as the issue, ultimately, is that the
 			// user failed to provide us a preimage within the cltv_expiry time window.
-			let mut htlc_msat_height_data = byte_utils::be64_to_array(value).to_vec();
-			htlc_msat_height_data.extend_from_slice(&byte_utils::be32_to_array(
-				self.latest_block_height.load(Ordering::Acquire) as u32,
-			));
-			self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), source, &payment_hash, HTLCFailReason::Reason {
-				failure_code: 0x4000 | 15,
-				data: htlc_msat_height_data
-			});
+			self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), source, &payment_hash, reason);
 		}
 		self.latest_block_height.store(height as usize, Ordering::Release);
 		*self.last_block_hash.try_lock().expect("block_(dis)connected must not be called in parallel") = header_hash;

lightning/src/ln/functional_tests.rs

@@ -3698,7 +3698,7 @@ fn test_htlc_timeout() {
 			assert_eq!(payment_hash, our_payment_hash);
 			assert!(rejected_by_dest);
 			assert_eq!(error_code.unwrap(), 0x4000 | 15);
-			// 100_000 msat as u64, followed by a height of 122 as u32
+			// 100_000 msat as u64, followed by a height of 123 as u32
 			assert_eq!(&error_data.as_ref().unwrap()[..], &[
 				((100_000u64 >> 7*8) & 0xff) as u8,
 				((100_000u64 >> 6*8) & 0xff) as u8,
@@ -3708,7 +3708,7 @@ fn test_htlc_timeout() {
 				((100_000u64 >> 2*8) & 0xff) as u8,
 				((100_000u64 >> 1*8) & 0xff) as u8,
 				((100_000u64 >> 0*8) & 0xff) as u8,
-				0, 0, 0, 122]);
+				0, 0, 0, 123]);
 		},
 		_ => panic!("Unexpected event"),
 	}