@@ -3465,7 +3465,7 @@ mod tests {
3465
3465
assert_eq ! ( node_txn[ 3 ] . input. len( ) , 2 ) ;
3466
3466
node_txn[ 3 ] . verify ( & revoked_tx_map) . unwrap ( ) ;
3467
3467
3468
- assert_eq ! ( node_txn[ 0 ] . txid ( ) , node_txn[ 3 ] . txid ( ) ) ; // justice tx is duplicated due to block re-scanning
3468
+ assert_eq ! ( node_txn[ 0 ] , node_txn[ 3 ] ) ; // justice tx is duplicated due to block re-scanning
3469
3469
3470
3470
let witness_script_1 = node_txn[ 0 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3471
3471
let witness_script_2 = node_txn[ 0 ] . clone ( ) . input [ 1 ] . witness . pop ( ) . unwrap ( ) ;
@@ -3478,12 +3478,87 @@ mod tests {
3478
3478
}
3479
3479
3480
3480
assert_eq ! ( node_txn[ 1 ] . input. len( ) , 1 ) ;
3481
- let witness_script = node_txn[ 1 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3482
- assert_eq ! ( witness_script. len( ) , 71 ) ; // Spending funding tx unique txoutput, tx broadcasted by ChannelManager
3481
+ assert_eq ! ( node_txn[ 1 ] . input[ 0 ] . previous_output. txid, chan_1. 3 . txid( ) ) ; //Spending funding tx unique txouput, tx broadcasted by ChannelManager
3483
3482
3484
3483
assert_eq ! ( node_txn[ 2 ] . input. len( ) , 1 ) ;
3485
3484
let witness_script = node_txn[ 2 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3486
- assert_eq ! ( witness_script. len( ) , 133 ) ; //Spending a offered htlc output
3485
+ assert_eq ! ( witness_script. len( ) , 133 ) ; //Spending an offered htlc output
3486
+ assert_eq ! ( node_txn[ 2 ] . input[ 0 ] . previous_output. txid, node_txn[ 1 ] . txid( ) ) ;
3487
+ assert_ne ! ( node_txn[ 2 ] . input[ 0 ] . previous_output. txid, node_txn[ 0 ] . input[ 0 ] . previous_output. txid) ;
3488
+ assert_ne ! ( node_txn[ 2 ] . input[ 0 ] . previous_output. txid, node_txn[ 0 ] . input[ 1 ] . previous_output. txid) ;
3489
+
3490
+ }
3491
+ get_announce_close_broadcast_events ( & nodes, 0 , 1 ) ;
3492
+ assert_eq ! ( nodes[ 0 ] . node. list_channels( ) . len( ) , 0 ) ;
3493
+ assert_eq ! ( nodes[ 1 ] . node. list_channels( ) . len( ) , 0 ) ;
3494
+ }
3495
+
3496
+ #[ test]
3497
+ fn claim_htlc_outputs_single_tx ( ) {
3498
+ // Node revoked old state, htlcs have timed out, claim each of them in separated justice tx
3499
+
3500
+ let nodes = create_network ( 2 ) ;
3501
+
3502
+ let chan_1 = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
3503
+
3504
+ // Rebalance the network to generate htlc in the two directions
3505
+ send_payment ( & nodes[ 0 ] , & vec ! ( & nodes[ 1 ] ) [ ..] , 8000000 ) ;
3506
+ // node[0] is gonna to revoke an old state thus node[1] should be able to claim both offered/received HTLC outputs on top of commitment tx, but this
3507
+ // time as two different claim transactions as we're gonna to timeout htlc with given a high current height
3508
+ let payment_preimage_1 = route_payment ( & nodes[ 0 ] , & vec ! ( & nodes[ 1 ] ) [ ..] , 3000000 ) . 0 ;
3509
+ let _payment_preimage_2 = route_payment ( & nodes[ 1 ] , & vec ! ( & nodes[ 0 ] ) [ ..] , 3000000 ) . 0 ;
3510
+
3511
+ // Get the will-be-revoked local txn from node[0]
3512
+ let revoked_local_txn = nodes[ 0 ] . node . channel_state . lock ( ) . unwrap ( ) . by_id . get ( & chan_1. 2 ) . unwrap ( ) . last_local_commitment_txn . clone ( ) ;
3513
+
3514
+ //Revoke the old state
3515
+ claim_payment ( & nodes[ 0 ] , & vec ! ( & nodes[ 1 ] ) [ ..] , payment_preimage_1) ;
3516
+
3517
+ {
3518
+ let header = BlockHeader { version : 0x20000000 , prev_blockhash : Default :: default ( ) , merkle_root : Default :: default ( ) , time : 42 , bits : 42 , nonce : 42 } ;
3519
+
3520
+ nodes[ 0 ] . chain_monitor . block_connected_with_filtering ( & Block { header, txdata : vec ! [ revoked_local_txn[ 0 ] . clone( ) ] } , 200 ) ;
3521
+
3522
+ nodes[ 1 ] . chain_monitor . block_connected_with_filtering ( & Block { header, txdata : vec ! [ revoked_local_txn[ 0 ] . clone( ) ] } , 200 ) ;
3523
+ let node_txn = nodes[ 1 ] . tx_broadcaster . txn_broadcasted . lock ( ) . unwrap ( ) ;
3524
+ assert_eq ! ( node_txn. len( ) , 10 ) ; // ChannelManager : 2, ChannelMontitor: 8 (2 revocation htlc tx, 1 local commitment tx + 1 htlc timeout tx) * 2 (block-rescan)
3525
+
3526
+ assert_eq ! ( node_txn[ 0 ] , node_txn[ 6 ] ) ;
3527
+ assert_eq ! ( node_txn[ 1 ] , node_txn[ 7 ] ) ;
3528
+ assert_eq ! ( node_txn[ 2 ] , node_txn[ 8 ] ) ;
3529
+ assert_eq ! ( node_txn[ 3 ] , node_txn[ 9 ] ) ;
3530
+ assert_eq ! ( node_txn[ 2 ] , node_txn[ 4 ] ) ; //local commitment tx + htlc timeout tx broadcated by ChannelManger
3531
+ assert_eq ! ( node_txn[ 3 ] , node_txn[ 5 ] ) ;
3532
+
3533
+ assert_eq ! ( node_txn[ 0 ] . input. len( ) , 1 ) ;
3534
+ assert_eq ! ( node_txn[ 1 ] . input. len( ) , 1 ) ;
3535
+
3536
+ let mut revoked_tx_map = HashMap :: new ( ) ;
3537
+ revoked_tx_map. insert ( revoked_local_txn[ 0 ] . txid ( ) , revoked_local_txn[ 0 ] . clone ( ) ) ;
3538
+ node_txn[ 0 ] . verify ( & revoked_tx_map) . unwrap ( ) ;
3539
+ node_txn[ 1 ] . verify ( & revoked_tx_map) . unwrap ( ) ;
3540
+
3541
+ let witness_script_1 = node_txn[ 0 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3542
+ let witness_script_2 = node_txn[ 1 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3543
+ if witness_script_1. len ( ) > 133 {
3544
+ assert_eq ! ( witness_script_1. len( ) , 138 ) ;
3545
+ assert_eq ! ( witness_script_2. len( ) , 133 ) ;
3546
+ } else {
3547
+ assert_eq ! ( witness_script_1. len( ) , 133 ) ;
3548
+ assert_eq ! ( witness_script_2. len( ) , 138 ) ;
3549
+ }
3550
+
3551
+ let mut funding_tx_map = HashMap :: new ( ) ;
3552
+ funding_tx_map. insert ( chan_1. 3 . txid ( ) , chan_1. 3 . clone ( ) ) ;
3553
+ node_txn[ 2 ] . verify ( & funding_tx_map) . unwrap ( ) ;
3554
+ assert_eq ! ( node_txn[ 2 ] . input. len( ) , 1 ) ;
3555
+
3556
+ assert_eq ! ( node_txn[ 3 ] . input. len( ) , 1 ) ;
3557
+ let witness_script = node_txn[ 3 ] . clone ( ) . input [ 0 ] . witness . pop ( ) . unwrap ( ) ;
3558
+ assert_eq ! ( witness_script. len( ) , 133 ) ; //Spending an offered htlc output
3559
+ assert_eq ! ( node_txn[ 3 ] . input[ 0 ] . previous_output. txid, node_txn[ 2 ] . txid( ) ) ;
3560
+ assert_ne ! ( node_txn[ 3 ] . input[ 0 ] . previous_output. txid, node_txn[ 0 ] . input[ 0 ] . previous_output. txid) ;
3561
+ assert_ne ! ( node_txn[ 3 ] . input[ 0 ] . previous_output. txid, node_txn[ 1 ] . input[ 0 ] . previous_output. txid) ;
3487
3562
3488
3563
}
3489
3564
get_announce_close_broadcast_events ( & nodes, 0 , 1 ) ;
0 commit comments