@@ -6269,3 +6269,98 @@ fn test_check_htlc_underpaying() {
6269
6269
}
6270
6270
nodes[ 1 ] . node . get_and_clear_pending_events ( ) ;
6271
6271
}
6272
+
6273
+ #[ test]
6274
+ fn test_bump_penalty_txn_on_revoked_commitment ( ) {
6275
+ // In case of penalty txn with too low feerates for getting into mempools, RBF-bump them to be sure
6276
+ // we're able to claim outputs on revoked commitment transaction before timelocks expiration
6277
+
6278
+ let nodes = create_network ( 2 , & [ None , None ] ) ;
6279
+
6280
+ let chan = create_announced_chan_between_nodes_with_value ( & nodes, 0 , 1 , 1000000 , 59000000 , LocalFeatures :: new ( ) , LocalFeatures :: new ( ) ) ;
6281
+ let payment_preimage = route_payment ( & nodes[ 0 ] , & vec ! ( & nodes[ 1 ] ) [ ..] , 3000000 ) . 0 ;
6282
+ route_payment ( & nodes[ 1 ] , & vec ! ( & nodes[ 0 ] ) [ ..] , 3000000 ) . 0 ;
6283
+ let revoked_txn = nodes[ 0 ] . node . channel_state . lock ( ) . unwrap ( ) . by_id . get ( & chan. 2 ) . unwrap ( ) . last_local_commitment_txn . clone ( ) ;
6284
+ // Revoked commitment txn with 4 outputs : to_local, to_remote, 1 outgoing HTLC, 1 incoming HTLC
6285
+ assert_eq ! ( revoked_txn[ 0 ] . output. len( ) , 4 ) ;
6286
+ assert_eq ! ( revoked_txn[ 0 ] . input. len( ) , 1 ) ;
6287
+ assert_eq ! ( revoked_txn[ 0 ] . input[ 0 ] . previous_output. txid, chan. 3 . txid( ) ) ;
6288
+ let revoked_txid = revoked_txn[ 0 ] . txid ( ) ;
6289
+
6290
+ let mut penalty_sum = 0 ;
6291
+ for outp in revoked_txn[ 0 ] . output . iter ( ) {
6292
+ if outp. script_pubkey . is_v0_p2wsh ( ) {
6293
+ penalty_sum += outp. value ;
6294
+ }
6295
+ }
6296
+
6297
+ // Actually revoke tx by claiming a HTLC
6298
+ claim_payment ( & nodes[ 0 ] , & vec ! ( & nodes[ 1 ] ) [ ..] , payment_preimage, 3_000_000 ) ;
6299
+ let header = BlockHeader { version : 0x20000000 , prev_blockhash : Default :: default ( ) , merkle_root : Default :: default ( ) , time : 42 , bits : 42 , nonce : 42 } ;
6300
+ nodes[ 1 ] . block_notifier . block_connected ( & Block { header, txdata : vec ! [ revoked_txn[ 0 ] . clone( ) ] } , 1 ) ;
6301
+
6302
+ // One or more justice tx should have been broadcast, check it
6303
+ let penalty_1;
6304
+ let feerate_1;
6305
+ {
6306
+ let mut node_txn = nodes[ 1 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) ;
6307
+ assert_eq ! ( node_txn. len( ) , 4 ) ; // justice tx (broadcasted from ChannelMonitor) * 2 (block-reparsing) + local commitment tx + local HTLC-timeout (broadcasted from ChannelManager)
6308
+ assert_eq ! ( node_txn[ 0 ] , node_txn[ 3 ] ) ;
6309
+ assert_eq ! ( node_txn[ 0 ] . input. len( ) , 3 ) ; // Penalty txn claims to_local, offered_htlc and received_htlc outputs
6310
+ assert_eq ! ( node_txn[ 0 ] . output. len( ) , 1 ) ;
6311
+ check_spends ! ( node_txn[ 0 ] , revoked_txn[ 0 ] . clone( ) ) ;
6312
+ let fee_1 = penalty_sum - node_txn[ 0 ] . output [ 0 ] . value ;
6313
+ feerate_1 = fee_1 * 1000 / node_txn[ 0 ] . get_weight ( ) as u64 ;
6314
+ penalty_1 = node_txn[ 0 ] . txid ( ) ;
6315
+ node_txn. clear ( ) ;
6316
+ } ;
6317
+
6318
+ // After exhaustion of height timer, a new bumped justice tx should have been broadcast, check it
6319
+ let header = connect_blocks ( & nodes[ 1 ] . block_notifier , 15 , 1 , true , header. bitcoin_hash ( ) ) ;
6320
+ let mut penalty_2 = penalty_1;
6321
+ let mut feerate_2 = 0 ;
6322
+ {
6323
+ let mut node_txn = nodes[ 1 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) ;
6324
+ assert_eq ! ( node_txn. len( ) , 1 ) ;
6325
+ if node_txn[ 0 ] . input [ 0 ] . previous_output . txid == revoked_txid {
6326
+ assert_eq ! ( node_txn[ 0 ] . input. len( ) , 3 ) ; // Penalty txn claims to_local, offered_htlc and received_htlc outputs
6327
+ assert_eq ! ( node_txn[ 0 ] . output. len( ) , 1 ) ;
6328
+ check_spends ! ( node_txn[ 0 ] , revoked_txn[ 0 ] . clone( ) ) ;
6329
+ penalty_2 = node_txn[ 0 ] . txid ( ) ;
6330
+ // Verify new bumped tx is different from last claiming transaction, we don't want spurrious rebroadcast
6331
+ assert_ne ! ( penalty_2, penalty_1) ;
6332
+ let fee_2 = penalty_sum - node_txn[ 0 ] . output [ 0 ] . value ;
6333
+ feerate_2 = fee_2 * 1000 / node_txn[ 0 ] . get_weight ( ) as u64 ;
6334
+ // Verify 25% bump heuristic
6335
+ assert ! ( feerate_2 * 100 >= feerate_1 * 125 ) ;
6336
+ node_txn. clear ( ) ;
6337
+ }
6338
+ }
6339
+ assert_ne ! ( feerate_2, 0 ) ;
6340
+
6341
+ // After exhaustion of height timer for a 2nd time, a new bumped justice tx should have been broadcast, check it
6342
+ connect_blocks ( & nodes[ 1 ] . block_notifier , 15 , 16 , true , header) ;
6343
+ let penalty_3;
6344
+ let mut feerate_3 = 0 ;
6345
+ {
6346
+ let mut node_txn = nodes[ 1 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) ;
6347
+ assert_eq ! ( node_txn. len( ) , 1 ) ;
6348
+ if node_txn[ 0 ] . input [ 0 ] . previous_output . txid == revoked_txid {
6349
+ assert_eq ! ( node_txn[ 0 ] . input. len( ) , 3 ) ; // Penalty txn claims to_local, offered_htlc and received_htlc outputs
6350
+ assert_eq ! ( node_txn[ 0 ] . output. len( ) , 1 ) ;
6351
+ check_spends ! ( node_txn[ 0 ] , revoked_txn[ 0 ] . clone( ) ) ;
6352
+ penalty_3 = node_txn[ 0 ] . txid ( ) ;
6353
+ // Verify new bumped tx is different from last claiming transaction, we don't want spurrious rebroadcast
6354
+ assert_ne ! ( penalty_3, penalty_2) ;
6355
+ let fee_3 = penalty_sum - node_txn[ 0 ] . output [ 0 ] . value ;
6356
+ feerate_3 = fee_3 * 1000 / node_txn[ 0 ] . get_weight ( ) as u64 ;
6357
+ // Verify 25% bump heuristic
6358
+ assert ! ( feerate_3 * 100 >= feerate_2 * 125 ) ;
6359
+ node_txn. clear ( ) ;
6360
+ }
6361
+ }
6362
+ assert_ne ! ( feerate_3, 0 ) ;
6363
+
6364
+ nodes[ 1 ] . node . get_and_clear_pending_events ( ) ;
6365
+ nodes[ 1 ] . node . get_and_clear_pending_msg_events ( ) ;
6366
+ }
0 commit comments