HTLCUpdate::htlc_value_satoshis -> msats

We need this level of precision when generating this event for off-chain
claims.

One test failed due to us previously overreporting a fee due to this lack of
precision, fixed now.

Author: valentinewallace

lightning/src/chain/channelmonitor.rs

@@ -260,15 +260,16 @@ pub struct HTLCUpdate {
 	pub(crate) payment_hash: PaymentHash,
 	pub(crate) payment_preimage: Option<PaymentPreimage>,
 	pub(crate) source: HTLCSource,
-	pub(crate) htlc_value_satoshis: Option<u64>,
+	pub(crate) htlc_value_msat: Option<u64>,
 	pub(crate) user_channel_id: Option<u128>,
 }
 impl_writeable_tlv_based!(HTLCUpdate, {
 	(0, payment_hash, required),
-	(1, htlc_value_satoshis, option),
+	(1, htlc_value_satoshis, (legacy, u64, |_| Ok(()), |us: &HTLCUpdate| us.htlc_value_msat.map(|v| v / 1000))),
 	(2, source, required),
 	(4, payment_preimage, option),
 	(5, user_channel_id, option),
+	(7, htlc_value_msat, (default_value, htlc_value_satoshis.map(|v: u64| v * 1000))), // Added in 0.4
 });
 
 /// If an output goes from claimable only by us to claimable by us or our counterparty within this
@@ -3856,7 +3857,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						payment_hash: htlc.payment_hash,
 						payment_preimage: Some(*claimed_preimage),
 						source: *source.clone(),
-						htlc_value_satoshis: Some(htlc.amount_msat),
+						htlc_value_msat: Some(htlc.amount_msat),
 						user_channel_id: self.user_channel_id,
 					}));
 				}
@@ -4575,7 +4576,6 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			if self.counterparty_fulfilled_htlcs.get(&SentHTLCId::from_source(source)).is_some() {
 				continue;
 			}
-			let htlc_value_satoshis = Some(amount_msat / 1000);
 			let logger = WithContext::from(logger, None, None, Some(payment_hash));
 			// Defensively mark the HTLC as failed back so the expiry-based failure
 			// path in `block_connected` doesn't generate a duplicate `HTLCUpdate`
@@ -4594,7 +4594,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						payment_hash,
 						payment_preimage: None,
 						source: source.clone(),
-						htlc_value_satoshis,
+						htlc_value_msat: Some(amount_msat),
 						user_channel_id: self.user_channel_id,
 					}),
 					&mut self.next_monitor_event_id,
@@ -4616,7 +4616,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					event: OnchainEvent::HTLCUpdate {
 						source: source.clone(),
 						payment_hash,
-						htlc_value_satoshis,
+						htlc_value_satoshis: Some(amount_msat / 1000),
 						commitment_tx_output_idx: None,
 					},
 				};
@@ -5932,7 +5932,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						payment_hash,
 						payment_preimage: None,
 						source,
-						htlc_value_satoshis,
+						htlc_value_msat: htlc_value_satoshis.map(|v| v * 1000),
 						user_channel_id: self.user_channel_id,
 					}));
 					self.htlcs_resolved_on_chain.push(IrrevocablyResolvedHTLC {
@@ -6043,7 +6043,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						source: source.clone(),
 						payment_preimage: None,
 						payment_hash: htlc.payment_hash,
-						htlc_value_satoshis: Some(htlc.amount_msat / 1000),
+						htlc_value_msat: Some(htlc.amount_msat),
 						user_channel_id: self.user_channel_id,
 					}), &mut self.next_monitor_event_id);
 				}
@@ -6461,7 +6461,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 							source,
 							payment_preimage: Some(payment_preimage),
 							payment_hash,
-							htlc_value_satoshis: Some(amount_msat / 1000),
+							htlc_value_msat: Some(amount_msat),
 							user_channel_id: self.user_channel_id,
 						}), &mut self.next_monitor_event_id);
 					}
@@ -6486,7 +6486,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 							source,
 							payment_preimage: Some(payment_preimage),
 							payment_hash,
-							htlc_value_satoshis: Some(amount_msat / 1000),
+							htlc_value_msat: Some(amount_msat),
 							user_channel_id: self.user_channel_id,
 						}), &mut self.next_monitor_event_id);
 					}

lightning/src/ln/channelmanager.rs

@@ -13738,7 +13738,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 								self.claim_funds_internal(
 									htlc_update.source,
 									preimage,
-									htlc_update.htlc_value_satoshis.map(|v| v * 1000),
+									htlc_update.htlc_value_msat,
 									None,
 									from_onchain,
 									counterparty_node_id,

lightning/src/ln/functional_tests.rs

@@ -4294,7 +4294,7 @@ pub fn test_duplicate_payment_hash_one_failure_one_success() {
 	// Finally, give node B the HTLC success transaction and ensure it extracts the preimage to
 	// provide to node A.
 	mine_transaction(&nodes[1], htlc_success_tx_to_confirm);
-	expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(392), true, true);
+	expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(196), true, true);
 	let mut updates = get_htlc_update_msgs(&nodes[1], &node_a_id);
 	assert!(updates.update_add_htlcs.is_empty());
 	assert!(updates.update_fail_htlcs.is_empty());