_ Git - rust-lightning/blob - lightning/src/ln/chanmon_update_fail_tests.rs

   1 // This file is Copyright its original authors, visible in version control
   2 // history.
   3 //
   4 // This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
   5 // or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
   6 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
   7 // You may not use this file except in accordance with one or both of these
   8 // licenses.
   9
  10 //! Functional tests which test the correct handling of ChannelMonitorUpdateStatus returns from
  11 //! monitor updates.
  12 //! There are a bunch of these as their handling is relatively error-prone so they are split out
  13 //! here. See also the chanmon_fail_consistency fuzz test.
  14
  15 use bitcoin::blockdata::constants::genesis_block;
  16 use bitcoin::hash_types::BlockHash;
  17 use bitcoin::network::constants::Network;
  18 use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
  19 use crate::chain::transaction::OutPoint;
  20 use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
  21 use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
  22 use crate::ln::channelmanager::{ChannelManager, RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
  23 use crate::ln::channel::AnnouncementSigsState;
  24 use crate::ln::msgs;
  25 use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
  26 use crate::util::enforcing_trait_impls::EnforcingSigner;
  27 use crate::util::errors::APIError;
  28 use crate::util::ser::{ReadableArgs, Writeable};
  29 use crate::util::test_utils::TestBroadcaster;
  30
  31 use crate::ln::functional_test_utils::*;
  32
  33 use crate::util::test_utils;
  34
  35 use crate::io;
  36 use bitcoin::hashes::Hash;
  37 use crate::prelude::*;
  38 use crate::sync::{Arc, Mutex};
  39
  40 #[test]
  41 fn test_simple_monitor_permanent_update_fail() {
  42         // Test that we handle a simple permanent monitor update failure
  43         let chanmon_cfgs = create_chanmon_cfgs(2);
  44         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
  45         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
  46         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
  47         create_announced_chan_between_nodes(&nodes, 0, 1);
  48
  49         let (route, payment_hash_1, _, payment_secret_1) = get_route_and_payment_hash!(&nodes[0], nodes[1], 1000000);
  50         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::PermanentFailure);
  51         unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, payment_hash_1,
  52                         RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)
  53                 ), true, APIError::ChannelUnavailable {..}, {});
  54         check_added_monitors!(nodes[0], 2);
  55
  56         let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
  57         assert_eq!(events_1.len(), 2);
  58         match events_1[0] {
  59                 MessageSendEvent::BroadcastChannelUpdate { .. } => {},
  60                 _ => panic!("Unexpected event"),
  61         };
  62         match events_1[1] {
  63                 MessageSendEvent::HandleError { node_id, .. } => assert_eq!(node_id, nodes[1].node.get_our_node_id()),
  64                 _ => panic!("Unexpected event"),
  65         };
  66
  67         assert!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().is_empty());
  68
  69         // TODO: Once we hit the chain with the failure transaction we should check that we get a
  70         // PaymentPathFailed event
  71
  72         assert_eq!(nodes[0].node.list_channels().len(), 0);
  73         check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() },
  74                 [nodes[1].node.get_our_node_id()], 100000);
  75 }
  76
  77 #[test]
  78 fn test_monitor_and_persister_update_fail() {
  79         // Test that if both updating the `ChannelMonitor` and persisting the updated
  80         // `ChannelMonitor` fail, then the failure from updating the `ChannelMonitor`
  81         // one that gets returned.
  82         let chanmon_cfgs = create_chanmon_cfgs(2);
  83         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
  84         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
  85         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
  86
  87         // Create some initial channel
  88         let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
  89         let outpoint = OutPoint { txid: chan.3.txid(), index: 0 };
  90
  91         // Rebalance the network to generate htlc in the two directions
  92         send_payment(&nodes[0], &vec!(&nodes[1])[..], 10_000_000);
  93
  94         // Route an HTLC from node 0 to node 1 (but don't settle)
  95         let (preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1]], 9_000_000);
  96
  97         // Make a copy of the ChainMonitor so we can capture the error it returns on a
  98         // bogus update. Note that if instead we updated the nodes[0]'s ChainMonitor
  99         // directly, the node would fail to be `Drop`'d at the end because its
 100         // ChannelManager and ChainMonitor would be out of sync.
 101         let chain_source = test_utils::TestChainSource::new(Network::Testnet);
 102         let logger = test_utils::TestLogger::with_id(format!("node {}", 0));
 103         let persister = test_utils::TestPersister::new();
 104         let tx_broadcaster = TestBroadcaster {
 105                 txn_broadcasted: Mutex::new(Vec::new()),
 106                 // Because we will connect a block at height 200 below, we need the TestBroadcaster to know
 107                 // that we are at height 200 so that it doesn't think we're violating the time lock
 108                 // requirements of transactions broadcasted at that point.
 109                 blocks: Arc::new(Mutex::new(vec![(genesis_block(Network::Testnet), 200); 200])),
 110         };
 111         let chain_mon = {
 112                 let new_monitor = {
 113                         let monitor = nodes[0].chain_monitor.chain_monitor.get_monitor(outpoint).unwrap();
 114                         let new_monitor = <(BlockHash, ChannelMonitor<EnforcingSigner>)>::read(
 115                                 &mut io::Cursor::new(&monitor.encode()), (nodes[0].keys_manager, nodes[0].keys_manager)).unwrap().1;
 116                         assert!(new_monitor == *monitor);
 117                         new_monitor
 118                 };
 119                 let chain_mon = test_utils::TestChainMonitor::new(Some(&chain_source), &tx_broadcaster, &logger, &chanmon_cfgs[0].fee_estimator, &persister, &node_cfgs[0].keys_manager);
 120                 assert_eq!(chain_mon.watch_channel(outpoint, new_monitor), ChannelMonitorUpdateStatus::Completed);
 121                 chain_mon
 122         };
 123         chain_mon.chain_monitor.block_connected(&create_dummy_block(BlockHash::all_zeros(), 42, Vec::new()), 200);
 124
 125         // Set the persister's return value to be a InProgress.
 126         persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 127
 128         // Try to update ChannelMonitor
 129         nodes[1].node.claim_funds(preimage);
 130         expect_payment_claimed!(nodes[1], payment_hash, 9_000_000);
 131         check_added_monitors!(nodes[1], 1);
 132
 133         let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 134         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
 135         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
 136         {
 137                 let mut node_0_per_peer_lock;
 138                 let mut node_0_peer_state_lock;
 139                 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 140                 if let Ok(Some(update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 141                         // Check that even though the persister is returning a InProgress,
 142                         // because the update is bogus, ultimately the error that's returned
 143                         // should be a PermanentFailure.
 144                         if let ChannelMonitorUpdateStatus::PermanentFailure = chain_mon.chain_monitor.update_channel(outpoint, &update) {} else { panic!("Expected monitor error to be permanent"); }
 145                         logger.assert_log_regex("lightning::chain::chainmonitor", regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 146                         assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, &update), ChannelMonitorUpdateStatus::Completed);
 147                 } else { assert!(false); }
 148         }
 149
 150         check_added_monitors!(nodes[0], 1);
 151         let events = nodes[0].node.get_and_clear_pending_events();
 152         assert_eq!(events.len(), 1);
 153 }
 154
 155 fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
 156         // Test that we can recover from a simple temporary monitor update failure optionally with
 157         // a disconnect in between
 158         let chanmon_cfgs = create_chanmon_cfgs(2);
 159         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 160         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 161         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 162         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 163
 164         let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(&nodes[0], nodes[1], 1000000);
 165
 166         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 167
 168         {
 169                 unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, payment_hash_1,
 170                                 RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)
 171                         ), false, APIError::MonitorUpdateInProgress, {});
 172                 check_added_monitors!(nodes[0], 1);
 173         }
 174
 175         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 176         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 177         assert_eq!(nodes[0].node.list_channels().len(), 1);
 178
 179         if disconnect {
 180                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 181                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 182                 let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
 183                 reconnect_args.send_channel_ready = (true, true);
 184                 reconnect_nodes(reconnect_args);
 185         }
 186
 187         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 188         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 189         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 190         check_added_monitors!(nodes[0], 0);
 191
 192         let mut events_2 = nodes[0].node.get_and_clear_pending_msg_events();
 193         assert_eq!(events_2.len(), 1);
 194         let payment_event = SendEvent::from_event(events_2.pop().unwrap());
 195         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
 196         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 197         commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
 198
 199         expect_pending_htlcs_forwardable!(nodes[1]);
 200
 201         let events_3 = nodes[1].node.get_and_clear_pending_events();
 202         assert_eq!(events_3.len(), 1);
 203         match events_3[0] {
 204                 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, .. } => {
 205                         assert_eq!(payment_hash_1, *payment_hash);
 206                         assert_eq!(amount_msat, 1_000_000);
 207                         assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
 208                         assert_eq!(via_channel_id, Some(channel_id));
 209                         match &purpose {
 210                                 PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 211                                         assert!(payment_preimage.is_none());
 212                                         assert_eq!(payment_secret_1, *payment_secret);
 213                                 },
 214                                 _ => panic!("expected PaymentPurpose::InvoicePayment")
 215                         }
 216                 },
 217                 _ => panic!("Unexpected event"),
 218         }
 219
 220         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 221
 222         // Now set it to failed again...
 223         let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[0], nodes[1], 1000000);
 224         {
 225                 chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 226                 unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, payment_hash_2,
 227                                 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)
 228                         ), false, APIError::MonitorUpdateInProgress, {});
 229                 check_added_monitors!(nodes[0], 1);
 230         }
 231
 232         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 233         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 234         assert_eq!(nodes[0].node.list_channels().len(), 1);
 235
 236         if disconnect {
 237                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 238                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 239                 reconnect_nodes(ReconnectArgs::new(&nodes[0], &nodes[1]));
 240         }
 241
 242         // ...and make sure we can force-close a frozen channel
 243         nodes[0].node.force_close_broadcasting_latest_txn(&channel_id, &nodes[1].node.get_our_node_id()).unwrap();
 244         check_added_monitors!(nodes[0], 1);
 245         check_closed_broadcast!(nodes[0], true);
 246
 247         // TODO: Once we hit the chain with the failure transaction we should check that we get a
 248         // PaymentPathFailed event
 249
 250         assert_eq!(nodes[0].node.list_channels().len(), 0);
 251         check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed, [nodes[1].node.get_our_node_id()], 100000);
 252 }
 253
 254 #[test]
 255 fn test_simple_monitor_temporary_update_fail() {
 256         do_test_simple_monitor_temporary_update_fail(false);
 257         do_test_simple_monitor_temporary_update_fail(true);
 258 }
 259
 260 fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
 261         let disconnect_flags = 8 | 16;
 262
 263         // Test that we can recover from a temporary monitor update failure with some in-flight
 264         // HTLCs going on at the same time potentially with some disconnection thrown in.
 265         // * First we route a payment, then get a temporary monitor update failure when trying to
 266         //   route a second payment. We then claim the first payment.
 267         // * If disconnect_count is set, we will disconnect at this point (which is likely as
 268         //   InProgress likely indicates net disconnect which resulted in failing to update the
 269         //   ChannelMonitor on a watchtower).
 270         // * If !(disconnect_count & 16) we deliver a update_fulfill_htlc/CS for the first payment
 271         //   immediately, otherwise we wait disconnect and deliver them via the reconnect
 272         //   channel_reestablish processing (ie disconnect_count & 16 makes no sense if
 273         //   disconnect_count & !disconnect_flags is 0).
 274         // * We then update the channel monitor, reconnecting if disconnect_count is set and walk
 275         //   through message sending, potentially disconnect/reconnecting multiple times based on
 276         //   disconnect_count, to get the update_fulfill_htlc through.
 277         // * We then walk through more message exchanges to get the original update_add_htlc
 278         //   through, swapping message ordering based on disconnect_count & 8 and optionally
 279         //   disconnect/reconnecting based on disconnect_count.
 280         let chanmon_cfgs = create_chanmon_cfgs(2);
 281         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 282         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 283         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 284         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 285
 286         let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
 287
 288         // Now try to send a second payment which will fail to send
 289         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
 290         {
 291                 chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 292                 unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, payment_hash_2,
 293                                 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)
 294                         ), false, APIError::MonitorUpdateInProgress, {});
 295                 check_added_monitors!(nodes[0], 1);
 296         }
 297
 298         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 299         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 300         assert_eq!(nodes[0].node.list_channels().len(), 1);
 301
 302         // Claim the previous payment, which will result in a update_fulfill_htlc/CS from nodes[1]
 303         // but nodes[0] won't respond since it is frozen.
 304         nodes[1].node.claim_funds(payment_preimage_1);
 305         check_added_monitors!(nodes[1], 1);
 306         expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
 307
 308         let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
 309         assert_eq!(events_2.len(), 1);
 310         let (bs_initial_fulfill, bs_initial_commitment_signed) = match events_2[0] {
 311                 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 312                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 313                         assert!(update_add_htlcs.is_empty());
 314                         assert_eq!(update_fulfill_htlcs.len(), 1);
 315                         assert!(update_fail_htlcs.is_empty());
 316                         assert!(update_fail_malformed_htlcs.is_empty());
 317                         assert!(update_fee.is_none());
 318
 319                         if (disconnect_count & 16) == 0 {
 320                                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_htlcs[0]);
 321                                 let events_3 = nodes[0].node.get_and_clear_pending_events();
 322                                 assert_eq!(events_3.len(), 1);
 323                                 match events_3[0] {
 324                                         Event::PaymentSent { ref payment_preimage, ref payment_hash, .. } => {
 325                                                 assert_eq!(*payment_preimage, payment_preimage_1);
 326                                                 assert_eq!(*payment_hash, payment_hash_1);
 327                                         },
 328                                         _ => panic!("Unexpected event"),
 329                                 }
 330
 331                                 nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), commitment_signed);
 332                                 check_added_monitors!(nodes[0], 1);
 333                                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 334                         }
 335
 336                         (update_fulfill_htlcs[0].clone(), commitment_signed.clone())
 337                 },
 338                 _ => panic!("Unexpected event"),
 339         };
 340
 341         if disconnect_count & !disconnect_flags > 0 {
 342                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 343                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 344         }
 345
 346         // Now fix monitor updating...
 347         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 348         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 349         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 350         check_added_monitors!(nodes[0], 0);
 351
 352         macro_rules! disconnect_reconnect_peers { () => { {
 353                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 354                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
 355
 356                 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
 357                         features: nodes[1].node.init_features(), networks: None, remote_network_address: None
 358                 }, true).unwrap();
 359                 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
 360                 assert_eq!(reestablish_1.len(), 1);
 361                 nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
 362                         features: nodes[0].node.init_features(), networks: None, remote_network_address: None
 363                 }, false).unwrap();
 364                 let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
 365                 assert_eq!(reestablish_2.len(), 1);
 366
 367                 nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]);
 368                 let as_resp = handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
 369                 nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]);
 370                 let bs_resp = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
 371
 372                 assert!(as_resp.0.is_none());
 373                 assert!(bs_resp.0.is_none());
 374
 375                 (reestablish_1, reestablish_2, as_resp, bs_resp)
 376         } } }
 377
 378         let (payment_event, initial_revoke_and_ack) = if disconnect_count & !disconnect_flags > 0 {
 379                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 380                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 381
 382                 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
 383                         features: nodes[1].node.init_features(), networks: None, remote_network_address: None
 384                 }, true).unwrap();
 385                 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
 386                 assert_eq!(reestablish_1.len(), 1);
 387                 nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
 388                         features: nodes[0].node.init_features(), networks: None, remote_network_address: None
 389                 }, false).unwrap();
 390                 let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
 391                 assert_eq!(reestablish_2.len(), 1);
 392
 393                 nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]);
 394                 check_added_monitors!(nodes[0], 0);
 395                 let mut as_resp = handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
 396                 nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]);
 397                 check_added_monitors!(nodes[1], 0);
 398                 let mut bs_resp = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
 399
 400                 assert!(as_resp.0.is_none());
 401                 assert!(bs_resp.0.is_none());
 402
 403                 assert!(bs_resp.1.is_none());
 404                 if (disconnect_count & 16) == 0 {
 405                         assert!(bs_resp.2.is_none());
 406
 407                         assert!(as_resp.1.is_some());
 408                         assert!(as_resp.2.is_some());
 409                         assert!(as_resp.3 == RAACommitmentOrder::CommitmentFirst);
 410                 } else {
 411                         assert!(bs_resp.2.as_ref().unwrap().update_add_htlcs.is_empty());
 412                         assert!(bs_resp.2.as_ref().unwrap().update_fail_htlcs.is_empty());
 413                         assert!(bs_resp.2.as_ref().unwrap().update_fail_malformed_htlcs.is_empty());
 414                         assert!(bs_resp.2.as_ref().unwrap().update_fee.is_none());
 415                         assert!(bs_resp.2.as_ref().unwrap().update_fulfill_htlcs == vec![bs_initial_fulfill]);
 416                         assert!(bs_resp.2.as_ref().unwrap().commitment_signed == bs_initial_commitment_signed);
 417
 418                         assert!(as_resp.1.is_none());
 419
 420                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().update_fulfill_htlcs[0]);
 421                         let events_3 = nodes[0].node.get_and_clear_pending_events();
 422                         assert_eq!(events_3.len(), 1);
 423                         match events_3[0] {
 424                                 Event::PaymentSent { ref payment_preimage, ref payment_hash, .. } => {
 425                                         assert_eq!(*payment_preimage, payment_preimage_1);
 426                                         assert_eq!(*payment_hash, payment_hash_1);
 427                                 },
 428                                 _ => panic!("Unexpected event"),
 429                         }
 430
 431                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().commitment_signed);
 432                         let as_resp_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 433                         // No commitment_signed so get_event_msg's assert(len == 1) passes
 434                         check_added_monitors!(nodes[0], 1);
 435
 436                         as_resp.1 = Some(as_resp_raa);
 437                         bs_resp.2 = None;
 438                 }
 439
 440                 if disconnect_count & !disconnect_flags > 1 {
 441                         let (second_reestablish_1, second_reestablish_2, second_as_resp, second_bs_resp) = disconnect_reconnect_peers!();
 442
 443                         if (disconnect_count & 16) == 0 {
 444                                 assert!(reestablish_1 == second_reestablish_1);
 445                                 assert!(reestablish_2 == second_reestablish_2);
 446                         }
 447                         assert!(as_resp == second_as_resp);
 448                         assert!(bs_resp == second_bs_resp);
 449                 }
 450
 451                 (SendEvent::from_commitment_update(nodes[1].node.get_our_node_id(), as_resp.2.unwrap()), as_resp.1.unwrap())
 452         } else {
 453                 let mut events_4 = nodes[0].node.get_and_clear_pending_msg_events();
 454                 assert_eq!(events_4.len(), 2);
 455                 (SendEvent::from_event(events_4.remove(0)), match events_4[0] {
 456                         MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 457                                 assert_eq!(*node_id, nodes[1].node.get_our_node_id());
 458                                 msg.clone()
 459                         },
 460                         _ => panic!("Unexpected event"),
 461                 })
 462         };
 463
 464         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
 465
 466         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 467         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
 468         let bs_revoke_and_ack = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 469         // nodes[1] is awaiting an RAA from nodes[0] still so get_event_msg's assert(len == 1) passes
 470         check_added_monitors!(nodes[1], 1);
 471
 472         if disconnect_count & !disconnect_flags > 2 {
 473                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 474
 475                 assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
 476                 assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
 477
 478                 assert!(as_resp.2.is_none());
 479                 assert!(bs_resp.2.is_none());
 480         }
 481
 482         let as_commitment_update;
 483         let bs_second_commitment_update;
 484
 485         macro_rules! handle_bs_raa { () => {
 486                 nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack);
 487                 as_commitment_update = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
 488                 assert!(as_commitment_update.update_add_htlcs.is_empty());
 489                 assert!(as_commitment_update.update_fulfill_htlcs.is_empty());
 490                 assert!(as_commitment_update.update_fail_htlcs.is_empty());
 491                 assert!(as_commitment_update.update_fail_malformed_htlcs.is_empty());
 492                 assert!(as_commitment_update.update_fee.is_none());
 493                 check_added_monitors!(nodes[0], 1);
 494         } }
 495
 496         macro_rules! handle_initial_raa { () => {
 497                 nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &initial_revoke_and_ack);
 498                 bs_second_commitment_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 499                 assert!(bs_second_commitment_update.update_add_htlcs.is_empty());
 500                 assert!(bs_second_commitment_update.update_fulfill_htlcs.is_empty());
 501                 assert!(bs_second_commitment_update.update_fail_htlcs.is_empty());
 502                 assert!(bs_second_commitment_update.update_fail_malformed_htlcs.is_empty());
 503                 assert!(bs_second_commitment_update.update_fee.is_none());
 504                 check_added_monitors!(nodes[1], 1);
 505         } }
 506
 507         if (disconnect_count & 8) == 0 {
 508                 handle_bs_raa!();
 509
 510                 if disconnect_count & !disconnect_flags > 3 {
 511                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 512
 513                         assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
 514                         assert!(bs_resp.1.is_none());
 515
 516                         assert!(as_resp.2.unwrap() == as_commitment_update);
 517                         assert!(bs_resp.2.is_none());
 518
 519                         assert!(as_resp.3 == RAACommitmentOrder::RevokeAndACKFirst);
 520                 }
 521
 522                 handle_initial_raa!();
 523
 524                 if disconnect_count & !disconnect_flags > 4 {
 525                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 526
 527                         assert!(as_resp.1.is_none());
 528                         assert!(bs_resp.1.is_none());
 529
 530                         assert!(as_resp.2.unwrap() == as_commitment_update);
 531                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 532                 }
 533         } else {
 534                 handle_initial_raa!();
 535
 536                 if disconnect_count & !disconnect_flags > 3 {
 537                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 538
 539                         assert!(as_resp.1.is_none());
 540                         assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
 541
 542                         assert!(as_resp.2.is_none());
 543                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 544
 545                         assert!(bs_resp.3 == RAACommitmentOrder::RevokeAndACKFirst);
 546                 }
 547
 548                 handle_bs_raa!();
 549
 550                 if disconnect_count & !disconnect_flags > 4 {
 551                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 552
 553                         assert!(as_resp.1.is_none());
 554                         assert!(bs_resp.1.is_none());
 555
 556                         assert!(as_resp.2.unwrap() == as_commitment_update);
 557                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 558                 }
 559         }
 560
 561         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_commitment_update.commitment_signed);
 562         let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 563         // No commitment_signed so get_event_msg's assert(len == 1) passes
 564         check_added_monitors!(nodes[0], 1);
 565
 566         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment_update.commitment_signed);
 567         let bs_second_revoke_and_ack = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 568         // No commitment_signed so get_event_msg's assert(len == 1) passes
 569         check_added_monitors!(nodes[1], 1);
 570
 571         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
 572         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 573         check_added_monitors!(nodes[1], 1);
 574
 575         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke_and_ack);
 576         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 577         check_added_monitors!(nodes[0], 1);
 578         expect_payment_path_successful!(nodes[0]);
 579
 580         expect_pending_htlcs_forwardable!(nodes[1]);
 581
 582         let events_5 = nodes[1].node.get_and_clear_pending_events();
 583         assert_eq!(events_5.len(), 1);
 584         match events_5[0] {
 585                 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, .. } => {
 586                         assert_eq!(payment_hash_2, *payment_hash);
 587                         assert_eq!(amount_msat, 1_000_000);
 588                         assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
 589                         assert_eq!(via_channel_id, Some(channel_id));
 590                         match &purpose {
 591                                 PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 592                                         assert!(payment_preimage.is_none());
 593                                         assert_eq!(payment_secret_2, *payment_secret);
 594                                 },
 595                                 _ => panic!("expected PaymentPurpose::InvoicePayment")
 596                         }
 597                 },
 598                 _ => panic!("Unexpected event"),
 599         }
 600
 601         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
 602 }
 603
 604 #[test]
 605 fn test_monitor_temporary_update_fail_a() {
 606         do_test_monitor_temporary_update_fail(0);
 607         do_test_monitor_temporary_update_fail(1);
 608         do_test_monitor_temporary_update_fail(2);
 609         do_test_monitor_temporary_update_fail(3);
 610         do_test_monitor_temporary_update_fail(4);
 611         do_test_monitor_temporary_update_fail(5);
 612 }
 613
 614 #[test]
 615 fn test_monitor_temporary_update_fail_b() {
 616         do_test_monitor_temporary_update_fail(2 | 8);
 617         do_test_monitor_temporary_update_fail(3 | 8);
 618         do_test_monitor_temporary_update_fail(4 | 8);
 619         do_test_monitor_temporary_update_fail(5 | 8);
 620 }
 621
 622 #[test]
 623 fn test_monitor_temporary_update_fail_c() {
 624         do_test_monitor_temporary_update_fail(1 | 16);
 625         do_test_monitor_temporary_update_fail(2 | 16);
 626         do_test_monitor_temporary_update_fail(3 | 16);
 627         do_test_monitor_temporary_update_fail(2 | 8 | 16);
 628         do_test_monitor_temporary_update_fail(3 | 8 | 16);
 629 }
 630
 631 #[test]
 632 fn test_monitor_update_fail_cs() {
 633         // Tests handling of a monitor update failure when processing an incoming commitment_signed
 634         let chanmon_cfgs = create_chanmon_cfgs(2);
 635         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 636         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 637         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 638         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 639
 640         let (route, our_payment_hash, payment_preimage, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
 641         {
 642                 nodes[0].node.send_payment_with_route(&route, our_payment_hash,
 643                         RecipientOnionFields::secret_only(our_payment_secret), PaymentId(our_payment_hash.0)).unwrap();
 644                 check_added_monitors!(nodes[0], 1);
 645         }
 646
 647         let send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 648         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 649
 650         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 651         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send_event.commitment_msg);
 652         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 653         check_added_monitors!(nodes[1], 1);
 654         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 655
 656         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 657         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 658         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 659         check_added_monitors!(nodes[1], 0);
 660         let responses = nodes[1].node.get_and_clear_pending_msg_events();
 661         assert_eq!(responses.len(), 2);
 662
 663         match responses[0] {
 664                 MessageSendEvent::SendRevokeAndACK { ref msg, ref node_id } => {
 665                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 666                         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &msg);
 667                         check_added_monitors!(nodes[0], 1);
 668                 },
 669                 _ => panic!("Unexpected event"),
 670         }
 671         match responses[1] {
 672                 MessageSendEvent::UpdateHTLCs { ref updates, ref node_id } => {
 673                         assert!(updates.update_add_htlcs.is_empty());
 674                         assert!(updates.update_fulfill_htlcs.is_empty());
 675                         assert!(updates.update_fail_htlcs.is_empty());
 676                         assert!(updates.update_fail_malformed_htlcs.is_empty());
 677                         assert!(updates.update_fee.is_none());
 678                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 679
 680                         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 681                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &updates.commitment_signed);
 682                         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 683                         check_added_monitors!(nodes[0], 1);
 684                         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 685                 },
 686                 _ => panic!("Unexpected event"),
 687         }
 688
 689         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 690         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 691         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 692         check_added_monitors!(nodes[0], 0);
 693
 694         let final_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 695         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &final_raa);
 696         check_added_monitors!(nodes[1], 1);
 697
 698         expect_pending_htlcs_forwardable!(nodes[1]);
 699
 700         let events = nodes[1].node.get_and_clear_pending_events();
 701         assert_eq!(events.len(), 1);
 702         match events[0] {
 703                 Event::PaymentClaimable { payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, .. } => {
 704                         assert_eq!(payment_hash, our_payment_hash);
 705                         assert_eq!(amount_msat, 1_000_000);
 706                         assert_eq!(receiver_node_id.unwrap(), nodes[1].node.get_our_node_id());
 707                         assert_eq!(via_channel_id, Some(channel_id));
 708                         match &purpose {
 709                                 PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 710                                         assert!(payment_preimage.is_none());
 711                                         assert_eq!(our_payment_secret, *payment_secret);
 712                                 },
 713                                 _ => panic!("expected PaymentPurpose::InvoicePayment")
 714                         }
 715                 },
 716                 _ => panic!("Unexpected event"),
 717         };
 718
 719         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage);
 720 }
 721
 722 #[test]
 723 fn test_monitor_update_fail_no_rebroadcast() {
 724         // Tests handling of a monitor update failure when no message rebroadcasting on
 725         // channel_monitor_updated() is required. Backported from chanmon_fail_consistency
 726         // fuzz tests.
 727         let chanmon_cfgs = create_chanmon_cfgs(2);
 728         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 729         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 730         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 731         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 732
 733         let (route, our_payment_hash, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
 734         {
 735                 nodes[0].node.send_payment_with_route(&route, our_payment_hash,
 736                         RecipientOnionFields::secret_only(payment_secret_1), PaymentId(our_payment_hash.0)).unwrap();
 737                 check_added_monitors!(nodes[0], 1);
 738         }
 739
 740         let send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 741         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 742         let bs_raa = commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false, true, false, true);
 743
 744         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 745         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &bs_raa);
 746         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 747         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 748         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 749         check_added_monitors!(nodes[1], 1);
 750
 751         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 752         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 753         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 754         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 755         check_added_monitors!(nodes[1], 0);
 756         expect_pending_htlcs_forwardable!(nodes[1]);
 757
 758         let events = nodes[1].node.get_and_clear_pending_events();
 759         assert_eq!(events.len(), 1);
 760         match events[0] {
 761                 Event::PaymentClaimable { payment_hash, .. } => {
 762                         assert_eq!(payment_hash, our_payment_hash);
 763                 },
 764                 _ => panic!("Unexpected event"),
 765         }
 766
 767         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 768 }
 769
 770 #[test]
 771 fn test_monitor_update_raa_while_paused() {
 772         // Tests handling of an RAA while monitor updating has already been marked failed.
 773         // Backported from chanmon_fail_consistency fuzz tests as this used to be broken.
 774         let chanmon_cfgs = create_chanmon_cfgs(2);
 775         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 776         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 777         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 778         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
 779
 780         send_payment(&nodes[0], &[&nodes[1]], 5000000);
 781         let (route, our_payment_hash_1, payment_preimage_1, our_payment_secret_1) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
 782         {
 783                 nodes[0].node.send_payment_with_route(&route, our_payment_hash_1,
 784                         RecipientOnionFields::secret_only(our_payment_secret_1), PaymentId(our_payment_hash_1.0)).unwrap();
 785                 check_added_monitors!(nodes[0], 1);
 786         }
 787         let send_event_1 = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 788
 789         let (route, our_payment_hash_2, payment_preimage_2, our_payment_secret_2) = get_route_and_payment_hash!(nodes[1], nodes[0], 1000000);
 790         {
 791                 nodes[1].node.send_payment_with_route(&route, our_payment_hash_2,
 792                         RecipientOnionFields::secret_only(our_payment_secret_2), PaymentId(our_payment_hash_2.0)).unwrap();
 793                 check_added_monitors!(nodes[1], 1);
 794         }
 795         let send_event_2 = SendEvent::from_event(nodes[1].node.get_and_clear_pending_msg_events().remove(0));
 796
 797         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event_1.msgs[0]);
 798         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send_event_1.commitment_msg);
 799         check_added_monitors!(nodes[1], 1);
 800         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 801
 802         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 803         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 804         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event_2.msgs[0]);
 805         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &send_event_2.commitment_msg);
 806         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 807         check_added_monitors!(nodes[0], 1);
 808         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 809
 810         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
 811         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 812         check_added_monitors!(nodes[0], 1);
 813
 814         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 815         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 816         check_added_monitors!(nodes[0], 0);
 817
 818         let as_update_raa = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
 819         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_update_raa.0);
 820         check_added_monitors!(nodes[1], 1);
 821         let bs_cs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 822
 823         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_update_raa.1);
 824         check_added_monitors!(nodes[1], 1);
 825         let bs_second_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 826
 827         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_cs.commitment_signed);
 828         check_added_monitors!(nodes[0], 1);
 829         let as_second_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 830
 831         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
 832         check_added_monitors!(nodes[0], 1);
 833         expect_pending_htlcs_forwardable!(nodes[0]);
 834         expect_payment_claimable!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
 835
 836         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
 837         check_added_monitors!(nodes[1], 1);
 838         expect_pending_htlcs_forwardable!(nodes[1]);
 839         expect_payment_claimable!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
 840
 841         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 842         claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
 843 }
 844
 845 fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 846         // Tests handling of a monitor update failure when processing an incoming RAA
 847         let chanmon_cfgs = create_chanmon_cfgs(3);
 848         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 849         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
 850         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 851         create_announced_chan_between_nodes(&nodes, 0, 1);
 852         let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2);
 853
 854         // Rebalance a bit so that we can send backwards from 2 to 1.
 855         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
 856
 857         // Route a first payment that we'll fail backwards
 858         let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
 859
 860         // Fail the payment backwards, failing the monitor update on nodes[1]'s receipt of the RAA
 861         nodes[2].node.fail_htlc_backwards(&payment_hash_1);
 862         expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2], vec![HTLCDestination::FailedPayment { payment_hash: payment_hash_1 }]);
 863         check_added_monitors!(nodes[2], 1);
 864
 865         let updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
 866         assert!(updates.update_add_htlcs.is_empty());
 867         assert!(updates.update_fulfill_htlcs.is_empty());
 868         assert_eq!(updates.update_fail_htlcs.len(), 1);
 869         assert!(updates.update_fail_malformed_htlcs.is_empty());
 870         assert!(updates.update_fee.is_none());
 871         nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
 872
 873         let bs_revoke_and_ack = commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false, true, false, true);
 874         check_added_monitors!(nodes[0], 0);
 875
 876         // While the second channel is AwaitingRAA, forward a second payment to get it into the
 877         // holding cell.
 878         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[2], 1000000);
 879         {
 880                 nodes[0].node.send_payment_with_route(&route, payment_hash_2,
 881                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 882                 check_added_monitors!(nodes[0], 1);
 883         }
 884
 885         let mut send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 886         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 887         commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false);
 888
 889         expect_pending_htlcs_forwardable!(nodes[1]);
 890         check_added_monitors!(nodes[1], 0);
 891         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 892
 893         // Now fail monitor updating.
 894         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
 895         nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_revoke_and_ack);
 896         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 897         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 898         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 899         check_added_monitors!(nodes[1], 1);
 900
 901         // Forward a third payment which will also be added to the holding cell, despite the channel
 902         // being paused waiting a monitor update.
 903         let (route, payment_hash_3, _, payment_secret_3) = get_route_and_payment_hash!(nodes[0], nodes[2], 1000000);
 904         {
 905                 nodes[0].node.send_payment_with_route(&route, payment_hash_3,
 906                         RecipientOnionFields::secret_only(payment_secret_3), PaymentId(payment_hash_3.0)).unwrap();
 907                 check_added_monitors!(nodes[0], 1);
 908         }
 909
 910         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed); // We succeed in updating the monitor for the first channel
 911         send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 912         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 913         commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false, true);
 914         check_added_monitors!(nodes[1], 0);
 915
 916         // Call forward_pending_htlcs and check that the new HTLC was simply added to the holding cell
 917         // and not forwarded.
 918         expect_pending_htlcs_forwardable!(nodes[1]);
 919         check_added_monitors!(nodes[1], 0);
 920         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 921
 922         let (payment_preimage_4, payment_hash_4) = if test_ignore_second_cs {
 923                 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 924                 let (route, payment_hash_4, payment_preimage_4, payment_secret_4) = get_route_and_payment_hash!(nodes[2], nodes[0], 1000000);
 925                 nodes[2].node.send_payment_with_route(&route, payment_hash_4,
 926                         RecipientOnionFields::secret_only(payment_secret_4), PaymentId(payment_hash_4.0)).unwrap();
 927                 check_added_monitors!(nodes[2], 1);
 928
 929                 send_event = SendEvent::from_event(nodes[2].node.get_and_clear_pending_msg_events().remove(0));
 930                 nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &send_event.msgs[0]);
 931                 nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &send_event.commitment_msg);
 932                 check_added_monitors!(nodes[1], 1);
 933                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 934                 (Some(payment_preimage_4), Some(payment_hash_4))
 935         } else { (None, None) };
 936
 937         // Restore monitor updating, ensuring we immediately get a fail-back update and a
 938         // update_add update.
 939         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
 940         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_2.2).unwrap().clone();
 941         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
 942         check_added_monitors!(nodes[1], 0);
 943         expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_2.2 }]);
 944         check_added_monitors!(nodes[1], 1);
 945
 946         let mut events_3 = nodes[1].node.get_and_clear_pending_msg_events();
 947         if test_ignore_second_cs {
 948                 assert_eq!(events_3.len(), 3);
 949         } else {
 950                 assert_eq!(events_3.len(), 2);
 951         }
 952
 953         // Note that the ordering of the events for different nodes is non-prescriptive, though the
 954         // ordering of the two events that both go to nodes[2] have to stay in the same order.
 955         let nodes_0_event = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
 956         let messages_a = match nodes_0_event {
 957                 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 958                         assert_eq!(node_id, nodes[0].node.get_our_node_id());
 959                         assert!(updates.update_fulfill_htlcs.is_empty());
 960                         assert_eq!(updates.update_fail_htlcs.len(), 1);
 961                         assert!(updates.update_fail_malformed_htlcs.is_empty());
 962                         assert!(updates.update_add_htlcs.is_empty());
 963                         assert!(updates.update_fee.is_none());
 964                         (updates.update_fail_htlcs.remove(0), updates.commitment_signed)
 965                 },
 966                 _ => panic!("Unexpected event type!"),
 967         };
 968
 969         let nodes_2_event = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 970         let send_event_b = SendEvent::from_event(nodes_2_event);
 971         assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());
 972
 973         let raa = if test_ignore_second_cs {
 974                 let nodes_2_event = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 975                 match nodes_2_event {
 976                         MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 977                                 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 978                                 Some(msg.clone())
 979                         },
 980                         _ => panic!("Unexpected event"),
 981                 }
 982         } else { None };
 983
 984         // Now deliver the new messages...
 985
 986         nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &messages_a.0);
 987         commitment_signed_dance!(nodes[0], nodes[1], messages_a.1, false);
 988         expect_payment_failed!(nodes[0], payment_hash_1, true);
 989
 990         nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event_b.msgs[0]);
 991         let as_cs;
 992         if test_ignore_second_cs {
 993                 nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &send_event_b.commitment_msg);
 994                 check_added_monitors!(nodes[2], 1);
 995                 let bs_revoke_and_ack = get_event_msg!(nodes[2], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 996                 nodes[2].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &raa.unwrap());
 997                 check_added_monitors!(nodes[2], 1);
 998                 let bs_cs = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
 999                 assert!(bs_cs.update_add_htlcs.is_empty());
