_ 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 ChannelMonitorUpdateErr 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::block::{Block, BlockHeader};
  16 use bitcoin::hash_types::BlockHash;
  17 use bitcoin::network::constants::Network;
  18 use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr};
  19 use chain::transaction::OutPoint;
  20 use chain::Listen;
  21 use chain::Watch;
  22 use ln::channelmanager::{RAACommitmentOrder, PaymentPreimage, PaymentHash, PaymentSendFailure};
  23 use ln::features::{InitFeatures, InvoiceFeatures};
  24 use ln::msgs;
  25 use ln::msgs::{ChannelMessageHandler, ErrorAction, RoutingMessageHandler};
  26 use routing::router::get_route;
  27 use util::enforcing_trait_impls::EnforcingSigner;
  28 use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
  29 use util::errors::APIError;
  30 use util::ser::{ReadableArgs, Writeable};
  31
  32 use bitcoin::hashes::sha256::Hash as Sha256;
  33 use bitcoin::hashes::Hash;
  34
  35 use ln::functional_test_utils::*;
  36
  37 use util::test_utils;
  38
  39 // If persister_fail is true, we have the persister return a PermanentFailure
  40 // instead of the higher-level ChainMonitor.
  41 fn do_test_simple_monitor_permanent_update_fail(persister_fail: bool) {
  42         // Test that we handle a simple permanent monitor update failure
  43         let mut 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, InitFeatures::known(), InitFeatures::known());
  48         let logger = test_utils::TestLogger::new();
  49
  50         let (_, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(&nodes[1]);
  51
  52         match persister_fail {
  53                 true => chanmon_cfgs[0].persister.set_update_ret(Err(ChannelMonitorUpdateErr::PermanentFailure)),
  54                 false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::PermanentFailure))
  55         }
  56         let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
  57         let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
  58         unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)), true, APIError::ChannelUnavailable {..}, {});
  59         check_added_monitors!(nodes[0], 2);
  60
  61         let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
  62         assert_eq!(events_1.len(), 2);
  63         match events_1[0] {
  64                 MessageSendEvent::BroadcastChannelUpdate { .. } => {},
  65                 _ => panic!("Unexpected event"),
  66         };
  67         match events_1[1] {
  68                 MessageSendEvent::HandleError { node_id, .. } => assert_eq!(node_id, nodes[1].node.get_our_node_id()),
  69                 _ => panic!("Unexpected event"),
  70         };
  71
  72         // TODO: Once we hit the chain with the failure transaction we should check that we get a
  73         // PaymentFailed event
  74
  75         assert_eq!(nodes[0].node.list_channels().len(), 0);
  76 }
  77
  78 #[test]
  79 fn test_monitor_and_persister_update_fail() {
  80         // Test that if both updating the `ChannelMonitor` and persisting the updated
  81         // `ChannelMonitor` fail, then the failure from updating the `ChannelMonitor`
  82         // one that gets returned.
  83         let chanmon_cfgs = create_chanmon_cfgs(2);
  84         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
  85         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
  86         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
  87
  88         // Create some initial channel
  89         let chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
  90         let outpoint = OutPoint { txid: chan.3.txid(), index: 0 };
  91
  92         // Rebalance the network to generate htlc in the two directions
  93         send_payment(&nodes[0], &vec!(&nodes[1])[..], 10_000_000);
  94
  95         // Route an HTLC from node 0 to node 1 (but don't settle)
  96         let preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 9_000_000).0;
  97
  98         // Make a copy of the ChainMonitor so we can capture the error it returns on a
  99         // bogus update. Note that if instead we updated the nodes[0]'s ChainMonitor
 100         // directly, the node would fail to be `Drop`'d at the end because its
 101         // ChannelManager and ChainMonitor would be out of sync.
 102         let chain_source = test_utils::TestChainSource::new(Network::Testnet);
 103         let logger = test_utils::TestLogger::with_id(format!("node {}", 0));
 104         let persister = test_utils::TestPersister::new();
 105         let chain_mon = {
 106                 let monitors = nodes[0].chain_monitor.chain_monitor.monitors.read().unwrap();
 107                 let monitor = monitors.get(&outpoint).unwrap();
 108                 let mut w = test_utils::TestVecWriter(Vec::new());
 109                 monitor.write(&mut w).unwrap();
 110                 let new_monitor = <(BlockHash, ChannelMonitor<EnforcingSigner>)>::read(
 111                         &mut ::std::io::Cursor::new(&w.0), &test_utils::OnlyReadsKeysInterface {}).unwrap().1;
 112                 assert!(new_monitor == *monitor);
 113                 let chain_mon = test_utils::TestChainMonitor::new(Some(&chain_source), &chanmon_cfgs[0].tx_broadcaster, &logger, &chanmon_cfgs[0].fee_estimator, &persister, &node_cfgs[0].keys_manager);
 114                 assert!(chain_mon.watch_channel(outpoint, new_monitor).is_ok());
 115                 chain_mon
 116         };
 117         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 118         chain_mon.chain_monitor.block_connected(&Block { header, txdata: vec![] }, 200);
 119
 120         // Set the persister's return value to be a TemporaryFailure.
 121         persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 122
 123         // Try to update ChannelMonitor
 124         assert!(nodes[1].node.claim_funds(preimage));
 125         check_added_monitors!(nodes[1], 1);
 126         let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 127         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
 128         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
 129         if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
 130                 if let Ok((_, _, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].fee_estimator, &node_cfgs[0].logger) {
 131                         // Check that even though the persister is returning a TemporaryFailure,
 132                         // because the update is bogus, ultimately the error that's returned
 133                         // should be a PermanentFailure.
 134                         if let Err(ChannelMonitorUpdateErr::PermanentFailure) = chain_mon.chain_monitor.update_channel(outpoint, update.clone()) {} else { panic!("Expected monitor error to be permanent"); }
 135                         logger.assert_log_contains("lightning::chain::chainmonitor".to_string(), "Failed to persist channel monitor update: TemporaryFailure".to_string(), 1);
 136                         if let Ok(_) = nodes[0].chain_monitor.update_channel(outpoint, update) {} else { assert!(false); }
 137                 } else { assert!(false); }
 138         } else { assert!(false); };
 139
 140         check_added_monitors!(nodes[0], 1);
 141         let events = nodes[0].node.get_and_clear_pending_events();
 142         assert_eq!(events.len(), 1);
 143 }
 144
 145 #[test]
 146 fn test_simple_monitor_permanent_update_fail() {
 147         do_test_simple_monitor_permanent_update_fail(false);
 148
 149         // Test behavior when the persister returns a PermanentFailure.
 150         do_test_simple_monitor_permanent_update_fail(true);
 151 }
 152
 153 // If persister_fail is true, we have the persister return a TemporaryFailure instead of the
 154 // higher-level ChainMonitor.
 155 fn do_test_simple_monitor_temporary_update_fail(disconnect: bool, persister_fail: bool) {
 156         // Test that we can recover from a simple temporary monitor update failure optionally with
 157         // a disconnect in between
 158         let mut 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, InitFeatures::known(), InitFeatures::known()).2;
 163         let logger = test_utils::TestLogger::new();
 164
 165         let (payment_preimage_1, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(&nodes[1]);
 166
 167         match persister_fail {
 168                 true => chanmon_cfgs[0].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure)),
 169                 false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure))
 170         }
 171
 172         {
 173                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 174                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 175                 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)), false, APIError::MonitorUpdateFailed, {});
 176                 check_added_monitors!(nodes[0], 1);
 177         }
 178
 179         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 180         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 181         assert_eq!(nodes[0].node.list_channels().len(), 1);
 182
 183         if disconnect {
 184                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 185                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 186                 reconnect_nodes(&nodes[0], &nodes[1], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 187         }
 188
 189         match persister_fail {
 190                 true => chanmon_cfgs[0].persister.set_update_ret(Ok(())),
 191                 false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()))
 192         }
 193         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 194         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
 195         check_added_monitors!(nodes[0], 0);
 196
 197         let mut events_2 = nodes[0].node.get_and_clear_pending_msg_events();
 198         assert_eq!(events_2.len(), 1);
 199         let payment_event = SendEvent::from_event(events_2.pop().unwrap());
 200         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
 201         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 202         commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
 203
 204         expect_pending_htlcs_forwardable!(nodes[1]);
 205
 206         let events_3 = nodes[1].node.get_and_clear_pending_events();
 207         assert_eq!(events_3.len(), 1);
 208         match events_3[0] {
 209                 Event::PaymentReceived { ref payment_hash, ref payment_preimage, ref payment_secret, amt, user_payment_id: _ } => {
 210                         assert_eq!(payment_hash_1, *payment_hash);
 211                         assert!(payment_preimage.is_none());
 212                         assert_eq!(payment_secret_1, *payment_secret);
 213                         assert_eq!(amt, 1000000);
 214                 },
 215                 _ => panic!("Unexpected event"),
 216         }
 217
 218         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 219
 220         // Now set it to failed again...
 221         let (_, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(&nodes[1]);
 222         {
 223                 match persister_fail {
 224                         true => chanmon_cfgs[0].persister.set_update_ret(Err(ChannelMonitorUpdateErr::TemporaryFailure)),
 225                         false => *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure))
 226                 }
 227                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 228                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 229                 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)), false, APIError::MonitorUpdateFailed, {});
 230                 check_added_monitors!(nodes[0], 1);
 231         }
 232
 233         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 234         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 235         assert_eq!(nodes[0].node.list_channels().len(), 1);
 236
 237         if disconnect {
 238                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 239                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 240                 reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 241         }
 242
 243         // ...and make sure we can force-close a frozen channel
 244         nodes[0].node.force_close_channel(&channel_id).unwrap();
 245         check_added_monitors!(nodes[0], 1);
 246         check_closed_broadcast!(nodes[0], true);
 247
 248         // TODO: Once we hit the chain with the failure transaction we should check that we get a
 249         // PaymentFailed event
 250
 251         assert_eq!(nodes[0].node.list_channels().len(), 0);
 252 }
 253
 254 #[test]
 255 fn test_simple_monitor_temporary_update_fail() {
 256         do_test_simple_monitor_temporary_update_fail(false, false);
 257         do_test_simple_monitor_temporary_update_fail(true, false);
 258
 259         // Test behavior when the persister returns a TemporaryFailure.
 260         do_test_simple_monitor_temporary_update_fail(false, true);
 261         do_test_simple_monitor_temporary_update_fail(true, true);
 262 }
 263
 264 fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
 265         let disconnect_flags = 8 | 16;
 266
 267         // Test that we can recover from a temporary monitor update failure with some in-flight
 268         // HTLCs going on at the same time potentially with some disconnection thrown in.
 269         // * First we route a payment, then get a temporary monitor update failure when trying to
 270         //   route a second payment. We then claim the first payment.
 271         // * If disconnect_count is set, we will disconnect at this point (which is likely as
 272         //   TemporaryFailure likely indicates net disconnect which resulted in failing to update
 273         //   the ChannelMonitor on a watchtower).
 274         // * If !(disconnect_count & 16) we deliver a update_fulfill_htlc/CS for the first payment
 275         //   immediately, otherwise we wait disconnect and deliver them via the reconnect
 276         //   channel_reestablish processing (ie disconnect_count & 16 makes no sense if
 277         //   disconnect_count & !disconnect_flags is 0).
 278         // * We then update the channel monitor, reconnecting if disconnect_count is set and walk
 279         //   through message sending, potentially disconnect/reconnecting multiple times based on
 280         //   disconnect_count, to get the update_fulfill_htlc through.
 281         // * We then walk through more message exchanges to get the original update_add_htlc
 282         //   through, swapping message ordering based on disconnect_count & 8 and optionally
 283         //   disconnect/reconnecting based on disconnect_count.
 284         let chanmon_cfgs = create_chanmon_cfgs(2);
 285         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 286         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 287         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 288         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
 289         let logger = test_utils::TestLogger::new();
 290
 291         let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
 292
 293         // Now try to send a second payment which will fail to send
 294         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
 295         {
 296                 *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 297                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 298                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 299                 unwrap_send_err!(nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)), false, APIError::MonitorUpdateFailed, {});
 300                 check_added_monitors!(nodes[0], 1);
 301         }
 302
 303         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 304         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 305         assert_eq!(nodes[0].node.list_channels().len(), 1);
 306
 307         // Claim the previous payment, which will result in a update_fulfill_htlc/CS from nodes[1]
 308         // but nodes[0] won't respond since it is frozen.
 309         assert!(nodes[1].node.claim_funds(payment_preimage_1));
 310         check_added_monitors!(nodes[1], 1);
 311         let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
 312         assert_eq!(events_2.len(), 1);
 313         let (bs_initial_fulfill, bs_initial_commitment_signed) = match events_2[0] {
 314                 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 } } => {
 315                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 316                         assert!(update_add_htlcs.is_empty());
 317                         assert_eq!(update_fulfill_htlcs.len(), 1);
 318                         assert!(update_fail_htlcs.is_empty());
 319                         assert!(update_fail_malformed_htlcs.is_empty());
 320                         assert!(update_fee.is_none());
 321
 322                         if (disconnect_count & 16) == 0 {
 323                                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_htlcs[0]);
 324                                 let events_3 = nodes[0].node.get_and_clear_pending_events();
 325                                 assert_eq!(events_3.len(), 1);
 326                                 match events_3[0] {
 327                                         Event::PaymentSent { ref payment_preimage } => {
 328                                                 assert_eq!(*payment_preimage, payment_preimage_1);
 329                                         },
 330                                         _ => panic!("Unexpected event"),
 331                                 }
 332
 333                                 nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), commitment_signed);
 334                                 check_added_monitors!(nodes[0], 1);
 335                                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 336                                 nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented generation of RAA".to_string(), 1);
 337                         }
 338
 339                         (update_fulfill_htlcs[0].clone(), commitment_signed.clone())
 340                 },
 341                 _ => panic!("Unexpected event"),
 342         };
 343
 344         if disconnect_count & !disconnect_flags > 0 {
 345                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 346                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 347         }
 348
 349         // Now fix monitor updating...
 350         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 351         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 352         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
 353         check_added_monitors!(nodes[0], 0);
 354
 355         macro_rules! disconnect_reconnect_peers { () => { {
 356                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 357                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 358
 359                 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
 360                 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
 361                 assert_eq!(reestablish_1.len(), 1);
 362                 nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
 363                 let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
 364                 assert_eq!(reestablish_2.len(), 1);
 365
 366                 nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]);
 367                 let as_resp = handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
 368                 nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]);
 369                 let bs_resp = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
 370
 371                 assert!(as_resp.0.is_none());
 372                 assert!(bs_resp.0.is_none());
 373
 374                 (reestablish_1, reestablish_2, as_resp, bs_resp)
 375         } } }
 376
 377         let (payment_event, initial_revoke_and_ack) = if disconnect_count & !disconnect_flags > 0 {
 378                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
 379                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 380
 381                 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
 382                 let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
 383                 assert_eq!(reestablish_1.len(), 1);
 384                 nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
 385                 let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
 386                 assert_eq!(reestablish_2.len(), 1);
 387
 388                 nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]);
 389                 check_added_monitors!(nodes[0], 0);
 390                 let mut as_resp = handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
 391                 nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]);
 392                 check_added_monitors!(nodes[1], 0);
 393                 let mut bs_resp = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
 394
 395                 assert!(as_resp.0.is_none());
 396                 assert!(bs_resp.0.is_none());
 397
 398                 assert!(bs_resp.1.is_none());
 399                 if (disconnect_count & 16) == 0 {
 400                         assert!(bs_resp.2.is_none());
 401
 402                         assert!(as_resp.1.is_some());
 403                         assert!(as_resp.2.is_some());
 404                         assert!(as_resp.3 == RAACommitmentOrder::CommitmentFirst);
 405                 } else {
 406                         assert!(bs_resp.2.as_ref().unwrap().update_add_htlcs.is_empty());
 407                         assert!(bs_resp.2.as_ref().unwrap().update_fail_htlcs.is_empty());
 408                         assert!(bs_resp.2.as_ref().unwrap().update_fail_malformed_htlcs.is_empty());
 409                         assert!(bs_resp.2.as_ref().unwrap().update_fee.is_none());
 410                         assert!(bs_resp.2.as_ref().unwrap().update_fulfill_htlcs == vec![bs_initial_fulfill]);
 411                         assert!(bs_resp.2.as_ref().unwrap().commitment_signed == bs_initial_commitment_signed);
 412
 413                         assert!(as_resp.1.is_none());
 414
 415                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().update_fulfill_htlcs[0]);
 416                         let events_3 = nodes[0].node.get_and_clear_pending_events();
 417                         assert_eq!(events_3.len(), 1);
 418                         match events_3[0] {
 419                                 Event::PaymentSent { ref payment_preimage } => {
 420                                         assert_eq!(*payment_preimage, payment_preimage_1);
 421                                 },
 422                                 _ => panic!("Unexpected event"),
 423                         }
 424
 425                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().commitment_signed);
 426                         let as_resp_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 427                         // No commitment_signed so get_event_msg's assert(len == 1) passes
 428                         check_added_monitors!(nodes[0], 1);
 429
 430                         as_resp.1 = Some(as_resp_raa);
 431                         bs_resp.2 = None;
 432                 }
 433
 434                 if disconnect_count & !disconnect_flags > 1 {
 435                         let (second_reestablish_1, second_reestablish_2, second_as_resp, second_bs_resp) = disconnect_reconnect_peers!();
 436
 437                         if (disconnect_count & 16) == 0 {
 438                                 assert!(reestablish_1 == second_reestablish_1);
 439                                 assert!(reestablish_2 == second_reestablish_2);
 440                         }
 441                         assert!(as_resp == second_as_resp);
 442                         assert!(bs_resp == second_bs_resp);
 443                 }
 444
 445                 (SendEvent::from_commitment_update(nodes[1].node.get_our_node_id(), as_resp.2.unwrap()), as_resp.1.unwrap())
 446         } else {
 447                 let mut events_4 = nodes[0].node.get_and_clear_pending_msg_events();
 448                 assert_eq!(events_4.len(), 2);
 449                 (SendEvent::from_event(events_4.remove(0)), match events_4[0] {
 450                         MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 451                                 assert_eq!(*node_id, nodes[1].node.get_our_node_id());
 452                                 msg.clone()
 453                         },
 454                         _ => panic!("Unexpected event"),
 455                 })
 456         };
 457
 458         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
 459
 460         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
 461         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
 462         let bs_revoke_and_ack = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 463         // nodes[1] is awaiting an RAA from nodes[0] still so get_event_msg's assert(len == 1) passes
 464         check_added_monitors!(nodes[1], 1);
 465
 466         if disconnect_count & !disconnect_flags > 2 {
 467                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 468
 469                 assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
 470                 assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
 471
 472                 assert!(as_resp.2.is_none());
 473                 assert!(bs_resp.2.is_none());
 474         }
 475
 476         let as_commitment_update;
 477         let bs_second_commitment_update;
 478
 479         macro_rules! handle_bs_raa { () => {
 480                 nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack);
 481                 as_commitment_update = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
 482                 assert!(as_commitment_update.update_add_htlcs.is_empty());
 483                 assert!(as_commitment_update.update_fulfill_htlcs.is_empty());
 484                 assert!(as_commitment_update.update_fail_htlcs.is_empty());
 485                 assert!(as_commitment_update.update_fail_malformed_htlcs.is_empty());
 486                 assert!(as_commitment_update.update_fee.is_none());
 487                 check_added_monitors!(nodes[0], 1);
 488         } }
 489
 490         macro_rules! handle_initial_raa { () => {
 491                 nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &initial_revoke_and_ack);
 492                 bs_second_commitment_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 493                 assert!(bs_second_commitment_update.update_add_htlcs.is_empty());
 494                 assert!(bs_second_commitment_update.update_fulfill_htlcs.is_empty());
 495                 assert!(bs_second_commitment_update.update_fail_htlcs.is_empty());
 496                 assert!(bs_second_commitment_update.update_fail_malformed_htlcs.is_empty());
 497                 assert!(bs_second_commitment_update.update_fee.is_none());
 498                 check_added_monitors!(nodes[1], 1);
 499         } }
 500
 501         if (disconnect_count & 8) == 0 {
 502                 handle_bs_raa!();
 503
 504                 if disconnect_count & !disconnect_flags > 3 {
 505                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 506
 507                         assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
 508                         assert!(bs_resp.1.is_none());
 509
 510                         assert!(as_resp.2.unwrap() == as_commitment_update);
 511                         assert!(bs_resp.2.is_none());
 512
 513                         assert!(as_resp.3 == RAACommitmentOrder::RevokeAndACKFirst);
 514                 }
 515
 516                 handle_initial_raa!();
 517
 518                 if disconnect_count & !disconnect_flags > 4 {
 519                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 520
 521                         assert!(as_resp.1.is_none());
 522                         assert!(bs_resp.1.is_none());
 523
 524                         assert!(as_resp.2.unwrap() == as_commitment_update);
 525                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 526                 }
 527         } else {
 528                 handle_initial_raa!();
 529
 530                 if disconnect_count & !disconnect_flags > 3 {
 531                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 532
 533                         assert!(as_resp.1.is_none());
 534                         assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
 535
 536                         assert!(as_resp.2.is_none());
 537                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 538
 539                         assert!(bs_resp.3 == RAACommitmentOrder::RevokeAndACKFirst);
 540                 }
 541
 542                 handle_bs_raa!();
 543
 544                 if disconnect_count & !disconnect_flags > 4 {
 545                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
 546
 547                         assert!(as_resp.1.is_none());
 548                         assert!(bs_resp.1.is_none());
 549
 550                         assert!(as_resp.2.unwrap() == as_commitment_update);
 551                         assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
 552                 }
 553         }
 554
 555         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_commitment_update.commitment_signed);
 556         let as_revoke_and_ack = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 557         // No commitment_signed so get_event_msg's assert(len == 1) passes
 558         check_added_monitors!(nodes[0], 1);
 559
 560         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment_update.commitment_signed);
 561         let bs_second_revoke_and_ack = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 562         // No commitment_signed so get_event_msg's assert(len == 1) passes
 563         check_added_monitors!(nodes[1], 1);
 564
 565         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack);
 566         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 567         check_added_monitors!(nodes[1], 1);
 568
 569         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke_and_ack);
 570         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 571         check_added_monitors!(nodes[0], 1);
 572
 573         expect_pending_htlcs_forwardable!(nodes[1]);
 574
 575         let events_5 = nodes[1].node.get_and_clear_pending_events();
 576         assert_eq!(events_5.len(), 1);
 577         match events_5[0] {
 578                 Event::PaymentReceived { ref payment_hash, ref payment_preimage, ref payment_secret, amt, user_payment_id: _ } => {
 579                         assert_eq!(payment_hash_2, *payment_hash);
 580                         assert!(payment_preimage.is_none());
 581                         assert_eq!(payment_secret_2, *payment_secret);
 582                         assert_eq!(amt, 1000000);
 583                 },
 584                 _ => panic!("Unexpected event"),
 585         }
 586
 587         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
 588 }
 589
 590 #[test]
 591 fn test_monitor_temporary_update_fail_a() {
 592         do_test_monitor_temporary_update_fail(0);
 593         do_test_monitor_temporary_update_fail(1);
 594         do_test_monitor_temporary_update_fail(2);
 595         do_test_monitor_temporary_update_fail(3);
 596         do_test_monitor_temporary_update_fail(4);
 597         do_test_monitor_temporary_update_fail(5);
 598 }
 599
 600 #[test]
 601 fn test_monitor_temporary_update_fail_b() {
 602         do_test_monitor_temporary_update_fail(2 | 8);
 603         do_test_monitor_temporary_update_fail(3 | 8);
 604         do_test_monitor_temporary_update_fail(4 | 8);
 605         do_test_monitor_temporary_update_fail(5 | 8);
 606 }
 607
 608 #[test]
 609 fn test_monitor_temporary_update_fail_c() {
 610         do_test_monitor_temporary_update_fail(1 | 16);
 611         do_test_monitor_temporary_update_fail(2 | 16);
 612         do_test_monitor_temporary_update_fail(3 | 16);
 613         do_test_monitor_temporary_update_fail(2 | 8 | 16);
 614         do_test_monitor_temporary_update_fail(3 | 8 | 16);
 615 }
 616
 617 #[test]
 618 fn test_monitor_update_fail_cs() {
 619         // Tests handling of a monitor update failure when processing an incoming commitment_signed
 620         let chanmon_cfgs = create_chanmon_cfgs(2);
 621         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 622         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 623         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 624         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
 625         let logger = test_utils::TestLogger::new();
 626
 627         let (payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(nodes[1]);
 628         {
 629                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 630                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 631                 nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
 632                 check_added_monitors!(nodes[0], 1);
 633         }
 634
 635         let send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 636         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 637
 638         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 639         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send_event.commitment_msg);
 640         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 641         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
 642         check_added_monitors!(nodes[1], 1);
 643         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 644
 645         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 646         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 647         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
 648         check_added_monitors!(nodes[1], 0);
 649         let responses = nodes[1].node.get_and_clear_pending_msg_events();
 650         assert_eq!(responses.len(), 2);
 651
 652         match responses[0] {
 653                 MessageSendEvent::SendRevokeAndACK { ref msg, ref node_id } => {
 654                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 655                         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &msg);
 656                         check_added_monitors!(nodes[0], 1);
 657                 },
 658                 _ => panic!("Unexpected event"),
 659         }
 660         match responses[1] {
 661                 MessageSendEvent::UpdateHTLCs { ref updates, ref node_id } => {
 662                         assert!(updates.update_add_htlcs.is_empty());
 663                         assert!(updates.update_fulfill_htlcs.is_empty());
 664                         assert!(updates.update_fail_htlcs.is_empty());
 665                         assert!(updates.update_fail_malformed_htlcs.is_empty());
 666                         assert!(updates.update_fee.is_none());
 667                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
 668
 669                         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 670                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &updates.commitment_signed);
 671                         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 672                         nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
 673                         check_added_monitors!(nodes[0], 1);
 674                         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 675                 },
 676                 _ => panic!("Unexpected event"),
 677         }
 678
 679         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 680         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 681         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
 682         check_added_monitors!(nodes[0], 0);
 683
 684         let final_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 685         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &final_raa);
 686         check_added_monitors!(nodes[1], 1);
 687
 688         expect_pending_htlcs_forwardable!(nodes[1]);
 689
 690         let events = nodes[1].node.get_and_clear_pending_events();
 691         assert_eq!(events.len(), 1);
 692         match events[0] {
 693                 Event::PaymentReceived { payment_hash, payment_preimage, payment_secret, amt, user_payment_id: _ } => {
 694                         assert_eq!(payment_hash, our_payment_hash);
 695                         assert!(payment_preimage.is_none());
 696                         assert_eq!(our_payment_secret, payment_secret);
 697                         assert_eq!(amt, 1000000);
 698                 },
 699                 _ => panic!("Unexpected event"),
 700         };
 701
 702         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage);
 703 }
 704
 705 #[test]
 706 fn test_monitor_update_fail_no_rebroadcast() {
 707         // Tests handling of a monitor update failure when no message rebroadcasting on
 708         // channel_monitor_updated() is required. Backported from chanmon_fail_consistency
 709         // fuzz tests.
 710         let chanmon_cfgs = create_chanmon_cfgs(2);
 711         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 712         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 713         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 714         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
 715         let logger = test_utils::TestLogger::new();
 716
 717         let (payment_preimage_1, our_payment_hash, payment_secret_1) = get_payment_preimage_hash!(nodes[1]);
 718         {
 719                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 720                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 721                 nodes[0].node.send_payment(&route, our_payment_hash, &Some(payment_secret_1)).unwrap();
 722                 check_added_monitors!(nodes[0], 1);
 723         }
 724
 725         let send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 726         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 727         let bs_raa = commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false, true, false, true);
 728
 729         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 730         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &bs_raa);
 731         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 732         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
 733         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 734         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 735         check_added_monitors!(nodes[1], 1);
 736
 737         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 738         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 739         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
 740         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 741         check_added_monitors!(nodes[1], 0);
 742         expect_pending_htlcs_forwardable!(nodes[1]);
 743
 744         let events = nodes[1].node.get_and_clear_pending_events();
 745         assert_eq!(events.len(), 1);
 746         match events[0] {
 747                 Event::PaymentReceived { payment_hash, .. } => {
 748                         assert_eq!(payment_hash, our_payment_hash);
 749                 },
 750                 _ => panic!("Unexpected event"),
 751         }
 752
 753         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 754 }
 755
 756 #[test]
 757 fn test_monitor_update_raa_while_paused() {
 758         // Tests handling of an RAA while monitor updating has already been marked failed.
 759         // Backported from chanmon_fail_consistency fuzz tests as this used to be broken.
 760         let chanmon_cfgs = create_chanmon_cfgs(2);
 761         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 762         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
 763         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 764         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
 765         let logger = test_utils::TestLogger::new();
 766
 767         send_payment(&nodes[0], &[&nodes[1]], 5000000);
 768         let (payment_preimage_1, our_payment_hash_1, our_payment_secret_1) = get_payment_preimage_hash!(nodes[1]);
 769         {
 770                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 771                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 772                 nodes[0].node.send_payment(&route, our_payment_hash_1, &Some(our_payment_secret_1)).unwrap();
 773                 check_added_monitors!(nodes[0], 1);
 774         }
 775         let send_event_1 = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 776
 777         let (payment_preimage_2, our_payment_hash_2, our_payment_secret_2) = get_payment_preimage_hash!(nodes[0]);
 778         {
 779                 let net_graph_msg_handler = &nodes[1].net_graph_msg_handler;
 780                 let route = get_route(&nodes[1].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 781                 nodes[1].node.send_payment(&route, our_payment_hash_2, &Some(our_payment_secret_2)).unwrap();
 782                 check_added_monitors!(nodes[1], 1);
 783         }
 784         let send_event_2 = SendEvent::from_event(nodes[1].node.get_and_clear_pending_msg_events().remove(0));
 785
 786         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event_1.msgs[0]);
 787         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &send_event_1.commitment_msg);
 788         check_added_monitors!(nodes[1], 1);
 789         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 790
 791         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 792         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event_2.msgs[0]);
 793         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &send_event_2.commitment_msg);
 794         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 795         nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
 796         check_added_monitors!(nodes[0], 1);
 797
 798         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
 799         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
 800         nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented responses to RAA".to_string(), 1);
 801         check_added_monitors!(nodes[0], 1);
 802
 803         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 804         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
 805         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
 806         check_added_monitors!(nodes[0], 0);
 807
 808         let as_update_raa = get_revoke_commit_msgs!(nodes[0], nodes[1].node.get_our_node_id());
 809         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_update_raa.0);
 810         check_added_monitors!(nodes[1], 1);
 811         let bs_cs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 812
 813         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_update_raa.1);
 814         check_added_monitors!(nodes[1], 1);
 815         let bs_second_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
 816
 817         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_cs.commitment_signed);
 818         check_added_monitors!(nodes[0], 1);
 819         let as_second_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
 820
 821         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_raa);
 822         check_added_monitors!(nodes[0], 1);
 823         expect_pending_htlcs_forwardable!(nodes[0]);
 824         expect_payment_received!(nodes[0], our_payment_hash_2, our_payment_secret_2, 1000000);
 825
 826         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_raa);
 827         check_added_monitors!(nodes[1], 1);
 828         expect_pending_htlcs_forwardable!(nodes[1]);
 829         expect_payment_received!(nodes[1], our_payment_hash_1, our_payment_secret_1, 1000000);
 830
 831         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
 832         claim_payment(&nodes[1], &[&nodes[0]], payment_preimage_2);
 833 }
 834
 835 fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 836         // Tests handling of a monitor update failure when processing an incoming RAA
 837         let chanmon_cfgs = create_chanmon_cfgs(3);
 838         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 839         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
 840         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 841         create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 842         let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
 843         let logger = test_utils::TestLogger::new();
 844
 845         // Rebalance a bit so that we can send backwards from 2 to 1.
 846         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
 847
 848         // Route a first payment that we'll fail backwards
 849         let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
 850
 851         // Fail the payment backwards, failing the monitor update on nodes[1]'s receipt of the RAA
 852         assert!(nodes[2].node.fail_htlc_backwards(&payment_hash_1));
 853         expect_pending_htlcs_forwardable!(nodes[2]);
 854         check_added_monitors!(nodes[2], 1);
 855
 856         let updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
 857         assert!(updates.update_add_htlcs.is_empty());
 858         assert!(updates.update_fulfill_htlcs.is_empty());
 859         assert_eq!(updates.update_fail_htlcs.len(), 1);
 860         assert!(updates.update_fail_malformed_htlcs.is_empty());
 861         assert!(updates.update_fee.is_none());
 862         nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
 863
 864         let bs_revoke_and_ack = commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false, true, false, true);
 865         check_added_monitors!(nodes[0], 0);
 866
 867         // While the second channel is AwaitingRAA, forward a second payment to get it into the
 868         // holding cell.
 869         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[2]);
 870         {
 871                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 872                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 873                 nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
 874                 check_added_monitors!(nodes[0], 1);
 875         }
 876
 877         let mut send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 878         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 879         commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false);
 880
 881         expect_pending_htlcs_forwardable!(nodes[1]);
 882         check_added_monitors!(nodes[1], 0);
 883         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 884
 885         // Now fail monitor updating.
 886         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
 887         nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_revoke_and_ack);
 888         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 889         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
 890         assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 891         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 892         check_added_monitors!(nodes[1], 1);
 893
 894         // Attempt to forward a third payment but fail due to the second channel being unavailable
 895         // for forwarding.
 896         let (_, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[2]);
 897         {
 898                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
 899                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[2].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 900                 nodes[0].node.send_payment(&route, payment_hash_3, &Some(payment_secret_3)).unwrap();
 901                 check_added_monitors!(nodes[0], 1);
 902         }
 903
 904         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(())); // We succeed in updating the monitor for the first channel
 905         send_event = SendEvent::from_event(nodes[0].node.get_and_clear_pending_msg_events().remove(0));
 906         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &send_event.msgs[0]);
 907         commitment_signed_dance!(nodes[1], nodes[0], send_event.commitment_msg, false, true);
 908         check_added_monitors!(nodes[1], 0);
 909
 910         let mut events_2 = nodes[1].node.get_and_clear_pending_msg_events();
 911         assert_eq!(events_2.len(), 1);
 912         match events_2.remove(0) {
 913                 MessageSendEvent::UpdateHTLCs { node_id, updates } => {
 914                         assert_eq!(node_id, nodes[0].node.get_our_node_id());
 915                         assert!(updates.update_fulfill_htlcs.is_empty());
 916                         assert_eq!(updates.update_fail_htlcs.len(), 1);
 917                         assert!(updates.update_fail_malformed_htlcs.is_empty());
 918                         assert!(updates.update_add_htlcs.is_empty());
 919                         assert!(updates.update_fee.is_none());
 920
 921                         nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fail_htlcs[0]);
 922                         commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false, true);
 923
 924                         let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
 925                         assert_eq!(msg_events.len(), 1);
 926                         match msg_events[0] {
 927                                 MessageSendEvent::PaymentFailureNetworkUpdate { update: msgs::HTLCFailChannelUpdate::ChannelUpdateMessage { ref msg }} => {
 928                                         assert_eq!(msg.contents.short_channel_id, chan_2.0.contents.short_channel_id);
 929                                         assert_eq!(msg.contents.flags & 2, 2); // temp disabled
 930                                 },
 931                                 _ => panic!("Unexpected event"),
 932                         }
 933
 934                         let events = nodes[0].node.get_and_clear_pending_events();
 935                         assert_eq!(events.len(), 1);
 936                         if let Event::PaymentFailed { payment_hash, rejected_by_dest, .. } = events[0] {
 937                                 assert_eq!(payment_hash, payment_hash_3);
 938                                 assert!(!rejected_by_dest);
 939                         } else { panic!("Unexpected event!"); }
 940                 },
 941                 _ => panic!("Unexpected event type!"),
 942         };
 943
 944         let (payment_preimage_4, payment_hash_4) = if test_ignore_second_cs {
 945                 // Try to route another payment backwards from 2 to make sure 1 holds off on responding
 946                 let (payment_preimage_4, payment_hash_4, payment_secret_4) = get_payment_preimage_hash!(nodes[0]);
 947                 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
 948                 let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
 949                 nodes[2].node.send_payment(&route, payment_hash_4, &Some(payment_secret_4)).unwrap();
 950                 check_added_monitors!(nodes[2], 1);
 951
 952                 send_event = SendEvent::from_event(nodes[2].node.get_and_clear_pending_msg_events().remove(0));
 953                 nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &send_event.msgs[0]);
 954                 nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &send_event.commitment_msg);
 955                 check_added_monitors!(nodes[1], 1);
 956                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 957                 nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented generation of RAA".to_string(), 1);
 958                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 959                 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 960                 (Some(payment_preimage_4), Some(payment_hash_4))
 961         } else { (None, None) };
 962
 963         // Restore monitor updating, ensuring we immediately get a fail-back update and a
 964         // update_add update.
 965         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
 966         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_2.2).unwrap().clone();
 967         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
 968         check_added_monitors!(nodes[1], 0);
 969         expect_pending_htlcs_forwardable!(nodes[1]);
 970         check_added_monitors!(nodes[1], 1);
 971
 972         let mut events_3 = nodes[1].node.get_and_clear_pending_msg_events();
 973         if test_ignore_second_cs {
 974                 assert_eq!(events_3.len(), 3);
 975         } else {
 976                 assert_eq!(events_3.len(), 2);
 977         }
 978
 979         // Note that the ordering of the events for different nodes is non-prescriptive, though the
 980         // ordering of the two events that both go to nodes[2] have to stay in the same order.
 981         let messages_a = match events_3.pop().unwrap() {
 982                 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 983                         assert_eq!(node_id, nodes[0].node.get_our_node_id());
 984                         assert!(updates.update_fulfill_htlcs.is_empty());
 985                         assert_eq!(updates.update_fail_htlcs.len(), 1);
 986                         assert!(updates.update_fail_malformed_htlcs.is_empty());
 987                         assert!(updates.update_add_htlcs.is_empty());
 988                         assert!(updates.update_fee.is_none());
 989                         (updates.update_fail_htlcs.remove(0), updates.commitment_signed)
 990                 },
 991                 _ => panic!("Unexpected event type!"),
 992         };
 993         let raa = if test_ignore_second_cs {
 994                 match events_3.remove(1) {
 995                         MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 996                                 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 997                                 Some(msg.clone())
 998                         },
 999                         _ => panic!("Unexpected event"),
1000                 }
1001         } else { None };
1002         let send_event_b = SendEvent::from_event(events_3.remove(0));
1003         assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());
1004
1005         // Now deliver the new messages...
1006
1007         nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &messages_a.0);
1008         commitment_signed_dance!(nodes[0], nodes[1], messages_a.1, false);
1009         let events_4 = nodes[0].node.get_and_clear_pending_events();
1010         assert_eq!(events_4.len(), 1);
1011         if let Event::PaymentFailed { payment_hash, rejected_by_dest, .. } = events_4[0] {
1012                 assert_eq!(payment_hash, payment_hash_1);
1013                 assert!(rejected_by_dest);
1014         } else { panic!("Unexpected event!"); }
1015
1016         nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event_b.msgs[0]);
1017         if test_ignore_second_cs {
1018                 nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &send_event_b.commitment_msg);
1019                 check_added_monitors!(nodes[2], 1);
1020                 let bs_revoke_and_ack = get_event_msg!(nodes[2], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1021                 nodes[2].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &raa.unwrap());
1022                 check_added_monitors!(nodes[2], 1);
1023                 let bs_cs = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1024                 assert!(bs_cs.update_add_htlcs.is_empty());
1025                 assert!(bs_cs.update_fail_htlcs.is_empty());
1026                 assert!(bs_cs.update_fail_malformed_htlcs.is_empty());
1027                 assert!(bs_cs.update_fulfill_htlcs.is_empty());
1028                 assert!(bs_cs.update_fee.is_none());
1029
1030                 nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_revoke_and_ack);
1031                 check_added_monitors!(nodes[1], 1);
1032                 let as_cs = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
1033                 assert!(as_cs.update_add_htlcs.is_empty());
1034                 assert!(as_cs.update_fail_htlcs.is_empty());
1035                 assert!(as_cs.update_fail_malformed_htlcs.is_empty());
1036                 assert!(as_cs.update_fulfill_htlcs.is_empty());
1037                 assert!(as_cs.update_fee.is_none());
1038
1039                 nodes[1].node.handle_commitment_signed(&nodes[2].node.get_our_node_id(), &bs_cs.commitment_signed);
1040                 check_added_monitors!(nodes[1], 1);
1041                 let as_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[2].node.get_our_node_id());
1042
1043                 nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &as_cs.commitment_signed);
1044                 check_added_monitors!(nodes[2], 1);
1045                 let bs_second_raa = get_event_msg!(nodes[2], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1046
1047                 nodes[2].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &as_raa);
1048                 check_added_monitors!(nodes[2], 1);
1049                 assert!(nodes[2].node.get_and_clear_pending_msg_events().is_empty());
1050
1051                 nodes[1].node.handle_revoke_and_ack(&nodes[2].node.get_our_node_id(), &bs_second_raa);
1052                 check_added_monitors!(nodes[1], 1);
1053                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1054         } else {
1055                 commitment_signed_dance!(nodes[2], nodes[1], send_event_b.commitment_msg, false);
1056         }
1057
1058         expect_pending_htlcs_forwardable!(nodes[2]);
1059
1060         let events_6 = nodes[2].node.get_and_clear_pending_events();
1061         assert_eq!(events_6.len(), 1);
1062         match events_6[0] {
1063                 Event::PaymentReceived { payment_hash, .. } => { assert_eq!(payment_hash, payment_hash_2); },
1064                 _ => panic!("Unexpected event"),
1065         };
1066
1067         if test_ignore_second_cs {
1068                 expect_pending_htlcs_forwardable!(nodes[1]);
1069                 check_added_monitors!(nodes[1], 1);
1070
1071                 send_event = SendEvent::from_node(&nodes[1]);
1072                 assert_eq!(send_event.node_id, nodes[0].node.get_our_node_id());
1073                 assert_eq!(send_event.msgs.len(), 1);
1074                 nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &send_event.msgs[0]);
1075                 commitment_signed_dance!(nodes[0], nodes[1], send_event.commitment_msg, false);
1076
1077                 expect_pending_htlcs_forwardable!(nodes[0]);
1078
1079                 let events_9 = nodes[0].node.get_and_clear_pending_events();
1080                 assert_eq!(events_9.len(), 1);
1081                 match events_9[0] {
1082                         Event::PaymentReceived { payment_hash, .. } => assert_eq!(payment_hash, payment_hash_4.unwrap()),
1083                         _ => panic!("Unexpected event"),
1084                 };
1085                 claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_4.unwrap());
1086         }
1087
1088         claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage_2);
1089 }
1090
1091 #[test]
1092 fn test_monitor_update_fail_raa() {
1093         do_test_monitor_update_fail_raa(false);
1094         do_test_monitor_update_fail_raa(true);
1095 }
1096
1097 #[test]
1098 fn test_monitor_update_fail_reestablish() {
1099         // Simple test for message retransmission after monitor update failure on
1100         // channel_reestablish generating a monitor update (which comes from freeing holding cell
1101         // HTLCs).
1102         let chanmon_cfgs = create_chanmon_cfgs(3);
1103         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1104         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1105         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1106         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1107         create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
1108
1109         let (our_payment_preimage, _, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
1110
1111         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
1112         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
1113
1114         assert!(nodes[2].node.claim_funds(our_payment_preimage));
1115         check_added_monitors!(nodes[2], 1);
1116         let mut updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1117         assert!(updates.update_add_htlcs.is_empty());
1118         assert!(updates.update_fail_htlcs.is_empty());
1119         assert!(updates.update_fail_malformed_htlcs.is_empty());
1120         assert!(updates.update_fee.is_none());
1121         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
1122         nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1123         check_added_monitors!(nodes[1], 1);
1124         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1125         commitment_signed_dance!(nodes[1], nodes[2], updates.commitment_signed, false);
1126
1127         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1128         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1129         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1130
1131         let as_reestablish = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReestablish, nodes[1].node.get_our_node_id());
1132         let bs_reestablish = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReestablish, nodes[0].node.get_our_node_id());
1133
1134         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reestablish);
1135
1136         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish);
1137         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1138         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1139         check_added_monitors!(nodes[1], 1);
1140
1141         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
1142         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
1143
1144         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1145         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1146
1147         assert!(as_reestablish == get_event_msg!(nodes[0], MessageSendEvent::SendChannelReestablish, nodes[1].node.get_our_node_id()));
1148         assert!(bs_reestablish == get_event_msg!(nodes[1], MessageSendEvent::SendChannelReestablish, nodes[0].node.get_our_node_id()));
1149
1150         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reestablish);
1151
1152         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish);
1153         check_added_monitors!(nodes[1], 0);
1154         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1155
1156         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1157         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone();
1158         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1159         check_added_monitors!(nodes[1], 0);
1160
1161         updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1162         assert!(updates.update_add_htlcs.is_empty());
1163         assert!(updates.update_fail_htlcs.is_empty());
1164         assert!(updates.update_fail_malformed_htlcs.is_empty());
1165         assert!(updates.update_fee.is_none());
1166         assert_eq!(updates.update_fulfill_htlcs.len(), 1);
1167         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1168         commitment_signed_dance!(nodes[0], nodes[1], updates.commitment_signed, false);
1169
1170         let events = nodes[0].node.get_and_clear_pending_events();
1171         assert_eq!(events.len(), 1);
1172         match events[0] {
1173                 Event::PaymentSent { payment_preimage, .. } => assert_eq!(payment_preimage, our_payment_preimage),
1174                 _ => panic!("Unexpected event"),
1175         }
1176 }
1177
1178 #[test]
1179 fn raa_no_response_awaiting_raa_state() {
1180         // This is a rather convoluted test which ensures that if handling of an RAA does not happen
1181         // due to a previous monitor update failure, we still set AwaitingRemoteRevoke on the channel
1182         // in question (assuming it intends to respond with a CS after monitor updating is restored).
1183         // Backported from chanmon_fail_consistency fuzz tests as this used to be broken.
1184         let chanmon_cfgs = create_chanmon_cfgs(2);
1185         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1186         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1187         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1188         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
1189         let logger = test_utils::TestLogger::new();
1190
1191         let (payment_preimage_1, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(nodes[1]);
1192         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
1193         let (payment_preimage_3, payment_hash_3, payment_secret_3) = get_payment_preimage_hash!(nodes[1]);
1194
1195         // Queue up two payments - one will be delivered right away, one immediately goes into the
1196         // holding cell as nodes[0] is AwaitingRAA. Ultimately this allows us to deliver an RAA
1197         // immediately after a CS. By setting failing the monitor update failure from the CS (which
1198         // requires only an RAA response due to AwaitingRAA) we can deliver the RAA and require the CS
1199         // generation during RAA while in monitor-update-failed state.
1200         {
1201                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1202                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1203                 nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();
1204                 check_added_monitors!(nodes[0], 1);
1205                 nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1206                 check_added_monitors!(nodes[0], 0);
1207         }
1208
1209         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1210         assert_eq!(events.len(), 1);
1211         let payment_event = SendEvent::from_event(events.pop().unwrap());
1212         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1213         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1214         check_added_monitors!(nodes[1], 1);
1215
1216         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1217         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1218         check_added_monitors!(nodes[0], 1);
1219         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1220         assert_eq!(events.len(), 1);
1221         let payment_event = SendEvent::from_event(events.pop().unwrap());
1222
1223         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1224         check_added_monitors!(nodes[0], 1);
1225         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1226
1227         // Now we have a CS queued up which adds a new HTLC (which will need a RAA/CS response from
1228         // nodes[1]) followed by an RAA. Fail the monitor updating prior to the CS, deliver the RAA,
1229         // then restore channel monitor updates.
1230         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1231         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1232         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1233         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1234         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1235         check_added_monitors!(nodes[1], 1);
1236
1237         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1238         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1239         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented responses to RAA".to_string(), 1);
1240         check_added_monitors!(nodes[1], 1);
1241
1242         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1243         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1244         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1245         // nodes[1] should be AwaitingRAA here!
1246         check_added_monitors!(nodes[1], 0);
1247         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1248         expect_pending_htlcs_forwardable!(nodes[1]);
1249         expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1250
1251         // We send a third payment here, which is somewhat of a redundant test, but the
1252         // chanmon_fail_consistency test required it to actually find the bug (by seeing out-of-sync
1253         // commitment transaction states) whereas here we can explicitly check for it.
1254         {
1255                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1256                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1257                 nodes[0].node.send_payment(&route, payment_hash_3, &Some(payment_secret_3)).unwrap();
1258                 check_added_monitors!(nodes[0], 0);
1259                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1260         }
1261         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1262         check_added_monitors!(nodes[0], 1);
1263         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1264         assert_eq!(events.len(), 1);
1265         let payment_event = SendEvent::from_event(events.pop().unwrap());
1266
1267         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1268         check_added_monitors!(nodes[0], 1);
1269         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1270
1271         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1272         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1273         check_added_monitors!(nodes[1], 1);
1274         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
1275
1276         // Finally deliver the RAA to nodes[1] which results in a CS response to the last update
1277         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1278         check_added_monitors!(nodes[1], 1);
1279         expect_pending_htlcs_forwardable!(nodes[1]);
1280         expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1281         let bs_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1282
1283         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
1284         check_added_monitors!(nodes[0], 1);
1285
1286         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_update.commitment_signed);
1287         check_added_monitors!(nodes[0], 1);
1288         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1289
1290         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1291         check_added_monitors!(nodes[1], 1);
1292         expect_pending_htlcs_forwardable!(nodes[1]);
1293         expect_payment_received!(nodes[1], payment_hash_3, payment_secret_3, 1000000);
1294
1295         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1296         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1297         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_3);
1298 }
1299
1300 #[test]
1301 fn claim_while_disconnected_monitor_update_fail() {
1302         // Test for claiming a payment while disconnected and then having the resulting
1303         // channel-update-generated monitor update fail. This kind of thing isn't a particularly
1304         // contrived case for nodes with network instability.
1305         // Backported from chanmon_fail_consistency fuzz tests as an unmerged version of the handling
1306         // code introduced a regression in this test (specifically, this caught a removal of the
1307         // channel_reestablish handling ensuring the order was sensical given the messages used).
1308         let chanmon_cfgs = create_chanmon_cfgs(2);
1309         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1310         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1311         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1312         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
1313         let logger = test_utils::TestLogger::new();
1314
1315         // Forward a payment for B to claim
1316         let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1317
1318         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
1319         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
1320
1321         assert!(nodes[1].node.claim_funds(payment_preimage_1));
1322         check_added_monitors!(nodes[1], 1);
1323
1324         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1325         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1326
1327         let as_reconnect = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReestablish, nodes[1].node.get_our_node_id());
1328         let bs_reconnect = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReestablish, nodes[0].node.get_our_node_id());
1329
1330         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reconnect);
1331         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1332
1333         // Now deliver a's reestablish, freeing the claim from the holding cell, but fail the monitor
1334         // update.
1335         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1336
1337         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reconnect);
1338         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1339         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1340         check_added_monitors!(nodes[1], 1);
1341         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1342
1343         // Send a second payment from A to B, resulting in a commitment update that gets swallowed with
1344         // the monitor still failed
1345         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
1346         {
1347                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1348                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1349                 nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1350                 check_added_monitors!(nodes[0], 1);
1351         }
1352
1353         let as_updates = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
1354         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &as_updates.update_add_htlcs[0]);
1355         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_updates.commitment_signed);
1356         check_added_monitors!(nodes[1], 1);
1357         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1358         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented generation of RAA".to_string(), 1);
1359         // Note that nodes[1] not updating monitor here is OK - it wont take action on the new HTLC
1360         // until we've channel_monitor_update'd and updated for the new commitment transaction.
1361
1362         // Now un-fail the monitor, which will result in B sending its original commitment update,
1363         // receiving the commitment update from A, and the resulting commitment dances.
1364         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1365         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1366         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1367         check_added_monitors!(nodes[1], 0);
1368
1369         let bs_msgs = nodes[1].node.get_and_clear_pending_msg_events();
1370         assert_eq!(bs_msgs.len(), 2);
1371
1372         match bs_msgs[0] {
1373                 MessageSendEvent::UpdateHTLCs { ref node_id, ref updates } => {
1374                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1375                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
1376                         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &updates.commitment_signed);
1377                         check_added_monitors!(nodes[0], 1);
1378
1379                         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1380                         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1381                         check_added_monitors!(nodes[1], 1);
1382                 },
1383                 _ => panic!("Unexpected event"),
1384         }
1385
1386         match bs_msgs[1] {
1387                 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
1388                         assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1389                         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), msg);
1390                         check_added_monitors!(nodes[0], 1);
1391                 },
1392                 _ => panic!("Unexpected event"),
1393         }
1394
1395         let as_commitment = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
1396
1397         let bs_commitment = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1398         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_commitment.commitment_signed);
1399         check_added_monitors!(nodes[0], 1);
1400         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1401
1402         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment.commitment_signed);
1403         check_added_monitors!(nodes[1], 1);
1404         let bs_raa = get_event_msg!(nodes[1], MessageSendEvent::SendRevokeAndACK, nodes[0].node.get_our_node_id());
1405         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1406         check_added_monitors!(nodes[1], 1);
1407
1408         expect_pending_htlcs_forwardable!(nodes[1]);
1409         expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1410
1411         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_raa);
1412         check_added_monitors!(nodes[0], 1);
1413
1414         let events = nodes[0].node.get_and_clear_pending_events();
1415         assert_eq!(events.len(), 1);
1416         match events[0] {
1417                 Event::PaymentSent { ref payment_preimage } => {
1418                         assert_eq!(*payment_preimage, payment_preimage_1);
1419                 },
1420                 _ => panic!("Unexpected event"),
1421         }
1422
1423         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1424 }
1425
1426 #[test]
1427 fn monitor_failed_no_reestablish_response() {
1428         // Test for receiving a channel_reestablish after a monitor update failure resulted in no
1429         // response to a commitment_signed.
1430         // Backported from chanmon_fail_consistency fuzz tests as it caught a long-standing
1431         // debug_assert!() failure in channel_reestablish handling.
1432         let chanmon_cfgs = create_chanmon_cfgs(2);
1433         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1434         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1435         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1436         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
1437         let logger = test_utils::TestLogger::new();
1438
1439         // Route the payment and deliver the initial commitment_signed (with a monitor update failure
1440         // on receipt).
1441         let (payment_preimage_1, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(nodes[1]);
1442         {
1443                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1444                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1445                 nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();
1446                 check_added_monitors!(nodes[0], 1);
1447         }
1448
1449         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1450         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1451         assert_eq!(events.len(), 1);
1452         let payment_event = SendEvent::from_event(events.pop().unwrap());
1453         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1454         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1455         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1456         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1457         check_added_monitors!(nodes[1], 1);
1458
1459         // Now disconnect and immediately reconnect, delivering the channel_reestablish while nodes[1]
1460         // is still failing to update monitors.
1461         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
1462         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
1463
1464         nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1465         nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init { features: InitFeatures::empty() });
1466
1467         let as_reconnect = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReestablish, nodes[1].node.get_our_node_id());
1468         let bs_reconnect = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReestablish, nodes[0].node.get_our_node_id());
1469
1470         nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reconnect);
1471         nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reconnect);
1472
1473         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1474         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1475         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1476         check_added_monitors!(nodes[1], 0);
1477         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1478
1479         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1480         check_added_monitors!(nodes[0], 1);
1481         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1482         check_added_monitors!(nodes[0], 1);
1483
1484         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1485         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1486         check_added_monitors!(nodes[1], 1);
1487
1488         expect_pending_htlcs_forwardable!(nodes[1]);
1489         expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1490
1491         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1492 }
1493
1494 #[test]
1495 fn first_message_on_recv_ordering() {
1496         // Test that if the initial generator of a monitor-update-frozen state doesn't generate
1497         // messages, we're willing to flip the order of response messages if neccessary in resposne to
1498         // a commitment_signed which needs to send an RAA first.
1499         // At a high level, our goal is to fail monitor updating in response to an RAA which needs no
1500         // response and then handle a CS while in the failed state, requiring an RAA followed by a CS
1501         // response. To do this, we start routing two payments, with the final RAA for the first being
1502         // delivered while B is in AwaitingRAA, hence when we deliver the CS for the second B will
1503         // have no pending response but will want to send a RAA/CS (with the updates for the second
1504         // payment applied).
1505         // Backported from chanmon_fail_consistency fuzz tests as it caught a bug here.
1506         let chanmon_cfgs = create_chanmon_cfgs(2);
1507         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1508         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1509         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1510         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
1511         let logger = test_utils::TestLogger::new();
1512
1513         // Route the first payment outbound, holding the last RAA for B until we are set up so that we
1514         // can deliver it and fail the monitor update.
1515         let (payment_preimage_1, payment_hash_1, payment_secret_1) = get_payment_preimage_hash!(nodes[1]);
1516         {
1517                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1518                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1519                 nodes[0].node.send_payment(&route, payment_hash_1, &Some(payment_secret_1)).unwrap();
1520                 check_added_monitors!(nodes[0], 1);
1521         }
1522
1523         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1524         assert_eq!(events.len(), 1);
1525         let payment_event = SendEvent::from_event(events.pop().unwrap());
1526         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
1527         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1528         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1529         check_added_monitors!(nodes[1], 1);
1530         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1531
1532         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1533         check_added_monitors!(nodes[0], 1);
1534         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1535         check_added_monitors!(nodes[0], 1);
1536
1537         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1538
1539         // Route the second payment, generating an update_add_htlc/commitment_signed
1540         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
1541         {
1542                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1543                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1544                 nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1545                 check_added_monitors!(nodes[0], 1);
1546         }
1547         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1548         assert_eq!(events.len(), 1);
1549         let payment_event = SendEvent::from_event(events.pop().unwrap());
1550         assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
1551
1552         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1553
1554         // Deliver the final RAA for the first payment, which does not require a response. RAAs
1555         // generally require a commitment_signed, so the fact that we're expecting an opposite response
1556         // to the next message also tests resetting the delivery order.
1557         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1558         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1559         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1560         check_added_monitors!(nodes[1], 1);
1561
1562         // Now deliver the update_add_htlc/commitment_signed for the second payment, which does need an
1563         // RAA/CS response, which should be generated when we call channel_monitor_update (with the
1564         // appropriate HTLC acceptance).
1565         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1566         nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
1567         check_added_monitors!(nodes[1], 1);
1568         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1569         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Previous monitor update failure prevented generation of RAA".to_string(), 1);
1570
1571         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1572         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1573         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1574         check_added_monitors!(nodes[1], 0);
1575
1576         expect_pending_htlcs_forwardable!(nodes[1]);
1577         expect_payment_received!(nodes[1], payment_hash_1, payment_secret_1, 1000000);
1578
1579         let bs_responses = get_revoke_commit_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1580         nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_responses.0);
1581         check_added_monitors!(nodes[0], 1);
1582         nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_responses.1);
1583         check_added_monitors!(nodes[0], 1);
1584
1585         let as_raa = get_event_msg!(nodes[0], MessageSendEvent::SendRevokeAndACK, nodes[1].node.get_our_node_id());
1586         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1587         check_added_monitors!(nodes[1], 1);
1588
1589         expect_pending_htlcs_forwardable!(nodes[1]);
1590         expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1591
1592         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
1593         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1594 }
1595
1596 #[test]
1597 fn test_monitor_update_fail_claim() {
1598         // Basic test for monitor update failures when processing claim_funds calls.
1599         // We set up a simple 3-node network, sending a payment from A to B and failing B's monitor
1600         // update to claim the payment. We then send a payment C->B->A, making the forward of this
1601         // payment from B to A fail due to the paused channel. Finally, we restore the channel monitor
1602         // updating and claim the payment on B.
1603         let chanmon_cfgs = create_chanmon_cfgs(3);
1604         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1605         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1606         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1607         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1608         create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
1609         let logger = test_utils::TestLogger::new();
1610
1611         // Rebalance a bit so that we can send backwards from 3 to 2.
1612         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
1613
1614         let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1615
1616         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1617         assert!(nodes[1].node.claim_funds(payment_preimage_1));
1618         check_added_monitors!(nodes[1], 1);
1619
1620         let (_, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[0]);
1621         {
1622                 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
1623                 let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1624                 nodes[2].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1625                 check_added_monitors!(nodes[2], 1);
1626         }
1627
1628         // Successfully update the monitor on the 1<->2 channel, but the 0<->1 channel should still be
1629         // paused, so forward shouldn't succeed until we call channel_monitor_updated().
1630         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1631
1632         let mut events = nodes[2].node.get_and_clear_pending_msg_events();
1633         assert_eq!(events.len(), 1);
1634         let payment_event = SendEvent::from_event(events.pop().unwrap());
1635         nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
1636         let events = nodes[1].node.get_and_clear_pending_msg_events();
1637         assert_eq!(events.len(), 0);
1638         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Temporary failure claiming HTLC, treating as success: Failed to update ChannelMonitor".to_string(), 1);
1639         commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false, true);
1640
1641         let bs_fail_update = get_htlc_update_msgs!(nodes[1], nodes[2].node.get_our_node_id());
1642         nodes[2].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &bs_fail_update.update_fail_htlcs[0]);
1643         commitment_signed_dance!(nodes[2], nodes[1], bs_fail_update.commitment_signed, false, true);
1644
1645         let msg_events = nodes[2].node.get_and_clear_pending_msg_events();
1646         assert_eq!(msg_events.len(), 1);
1647         match msg_events[0] {
1648                 MessageSendEvent::PaymentFailureNetworkUpdate { update: msgs::HTLCFailChannelUpdate::ChannelUpdateMessage { ref msg }} => {
1649                         assert_eq!(msg.contents.short_channel_id, chan_1.0.contents.short_channel_id);
1650                         assert_eq!(msg.contents.flags & 2, 2); // temp disabled
1651                 },
1652                 _ => panic!("Unexpected event"),
1653         }
1654
1655         let events = nodes[2].node.get_and_clear_pending_events();
1656         assert_eq!(events.len(), 1);
1657         if let Event::PaymentFailed { payment_hash, rejected_by_dest, .. } = events[0] {
1658                 assert_eq!(payment_hash, payment_hash_2);
1659                 assert!(!rejected_by_dest);
1660         } else { panic!("Unexpected event!"); }
1661
1662         // Now restore monitor updating on the 0<->1 channel and claim the funds on B.
1663         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone();
1664         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1665         check_added_monitors!(nodes[1], 0);
1666
1667         let bs_fulfill_update = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1668         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_fulfill_update.update_fulfill_htlcs[0]);
1669         commitment_signed_dance!(nodes[0], nodes[1], bs_fulfill_update.commitment_signed, false);
1670
1671         let events = nodes[0].node.get_and_clear_pending_events();
1672         assert_eq!(events.len(), 1);
1673         if let Event::PaymentSent { payment_preimage, .. } = events[0] {
1674                 assert_eq!(payment_preimage, payment_preimage_1);
1675         } else { panic!("Unexpected event!"); }
1676 }
1677
1678 #[test]
1679 fn test_monitor_update_on_pending_forwards() {
1680         // Basic test for monitor update failures when processing pending HTLC fail/add forwards.
1681         // We do this with a simple 3-node network, sending a payment from A to C and one from C to A.
1682         // The payment from A to C will be failed by C and pending a back-fail to A, while the payment
1683         // from C to A will be pending a forward to A.
1684         let chanmon_cfgs = create_chanmon_cfgs(3);
1685         let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
1686         let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
1687         let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
1688         let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
1689         create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
1690         let logger = test_utils::TestLogger::new();
1691
1692         // Rebalance a bit so that we can send backwards from 3 to 1.
1693         send_payment(&nodes[0], &[&nodes[1], &nodes[2]], 5000000);
1694
1695         let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1000000);
1696         assert!(nodes[2].node.fail_htlc_backwards(&payment_hash_1));
1697         expect_pending_htlcs_forwardable!(nodes[2]);
1698         check_added_monitors!(nodes[2], 1);
1699
1700         let cs_fail_update = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
1701         nodes[1].node.handle_update_fail_htlc(&nodes[2].node.get_our_node_id(), &cs_fail_update.update_fail_htlcs[0]);
1702         commitment_signed_dance!(nodes[1], nodes[2], cs_fail_update.commitment_signed, true, true);
1703         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1704
1705         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[0]);
1706         {
1707                 let net_graph_msg_handler = &nodes[2].net_graph_msg_handler;
1708                 let route = get_route(&nodes[2].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[0].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1709                 nodes[2].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1710                 check_added_monitors!(nodes[2], 1);
1711         }
1712
1713         let mut events = nodes[2].node.get_and_clear_pending_msg_events();
1714         assert_eq!(events.len(), 1);
1715         let payment_event = SendEvent::from_event(events.pop().unwrap());
1716         nodes[1].node.handle_update_add_htlc(&nodes[2].node.get_our_node_id(), &payment_event.msgs[0]);
1717         commitment_signed_dance!(nodes[1], nodes[2], payment_event.commitment_msg, false);
1718
1719         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1720         expect_pending_htlcs_forwardable!(nodes[1]);
1721         check_added_monitors!(nodes[1], 1);
1722         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1723         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1724
1725         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1726         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone();
1727         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1728         check_added_monitors!(nodes[1], 0);
1729
1730         let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1731         nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fail_htlcs[0]);
1732         nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_add_htlcs[0]);
1733         commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, false, true);
1734
1735         let events = nodes[0].node.get_and_clear_pending_events();
1736         assert_eq!(events.len(), 2);
1737         if let Event::PaymentFailed { payment_hash, rejected_by_dest, .. } = events[0] {
1738                 assert_eq!(payment_hash, payment_hash_1);
1739                 assert!(rejected_by_dest);
1740         } else { panic!("Unexpected event!"); }
1741         match events[1] {
1742                 Event::PendingHTLCsForwardable { .. } => { },
1743                 _ => panic!("Unexpected event"),
1744         };
1745         nodes[0].node.process_pending_htlc_forwards();
1746         expect_payment_received!(nodes[0], payment_hash_2, payment_secret_2, 1000000);
1747
1748         claim_payment(&nodes[2], &[&nodes[1], &nodes[0]], payment_preimage_2);
1749 }
1750
1751 #[test]
1752 fn monitor_update_claim_fail_no_response() {
1753         // Test for claim_funds resulting in both a monitor update failure and no message response (due
1754         // to channel being AwaitingRAA).
1755         // Backported from chanmon_fail_consistency fuzz tests as an unmerged version of the handling
1756         // code was broken.
1757         let chanmon_cfgs = create_chanmon_cfgs(2);
1758         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1759         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1760         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1761         let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
1762         let logger = test_utils::TestLogger::new();
1763
1764         // Forward a payment for B to claim
1765         let (payment_preimage_1, _, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
1766
1767         // Now start forwarding a second payment, skipping the last RAA so B is in AwaitingRAA
1768         let (payment_preimage_2, payment_hash_2, payment_secret_2) = get_payment_preimage_hash!(nodes[1]);
1769         {
1770                 let net_graph_msg_handler = &nodes[0].net_graph_msg_handler;
1771                 let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes[1].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &Vec::new(), 1000000, TEST_FINAL_CLTV, &logger).unwrap();
1772                 nodes[0].node.send_payment(&route, payment_hash_2, &Some(payment_secret_2)).unwrap();
1773                 check_added_monitors!(nodes[0], 1);
1774         }
1775
1776         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1777         assert_eq!(events.len(), 1);
1778         let payment_event = SendEvent::from_event(events.pop().unwrap());
1779         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
1780         let as_raa = commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false, true, false, true);
1781
1782         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1783         assert!(nodes[1].node.claim_funds(payment_preimage_1));
1784         check_added_monitors!(nodes[1], 1);
1785         let events = nodes[1].node.get_and_clear_pending_msg_events();
1786         assert_eq!(events.len(), 0);
1787         nodes[1].logger.assert_log("lightning::ln::channelmanager".to_string(), "Temporary failure claiming HTLC, treating as success: Failed to update ChannelMonitor".to_string(), 1);
1788
1789         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1790         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1791         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1792         check_added_monitors!(nodes[1], 0);
1793         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1794
1795         nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_raa);
1796         check_added_monitors!(nodes[1], 1);
1797         expect_pending_htlcs_forwardable!(nodes[1]);
1798         expect_payment_received!(nodes[1], payment_hash_2, payment_secret_2, 1000000);
1799
1800         let bs_updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
1801         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_updates.update_fulfill_htlcs[0]);
1802         commitment_signed_dance!(nodes[0], nodes[1], bs_updates.commitment_signed, false);
1803
1804         let events = nodes[0].node.get_and_clear_pending_events();
1805         assert_eq!(events.len(), 1);
1806         match events[0] {
1807                 Event::PaymentSent { ref payment_preimage } => {
1808                         assert_eq!(*payment_preimage, payment_preimage_1);
1809                 },
1810                 _ => panic!("Unexpected event"),
1811         }
1812
1813         claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
1814 }
1815
1816 // confirm_a_first and restore_b_before_conf are wholly unrelated to earlier bools and
1817 // restore_b_before_conf has no meaning if !confirm_a_first
1818 fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf: bool) {
1819         // Test that if the monitor update generated by funding_transaction_generated fails we continue
1820         // the channel setup happily after the update is restored.
1821         let chanmon_cfgs = create_chanmon_cfgs(2);
1822         let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
1823         let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
1824         let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
1825
1826         nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
1827         nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), InitFeatures::known(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
1828         nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), InitFeatures::known(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
1829
1830         let (temporary_channel_id, funding_tx, funding_output) = create_funding_transaction(&nodes[0], 100000, 43);
1831
1832         nodes[0].node.funding_transaction_generated(&temporary_channel_id, funding_tx.clone()).unwrap();
1833         check_added_monitors!(nodes[0], 0);
1834
1835         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1836         let funding_created_msg = get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id());
1837         let channel_id = OutPoint { txid: funding_created_msg.funding_txid, index: funding_created_msg.funding_output_index }.to_channel_id();
1838         nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &funding_created_msg);
1839         check_added_monitors!(nodes[1], 1);
1840
1841         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1842         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()));
1843         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1844         nodes[0].logger.assert_log("lightning::ln::channelmanager".to_string(), "Failed to update ChannelMonitor".to_string(), 1);
1845         check_added_monitors!(nodes[0], 1);
1846         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
1847         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1848         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1849         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
1850         check_added_monitors!(nodes[0], 0);
1851
1852         let events = nodes[0].node.get_and_clear_pending_events();
1853         assert_eq!(events.len(), 0);
1854         assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().len(), 1);
1855         assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0)[0].txid(), funding_output.txid);
1856
1857         if confirm_a_first {
1858                 confirm_transaction(&nodes[0], &funding_tx);
1859                 nodes[1].node.handle_funding_locked(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendFundingLocked, nodes[1].node.get_our_node_id()));
1860         } else {
1861                 assert!(!restore_b_before_conf);
1862                 confirm_transaction(&nodes[1], &funding_tx);
1863                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1864         }
1865
1866         // Make sure nodes[1] isn't stupid enough to re-send the FundingLocked on reconnect
1867         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
1868         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
1869         reconnect_nodes(&nodes[0], &nodes[1], (false, confirm_a_first), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
1870         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
1871         assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1872
1873         if !restore_b_before_conf {
1874                 confirm_transaction(&nodes[1], &funding_tx);
1875                 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
1876                 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
1877         }
1878
1879         *nodes[1].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1880         let (outpoint, latest_update) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&channel_id).unwrap().clone();
1881         nodes[1].node.channel_monitor_updated(&outpoint, latest_update);
1882         check_added_monitors!(nodes[1], 0);
1883
1884         let (channel_id, (announcement, as_update, bs_update)) = if !confirm_a_first {
1885                 nodes[0].node.handle_funding_locked(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendFundingLocked, nodes[0].node.get_our_node_id()));
1886
1887                 confirm_transaction(&nodes[0], &funding_tx);
1888                 let (funding_locked, channel_id) = create_chan_between_nodes_with_value_confirm_second(&nodes[1], &nodes[0]);
1889                 (channel_id, create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &funding_locked))
1890         } else {
1891                 if restore_b_before_conf {
1892                         confirm_transaction(&nodes[1], &funding_tx);
1893                 }
1894                 let (funding_locked, channel_id) = create_chan_between_nodes_with_value_confirm_second(&nodes[0], &nodes[1]);
1895                 (channel_id, create_chan_between_nodes_with_value_b(&nodes[1], &nodes[0], &funding_locked))
1896         };
1897         for node in nodes.iter() {
1898                 assert!(node.net_graph_msg_handler.handle_channel_announcement(&announcement).unwrap());
1899                 node.net_graph_msg_handler.handle_channel_update(&as_update).unwrap();
1900                 node.net_graph_msg_handler.handle_channel_update(&bs_update).unwrap();
1901         }
1902
1903         send_payment(&nodes[0], &[&nodes[1]], 8000000);
1904         close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);
1905 }
1906
1907 #[test]
1908 fn during_funding_monitor_fail() {
1909         do_during_funding_monitor_fail(true, true);
1910         do_during_funding_monitor_fail(true, false);
1911         do_during_funding_monitor_fail(false, false);
1912 }
1913
1914 #[test]
1915 fn test_path_paused_mpp() {
1916         // Simple test of sending a multi-part payment where one path is currently blocked awaiting
1917         // monitor update
1918         let chanmon_cfgs = create_chanmon_cfgs(4);
1919         let node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
1920         let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
1921         let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs);
1922
1923         let chan_1_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).0.contents.short_channel_id;
1924         let (chan_2_ann, _, chan_2_id, _) = create_announced_chan_between_nodes(&nodes, 0, 2, InitFeatures::known(), InitFeatures::known());
1925         let chan_3_id = create_announced_chan_between_nodes(&nodes, 1, 3, InitFeatures::known(), InitFeatures::known()).0.contents.short_channel_id;
1926         let chan_4_id = create_announced_chan_between_nodes(&nodes, 2, 3, InitFeatures::known(), InitFeatures::known()).0.contents.short_channel_id;
1927         let logger = test_utils::TestLogger::new();
1928
1929         let (payment_preimage, payment_hash, payment_secret) = get_payment_preimage_hash!(&nodes[3]);
1930         let mut route = get_route(&nodes[0].node.get_our_node_id(), &nodes[0].net_graph_msg_handler.network_graph.read().unwrap(), &nodes[3].node.get_our_node_id(), Some(InvoiceFeatures::known()), None, &[], 100000, TEST_FINAL_CLTV, &logger).unwrap();
1931
1932         // Set us up to take multiple routes, one 0 -> 1 -> 3 and one 0 -> 2 -> 3:
1933         let path = route.paths[0].clone();
1934         route.paths.push(path);
1935         route.paths[0][0].pubkey = nodes[1].node.get_our_node_id();
1936         route.paths[0][0].short_channel_id = chan_1_id;
1937         route.paths[0][1].short_channel_id = chan_3_id;
1938         route.paths[1][0].pubkey = nodes[2].node.get_our_node_id();
1939         route.paths[1][0].short_channel_id = chan_2_ann.contents.short_channel_id;
1940         route.paths[1][1].short_channel_id = chan_4_id;
1941
1942         // Set it so that the first monitor update (for the path 0 -> 1 -> 3) succeeds, but the second
1943         // (for the path 0 -> 2 -> 3) fails.
1944         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1945         *nodes[0].chain_monitor.next_update_ret.lock().unwrap() = Some(Err(ChannelMonitorUpdateErr::TemporaryFailure));
1946
1947         // Now check that we get the right return value, indicating that the first path succeeded but
1948         // the second got a MonitorUpdateFailed err. This implies PaymentSendFailure::PartialFailure as
1949         // some paths succeeded, preventing retry.
1950         if let Err(PaymentSendFailure::PartialFailure(results)) = nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)) {
1951                 assert_eq!(results.len(), 2);
1952                 if let Ok(()) = results[0] {} else { panic!(); }
1953                 if let Err(APIError::MonitorUpdateFailed) = results[1] {} else { panic!(); }
1954         } else { panic!(); }
1955         check_added_monitors!(nodes[0], 2);
1956         *nodes[0].chain_monitor.update_ret.lock().unwrap() = Some(Ok(()));
1957
1958         // Pass the first HTLC of the payment along to nodes[3].
1959         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1960         assert_eq!(events.len(), 1);
1961         pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 0, payment_hash.clone(), payment_secret, events.pop().unwrap(), false);
1962
1963         // And check that, after we successfully update the monitor for chan_2 we can pass the second
1964         // HTLC along to nodes[3] and claim the whole payment back to nodes[0].
1965         let (outpoint, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_2_id).unwrap().clone();
1966         nodes[0].node.channel_monitor_updated(&outpoint, latest_update);
1967         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
1968         assert_eq!(events.len(), 1);
1969         pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash.clone(), payment_secret, events.pop().unwrap(), true);
1970
1971         claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[3]], &[&nodes[2], &nodes[3]]], false, payment_preimage);
1972 }