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