1000                 assert!(bs_cs.update_fail_htlcs.is_empty());
1001                 assert!(bs_cs.update_fail_malformed_htlcs.is_empty());
1002                 assert!(bs_cs.update_fulfill_htlcs.is_empty());
1003                 assert!(bs_cs.update_fee.is_none());
1004
1005                 nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_revoke_and_ack);
1006                 check_added_monitors!(nodes[1], 1);
1007                 as_cs = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
1008
1009                 nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &bs_cs.commitment_signed);
1010                 check_added_monitors!(nodes[1], 1);
1011         } else {
1012                 nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &send_event_b.commitment_msg);
1013                 check_added_monitors!(nodes[2], 1);
1014
1015                 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
1016                 // As both messages are for nodes[1], they're in order.
1017                 assert_eq!(bs_revoke_and_commit.len(), 2);
1018                 match bs_revoke_and_commit[0] {
1019                         MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
1020                                 assert_eq!(*node_id, nodes[1].node.get_our_node_id());
1021                                 nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &msg);
1022                                 check_added_monitors!(nodes[1], 1);
1023                         },
1024                         _ => panic!("Unexpected event"),
1025                 }
1026
1027                 as_cs = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
1028
1029                 match bs_revoke_and_commit[1] {
1030                         MessageSendEvent::UpdateHTLCs { ref node_id, ref updates } => {
1031                                 assert_eq!(*node_id, nodes[1].node.get_our_node_id());
1032                                 assert!(updates.update_add_htlcs.is_empty());
1033                                 assert!(updates.update_fail_htlcs.is_empty());
1034                                 assert!(updates.update_fail_malformed_htlcs.is_empty());
1035                                 assert!(updates.update_fulfill_htlcs.is_empty());
1036                                 assert!(updates.update_fee.is_none());
1037                                 nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &updates.commitment_signed);
1038                                 check_added_monitors!(nodes[1], 1);
1039                         },
1040                         _ => panic!("Unexpected event"),
1041                 }
1042         }
1043
1044         assert_eq!(as_cs.update_add_htlcs.len(), 1);
1045         assert!(as_cs.update_fail_htlcs.is_empty());
1046         assert!(as_cs.update_fail_malformed_htlcs.is_empty());
1047         assert!(as_cs.update_fulfill_htlcs.is_empty());
1048         assert!(as_cs.update_fee.is_none());
1049         let as_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[2].node.get_our_node_id());
1050
1051
1052         nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &as_cs.update_add_htlcs[0]);
1053         nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &as_cs.commitment_signed);
1054         check_added_monitors!(nodes[2], 1);
1055         let bs_second_raa = get_event_msg!(nodes[2], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1056
1057         nodes[2].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &as_raa);
1058         check_added_monitors!(nodes[2], 1);
1059         let bs_second_cs = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1060
1061         nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_second_raa);
1062         check_added_monitors!(nodes[1], 1);
1063         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1064
1065         nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &bs_second_cs.commitment_signed);
1066         check_added_monitors!(nodes[1], 1);
1067         let as_second_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[2].node.get_our_node_id());
1068
1069         nodes[2].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &as_second_raa);
1070         check_added_monitors!(nodes[2], 1);
1071         assert!(nodes[2].node.get_and_clear_pending_msg_events().is_empty());
1072
1073         expect_pending_htlcs_forwardable!(nodes[2]);
1074
1075         let events_6 = nodes[2].node.get_and_clear_pending_events();
1076         assert_eq!(events_6.len(), 2);
1077         match events_6[0] {
1078                 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
1079                 _ => panic!("Unexpected event"),
1080         };
1081         match events_6[1] {
1082                 Event::PaymentClaimable { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_3); },
1083                 _ => panic!("Unexpected event"),
1084         };
1085
1086         if test_ignore_second_cs {
1087                 expect_pending_htlcs_forwardable!(nodes[1]);
1088                 check_added_monitors!(nodes[1], 1);
1089
1090                 send_event = SendEvent::from_node(&nodes[1]);
1091                 assert_eq!(send_event.node_id, nodes[0].node.get_our_node_id());
1092                 assert_eq!(send_event.msgs.len(), 1);
1093                 nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event.msgs[0]);
1094                 commitment_signed_dance!(nodes[0], nodes[1], send_event.commitment_msg, false);
1095
1096                 expect_pending_htlcs_forwardable!(nodes[0]);
1097
1098                 let events_9 = nodes[0].node.get_and_clear_pending_events();
1099                 assert_eq!(events_9.len(), 1);
1100                 match events_9[0] {
1101                         Event::PaymentClaimable { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
1102                         _ => panic!("Unexpected event"),
1103                 };
1104                 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
1105         }
1106
1107         claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage_2);
1108 }
1109
1110 #[test]
1111 fn test_monitor_update_fail_raa() {
1112         do_test_monitor_update_fail_raa(false);
1113         do_test_monitor_update_fail_raa(true);
1114 }
1115
1116 #[test]
1117 fn test_monitor_update_fail_reestablish() {
1118         // Simple test for message retransmission after monitor update failure on
1119         // channel_reestablish generating a monitor update (which comes from freeing holding cell
1120         // HTLCs).
1121         let chanmon_cfgs = create_chanmon_cfgs(3);
1122         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1123         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1124         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1125         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
1126         create_announced_chan_between_nodes(&nodes, 1, 2);
1127
1128         let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000);
1129
1130         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
1131         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
1132
1133         nodes[2].node.claim_funds(payment_preimage);
1134         check_added_monitors!(nodes[2], 1);
1135         expect_payment_claimed!(nodes[2], payment_hash, 1_000_000);
1136
1137         let mut updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1138         assert!(updates.update_add_htlcs.is_empty());
1139         assert!(updates.update_fail_htlcs.is_empty());
1140         assert!(updates.update_fail_malformed_htlcs.is_empty());
1141         assert!(updates.update_fee.is_none());
1142         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
1143         nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1144         expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
1145         check_added_monitors!(nodes[1], 1);
1146         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1147         commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);
1148
1149         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1150         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
1151                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
1152         }, true).unwrap();
1153         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
1154                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
1155         }, false).unwrap();
1156
1157         let as_reestablish = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
1158         let bs_reestablish = get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap();
1159
1160         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reestablish);
1161
1162         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish);
1163         assert_eq!(
1164                 get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id())
1165                         .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected
1166
1167         nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell
1168         check_added_monitors!(nodes[1], 1);
1169
1170         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
1171         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
1172
1173         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
1174                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
1175         }, true).unwrap();
1176         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
1177                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
1178         }, false).unwrap();
1179
1180         assert_eq!(get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap(), as_reestablish);
1181         assert_eq!(get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap(), bs_reestablish);
1182
1183         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reestablish);
1184         assert_eq!(
1185                 get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id())
1186                         .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected
1187
1188         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish);
1189         check_added_monitors!(nodes[1], 0);
1190         assert_eq!(
1191                 get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id())
1192                         .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected
1193
1194         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1195         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone();
1196         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1197         check_added_monitors!(nodes[1], 0);
1198
1199         updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1200         assert!(updates.update_add_htlcs.is_empty());
1201         assert!(updates.update_fail_htlcs.is_empty());
1202         assert!(updates.update_fail_malformed_htlcs.is_empty());
1203         assert!(updates.update_fee.is_none());
1204         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
1205         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1206         commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false);
1207         expect_payment_sent!(nodes[0], payment_preimage);
1208 }
1209
1210 #[test]
1211 fn raa_no_response_awaiting_raa_state() {
1212         // This is a rather convoluted test which ensures that if handling of an RAA does not happen
1213         // due to a previous monitor update failure, we still set AwaitingRemoteRevoke on the channel
1214         // in question (assuming it intends to respond with a CS after monitor updating is restored).
1215         // Backported from chanmon_fail_consistency fuzz tests as this used to be broken.
1216         let chanmon_cfgs = create_chanmon_cfgs(2);
1217         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1218         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1219         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1220         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
1221
1222         let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1223         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
1224         let (payment_preimage_3, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[1]);
1225
1226         // Queue up two payments - one will be delivered right away, one immediately goes into the
1227         // holding cell as nodes[0] is AwaitingRAA. Ultimately this allows us to deliver an RAA
1228         // immediately after a CS. By setting failing the monitor update failure from the CS (which
1229         // requires only an RAA response due to AwaitingRAA) we can deliver the RAA and require the CS
1230         // generation during RAA while in monitor-update-failed state.
1231         {
1232                 nodes[0].node.send_payment_with_route(&route, payment_hash_1,
1233                         RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)).unwrap();
1234                 check_added_monitors!(nodes[0], 1);
1235                 nodes[0].node.send_payment_with_route(&route, payment_hash_2,
1236                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1237                 check_added_monitors!(nodes[0], 0);
1238         }
1239
1240         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1241         assert_eq!(events.len(), 1);
1242         let payment_event = SendEvent::from_event(events.pop().unwrap());
1243         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1244         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1245         check_added_monitors!(nodes[1], 1);
1246
1247         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1248         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1249         check_added_monitors!(nodes[0], 1);
1250         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1251         assert_eq!(events.len(), 1);
1252         let payment_event = SendEvent::from_event(events.pop().unwrap());
1253
1254         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1255         check_added_monitors!(nodes[0], 1);
1256         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1257
1258         // Now we have a CS queued up which adds a new HTLC (which will need a RAA/CS response from
1259         // nodes[1]) followed by an RAA. Fail the monitor updating prior to the CS, deliver the RAA,
1260         // then restore channel monitor updates.
1261         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1262         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1263         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1264         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1265         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1266         check_added_monitors!(nodes[1], 1);
1267         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1268
1269         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1270         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1271         check_added_monitors!(nodes[1], 1);
1272
1273         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1274         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1275         // nodes[1] should be AwaitingRAA here!
1276         check_added_monitors!(nodes[1], 0);
1277         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1278         expect_pending_htlcs_forwardable!(nodes[1]);
1279         expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1280
1281         // We send a third payment here, which is somewhat of a redundant test, but the
1282         // chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
1283         // commitment transaction states) whereas here we can explicitly check for it.
1284         {
1285                 nodes[0].node.send_payment_with_route(&route, payment_hash_3,
1286                         RecipientOnionFields::secret_only(payment_secret_3), PaymentId(payment_hash_3.0)).unwrap();
1287                 check_added_monitors!(nodes[0], 0);
1288                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1289         }
1290         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1291         check_added_monitors!(nodes[0], 1);
1292         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1293         assert_eq!(events.len(), 1);
1294         let payment_event = SendEvent::from_event(events.pop().unwrap());
1295
1296         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1297         check_added_monitors!(nodes[0], 1);
1298         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1299
1300         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1301         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1302         check_added_monitors!(nodes[1], 1);
1303         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
1304
1305         // Finally deliver the RAA to nodes[1] which results in a CS response to the last update
1306         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1307         check_added_monitors!(nodes[1], 1);
1308         expect_pending_htlcs_forwardable!(nodes[1]);
1309         expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1310         let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1311
1312         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
1313         check_added_monitors!(nodes[0], 1);
1314
1315         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_update.commitment_signed);
1316         check_added_monitors!(nodes[0], 1);
1317         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1318
1319         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1320         check_added_monitors!(nodes[1], 1);
1321         expect_pending_htlcs_forwardable!(nodes[1]);
1322         expect_payment_claimable!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
1323
1324         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1325         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1326         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_3);
1327 }
1328
1329 #[test]
1330 fn claim_while_disconnected_monitor_update_fail() {
1331         // Test for claiming a payment while disconnected and then having the resulting
1332         // channel-update-generated monitor update fail. This kind of thing isn't a particularly
1333         // contrived case for nodes with network instability.
1334         // Backported from chanmon_fail_consistency fuzz tests as an unmerged version of the handling
1335         // code introduced a regression in this test (specifically, this caught a removal of the
1336         // channel_reestablish handling ensuring the order was sensical given the messages used).
1337         let chanmon_cfgs = create_chanmon_cfgs(2);
1338         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1339         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1340         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1341         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
1342
1343         // Forward a payment for B to claim
1344         let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
1345
1346         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
1347         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
1348
1349         nodes[1].node.claim_funds(payment_preimage_1);
1350         check_added_monitors!(nodes[1], 1);
1351         expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
1352
1353         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
1354                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
1355         }, true).unwrap();
1356         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
1357                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
1358         }, false).unwrap();
1359
1360         let as_reconnect = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
1361         let bs_reconnect = get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap();
1362
1363         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reconnect);
1364         let _as_channel_update = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
1365
1366         // Now deliver a's reestablish, freeing the claim from the holding cell, but fail the monitor
1367         // update.
1368         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1369
1370         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reconnect);
1371         let _bs_channel_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
1372         check_added_monitors!(nodes[1], 1);
1373         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1374
1375         // Send a second payment from A to B, resulting in a commitment update that gets swallowed with
1376         // the monitor still failed
1377         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1378         {
1379                 nodes[0].node.send_payment_with_route(&route, payment_hash_2,
1380                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1381                 check_added_monitors!(nodes[0], 1);
1382         }
1383
1384         let as_updates = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
1385         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &as_updates.update_add_htlcs[0]);
1386         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_updates.commitment_signed);
1387         check_added_monitors!(nodes[1], 1);
1388         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1389         // Note that nodes[1] not updating monitor here is OK - it wont take action on the new HTLC
1390         // until we've channel_monitor_update'd and updated for the new commitment transaction.
1391
1392         // Now un-fail the monitor, which will result in B sending its original commitment update,
1393         // receiving the commitment update from A, and the resulting commitment dances.
1394         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1395         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1396         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1397         check_added_monitors!(nodes[1], 0);
1398
1399         let bs_msgs = nodes[1].node.get_and_clear_pending_msg_events();
1400         assert_eq!(bs_msgs.len(), 2);
1401
1402         match bs_msgs[0] {
1403                 MessageSendEvent::UpdateHTLCs { ref node_id, ref updates } => {
1404                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1405                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1406                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &updates.commitment_signed);
1407                         check_added_monitors!(nodes[0], 1);
1408
1409                         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1410                         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1411                         check_added_monitors!(nodes[1], 1);
1412                 },
1413                 _ => panic!("Unexpected event"),
1414         }
1415
1416         match bs_msgs[1] {
1417                 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
1418                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1419                         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), msg);
1420                         check_added_monitors!(nodes[0], 1);
1421                 },
1422                 _ => panic!("Unexpected event"),
1423         }
1424
1425         let as_commitment = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
1426
1427         let bs_commitment = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1428         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_commitment.commitment_signed);
1429         check_added_monitors!(nodes[0], 1);
1430         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1431
1432         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment.commitment_signed);
1433         check_added_monitors!(nodes[1], 1);
1434         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
1435         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1436         check_added_monitors!(nodes[1], 1);
1437
1438         expect_pending_htlcs_forwardable!(nodes[1]);
1439         expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1440
1441         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
1442         check_added_monitors!(nodes[0], 1);
1443         expect_payment_sent!(nodes[0], payment_preimage_1);
1444
1445         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1446 }
1447
1448 #[test]
1449 fn monitor_failed_no_reestablish_response() {
1450         // Test for receiving a channel_reestablish after a monitor update failure resulted in no
1451         // response to a commitment_signed.
1452         // Backported from chanmon_fail_consistency fuzz tests as it caught a long-standing
1453         // debug_assert!() failure in channel_reestablish handling.
1454         let chanmon_cfgs = create_chanmon_cfgs(2);
1455         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1456         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1457         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1458         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
1459         {
1460                 let mut node_0_per_peer_lock;
1461                 let mut node_0_peer_state_lock;
1462                 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).context.announcement_sigs_state = AnnouncementSigsState::PeerReceived;
1463         }
1464         {
1465                 let mut node_1_per_peer_lock;
1466                 let mut node_1_peer_state_lock;
1467                 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).context.announcement_sigs_state = AnnouncementSigsState::PeerReceived;
1468         }
1469
1470         // Route the payment and deliver the initial commitment_signed (with a monitor update failure
1471         // on receipt).
1472         let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1473         {
1474                 nodes[0].node.send_payment_with_route(&route, payment_hash_1,
1475                         RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)).unwrap();
1476                 check_added_monitors!(nodes[0], 1);
1477         }
1478
1479         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1480         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1481         assert_eq!(events.len(), 1);
1482         let payment_event = SendEvent::from_event(events.pop().unwrap());
1483         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1484         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1485         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1486         check_added_monitors!(nodes[1], 1);
1487
1488         // Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
1489         // is still failing to update monitors.
1490         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
1491         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
1492
1493         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
1494                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
1495         }, true).unwrap();
1496         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
1497                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
1498         }, false).unwrap();
1499
1500         let as_reconnect = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
1501         let bs_reconnect = get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap();
1502
1503         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reconnect);
1504         let _bs_channel_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
1505         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reconnect);
1506         let _as_channel_update = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
1507
1508         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1509         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1510         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1511         check_added_monitors!(nodes[1], 0);
1512         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1513
1514         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1515         check_added_monitors!(nodes[0], 1);
1516         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1517         check_added_monitors!(nodes[0], 1);
1518
1519         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1520         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1521         check_added_monitors!(nodes[1], 1);
1522
1523         expect_pending_htlcs_forwardable!(nodes[1]);
1524         expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1525
1526         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1527 }
1528
1529 #[test]
1530 fn first_message_on_recv_ordering() {
1531         // Test that if the initial generator of a monitor-update-frozen state doesn't generate
1532         // messages, we're willing to flip the order of response messages if neccessary in resposne to
1533         // a commitment_signed which needs to send an RAA first.
1534         // At a high level, our goal is to fail monitor updating in response to an RAA which needs no
1535         // response and then handle a CS while in the failed state, requiring an RAA followed by a CS
1536         // response. To do this, we start routing two payments, with the final RAA for the first being
1537         // delivered while B is in AwaitingRAA, hence when we deliver the CS for the second B will
1538         // have no pending response but will want to send a RAA/CS (with the updates for the second
1539         // payment applied).
1540         // Backported from chanmon_fail_consistency fuzz tests as it caught a bug here.
1541         let chanmon_cfgs = create_chanmon_cfgs(2);
1542         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1543         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1544         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1545         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
1546
1547         // Route the first payment outbound, holding the last RAA for B until we are set up so that we
1548         // can deliver it and fail the monitor update.
1549         let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1550         {
1551                 nodes[0].node.send_payment_with_route(&route, payment_hash_1,
1552                         RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)).unwrap();
1553                 check_added_monitors!(nodes[0], 1);
1554         }
1555
1556         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1557         assert_eq!(events.len(), 1);
1558         let payment_event = SendEvent::from_event(events.pop().unwrap());
1559         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
1560         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1561         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1562         check_added_monitors!(nodes[1], 1);
1563         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1564
1565         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1566         check_added_monitors!(nodes[0], 1);
1567         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1568         check_added_monitors!(nodes[0], 1);
1569
1570         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1571
1572         // Route the second payment, generating an update_add_htlc/commitment_signed
1573         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1574         {
1575                 nodes[0].node.send_payment_with_route(&route, payment_hash_2,
1576                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1577                 check_added_monitors!(nodes[0], 1);
1578         }
1579         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1580         assert_eq!(events.len(), 1);
1581         let payment_event = SendEvent::from_event(events.pop().unwrap());
1582         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
1583
1584         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1585
1586         // Deliver the final RAA for the first payment, which does not require a response. RAAs
1587         // generally require a commitment_signed, so the fact that we're expecting an opposite response
1588         // to the next message also tests resetting the delivery order.
1589         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1590         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1591         check_added_monitors!(nodes[1], 1);
1592
1593         // Now deliver the update_add_htlc/commitment_signed for the second payment, which does need an
1594         // RAA/CS response, which should be generated when we call channel_monitor_update (with the
1595         // appropriate HTLC acceptance).
1596         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1597         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1598         check_added_monitors!(nodes[1], 1);
1599         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1600
1601         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1602         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1603         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1604         check_added_monitors!(nodes[1], 0);
1605
1606         expect_pending_htlcs_forwardable!(nodes[1]);
1607         expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1608
1609         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1610         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1611         check_added_monitors!(nodes[0], 1);
1612         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1613         check_added_monitors!(nodes[0], 1);
1614
1615         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1616         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1617         check_added_monitors!(nodes[1], 1);
1618
1619         expect_pending_htlcs_forwardable!(nodes[1]);
1620         expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1621
1622         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1623         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1624 }
1625
1626 #[test]
1627 fn test_monitor_update_fail_claim() {
1628         // Basic test for monitor update failures when processing claim_funds calls.
1629         // We set up a simple 3-node network, sending a payment from A to B and failing B's monitor
1630         // update to claim the payment. We then send two payments C->B->A, which are held at B.
1631         // Finally, we restore the channel monitor updating and claim the payment on B, forwarding
1632         // the payments from C onwards to A.
1633         let chanmon_cfgs = create_chanmon_cfgs(3);
1634         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1635         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1636         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1637         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
1638         create_announced_chan_between_nodes(&nodes, 1, 2);
1639
1640         // Rebalance a bit so that we can send backwards from 3 to 2.
1641         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
1642
1643         let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
1644
1645         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1646         nodes[1].node.claim_funds(payment_preimage_1);
1647         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1648         check_added_monitors!(nodes[1], 1);
1649
1650         // Note that at this point there is a pending commitment transaction update for A being held by
1651         // B. Even when we go to send the payment from C through B to A, B will not update this
1652         // already-signed commitment transaction and will instead wait for it to resolve before
1653         // forwarding the payment onwards.
1654
1655         let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(nodes[2], nodes[0], 1_000_000);
1656         {
1657                 nodes[2].node.send_payment_with_route(&route, payment_hash_2,
1658                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1659                 check_added_monitors!(nodes[2], 1);
1660         }
1661
1662         // Successfully update the monitor on the 1<->2 channel, but the 0<->1 channel should still be
1663         // paused, so forward shouldn't succeed until we call channel_monitor_updated().
1664         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1665
1666         let mut events = nodes[2].node.get_and_clear_pending_msg_events();
1667         assert_eq!(events.len(), 1);
1668         let payment_event = SendEvent::from_event(events.pop().unwrap());
1669         nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
1670         let events = nodes[1].node.get_and_clear_pending_msg_events();
1671         assert_eq!(events.len(), 0);
1672         commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
1673         expect_pending_htlcs_forwardable_ignore!(nodes[1]);
1674
1675         let (_, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[0]);
1676         nodes[2].node.send_payment_with_route(&route, payment_hash_3,
1677                 RecipientOnionFields::secret_only(payment_secret_3), PaymentId(payment_hash_3.0)).unwrap();
1678         check_added_monitors!(nodes[2], 1);
1679
1680         let mut events = nodes[2].node.get_and_clear_pending_msg_events();
1681         assert_eq!(events.len(), 1);
1682         let payment_event = SendEvent::from_event(events.pop().unwrap());
1683         nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
1684         let events = nodes[1].node.get_and_clear_pending_msg_events();
1685         assert_eq!(events.len(), 0);
1686         commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
1687
1688         // Now restore monitor updating on the 0<->1 channel and claim the funds on B.
1689         let channel_id = chan_1.2;
1690         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1691         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1692         expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
1693         check_added_monitors!(nodes[1], 0);
1694
1695         let bs_fulfill_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1696         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_fulfill_update.update_fulfill_htlcs[0]);
1697         commitment_signed_dance!(nodes[0], nodes[1], bs_fulfill_update.commitment_signed, false);
1698         expect_payment_sent!(nodes[0], payment_preimage_1);
1699
1700         // Get the payment forwards, note that they were batched into one commitment update.
1701         nodes[1].node.process_pending_htlc_forwards();
1702         check_added_monitors!(nodes[1], 1);
1703         let bs_forward_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1704         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &bs_forward_update.update_add_htlcs[0]);
1705         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &bs_forward_update.update_add_htlcs[1]);
1706         commitment_signed_dance!(nodes[0], nodes[1], bs_forward_update.commitment_signed, false);
1707         expect_pending_htlcs_forwardable!(nodes[0]);
1708
1709         let events = nodes[0].node.get_and_clear_pending_events();
1710         assert_eq!(events.len(), 2);
1711         match events[0] {
1712                 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, via_user_channel_id, .. } => {
1713                         assert_eq!(payment_hash_2, *payment_hash);
1714                         assert_eq!(1_000_000, amount_msat);
1715                         assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
1716                         assert_eq!(via_channel_id, Some(channel_id));
1717                         assert_eq!(via_user_channel_id, Some(42));
1718                         match &purpose {
1719                                 PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
1720                                         assert!(payment_preimage.is_none());
1721                                         assert_eq!(payment_secret_2, *payment_secret);
1722                                 },
1723                                 _ => panic!("expected PaymentPurpose::InvoicePayment")
1724                         }
1725                 },
1726                 _ => panic!("Unexpected event"),
1727         }
1728         match events[1] {
1729                 Event::PaymentClaimable { ref payment_hash, ref purpose, amount_msat, receiver_node_id, via_channel_id, .. } => {
1730                         assert_eq!(payment_hash_3, *payment_hash);
1731                         assert_eq!(1_000_000, amount_msat);
1732                         assert_eq!(receiver_node_id.unwrap(), nodes[0].node.get_our_node_id());
1733                         assert_eq!(via_channel_id, Some(channel_id));
1734                         match &purpose {
1735                                 PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
1736                                         assert!(payment_preimage.is_none());
1737                                         assert_eq!(payment_secret_3, *payment_secret);
1738                                 },
1739                                 _ => panic!("expected PaymentPurpose::InvoicePayment")
1740                         }
1741                 },
1742                 _ => panic!("Unexpected event"),
1743         }
1744 }
1745
1746 #[test]
1747 fn test_monitor_update_on_pending_forwards() {
1748         // Basic test for monitor update failures when processing pending HTLC fail/add forwards.
1749         // We do this with a simple 3-node network, sending a payment from A to C and one from C to A.
1750         // The payment from A to C will be failed by C and pending a back-fail to A, while the payment
1751         // from C to A will be pending a forward to A.
1752         let chanmon_cfgs = create_chanmon_cfgs(3);
1753         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1754         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1755         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1756         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
1757         let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2);
1758
1759         // Rebalance a bit so that we can send backwards from 3 to 1.
1760         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
1761
1762         let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
1763         nodes[2].node.fail_htlc_backwards(&payment_hash_1);
1764         expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2], vec![HTLCDestination::FailedPayment { payment_hash: payment_hash_1 }]);
1765         check_added_monitors!(nodes[2], 1);
1766
1767         let cs_fail_update = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1768         nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &cs_fail_update.update_fail_htlcs[0]);
1769         commitment_signed_dance!(nodes[1], nodes[2], cs_fail_update.commitment_signed, true, true);
1770         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1771
1772         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[2], nodes[0], 1000000);
1773         {
1774                 nodes[2].node.send_payment_with_route(&route, payment_hash_2,
1775                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1776                 check_added_monitors!(nodes[2], 1);
1777         }
1778
1779         let mut events = nodes[2].node.get_and_clear_pending_msg_events();
1780         assert_eq!(events.len(), 1);
1781         let payment_event = SendEvent::from_event(events.pop().unwrap());
1782         nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
1783         commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false);
1784
1785         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1786         expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_2.2 }]);
1787         check_added_monitors!(nodes[1], 1);
1788
1789         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1790         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone();
1791         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1792         check_added_monitors!(nodes[1], 0);
1793
1794         let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1795         nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fail_htlcs[0]);
1796         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_add_htlcs[0]);
1797         commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, false, true);
1798
1799         let events = nodes[0].node.get_and_clear_pending_events();
1800         assert_eq!(events.len(), 3);
1801         if let Event::PaymentPathFailed { payment_hash, payment_failed_permanently, .. } = events[1] {
1802                 assert_eq!(payment_hash, payment_hash_1);
1803                 assert!(payment_failed_permanently);
1804         } else { panic!("Unexpected event!"); }
1805         match events[2] {
1806                 Event::PaymentFailed { payment_hash, .. } => {
1807                         assert_eq!(payment_hash, payment_hash_1);
1808                 },
1809                 _ => panic!("Unexpected event"),
1810         }
1811         match events[0] {
1812                 Event::PendingHTLCsForwardable { .. } => { },
1813                 _ => panic!("Unexpected event"),
1814         };
1815         nodes[0].node.process_pending_htlc_forwards();
1816         expect_payment_claimable!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
1817
1818         claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
1819 }
1820
1821 #[test]
1822 fn monitor_update_claim_fail_no_response() {
1823         // Test for claim_funds resulting in both a monitor update failure and no message response (due
1824         // to channel being AwaitingRAA).
1825         // Backported from chanmon_fail_consistency fuzz tests as an unmerged version of the handling
1826         // code was broken.
1827         let chanmon_cfgs = create_chanmon_cfgs(2);
1828         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1829         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1830         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1831         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
1832
1833         // Forward a payment for B to claim
1834         let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
1835
1836         // Now start forwarding a second payment, skipping the last RAA so B is in AwaitingRAA
1837         let (route, payment_hash_2, payment_preimage_2, payment_secret_2) = get_route_and_payment_hash!(nodes[0], nodes[1], 1000000);
1838         {
1839                 nodes[0].node.send_payment_with_route(&route, payment_hash_2,
1840                         RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
1841                 check_added_monitors!(nodes[0], 1);
1842         }
1843
1844         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1845         assert_eq!(events.len(), 1);
1846         let payment_event = SendEvent::from_event(events.pop().unwrap());
1847         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1848         let as_raa = commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false, true, false, true);
1849
1850         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1851         nodes[1].node.claim_funds(payment_preimage_1);
1852         check_added_monitors!(nodes[1], 1);
1853
1854         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1855
1856         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1857         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1858         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1859         expect_payment_claimed!(nodes[1], payment_hash_1, 1_000_000);
1860         check_added_monitors!(nodes[1], 0);
1861         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1862
1863         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1864         check_added_monitors!(nodes[1], 1);
1865         expect_pending_htlcs_forwardable!(nodes[1]);
1866         expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1867
1868         let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1869         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
1870         commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, false);
1871         expect_payment_sent!(nodes[0], payment_preimage_1);
1872
1873         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1874 }
1875
1876 // restore_b_before_conf has no meaning if !confirm_a_first
1877 // restore_b_before_lock has no meaning if confirm_a_first
1878 fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf: bool, restore_b_before_lock: bool) {
1879         // Test that if the monitor update generated by funding_transaction_generated fails we continue
1880         // the channel setup happily after the update is restored.
1881         let chanmon_cfgs = create_chanmon_cfgs(2);
1882         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1883         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1884         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1885
1886         nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
1887         nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
1888         nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
1889
1890         let (temporary_channel_id, funding_tx, funding_output) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
1891
1892         nodes[0].node.funding_transaction_generated(&temporary_channel_id, &nodes[1].node.get_our_node_id(), funding_tx.clone()).unwrap();
1893         check_added_monitors!(nodes[0], 0);
1894
1895         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1896         let funding_created_msg = get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id());
1897         let channel_id = OutPoint { txid: funding_created_msg.funding_txid, index: funding_created_msg.funding_output_index }.to_channel_id();
1898         nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &funding_created_msg);
1899         check_added_monitors!(nodes[1], 1);
1900
1901         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
1902         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()));
1903         check_added_monitors!(nodes[0], 1);
1904         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1905         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
1906         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1907         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1908         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1909         check_added_monitors!(nodes[0], 0);
1910         expect_channel_pending_event(&nodes[0], &nodes[1].node.get_our_node_id());
1911
1912         let events = nodes[0].node.get_and_clear_pending_events();
1913         assert_eq!(events.len(), 0);
1914         assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().len(), 1);
1915         assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0)[0].txid(), funding_output.txid);
1916
1917         if confirm_a_first {
1918                 confirm_transaction(&nodes[0], &funding_tx);
1919                 nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id()));
1920                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1921                 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
1922         } else {
1923                 assert!(!restore_b_before_conf);
1924                 confirm_transaction(&nodes[1], &funding_tx);
1925                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1926         }
1927
1928         // Make sure nodes[1] isn't stupid enough to re-send the ChannelReady on reconnect
1929         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
1930         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
1931         let mut reconnect_args = ReconnectArgs::new(&nodes[0], &nodes[1]);
1932         reconnect_args.send_channel_ready.1 = confirm_a_first;
1933         reconnect_nodes(reconnect_args);
1934
1935         // But we want to re-emit ChannelPending
1936         expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
1937         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1938         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1939
1940         if !restore_b_before_conf {
1941                 confirm_transaction(&nodes[1], &funding_tx);
1942                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1943                 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
1944         }
1945         if !confirm_a_first && !restore_b_before_lock {
1946                 confirm_transaction(&nodes[0], &funding_tx);
1947                 nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id()));
1948                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1949                 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
1950         }
1951
1952         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
1953         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1954         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
1955         check_added_monitors!(nodes[1], 0);
1956
1957         let (channel_id, (announcement, as_update, bs_update)) = if !confirm_a_first {
1958                 if !restore_b_before_lock {
1959                         let (channel_ready, channel_id) = create_chan_between_nodes_with_value_confirm_second(&nodes[0], &nodes[1]);
1960                         (channel_id, create_chan_between_nodes_with_value_b(&nodes[1], &nodes[0], &channel_ready))
1961                 } else {
1962                         nodes[0].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendChannelReady, nodes[0].node.get_our_node_id()));
1963                         confirm_transaction(&nodes[0], &funding_tx);
1964                         let (channel_ready, channel_id) = create_chan_between_nodes_with_value_confirm_second(&nodes[1], &nodes[0]);
1965                         (channel_id, create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready))
1966                 }
1967         } else {
1968                 if restore_b_before_conf {
1969                         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1970                         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
1971                         confirm_transaction(&nodes[1], &funding_tx);
1972                 }
1973                 let (channel_ready, channel_id) = create_chan_between_nodes_with_value_confirm_second(&nodes[0], &nodes[1]);
1974                 (channel_id, create_chan_between_nodes_with_value_b(&nodes[1], &nodes[0], &channel_ready))
1975         };
1976         for node in nodes.iter() {
1977                 assert!(node.gossip_sync.handle_channel_announcement(&announcement).unwrap());
1978                 node.gossip_sync.handle_channel_update(&as_update).unwrap();
1979                 node.gossip_sync.handle_channel_update(&bs_update).unwrap();
1980         }
1981
1982         if !restore_b_before_lock {
1983                 expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
1984         } else {
1985                 expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
1986         }
1987
1988
1989         send_payment(&nodes[0], &[&nodes[1]], 8000000);
1990         close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
1991         check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure, [nodes[1].node.get_our_node_id()], 100000);
1992         check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure, [nodes[0].node.get_our_node_id()], 100000);
1993 }
1994
1995 #[test]
1996 fn during_funding_monitor_fail() {
1997         do_during_funding_monitor_fail(true, true, false);
1998         do_during_funding_monitor_fail(true, false, false);
1999         do_during_funding_monitor_fail(false, false, false);
2000         do_during_funding_monitor_fail(false, false, true);
2001 }
2002
2003 #[test]
2004 fn test_path_paused_mpp() {
2005         // Simple test of sending a multi-part payment where one path is currently blocked awaiting
2006         // monitor update
2007         let chanmon_cfgs = create_chanmon_cfgs(4);
2008         let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
2009         let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
2010         let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs);
2011
2012         let chan_1_id = create_announced_chan_between_nodes(&nodes, 0, 1).0.contents.short_channel_id;
2013         let (chan_2_ann, _, chan_2_id, _) = create_announced_chan_between_nodes(&nodes, 0, 2);
2014         let chan_3_id = create_announced_chan_between_nodes(&nodes, 1, 3).0.contents.short_channel_id;
2015         let chan_4_id = create_announced_chan_between_nodes(&nodes, 2, 3).0.contents.short_channel_id;
2016
2017         let (mut route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(&nodes[0], nodes[3], 100000);
2018
2019         // Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
2020         let path = route.paths[0].clone();
2021         route.paths.push(path);
2022         route.paths[0].hops[0].pubkey = nodes[1].node.get_our_node_id();
2023         route.paths[0].hops[0].short_channel_id = chan_1_id;
2024         route.paths[0].hops[1].short_channel_id = chan_3_id;
2025         route.paths[1].hops[0].pubkey = nodes[2].node.get_our_node_id();
2026         route.paths[1].hops[0].short_channel_id = chan_2_ann.contents.short_channel_id;
2027         route.paths[1].hops[1].short_channel_id = chan_4_id;
2028
2029         // Set it so that the first monitor update (for the path 0 -> 1 -> 3) succeeds, but the second
2030         // (for the path 0 -> 2 -> 3) fails.
2031         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2032         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2033
2034         // Now check that we get the right return value, indicating that the first path succeeded but
2035         // the second got a MonitorUpdateInProgress err. This implies
2036         // PaymentSendFailure::PartialFailure as some paths succeeded, preventing retry.
2037         if let Err(PaymentSendFailure::PartialFailure { results, ..}) = nodes[0].node.send_payment_with_route(
2038                 &route, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)
2039         ) {
2040                 assert_eq!(results.len(), 2);
2041                 if let Ok(()) = results[0] {} else { panic!(); }
2042                 if let Err(APIError::MonitorUpdateInProgress) = results[1] {} else { panic!(); }
2043         } else { panic!(); }
2044         check_added_monitors!(nodes[0], 2);
2045         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2046
2047         // Pass the first HTLC of the payment along to nodes[3].
2048         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
2049         assert_eq!(events.len(), 1);
2050         pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 0, payment_hash.clone(), Some(payment_secret), events.pop().unwrap(), false, None);
2051
2052         // And check that, after we successfully update the monitor for chan_2 we can pass the second
2053         // HTLC along to nodes[3] and claim the whole payment back to nodes[0].
2054         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_2_id).unwrap().clone();
2055         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
2056         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
2057         assert_eq!(events.len(), 1);
2058         pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash.clone(), Some(payment_secret), events.pop().unwrap(), true, None);
2059
2060         claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]], false, payment_preimage);
2061 }
2062
2063 #[test]
2064 fn test_pending_update_fee_ack_on_reconnect() {
2065         // In early versions of our automated fee update patch, nodes did not correctly use the
2066         // previous channel feerate after sending an undelivered revoke_and_ack when re-sending an
2067         // undelivered commitment_signed.
2068         //
2069         // B sends A new HTLC + CS, not delivered
2070         // A sends B update_fee + CS
2071         // B receives the CS and sends RAA, previously causing B to lock in the new feerate
2072         // reconnect
2073         // B resends initial CS, using the original fee
2074
2075         let chanmon_cfgs = create_chanmon_cfgs(2);
2076         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2077         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
2078         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2079
2080         create_announced_chan_between_nodes(&nodes, 0, 1);
2081         send_payment(&nodes[0], &[&nodes[1]], 100_000_00);
2082
2083         let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(&nodes[1], nodes[0], 1_000_000);
2084         nodes[1].node.send_payment_with_route(&route, payment_hash,
2085                 RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_hash.0)).unwrap();
2086         check_added_monitors!(nodes[1], 1);
2087         let bs_initial_send_msgs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2088         // bs_initial_send_msgs are not delivered until they are re-generated after reconnect
2089
2090         {
2091                 let mut feerate_lock = chanmon_cfgs[0].fee_estimator.sat_per_kw.lock().unwrap();
2092                 *feerate_lock *= 2;
2093         }
2094         nodes[0].node.timer_tick_occurred();
2095         check_added_monitors!(nodes[0], 1);
2096         let as_update_fee_msgs = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
2097         assert!(as_update_fee_msgs.update_fee.is_some());
2098
2099         nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), as_update_fee_msgs.update_fee.as_ref().unwrap());
2100         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_update_fee_msgs.commitment_signed);
2101         check_added_monitors!(nodes[1], 1);
2102         let bs_first_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
2103         // bs_first_raa is not delivered until it is re-generated after reconnect
2104
2105         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
2106         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
2107
2108         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
2109                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
2110         }, true).unwrap();
2111         let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
2112         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
2113                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
2114         }, false).unwrap();
2115         let bs_connect_msg = get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap();
2116
2117         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_connect_msg);
2118         let bs_resend_msgs = nodes[1].node.get_and_clear_pending_msg_events();
2119         assert_eq!(bs_resend_msgs.len(), 3);
2120         if let MessageSendEvent::UpdateHTLCs { ref updates, .. } = bs_resend_msgs[0] {
2121                 assert_eq!(*updates, bs_initial_send_msgs);
2122         } else { panic!(); }
2123         if let MessageSendEvent::SendRevokeAndACK { ref msg, .. } = bs_resend_msgs[1] {
2124                 assert_eq!(*msg, bs_first_raa);
2125         } else { panic!(); }
2126         if let MessageSendEvent::SendChannelUpdate { .. } = bs_resend_msgs[2] { } else { panic!(); }
2127
2128         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_connect_msg);
2129         get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
2130
2131         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &bs_initial_send_msgs.update_add_htlcs[0]);
2132         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_initial_send_msgs.commitment_signed);
2133         check_added_monitors!(nodes[0], 1);
2134         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id()));
2135         check_added_monitors!(nodes[1], 1);
2136         let bs_second_cs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()).commitment_signed;
2137
2138         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_first_raa);
2139         check_added_monitors!(nodes[0], 1);
2140         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id()).commitment_signed);
2141         check_added_monitors!(nodes[1], 1);
2142         let bs_third_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
2143
2144         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_cs);
2145         check_added_monitors!(nodes[0], 1);
2146         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_third_raa);
2147         check_added_monitors!(nodes[0], 1);
2148
2149         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id()));
2150         check_added_monitors!(nodes[1], 1);
2151
2152         expect_pending_htlcs_forwardable!(nodes[0]);
2153         expect_payment_claimable!(nodes[0], payment_hash, payment_secret, 1_000_000);
2154
2155         claim_payment(&nodes[1], &[&nodes[0]], payment_preimage);
2156 }
2157
2158 #[test]
2159 fn test_fail_htlc_on_broadcast_after_claim() {
2160         // In an earlier version of 7e78fa660cec8a73286c94c1073ee588140e7a01 we'd also fail the inbound
2161         // channel backwards if we received an HTLC failure after a HTLC fulfillment. Here we test a
2162         // specific case of that by having the HTLC failure come from the ChannelMonitor after a dust
2163         // HTLC was not included in a confirmed commitment transaction.
2164         //
2165         // We first forward a payment, then claim it with an update_fulfill_htlc message, closing the
2166         // channel immediately before commitment occurs. After the commitment transaction reaches
2167         // ANTI_REORG_DELAY confirmations, will will try to fail the HTLC which was already fulfilled.
2168         let chanmon_cfgs = create_chanmon_cfgs(3);
2169         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
2170         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
2171         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
2172
2173         create_announced_chan_between_nodes(&nodes, 0, 1);
2174         let chan_id_2 = create_announced_chan_between_nodes(&nodes, 1, 2).2;
2175
2176         let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 2000);
2177
2178         let bs_txn = get_local_commitment_txn!(nodes[2], chan_id_2);
2179         assert_eq!(bs_txn.len(), 1);
2180
2181         nodes[2].node.claim_funds(payment_preimage);
2182         check_added_monitors!(nodes[2], 1);
2183         expect_payment_claimed!(nodes[2], payment_hash, 2000);
2184
2185         let cs_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
2186         nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
2187         let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2188         check_added_monitors!(nodes[1], 1);
2189         expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
2190
2191         mine_transaction(&nodes[1], &bs_txn[0]);
2192         check_closed_event!(nodes[1], 1, ClosureReason::CommitmentTxConfirmed, [nodes[2].node.get_our_node_id()], 100000);
2193         check_closed_broadcast!(nodes[1], true);
2194         connect_blocks(&nodes[1], ANTI_REORG_DELAY - 1);
2195         check_added_monitors!(nodes[1], 1);
2196         expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
2197
2198         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
2199         expect_payment_sent_without_paths!(nodes[0], payment_preimage);
2200         commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, true, true);
2201         expect_payment_path_successful!(nodes[0]);
2202 }
2203
2204 fn do_update_fee_resend_test(deliver_update: bool, parallel_updates: bool) {
2205         // In early versions we did not handle resending of update_fee on reconnect correctly. The
2206         // chanmon_consistency fuzz target, of course, immediately found it, but we test a few cases
2207         // explicitly here.
2208         let chanmon_cfgs = create_chanmon_cfgs(2);
2209         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2210         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
2211         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2212
2213         create_announced_chan_between_nodes(&nodes, 0, 1);
2214         send_payment(&nodes[0], &[&nodes[1]], 1000);
2215
2216         {
2217                 let mut feerate_lock = chanmon_cfgs[0].fee_estimator.sat_per_kw.lock().unwrap();
2218                 *feerate_lock += 20;
2219         }
2220         nodes[0].node.timer_tick_occurred();
2221         check_added_monitors!(nodes[0], 1);
2222         let update_msgs = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
2223         assert!(update_msgs.update_fee.is_some());
2224         if deliver_update {
2225                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msgs.update_fee.as_ref().unwrap());
2226         }
2227
2228         if parallel_updates {
2229                 {
2230                         let mut feerate_lock = chanmon_cfgs[0].fee_estimator.sat_per_kw.lock().unwrap();
2231                         *feerate_lock += 20;
2232                 }
2233                 nodes[0].node.timer_tick_occurred();
2234                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
2235         }
2236
2237         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
2238         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
2239
2240         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
2241                 features: nodes[1].node.init_features(), networks: None, remote_network_address: None
2242         }, true).unwrap();
2243         let as_connect_msg = get_chan_reestablish_msgs!(nodes[0], nodes[1]).pop().unwrap();
2244         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
2245                 features: nodes[0].node.init_features(), networks: None, remote_network_address: None
2246         }, false).unwrap();
2247         let bs_connect_msg = get_chan_reestablish_msgs!(nodes[1], nodes[0]).pop().unwrap();
2248
2249         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_connect_msg);
2250         get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
2251         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
2252
2253         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_connect_msg);
2254         let mut as_reconnect_msgs = nodes[0].node.get_and_clear_pending_msg_events();
2255         assert_eq!(as_reconnect_msgs.len(), 2);
2256         if let MessageSendEvent::SendChannelUpdate { .. } = as_reconnect_msgs.pop().unwrap() {} else { panic!(); }
2257         let update_msgs = if let MessageSendEvent::UpdateHTLCs { updates, .. } = as_reconnect_msgs.pop().unwrap()
2258                 { updates } else { panic!(); };
2259         assert!(update_msgs.update_fee.is_some());
2260         nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msgs.update_fee.as_ref().unwrap());
2261         if parallel_updates {
2262                 nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &update_msgs.commitment_signed);
2263                 check_added_monitors!(nodes[1], 1);
2264                 let (bs_first_raa, bs_first_cs) = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2265                 nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_first_raa);
2266                 check_added_monitors!(nodes[0], 1);
2267                 let as_second_update = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
2268
2269                 nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_first_cs);
2270                 check_added_monitors!(nodes[0], 1);
2271                 let as_first_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
2272
2273                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), as_second_update.update_fee.as_ref().unwrap());
2274                 nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_second_update.commitment_signed);
2275                 check_added_monitors!(nodes[1], 1);
2276                 let bs_second_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
2277
2278                 nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_first_raa);
2279                 let bs_second_cs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2280                 check_added_monitors!(nodes[1], 1);
2281
2282                 nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
2283                 check_added_monitors!(nodes[0], 1);
2284
2285                 nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_cs.commitment_signed);
2286                 check_added_monitors!(nodes[0], 1);
2287                 let as_second_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
2288
2289                 nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
2290                 check_added_monitors!(nodes[1], 1);
2291         } else {
2292                 commitment_signed_dance!(nodes[1], nodes[0], update_msgs.commitment_signed, false);
2293         }
2294
2295         send_payment(&nodes[0], &[&nodes[1]], 1000);
2296 }
2297 #[test]
2298 fn update_fee_resend_test() {
2299         do_update_fee_resend_test(false, false);
2300         do_update_fee_resend_test(true, false);
2301         do_update_fee_resend_test(false, true);
2302         do_update_fee_resend_test(true, true);
2303 }
2304
2305 fn do_channel_holding_cell_serialize(disconnect: bool, reload_a: bool) {
2306         // Tests that, when we serialize a channel with AddHTLC entries in the holding cell, we
2307         // properly free them on reconnect. We previously failed such HTLCs upon serialization, but
2308         // that behavior was both somewhat unexpected and also broken (there was a debug assertion
2309         // which failed in such a case).
2310         let chanmon_cfgs = create_chanmon_cfgs(2);
2311         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2312         let persister;
2313         let new_chain_monitor;
2314         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
2315         let nodes_0_deserialized;
2316         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2317
2318         let chan_id = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 15_000_000, 7_000_000_000).2;
2319         let (route, payment_hash_1, payment_preimage_1, payment_secret_1) = get_route_and_payment_hash!(&nodes[0], nodes[1], 100000);
2320         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(&nodes[1]);
2321
2322         // Do a really complicated dance to get an HTLC into the holding cell, with
2323         // MonitorUpdateInProgress set but AwaitingRemoteRevoke unset. When this test was written, any
2324         // attempts to send an HTLC while MonitorUpdateInProgress is set are immediately
2325         // failed-backwards. Thus, the only way to get an AddHTLC into the holding cell is to add it
2326         // while AwaitingRemoteRevoke is set but MonitorUpdateInProgress is unset, and then swap the
2327         // flags.
2328         //
2329         // We do this by:
2330         //  a) routing a payment from node B to node A,
2331         //  b) sending a payment from node A to node B without delivering any of the generated messages,
2332         //     putting node A in AwaitingRemoteRevoke,
2333         //  c) sending a second payment from node A to node B, which is immediately placed in the
2334         //     holding cell,
2335         //  d) claiming the first payment from B, allowing us to fail the monitor update which occurs
2336         //     when we try to persist the payment preimage,
2337         //  e) delivering A's commitment_signed from (b) and the resulting B revoke_and_ack message,
2338         //     clearing AwaitingRemoteRevoke on node A.
2339         //
2340         // Note that because, at the end, MonitorUpdateInProgress is still set, the HTLC generated in
2341         // (c) will not be freed from the holding cell.
2342         let (payment_preimage_0, payment_hash_0, _) = route_payment(&nodes[1], &[&nodes[0]], 100_000);
2343
2344         nodes[0].node.send_payment_with_route(&route, payment_hash_1,
2345                 RecipientOnionFields::secret_only(payment_secret_1), PaymentId(payment_hash_1.0)).unwrap();
2346         check_added_monitors!(nodes[0], 1);
2347         let send = SendEvent::from_node(&nodes[0]);
2348         assert_eq!(send.msgs.len(), 1);
2349
2350         nodes[0].node.send_payment_with_route(&route, payment_hash_2,
2351                 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
2352         check_added_monitors!(nodes[0], 0);
2353
2354         let chan_0_monitor_serialized = get_monitor!(nodes[0], chan_id).encode();
2355         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2356         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2357         nodes[0].node.claim_funds(payment_preimage_0);
2358         check_added_monitors!(nodes[0], 1);
2359
2360         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send.msgs[0]);
2361         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send.commitment_msg);
2362         check_added_monitors!(nodes[1], 1);
2363
2364         let (raa, cs) = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2365
2366         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &raa);
2367         check_added_monitors!(nodes[0], 1);
2368
2369         if disconnect {
2370                 // Optionally reload nodes[0] entirely through a serialization roundtrip, otherwise just
2371                 // disconnect the peers. Note that the fuzzer originally found this issue because
2372                 // deserializing a ChannelManager in this state causes an assertion failure.
2373                 if reload_a {
2374                         reload_node!(nodes[0], &nodes[0].node.encode(), &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized);
2375                         persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2376                         persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2377                 } else {
2378                         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
2379                 }
2380                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
2381
2382                 // Now reconnect the two
2383                 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
2384                         features: nodes[1].node.init_features(), networks: None, remote_network_address: None
2385                 }, true).unwrap();
2386                 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
2387                 assert_eq!(reestablish_1.len(), 1);
2388                 nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
2389                         features: nodes[0].node.init_features(), networks: None, remote_network_address: None
2390                 }, false).unwrap();
2391                 let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
2392                 assert_eq!(reestablish_2.len(), 1);
2393
2394                 nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]);
2395                 let resp_1 = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
2396                 check_added_monitors!(nodes[1], 0);
2397
2398                 nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]);
2399                 let resp_0 = handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
2400
2401                 assert!(resp_0.0.is_none());
2402                 assert!(resp_0.1.is_none());
2403                 assert!(resp_0.2.is_none());
2404                 assert!(resp_1.0.is_none());
2405                 assert!(resp_1.1.is_none());
2406
2407                 // Check that the freshly-generated cs is equal to the original (which we will deliver in a
2408                 // moment).
2409                 if let Some(pending_cs) = resp_1.2 {
2410                         assert!(pending_cs.update_add_htlcs.is_empty());
2411                         assert!(pending_cs.update_fail_htlcs.is_empty());
2412                         assert!(pending_cs.update_fulfill_htlcs.is_empty());
2413                         assert_eq!(pending_cs.commitment_signed, cs);
2414                 } else { panic!(); }
2415
2416                 if reload_a {
2417                         // The two pending monitor updates were replayed (but are still pending).
2418                         check_added_monitors(&nodes[0], 2);
2419                 } else {
2420                         // There should be no monitor updates as we are still pending awaiting a failed one.
2421                         check_added_monitors(&nodes[0], 0);
2422                 }
2423                 check_added_monitors(&nodes[1], 0);
2424         }
2425
2426         // If we finish updating the monitor, we should free the holding cell right away (this did
2427         // not occur prior to #756).
2428         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2429         let (funding_txo, mon_id, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone();
2430         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(funding_txo, mon_id);
2431         expect_payment_claimed!(nodes[0], payment_hash_0, 100_000);
2432
2433         // New outbound messages should be generated immediately upon a call to
2434         // get_and_clear_pending_msg_events (but not before).
2435         check_added_monitors!(nodes[0], 0);
2436         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
2437         check_added_monitors!(nodes[0], 1);
2438         assert_eq!(events.len(), 1);
2439
2440         // Deliver the pending in-flight CS
2441         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &cs);
2442         check_added_monitors!(nodes[0], 1);
2443
2444         let commitment_msg = match events.pop().unwrap() {
2445                 MessageSendEvent::UpdateHTLCs { node_id, updates } => {
2446                         assert_eq!(node_id, nodes[1].node.get_our_node_id());
2447                         assert!(updates.update_fail_htlcs.is_empty());
2448                         assert!(updates.update_fail_malformed_htlcs.is_empty());
2449                         assert!(updates.update_fee.is_none());
2450                         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
2451                         nodes[1].node.handle_update_fulfill_htlc(&nodes[0].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
2452                         expect_payment_sent_without_paths!(nodes[1], payment_preimage_0);
2453                         assert_eq!(updates.update_add_htlcs.len(), 1);
2454                         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &updates.update_add_htlcs[0]);
2455                         updates.commitment_signed
2456                 },
2457                 _ => panic!("Unexpected event type!"),
2458         };
2459
2460         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &commitment_msg);
2461         check_added_monitors!(nodes[1], 1);
2462
2463         let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
2464         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
2465         expect_pending_htlcs_forwardable!(nodes[1]);
2466         expect_payment_claimable!(nodes[1], payment_hash_1, payment_secret_1, 100000);
2467         check_added_monitors!(nodes[1], 1);
2468
2469         commitment_signed_dance!(nodes[1], nodes[0], (), false, true, false);
2470
2471         let events = nodes[1].node.get_and_clear_pending_events();
2472         assert_eq!(events.len(), 2);
2473         match events[0] {
2474                 Event::PendingHTLCsForwardable { .. } => { },
2475                 _ => panic!("Unexpected event"),
2476         };
2477         match events[1] {
2478                 Event::PaymentPathSuccessful { .. } => { },
2479                 _ => panic!("Unexpected event"),
2480         };
2481
2482         nodes[1].node.process_pending_htlc_forwards();
2483         expect_payment_claimable!(nodes[1], payment_hash_2, payment_secret_2, 100000);
2484
2485         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
2486         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
2487 }
2488 #[test]
2489 fn channel_holding_cell_serialize() {
2490         do_channel_holding_cell_serialize(true, true);
2491         do_channel_holding_cell_serialize(true, false);
2492         do_channel_holding_cell_serialize(false, true); // last arg doesn't matter
2493 }
2494
2495 #[derive(PartialEq)]
2496 enum HTLCStatusAtDupClaim {
2497         Received,
2498         HoldingCell,
2499         Cleared,
2500 }
2501 fn do_test_reconnect_dup_htlc_claims(htlc_status: HTLCStatusAtDupClaim, second_fails: bool) {
2502         // When receiving an update_fulfill_htlc message, we immediately forward the claim backwards
2503         // along the payment path before waiting for a full commitment_signed dance. This is great, but
2504         // can cause duplicative claims if a node sends an update_fulfill_htlc message, disconnects,
2505         // reconnects, and then has to re-send its update_fulfill_htlc message again.
2506         // In previous code, we didn't handle the double-claim correctly, spuriously closing the
2507         // channel on which the inbound HTLC was received.
2508         let chanmon_cfgs = create_chanmon_cfgs(3);
2509         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
2510         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
2511         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
2512
2513         create_announced_chan_between_nodes(&nodes, 0, 1);
2514         let chan_id_2 = create_announced_chan_between_nodes(&nodes, 1, 2).2;
2515
2516         let (payment_preimage, payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 100_000);
2517
2518         let mut as_raa = None;
2519         if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
2520                 // In order to get the HTLC claim into the holding cell at nodes[1], we need nodes[1] to be
2521                 // awaiting a remote revoke_and_ack from nodes[0].
2522                 let (route, second_payment_hash, _, second_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100_000);
2523                 nodes[0].node.send_payment_with_route(&route, second_payment_hash,
2524                         RecipientOnionFields::secret_only(second_payment_secret), PaymentId(second_payment_hash.0)).unwrap();
2525                 check_added_monitors!(nodes[0], 1);
2526
2527                 let send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
2528                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
2529                 nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send_event.commitment_msg);
2530                 check_added_monitors!(nodes[1], 1);
2531
2532                 let (bs_raa, bs_cs) = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
2533                 nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
2534                 check_added_monitors!(nodes[0], 1);
2535                 nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_cs);
2536                 check_added_monitors!(nodes[0], 1);
2537
2538                 as_raa = Some(get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id()));
2539         }
2540
2541         let fulfill_msg = msgs::UpdateFulfillHTLC {
2542                 channel_id: chan_id_2,
2543                 htlc_id: 0,
2544                 payment_preimage,
2545         };
2546         if second_fails {
2547                 nodes[2].node.fail_htlc_backwards(&payment_hash);
2548                 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[2], vec![HTLCDestination::FailedPayment { payment_hash }]);
2549                 check_added_monitors!(nodes[2], 1);
2550                 get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
2551         } else {
2552                 nodes[2].node.claim_funds(payment_preimage);
2553                 check_added_monitors!(nodes[2], 1);
2554                 expect_payment_claimed!(nodes[2], payment_hash, 100_000);
2555
2556                 let cs_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
2557                 assert_eq!(cs_updates.update_fulfill_htlcs.len(), 1);
2558                 // Check that the message we're about to deliver matches the one generated:
2559                 assert_eq!(fulfill_msg, cs_updates.update_fulfill_htlcs[0]);
2560         }
2561         nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &fulfill_msg);
2562         expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);
2563         check_added_monitors!(nodes[1], 1);
2564
2565         let mut bs_updates = None;
2566         if htlc_status != HTLCStatusAtDupClaim::HoldingCell {
2567                 bs_updates = Some(get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()));
2568                 assert_eq!(bs_updates.as_ref().unwrap().update_fulfill_htlcs.len(), 1);
2569                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.as_ref().unwrap().update_fulfill_htlcs[0]);
2570                 expect_payment_sent_without_paths!(nodes[0], payment_preimage);
2571                 if htlc_status == HTLCStatusAtDupClaim::Cleared {
2572                         commitment_signed_dance!(nodes[0], nodes[1], &bs_updates.as_ref().unwrap().commitment_signed, false);
2573                         expect_payment_path_successful!(nodes[0]);
2574                 }
2575         } else {
2576                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
2577         }
2578
2579         nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id());
2580         nodes[2].node.peer_disconnected(&nodes[1].node.get_our_node_id());
2581
2582         if second_fails {
2583                 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
2584                 reconnect_args.pending_htlc_fails.0 = 1;
2585                 reconnect_nodes(reconnect_args);
2586                 expect_pending_htlcs_forwardable_and_htlc_handling_failed!(nodes[1], vec![HTLCDestination::NextHopChannel { node_id: Some(nodes[2].node.get_our_node_id()), channel_id: chan_id_2 }]);
2587         } else {
2588                 let mut reconnect_args = ReconnectArgs::new(&nodes[1], &nodes[2]);
2589                 reconnect_args.pending_htlc_claims.0 = 1;
2590                 reconnect_nodes(reconnect_args);
2591         }
2592
2593         if htlc_status == HTLCStatusAtDupClaim::HoldingCell {
2594                 nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa.unwrap());
2595                 check_added_monitors!(nodes[1], 1);
2596                 expect_pending_htlcs_forwardable_ignore!(nodes[1]); // We finally receive the second payment, but don't claim it
2597
2598                 bs_updates = Some(get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id()));
2599                 assert_eq!(bs_updates.as_ref().unwrap().update_fulfill_htlcs.len(), 1);
2600                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.as_ref().unwrap().update_fulfill_htlcs[0]);
2601                 expect_payment_sent_without_paths!(nodes[0], payment_preimage);
2602         }
2603         if htlc_status != HTLCStatusAtDupClaim::Cleared {
2604                 commitment_signed_dance!(nodes[0], nodes[1], &bs_updates.as_ref().unwrap().commitment_signed, false);
2605                 expect_payment_path_successful!(nodes[0]);
2606         }
2607 }
2608
2609 #[test]
2610 fn test_reconnect_dup_htlc_claims() {
2611         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::Received, false);
2612         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::HoldingCell, false);
2613         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::Cleared, false);
2614         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::Received, true);
2615         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::HoldingCell, true);
2616         do_test_reconnect_dup_htlc_claims(HTLCStatusAtDupClaim::Cleared, true);
2617 }
2618
2619 #[test]
2620 fn test_temporary_error_during_shutdown() {
2621         // Test that temporary failures when updating the monitor's shutdown script delay cooperative
2622         // close.
2623         let mut config = test_default_channel_config();
2624         config.channel_handshake_config.commit_upfront_shutdown_pubkey = false;
2625
2626         let chanmon_cfgs = create_chanmon_cfgs(2);
2627         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2628         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(config), Some(config)]);
2629         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2630
2631         let (_, _, channel_id, funding_tx) = create_announced_chan_between_nodes(&nodes, 0, 1);
2632
2633         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2634         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2635
2636         nodes[0].node.close_channel(&channel_id, &nodes[1].node.get_our_node_id()).unwrap();
2637         nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id()));
2638         check_added_monitors!(nodes[1], 1);
2639
2640         nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id()));
2641         check_added_monitors!(nodes[0], 1);
2642
2643         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
2644
2645         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2646         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2647
2648         let (outpoint, latest_update, _) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
2649         nodes[0].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
2650         nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendClosingSigned, nodes[1].node.get_our_node_id()));
2651
2652         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
2653
2654         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2655         let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
2656         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, latest_update);
2657
2658         nodes[0].node.handle_closing_signed(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, nodes[0].node.get_our_node_id()));
2659         let (_, closing_signed_a) = get_closing_signed_broadcast!(nodes[0].node, nodes[1].node.get_our_node_id());
2660         let txn_a = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
2661
2662         nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &closing_signed_a.unwrap());
2663         let (_, none_b) = get_closing_signed_broadcast!(nodes[1].node, nodes[0].node.get_our_node_id());
2664         assert!(none_b.is_none());
2665         let txn_b = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
2666
2667         assert_eq!(txn_a, txn_b);
2668         assert_eq!(txn_a.len(), 1);
2669         check_spends!(txn_a[0], funding_tx);
2670         check_closed_event!(nodes[1], 1, ClosureReason::CooperativeClosure, [nodes[0].node.get_our_node_id()], 100000);
2671         check_closed_event!(nodes[0], 1, ClosureReason::CooperativeClosure, [nodes[1].node.get_our_node_id()], 100000);
2672 }
2673
2674 #[test]
2675 fn test_permanent_error_during_sending_shutdown() {
2676         // Test that permanent failures when updating the monitor's shutdown script result in a force
2677         // close when initiating a cooperative close.
2678         let mut config = test_default_channel_config();
2679         config.channel_handshake_config.commit_upfront_shutdown_pubkey = false;
2680
2681         let chanmon_cfgs = create_chanmon_cfgs(2);
2682         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2683         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(config), None]);
2684         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2685
2686         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
2687         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::PermanentFailure);
2688
2689         assert!(nodes[0].node.close_channel(&channel_id, &nodes[1].node.get_our_node_id()).is_ok());
2690
2691         // We always send the `shutdown` response when initiating a shutdown, even if we immediately
2692         // close the channel thereafter.
2693         let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
2694         assert_eq!(msg_events.len(), 3);
2695         if let MessageSendEvent::SendShutdown { .. } = msg_events[0] {} else { panic!(); }
2696         if let MessageSendEvent::BroadcastChannelUpdate { .. } = msg_events[1] {} else { panic!(); }
2697         if let MessageSendEvent::HandleError { .. } =  msg_events[2] {} else { panic!(); }
2698
2699         check_added_monitors!(nodes[0], 2);
2700         check_closed_event!(nodes[0], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() },
2701                 [nodes[1].node.get_our_node_id()], 100000);
2702 }
2703
2704 #[test]
2705 fn test_permanent_error_during_handling_shutdown() {
2706         // Test that permanent failures when updating the monitor's shutdown script result in a force
2707         // close when handling a cooperative close.
2708         let mut config = test_default_channel_config();
2709         config.channel_handshake_config.commit_upfront_shutdown_pubkey = false;
2710
2711         let chanmon_cfgs = create_chanmon_cfgs(2);
2712         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2713         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, Some(config)]);
2714         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2715
2716         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1).2;
2717         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::PermanentFailure);
2718
2719         assert!(nodes[0].node.close_channel(&channel_id, &nodes[1].node.get_our_node_id()).is_ok());
2720         let shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
2721         nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &shutdown);
2722
2723         // We always send the `shutdown` response when receiving a shutdown, even if we immediately
2724         // close the channel thereafter.
2725         let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
2726         assert_eq!(msg_events.len(), 3);
2727         if let MessageSendEvent::SendShutdown { .. } = msg_events[0] {} else { panic!(); }
2728         if let MessageSendEvent::BroadcastChannelUpdate { .. } = msg_events[1] {} else { panic!(); }
2729         if let MessageSendEvent::HandleError { .. } =  msg_events[2] {} else { panic!(); }
2730
2731         check_added_monitors!(nodes[1], 2);
2732         check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() },
2733                 [nodes[0].node.get_our_node_id()], 100000);
2734 }
2735
2736 #[test]
2737 fn double_temp_error() {
2738         // Test that it's OK to have multiple `ChainMonitor::update_channel` calls fail in a row.
2739         let chanmon_cfgs = create_chanmon_cfgs(2);
2740         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2741         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
2742         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2743
2744         let (_, _, channel_id, _) = create_announced_chan_between_nodes(&nodes, 0, 1);
2745
2746         let (payment_preimage_1, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
2747         let (payment_preimage_2, payment_hash_2, _) = route_payment(&nodes[0], &[&nodes[1]], 1_000_000);
2748
2749         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2750         // `claim_funds` results in a ChannelMonitorUpdate.
2751         nodes[1].node.claim_funds(payment_preimage_1);
2752         check_added_monitors!(nodes[1], 1);
2753         let (funding_tx, latest_update_1, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
2754
2755         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2756         // Previously, this would've panicked due to a double-call to `Channel::monitor_update_failed`,
2757         // which had some asserts that prevented it from being called twice.
2758         nodes[1].node.claim_funds(payment_preimage_2);
2759         check_added_monitors!(nodes[1], 1);
2760         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed);
2761
2762         let (_, latest_update_2, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
2763         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(funding_tx, latest_update_1);
2764         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
2765         check_added_monitors!(nodes[1], 0);
2766         nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(funding_tx, latest_update_2);
2767
2768         // Complete the first HTLC. Note that as a side-effect we handle the monitor update completions
2769         // and get both PaymentClaimed events at once.
2770         let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
2771
2772         let events = nodes[1].node.get_and_clear_pending_events();
2773         assert_eq!(events.len(), 2);
2774         match events[0] {
2775                 Event::PaymentClaimed { amount_msat: 1_000_000, payment_hash, .. } => assert_eq!(payment_hash, payment_hash_1),
2776                 _ => panic!("Unexpected Event: {:?}", events[0]),
2777         }
2778         match events[1] {
2779                 Event::PaymentClaimed { amount_msat: 1_000_000, payment_hash, .. } => assert_eq!(payment_hash, payment_hash_2),
2780                 _ => panic!("Unexpected Event: {:?}", events[1]),
2781         }
2782
2783         assert_eq!(msg_events.len(), 1);
2784         let (update_fulfill_1, commitment_signed_b1, node_id) = {
2785                 match &msg_events[0] {
2786                         &MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
2787                                 assert!(update_add_htlcs.is_empty());
2788                                 assert_eq!(update_fulfill_htlcs.len(), 1);
2789                                 assert!(update_fail_htlcs.is_empty());
2790                                 assert!(update_fail_malformed_htlcs.is_empty());
2791                                 assert!(update_fee.is_none());
2792                                 (update_fulfill_htlcs[0].clone(), commitment_signed.clone(), node_id.clone())
2793                         },
2794                         _ => panic!("Unexpected event"),
2795                 }
2796         };
2797         assert_eq!(node_id, nodes[0].node.get_our_node_id());
2798         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_1);
2799         check_added_monitors!(nodes[0], 0);
2800         expect_payment_sent_without_paths!(nodes[0], payment_preimage_1);
2801         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed_b1);
2802         check_added_monitors!(nodes[0], 1);
2803         nodes[0].node.process_pending_htlc_forwards();
2804         let (raa_a1, commitment_signed_a1) = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
2805         check_added_monitors!(nodes[1], 0);
2806         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
2807         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &raa_a1);
2808         check_added_monitors!(nodes[1], 1);
2809         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &commitment_signed_a1);
2810         check_added_monitors!(nodes[1], 1);
2811
2812         // Complete the second HTLC.
2813         let ((update_fulfill_2, commitment_signed_b2), raa_b2) = {
2814                 let events = nodes[1].node.get_and_clear_pending_msg_events();
2815                 assert_eq!(events.len(), 2);
2816                 (match &events[0] {
2817                         MessageSendEvent::UpdateHTLCs { node_id, updates } => {
2818                                 assert_eq!(*node_id, nodes[0].node.get_our_node_id());
2819                                 assert!(updates.update_add_htlcs.is_empty());
2820                                 assert!(updates.update_fail_htlcs.is_empty());
2821                                 assert!(updates.update_fail_malformed_htlcs.is_empty());
2822                                 assert!(updates.update_fee.is_none());
2823                                 assert_eq!(updates.update_fulfill_htlcs.len(), 1);
2824                                 (updates.update_fulfill_htlcs[0].clone(), updates.commitment_signed.clone())
2825                         },
2826                         _ => panic!("Unexpected event"),
2827                 },
2828                  match events[1] {
2829                          MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
2830                                  assert_eq!(*node_id, nodes[0].node.get_our_node_id());
2831                                  (*msg).clone()
2832                          },
2833                          _ => panic!("Unexpected event"),
2834                  })
2835         };
2836         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &raa_b2);
2837         check_added_monitors!(nodes[0], 1);
2838         expect_payment_path_successful!(nodes[0]);
2839
2840         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_2);
2841         check_added_monitors!(nodes[0], 0);
2842         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
2843         commitment_signed_dance!(nodes[0], nodes[1], commitment_signed_b2, false);
2844         expect_payment_sent!(nodes[0], payment_preimage_2);
2845 }
2846
2847 fn do_test_outbound_reload_without_init_mon(use_0conf: bool) {
2848         // Test that if the monitor update generated in funding_signed is stored async and we restart
2849         // with the latest ChannelManager but the ChannelMonitor persistence never completed we happily
2850         // drop the channel and move on.
2851         let chanmon_cfgs = create_chanmon_cfgs(2);
2852         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2853
2854         let persister;
2855         let new_chain_monitor;
2856
2857         let mut chan_config = test_default_channel_config();
2858         chan_config.manually_accept_inbound_channels = true;
2859         chan_config.channel_handshake_limits.trust_own_funding_0conf = true;
2860
2861         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(chan_config), Some(chan_config)]);
2862         let nodes_0_deserialized;
2863
2864         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2865
2866         nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
2867         nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
2868
2869         let events = nodes[1].node.get_and_clear_pending_events();
2870         assert_eq!(events.len(), 1);
2871         match events[0] {
2872                 Event::OpenChannelRequest { temporary_channel_id, .. } => {
2873                         if use_0conf {
2874                                 nodes[1].node.accept_inbound_channel_from_trusted_peer_0conf(&temporary_channel_id, &nodes[0].node.get_our_node_id(), 0).unwrap();
2875                         } else {
2876                                 nodes[1].node.accept_inbound_channel(&temporary_channel_id, &nodes[0].node.get_our_node_id(), 0).unwrap();
2877                         }
2878                 },
2879                 _ => panic!("Unexpected event"),
2880         };
2881
2882         nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
2883
2884         let (temporary_channel_id, funding_tx, ..) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
2885
2886         nodes[0].node.funding_transaction_generated(&temporary_channel_id, &nodes[1].node.get_our_node_id(), funding_tx.clone()).unwrap();
2887         check_added_monitors!(nodes[0], 0);
2888
2889         let funding_created_msg = get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id());
2890         nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &funding_created_msg);
2891         check_added_monitors!(nodes[1], 1);
2892         expect_channel_pending_event(&nodes[1], &nodes[0].node.get_our_node_id());
2893
2894         let bs_signed_locked = nodes[1].node.get_and_clear_pending_msg_events();
2895         assert_eq!(bs_signed_locked.len(), if use_0conf { 2 } else { 1 });
2896         match &bs_signed_locked[0] {
2897                 MessageSendEvent::SendFundingSigned { msg, .. } => {
2898                         chanmon_cfgs[0].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2899
2900                         nodes[0].node.handle_funding_signed(&nodes[1].node.get_our_node_id(), &msg);
2901                         check_added_monitors!(nodes[0], 1);
2902                 }
2903                 _ => panic!("Unexpected event"),
2904         }
2905         if use_0conf {
2906                 match &bs_signed_locked[1] {
2907                         MessageSendEvent::SendChannelReady { msg, .. } => {
2908                                 nodes[0].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), &msg);
2909                         }
2910                         _ => panic!("Unexpected event"),
2911                 }
2912         }
2913
2914         assert!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().is_empty());
2915         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
2916         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
2917
2918         // nodes[0] is now waiting on the first ChannelMonitor persistence to complete in order to
2919         // broadcast the funding transaction. If nodes[0] restarts at this point with the
2920         // ChannelMonitor lost, we should simply discard the channel.
2921
2922         // The test framework checks that watched_txn/outputs match the monitor set, which they will
2923         // not, so we have to clear them here.
2924         nodes[0].chain_source.watched_txn.lock().unwrap().clear();
2925         nodes[0].chain_source.watched_outputs.lock().unwrap().clear();
2926
2927         reload_node!(nodes[0], &nodes[0].node.encode(), &[], persister, new_chain_monitor, nodes_0_deserialized);
2928         check_closed_event!(nodes[0], 1, ClosureReason::DisconnectedPeer, [nodes[1].node.get_our_node_id()], 100000);
2929         assert!(nodes[0].node.list_channels().is_empty());
2930 }
2931
2932 #[test]
2933 fn test_outbound_reload_without_init_mon() {
2934         do_test_outbound_reload_without_init_mon(true);
2935         do_test_outbound_reload_without_init_mon(false);
2936 }
2937
2938 fn do_test_inbound_reload_without_init_mon(use_0conf: bool, lock_commitment: bool) {
2939         // Test that if the monitor update generated by funding_transaction_generated is stored async
2940         // and we restart with the latest ChannelManager but the ChannelMonitor persistence never
2941         // completed we happily drop the channel and move on.
2942         let chanmon_cfgs = create_chanmon_cfgs(2);
2943         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
2944
2945         let persister;
2946         let new_chain_monitor;
2947
2948         let mut chan_config = test_default_channel_config();
2949         chan_config.manually_accept_inbound_channels = true;
2950         chan_config.channel_handshake_limits.trust_own_funding_0conf = true;
2951
2952         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[Some(chan_config), Some(chan_config)]);
2953         let nodes_1_deserialized;
2954
2955         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
2956
2957         nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
2958         nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
2959
2960         let events = nodes[1].node.get_and_clear_pending_events();
2961         assert_eq!(events.len(), 1);
2962         match events[0] {
2963                 Event::OpenChannelRequest { temporary_channel_id, .. } => {
2964                         if use_0conf {
2965                                 nodes[1].node.accept_inbound_channel_from_trusted_peer_0conf(&temporary_channel_id, &nodes[0].node.get_our_node_id(), 0).unwrap();
2966                         } else {
2967                                 nodes[1].node.accept_inbound_channel(&temporary_channel_id, &nodes[0].node.get_our_node_id(), 0).unwrap();
2968                         }
2969                 },
2970                 _ => panic!("Unexpected event"),
2971         };
2972
2973         nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
2974
2975         let (temporary_channel_id, funding_tx, ..) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
2976
2977         nodes[0].node.funding_transaction_generated(&temporary_channel_id, &nodes[1].node.get_our_node_id(), funding_tx.clone()).unwrap();
2978         check_added_monitors!(nodes[0], 0);
2979
2980         let funding_created_msg = get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id());
2981         chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
2982         nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &funding_created_msg);
2983         check_added_monitors!(nodes[1], 1);
2984
2985         // nodes[1] happily sends its funding_signed even though its awaiting the persistence of the
2986         // initial ChannelMonitor, but it will decline to send its channel_ready even if the funding
2987         // transaction is confirmed.
2988         let funding_signed_msg = get_event_msg!(nodes[1], MessageSendEvent::SendFundingSigned, nodes[0].node.get_our_node_id());
2989
2990         nodes[0].node.handle_funding_signed(&nodes[1].node.get_our_node_id(), &funding_signed_msg);
2991         check_added_monitors!(nodes[0], 1);
2992         expect_channel_pending_event(&nodes[0], &nodes[1].node.get_our_node_id());
2993
2994         let as_funding_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
2995         if lock_commitment {
2996                 confirm_transaction(&nodes[0], &as_funding_tx[0]);
2997                 confirm_transaction(&nodes[1], &as_funding_tx[0]);
2998         }
2999         if use_0conf || lock_commitment {
3000                 let as_ready = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id());
3001                 nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &as_ready);
3002         }
3003         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
3004
3005         // nodes[1] is now waiting on the first ChannelMonitor persistence to complete in order to
3006         // move the channel to ready (or is waiting on the funding transaction to confirm). If nodes[1]
3007         // restarts at this point with the ChannelMonitor lost, we should simply discard the channel.
3008
3009         // The test framework checks that watched_txn/outputs match the monitor set, which they will
3010         // not, so we have to clear them here.
3011         nodes[1].chain_source.watched_txn.lock().unwrap().clear();
3012         nodes[1].chain_source.watched_outputs.lock().unwrap().clear();
3013
3014         reload_node!(nodes[1], &nodes[1].node.encode(), &[], persister, new_chain_monitor, nodes_1_deserialized);
3015
3016         check_closed_event!(nodes[1], 1, ClosureReason::DisconnectedPeer, [nodes[0].node.get_our_node_id()], 100000);
3017         assert!(nodes[1].node.list_channels().is_empty());
3018 }
3019
3020 #[test]
3021 fn test_inbound_reload_without_init_mon() {
3022         do_test_inbound_reload_without_init_mon(true, true);
3023         do_test_inbound_reload_without_init_mon(true, false);
3024         do_test_inbound_reload_without_init_mon(false, true);
3025         do_test_inbound_reload_without_init_mon(false, false);
3026 }