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