@@ -3400,3 +3400,79 @@ fn test_durable_preimages_on_closed_channel() {
34003400 do_test_durable_preimages_on_closed_channel ( false , false , true ) ;
34013401 do_test_durable_preimages_on_closed_channel ( false , false , false ) ;
34023402}
3403+
3404+ #[ test]
3405+ fn test_reload_mon_update_completion_actions ( ) {
3406+ // Test that if a `ChannelMonitorUpdate` completes but a `ChannelManager` isn't serialized
3407+ // before restart we run the monitor update completion action on startup.
3408+ let chanmon_cfgs = create_chanmon_cfgs ( 3 ) ;
3409+ let node_cfgs = create_node_cfgs ( 3 , & chanmon_cfgs) ;
3410+
3411+ let persister;
3412+ let new_chain_monitor;
3413+ let nodes_1_deserialized;
3414+
3415+ let node_chanmgrs = create_node_chanmgrs ( 3 , & node_cfgs, & [ None , None , None ] ) ;
3416+ let mut nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
3417+
3418+ let chan_id_ab = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) . 2 ;
3419+ let chan_id_bc = create_announced_chan_between_nodes ( & nodes, 1 , 2 ) . 2 ;
3420+
3421+ // Route a payment from A, through B, to C, then claim it on C. Once we pass B the
3422+ // `update_fulfill_htlc` we have a monitor update for both of B's channels. We complete the
3423+ // commitment signed dance on the B<->C channel but leave the A<->B monitor update pending,
3424+ // then reload B. At that point, the final monitor update on the B<->C channel is still pending
3425+ // because it can't fly until the preimage is persisted on the A<->B monitor.
3426+ let ( payment_preimage, payment_hash, _) = route_payment ( & nodes[ 0 ] , & [ & nodes[ 1 ] , & nodes[ 2 ] ] , 1_000_000 ) ;
3427+
3428+ nodes[ 2 ] . node . claim_funds ( payment_preimage) ;
3429+ check_added_monitors ( & nodes[ 2 ] , 1 ) ;
3430+ expect_payment_claimed ! ( nodes[ 2 ] , payment_hash, 1_000_000 ) ;
3431+
3432+ chanmon_cfgs[ 1 ] . persister . set_update_ret ( ChannelMonitorUpdateStatus :: InProgress ) ;
3433+ let cs_updates = get_htlc_update_msgs ( & nodes[ 2 ] , & nodes[ 1 ] . node . get_our_node_id ( ) ) ;
3434+ nodes[ 1 ] . node . handle_update_fulfill_htlc ( & nodes[ 2 ] . node . get_our_node_id ( ) , & cs_updates. update_fulfill_htlcs [ 0 ] ) ;
3435+
3436+ // B generates a new monitor update for the A <-> B channel, but doesn't send the new messages
3437+ // for it since the monitor update is marked in-progress.
3438+ check_added_monitors ( & nodes[ 1 ] , 1 ) ;
3439+ assert ! ( nodes[ 1 ] . node. get_and_clear_pending_msg_events( ) . is_empty( ) ) ;
3440+
3441+ // Now step the Commitment Signed Dance between B and C and check that after the final RAA B
3442+ // doesn't let the preimage-removing monitor update fly.
3443+ nodes[ 1 ] . node . handle_commitment_signed ( & nodes[ 2 ] . node . get_our_node_id ( ) , & cs_updates. commitment_signed ) ;
3444+ check_added_monitors ( & nodes[ 1 ] , 1 ) ;
3445+ let ( bs_raa, bs_cs) = get_revoke_commit_msgs ! ( nodes[ 1 ] , nodes[ 2 ] . node. get_our_node_id( ) ) ;
3446+
3447+ nodes[ 2 ] . node . handle_revoke_and_ack ( & nodes[ 1 ] . node . get_our_node_id ( ) , & bs_raa) ;
3448+ check_added_monitors ( & nodes[ 2 ] , 1 ) ;
3449+ nodes[ 2 ] . node . handle_commitment_signed ( & nodes[ 1 ] . node . get_our_node_id ( ) , & bs_cs) ;
3450+ check_added_monitors ( & nodes[ 2 ] , 1 ) ;
3451+
3452+ let cs_final_raa = get_event_msg ! ( nodes[ 2 ] , MessageSendEvent :: SendRevokeAndACK , nodes[ 1 ] . node. get_our_node_id( ) ) ;
3453+ nodes[ 1 ] . node . handle_revoke_and_ack ( & nodes[ 2 ] . node . get_our_node_id ( ) , & cs_final_raa) ;
3454+ check_added_monitors ( & nodes[ 1 ] , 0 ) ;
3455+
3456+ // Finally, reload node B and check that after we call `process_events` once we realize we've
3457+ // completed the A<->B preimage-including monitor update and so can release the B<->C
3458+ // preimage-removing monitor update.
3459+ let mon_ab = get_monitor ! ( nodes[ 1 ] , chan_id_ab) . encode ( ) ;
3460+ let mon_bc = get_monitor ! ( nodes[ 1 ] , chan_id_bc) . encode ( ) ;
3461+ let manager_b = nodes[ 1 ] . node . encode ( ) ;
3462+ reload_node ! ( nodes[ 1 ] , & manager_b, & [ & mon_ab, & mon_bc] , persister, new_chain_monitor, nodes_1_deserialized) ;
3463+
3464+ let bc_update_id = nodes[ 1 ] . chain_monitor . latest_monitor_update_id . lock ( ) . unwrap ( ) . get ( & chan_id_bc) . unwrap ( ) . 2 ;
3465+ expect_payment_forwarded ! ( nodes[ 1 ] , nodes[ 0 ] , nodes[ 2 ] , Some ( 1000 ) , false , false ) ;
3466+
3467+ // Once we run event processing the monitor should free, check that it was indeed the B<->C
3468+ // channel which was updated.
3469+ check_added_monitors ( & nodes[ 1 ] , 1 ) ;
3470+ let post_ev_bc_update_id = nodes[ 1 ] . chain_monitor . latest_monitor_update_id . lock ( ) . unwrap ( ) . get ( & chan_id_bc) . unwrap ( ) . 2 ;
3471+ assert ! ( bc_update_id != post_ev_bc_update_id) ;
3472+
3473+ // Finally, check that there's nothing left to do on B<->C reconnect and the channel operates
3474+ // fine.
3475+ nodes[ 2 ] . node . peer_disconnected ( & nodes[ 1 ] . node . get_our_node_id ( ) ) ;
3476+ reconnect_nodes ( & nodes[ 1 ] , & nodes[ 2 ] , ( false , false ) , ( 0 , 0 ) , ( 0 , 0 ) , ( 0 , 0 ) , ( 0 , 0 ) , ( 0 , 0 ) , ( false , false ) ) ;
3477+ send_payment ( & nodes[ 1 ] , & [ & nodes[ 2 ] ] , 100_000 ) ;
3478+ }
0 commit comments