@@ -9262,3 +9262,133 @@ fn test_keysend_payments_to_private_node() {
9262
9262
pass_along_path ( & nodes[ 0 ] , & path, 10000 , payment_hash, None , event, true , Some ( test_preimage) ) ;
9263
9263
claim_payment ( & nodes[ 0 ] , & path, test_preimage) ;
9264
9264
}
9265
+
9266
+ fn do_test_max_dust_htlc_exposure ( dust_outbound_balance : bool , at_forward : bool , on_holder_tx : bool ) {
9267
+ // Test that we properly reject dust HTLC violating our `max_dust_htlc_exposure_msat`
9268
+ // policy.
9269
+ //
9270
+ // At HTLC forward (`send_payment()`), if the sum of the trimmed-to-dust HTLC inbound and
9271
+ // trimmed-to-dust HTLC outbound balance and this new payment as included on next
9272
+ // counterparty commitment are above our `max_dust_htlc_exposure_msat`, we'll reject the
9273
+ // update. At HTLC reception (`update_add_htlc()`), if the sum of the trimmed-to-dust HTLC
9274
+ // inbound and trimmed-to-dust HTLC outbound balance and this new received HTLC as included
9275
+ // on next counterparty commitment are above our `max_dust_htlc_exposure_msat`, we'll fail
9276
+ // the update. Note, we return a `temporary_channel_failure` (0x1000 | 7), as the channel
9277
+ // might be available again for HTLC processing once the dust bandwidth has cleared up.
9278
+
9279
+ let chanmon_cfgs = create_chanmon_cfgs ( 2 ) ;
9280
+ let mut config = test_default_channel_config ( ) ;
9281
+ config. channel_options . max_dust_htlc_exposure_msat = 5_000_000 ; // default setting value
9282
+ let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
9283
+ let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , Some ( config) ] ) ;
9284
+ let mut nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
9285
+
9286
+ nodes[ 0 ] . node . create_channel ( nodes[ 1 ] . node . get_our_node_id ( ) , 1_000_000 , 500_000_000 , 42 , None ) . unwrap ( ) ;
9287
+ let mut open_channel = get_event_msg ! ( nodes[ 0 ] , MessageSendEvent :: SendOpenChannel , nodes[ 1 ] . node. get_our_node_id( ) ) ;
9288
+ open_channel. max_htlc_value_in_flight_msat = 50_000_000 ;
9289
+ open_channel. max_accepted_htlcs = 60 ;
9290
+ nodes[ 1 ] . node . handle_open_channel ( & nodes[ 0 ] . node . get_our_node_id ( ) , InitFeatures :: known ( ) , & open_channel) ;
9291
+ let mut accept_channel = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendAcceptChannel , nodes[ 0 ] . node. get_our_node_id( ) ) ;
9292
+ if on_holder_tx {
9293
+ accept_channel. dust_limit_satoshis = 546 ;
9294
+ }
9295
+ nodes[ 0 ] . node . handle_accept_channel ( & nodes[ 1 ] . node . get_our_node_id ( ) , InitFeatures :: known ( ) , & accept_channel) ;
9296
+
9297
+ let ( temporary_channel_id, tx, _) = create_funding_transaction ( & nodes[ 0 ] , 1_000_000 , 42 ) ;
9298
+
9299
+ if on_holder_tx {
9300
+ if let Some ( mut chan) = nodes[ 1 ] . node . channel_state . lock ( ) . unwrap ( ) . by_id . get_mut ( & temporary_channel_id) {
9301
+ chan. holder_dust_limit_satoshis = 546 ;
9302
+ }
9303
+ }
9304
+
9305
+ nodes[ 0 ] . node . funding_transaction_generated ( & temporary_channel_id, tx. clone ( ) ) . unwrap ( ) ;
9306
+ nodes[ 1 ] . node . handle_funding_created ( & nodes[ 0 ] . node . get_our_node_id ( ) , & get_event_msg ! ( nodes[ 0 ] , MessageSendEvent :: SendFundingCreated , nodes[ 1 ] . node. get_our_node_id( ) ) ) ;
9307
+ check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
9308
+
9309
+ nodes[ 0 ] . node . handle_funding_signed ( & nodes[ 1 ] . node . get_our_node_id ( ) , & get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendFundingSigned , nodes[ 0 ] . node. get_our_node_id( ) ) ) ;
9310
+ check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
9311
+
9312
+ let ( funding_locked, _) = create_chan_between_nodes_with_value_confirm ( & nodes[ 0 ] , & nodes[ 1 ] , & tx) ;
9313
+ let ( announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b ( & nodes[ 0 ] , & nodes[ 1 ] , & funding_locked) ;
9314
+ update_nodes_with_chan_announce ( & nodes, 0 , 1 , & announcement, & as_update, & bs_update) ;
9315
+
9316
+ if on_holder_tx {
9317
+ if dust_outbound_balance {
9318
+ // Outbound dust threshold: 2223 sats (`dust_buffer_feerate` * HTLC_TIMEOUT_TX_WEIGHT / 1000 + holder's `dust_limit_satoshis`)
9319
+ // Outbound dust balance: 4372 sats
9320
+ // Note, we need sent payment to be above outbound dust threshold on counterparty_tx of 2132 sats
9321
+ for i in 0 ..2 {
9322
+ let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , 2_186_000 ) ;
9323
+ if let Err ( _) = nodes[ 1 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) { panic ! ( "Unexpected event at dust HTLC {}" , i) ; }
9324
+ }
9325
+ } else {
9326
+ // Inbound dust threshold: 2324 sats (`dust_buffer_feerate` * HTLC_SUCCESS_TX_WEIGHT / 1000 + holder's `dust_limit_satoshis`)
9327
+ // Inbound dust balance: 4372 sats
9328
+ // Note, we need sent payment to be above outbound dust threshold on counterparty_tx of 2031 sats
9329
+ for _ in 0 ..2 {
9330
+ route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 2_186_000 ) ;
9331
+ }
9332
+ }
9333
+ } else {
9334
+ if dust_outbound_balance {
9335
+ // Outbound dust threshold: 2132 sats (`dust_buffer_feerate` * HTLC_TIMEOUT_TX_WEIGHT / 1000 + counteparty's `dust_limit_satoshis`)
9336
+ // Outbound dust balance: 5000 sats
9337
+ for i in 0 ..25 {
9338
+ let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , 200_000 ) ;
9339
+ if let Err ( _) = nodes[ 1 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) { panic ! ( "Unexpected event at dust HTLC {}" , i) ; }
9340
+ }
9341
+ } else {
9342
+ // Inbound dust threshold: 2031 sats (`dust_buffer_feerate` * HTLC_TIMEOUT_TX_WEIGHT / 1000 + counteparty's `dust_limit_satoshis`)
9343
+ // Inbound dust balance: 5000 sats
9344
+ for _ in 0 ..25 {
9345
+ route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 200_000 ) ;
9346
+ }
9347
+ }
9348
+ }
9349
+
9350
+ if at_forward {
9351
+ let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , if on_holder_tx { 2_186_000 } else { 200_000 } ) ;
9352
+ let mut config = UserConfig :: default ( ) ;
9353
+ // With default dust exposure: 5000 sats
9354
+ if on_holder_tx {
9355
+ // Outbound dust balance: 6558 sats
9356
+ unwrap_send_err ! ( nodes[ 1 ] . node. send_payment( & route, payment_hash, & Some ( payment_secret) ) , true , APIError :: ChannelUnavailable { ref err } , assert_eq!( err, & format!( "Cannot send value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx" , 6_558_000 , config. channel_options. max_dust_htlc_exposure_msat) ) ) ;
9357
+ } else {
9358
+ // Outbound dust balance: 5200 sats
9359
+ unwrap_send_err ! ( nodes[ 1 ] . node. send_payment( & route, payment_hash, & Some ( payment_secret) ) , true , APIError :: ChannelUnavailable { ref err } , assert_eq!( err, & format!( "Cannot send value that would put our exposure to dust HTLCs at {} over the limit {} on counterparty commitment tx" , 5_200_000 , config. channel_options. max_dust_htlc_exposure_msat) ) ) ;
9360
+ }
9361
+ } else {
9362
+ let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 0 ] , nodes[ 1 ] , if on_holder_tx { 2_186_000 } else { 200_000 } ) ;
9363
+ nodes[ 0 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) . unwrap ( ) ;
9364
+ check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
9365
+ let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
9366
+ assert_eq ! ( events. len( ) , 1 ) ;
9367
+ let payment_event = SendEvent :: from_event ( events. remove ( 0 ) ) ;
9368
+ nodes[ 1 ] . node . handle_update_add_htlc ( & nodes[ 0 ] . node . get_our_node_id ( ) , & payment_event. msgs [ 0 ] ) ;
9369
+ // With default dust exposure: 5000 sats
9370
+ if on_holder_tx {
9371
+ // Outbound dust balance: 6558 sats
9372
+ nodes[ 1 ] . logger . assert_log ( "lightning::ln::channel" . to_string ( ) , format ! ( "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx" , 6_558_000 , config. channel_options. max_dust_htlc_exposure_msat) , 1 ) ;
9373
+ } else {
9374
+ // Outbound dust balance: 5200 sats
9375
+ nodes[ 1 ] . logger . assert_log ( "lightning::ln::channel" . to_string ( ) , format ! ( "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on counterparty commitment tx" , 5_200_000 , config. channel_options. max_dust_htlc_exposure_msat) , 1 ) ;
9376
+ }
9377
+ }
9378
+
9379
+ let _ = nodes[ 1 ] . node . get_and_clear_pending_msg_events ( ) ;
9380
+ let mut added_monitors = nodes[ 1 ] . chain_monitor . added_monitors . lock ( ) . unwrap ( ) ;
9381
+ added_monitors. clear ( ) ;
9382
+ }
9383
+
9384
+ #[ test]
9385
+ fn test_max_dust_htlc_exposure ( ) {
9386
+ do_test_max_dust_htlc_exposure ( true , true , true ) ;
9387
+ do_test_max_dust_htlc_exposure ( false , true , true ) ;
9388
+ do_test_max_dust_htlc_exposure ( false , false , true ) ;
9389
+ do_test_max_dust_htlc_exposure ( false , false , false ) ;
9390
+ do_test_max_dust_htlc_exposure ( true , true , false ) ;
9391
+ do_test_max_dust_htlc_exposure ( true , false , false ) ;
9392
+ do_test_max_dust_htlc_exposure ( true , false , true ) ;
9393
+ do_test_max_dust_htlc_exposure ( false , true , false ) ;
9394
+ }
0 commit comments