f unwind onchain value

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1527,12 +1527,10 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 								// `StaticOutput` in a `MaturingOutput` in the revoked
 								// counterparty commitment transaction case generally, so don't
 								// need to do so again here.
-							} else if let Some((_, _, amount_sats_option)) = htlc_spend_pending {
-								if let Some(amount_sats) = amount_sats_option {
-									res.push(Balance::CounterpartyRevokedOutputClaimable {
-										claimable_amount_satoshis: amount_sats,
-									});
-								}
+							} else if htlc_spend_pending.is_some() {
+								res.push(Balance::CounterpartyRevokedOutputClaimable {
+									claimable_amount_satoshis: htlc.amount_msat / 1000,
+								});
 							} else if htlc_resolved.is_some() {
 								res.push(Balance::CounterpartyRevokedOutputClaimable {
 									claimable_amount_satoshis: htlc.amount_msat / 1000,

lightning/src/ln/monitor_tests.rs

@@ -1062,10 +1062,10 @@ fn test_revoked_counterparty_htlc_tx_balances() {
 			confirmation_height: to_remote_conf_height,
 		}, Balance::CounterpartyRevokedOutputClaimable { // to_self output to A
 			claimable_amount_satoshis: 10_000,
+		}, Balance::CounterpartyRevokedOutputClaimable { // HTLC 1
+			claimable_amount_satoshis: 3_000,
 		}, Balance::CounterpartyRevokedOutputClaimable { // HTLC 2
 			claimable_amount_satoshis: 1_000,
-		}, Balance::CounterpartyRevokedOutputClaimable {
-			claimable_amount_satoshis: revoked_htlc_success_txn[0].output[0].value,
 		}]),
 		sorted_vec(nodes[0].chain_monitor.chain_monitor.get_monitor(funding_outpoint).unwrap().get_claimable_balances()));
 
@@ -1138,7 +1138,7 @@ fn test_revoked_counterparty_htlc_tx_balances() {
 	assert_eq!(sorted_vec(vec![Balance::CounterpartyRevokedOutputClaimable { // to_self output to A
 			claimable_amount_satoshis: 10_000,
 		}, Balance::CounterpartyRevokedOutputClaimable { // HTLC 2
-			claimable_amount_satoshis: revoked_htlc_timeout_txn[0].output[0].value,
+			claimable_amount_satoshis: 1_000,
 		}]),
 		sorted_vec(nodes[0].chain_monitor.chain_monitor.get_monitor(funding_outpoint).unwrap().get_claimable_balances()));