f drop onchain amount in IrrevocableResolvedHTLC

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -589,8 +589,6 @@ struct IrrevocablyResolvedHTLC {
 	/// The txid of the transaction which resolved the HTLC, this may be a commitment,
 	/// HTLC-Success, or HTLC-Timeout transaction.
 	resolving_txid: Option<Txid>,
-	/// The amount of the output for this HTLC in `resolving_txid`.
-	onchain_value_satoshis: Option<u64>,
 	/// Only set if the HTLC claim was ours using a payment preimage
 	payment_preimage: Option<PaymentPreimage>,
 }
@@ -599,7 +597,6 @@ impl_writeable_tlv_based!(IrrevocablyResolvedHTLC, {
 	(0, commitment_tx_output_idx, required),
 	(1, resolving_txid, option),
 	(2, payment_preimage, option),
-	(3, onchain_value_satoshis, option),
 });
 
 /// A ChannelMonitor handles chain events (blocks connected and disconnected) and generates
@@ -2704,7 +2701,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 					if let Some(idx) = commitment_tx_output_idx {
 						self.htlcs_resolved_on_chain.push(IrrevocablyResolvedHTLC {
 							commitment_tx_output_idx: idx, resolving_txid: Some(entry.txid),
-							payment_preimage: None, onchain_value_satoshis,
+							payment_preimage: None,
 						});
 					}
 				},
@@ -2714,10 +2711,11 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 						outputs: vec![descriptor]
 					});
 				},
-				OnchainEvent::HTLCSpendConfirmation { commitment_tx_output_idx, preimage, onchain_value_satoshis, .. } => {
+				OnchainEvent::HTLCSpendConfirmation { commitment_tx_output_idx, preimage, .. } => {
 					self.htlcs_resolved_on_chain.push(IrrevocablyResolvedHTLC {
 						commitment_tx_output_idx, resolving_txid: Some(entry.txid),
-						payment_preimage: preimage, onchain_value_satoshis });
+						payment_preimage: preimage,
+					});
 				},
 				OnchainEvent::FundingSpendConfirmation { commitment_tx_to_counterparty_output, .. } => {
 					self.funding_spend_confirmed = Some(entry.txid);