@@ -9153,116 +9153,3 @@ fn test_keysend_payments_to_private_node() {
9153
9153
pass_along_path ( & nodes[ 0 ] , & path, 10000 , payment_hash, None , event, true , Some ( test_preimage) ) ;
9154
9154
claim_payment ( & nodes[ 0 ] , & path, test_preimage) ;
9155
9155
}
9156
-
9157
- fn do_test_max_dust_htlc_exposure ( dust_outbound_balance : bool , at_forward : bool , on_holder_tx : bool ) {
9158
- // Test that we properly reject dust HTLC violating our `max_dust_htlc_exposure_msat` policy.
9159
- //
9160
- // At HTLC forward (`send_payment()`), if the sum of the trimmed-to-dust HTLC inbound and
9161
- // trimmed-to-dust HTLC outbound balance and this new payment as included on next counterparty
9162
- // commitment are above our `max_dust_htlc_exposure_msat`, we'll reject the update.
9163
- // At HTLC reception (`update_add_htlc()`), if the sum of the trimmed-to-dust HTLC inbound
9164
- // and trimmed-to-dust HTLC outbound balance and this new received HTLC as included on next
9165
- // counterparty commitment are above our `max_dust_htlc_exposure_msat`, we'll fail the update.
9166
- // Note, we return a `temporary_channel_failure` (0x1000 | 7), as the channel might be
9167
- // available again for HTLC processing once the dust bandwidth has cleared up.
9168
-
9169
- let chanmon_cfgs = create_chanmon_cfgs ( 2 ) ;
9170
- let mut config = test_default_channel_config ( ) ;
9171
- config. channel_options . max_dust_htlc_exposure_msat = 5_000_000 ; // default setting value
9172
- let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
9173
- let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , Some ( config) ] ) ;
9174
- let mut nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
9175
-
9176
- nodes[ 0 ] . node . create_channel ( nodes[ 1 ] . node . get_our_node_id ( ) , 1_000_000 , 500_000_000 , 42 , None ) . unwrap ( ) ;
9177
- let mut open_channel = get_event_msg ! ( nodes[ 0 ] , MessageSendEvent :: SendOpenChannel , nodes[ 1 ] . node. get_our_node_id( ) ) ;
9178
- open_channel. max_htlc_value_in_flight_msat = 50_000_000 ;
9179
- open_channel. max_accepted_htlcs = 60 ;
9180
- nodes[ 1 ] . node . handle_open_channel ( & nodes[ 0 ] . node . get_our_node_id ( ) , InitFeatures :: known ( ) , & open_channel) ;
9181
- let mut accept_channel = get_event_msg ! ( nodes[ 1 ] , MessageSendEvent :: SendAcceptChannel , nodes[ 0 ] . node. get_our_node_id( ) ) ;
9182
- if on_holder_tx {
9183
- accept_channel. dust_limit_satoshis = 660 ;
9184
- }
9185
- nodes[ 0 ] . node . handle_accept_channel ( & nodes[ 1 ] . node . get_our_node_id ( ) , InitFeatures :: known ( ) , & accept_channel) ;
9186
-
9187
- let ( temporary_channel_id, tx, _) = create_funding_transaction ( & nodes[ 0 ] , 1_000_000 , 42 ) ;
9188
-
9189
- if on_holder_tx {
9190
- if let Some ( mut chan) = nodes[ 1 ] . node . channel_state . lock ( ) . unwrap ( ) . by_id . get_mut ( & temporary_channel_id) {
9191
- chan. holder_dust_limit_satoshis = 660 ;
9192
- }
9193
- }
9194
-
9195
- nodes[ 0 ] . node . funding_transaction_generated ( & temporary_channel_id, tx. clone ( ) ) . unwrap ( ) ;
9196
- 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( ) ) ) ;
9197
- check_added_monitors ! ( nodes[ 1 ] , 1 ) ;
9198
-
9199
- 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( ) ) ) ;
9200
- check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
9201
-
9202
- let ( funding_locked, _) = create_chan_between_nodes_with_value_confirm ( & nodes[ 0 ] , & nodes[ 1 ] , & tx) ;
9203
- let ( announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b ( & nodes[ 0 ] , & nodes[ 1 ] , & funding_locked) ;
9204
- update_nodes_with_chan_announce ( & nodes, 0 , 1 , & announcement, & as_update, & bs_update) ;
9205
-
9206
- if on_holder_tx {
9207
- if dust_outbound_balance {
9208
- for i in 0 ..2 {
9209
- let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , 2_300_000 ) ;
9210
- if let Err ( _) = nodes[ 1 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) { panic ! ( "Unexpected event at dust HTLC {}" , i) ; }
9211
- }
9212
- } else {
9213
- for _ in 0 ..2 {
9214
- route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 2_300_000 ) ;
9215
- }
9216
- }
9217
- } else {
9218
- if dust_outbound_balance {
9219
- for i in 0 ..25 {
9220
- let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , 200_000 ) ; // + 177_000 msat of HTLC-success tx at 253 sats/kWU
9221
- if let Err ( _) = nodes[ 1 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) { panic ! ( "Unexpected event at dust HTLC {}" , i) ; }
9222
- }
9223
- } else {
9224
- for _ in 0 ..25 {
9225
- route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] ] , 200_000 ) ; // + 167_000 msat of HTLC-timeout tx at 253 sats/kWU
9226
- }
9227
- }
9228
- }
9229
-
9230
- if at_forward {
9231
- let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 1 ] , nodes[ 0 ] , if on_holder_tx { 2_300_000 } else { 200_000 } ) ;
9232
- let mut config = UserConfig :: default ( ) ;
9233
- if on_holder_tx {
9234
- 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_900_000 , config. channel_options. max_dust_htlc_exposure_msat) ) ) ;
9235
- } else {
9236
- 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) ) ) ;
9237
- }
9238
- } else {
9239
- let ( route, payment_hash, _, payment_secret) = get_route_and_payment_hash ! ( nodes[ 0 ] , nodes[ 1 ] , if on_holder_tx { 2_300_000 } else { 200_000 } ) ;
9240
- nodes[ 0 ] . node . send_payment ( & route, payment_hash, & Some ( payment_secret) ) . unwrap ( ) ;
9241
- check_added_monitors ! ( nodes[ 0 ] , 1 ) ;
9242
- let mut events = nodes[ 0 ] . node . get_and_clear_pending_msg_events ( ) ;
9243
- assert_eq ! ( events. len( ) , 1 ) ;
9244
- let payment_event = SendEvent :: from_event ( events. remove ( 0 ) ) ;
9245
- nodes[ 1 ] . node . handle_update_add_htlc ( & nodes[ 0 ] . node . get_our_node_id ( ) , & payment_event. msgs [ 0 ] ) ;
9246
- if on_holder_tx {
9247
- 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_900_000 , config. channel_options. max_dust_htlc_exposure_msat) , 1 ) ;
9248
- } else {
9249
- 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 ) ;
9250
- }
9251
- }
9252
-
9253
- let _ = nodes[ 1 ] . node . get_and_clear_pending_msg_events ( ) ;
9254
- let mut added_monitors = nodes[ 1 ] . chain_monitor . added_monitors . lock ( ) . unwrap ( ) ;
9255
- added_monitors. clear ( ) ;
9256
- }
9257
-
9258
- #[ test]
9259
- fn test_max_dust_htlc_exposure ( ) {
9260
- do_test_max_dust_htlc_exposure ( true , true , true ) ;
9261
- do_test_max_dust_htlc_exposure ( false , true , true ) ;
9262
- do_test_max_dust_htlc_exposure ( false , false , true ) ;
9263
- do_test_max_dust_htlc_exposure ( false , false , false ) ;
9264
- do_test_max_dust_htlc_exposure ( true , true , false ) ;
9265
- do_test_max_dust_htlc_exposure ( true , false , false ) ;
9266
- do_test_max_dust_htlc_exposure ( true , false , true ) ;
9267
- do_test_max_dust_htlc_exposure ( false , true , false ) ;
9268
- }
0 commit comments