Send announcement_signatures msgs out-of-band for ordered delivery
[rust-lightning] / src / ln / channelmanager.rs
1 //! The top-level channel management and payment tracking stuff lives here.
2 //!
3 //! The ChannelManager is the main chunk of logic implementing the lightning protocol and is
4 //! responsible for tracking which channels are open, HTLCs are in flight and reestablishing those
5 //! upon reconnect to the relevant peer(s).
6 //!
7 //! It does not manage routing logic (see ln::router for that) nor does it manage constructing
8 //! on-chain transactions (it only monitors the chain to watch for any force-closes that might
9 //! imply it needs to fail HTLCs/payments/channels it manages).
10
11 use bitcoin::blockdata::block::BlockHeader;
12 use bitcoin::blockdata::transaction::Transaction;
13 use bitcoin::blockdata::constants::genesis_block;
14 use bitcoin::network::constants::Network;
15 use bitcoin::network::serialize::BitcoinHash;
16 use bitcoin::util::hash::Sha256dHash;
17
18 use secp256k1::key::{SecretKey,PublicKey};
19 use secp256k1::{Secp256k1,Message};
20 use secp256k1::ecdh::SharedSecret;
21 use secp256k1;
22
23 use chain::chaininterface::{BroadcasterInterface,ChainListener,ChainWatchInterface,FeeEstimator};
24 use chain::transaction::OutPoint;
25 use ln::channel::{Channel, ChannelError};
26 use ln::channelmonitor::{ChannelMonitorUpdateErr, ManyChannelMonitor, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
27 use ln::router::{Route,RouteHop};
28 use ln::msgs;
29 use ln::msgs::{ChannelMessageHandler, HandleError, RAACommitmentOrder};
30 use chain::keysinterface::KeysInterface;
31 use util::{byte_utils, events, internal_traits, rng};
32 use util::sha2::Sha256;
33 use util::ser::{Readable, Writeable};
34 use util::chacha20poly1305rfc::ChaCha20;
35 use util::logger::Logger;
36 use util::errors::APIError;
37
38 use crypto;
39 use crypto::mac::{Mac,MacResult};
40 use crypto::hmac::Hmac;
41 use crypto::digest::Digest;
42 use crypto::symmetriccipher::SynchronousStreamCipher;
43
44 use std::{ptr, mem};
45 use std::collections::HashMap;
46 use std::collections::hash_map;
47 use std::io::Cursor;
48 use std::sync::{Mutex,MutexGuard,Arc};
49 use std::sync::atomic::{AtomicUsize, Ordering};
50 use std::time::{Instant,Duration};
51
52 /// We hold various information about HTLC relay in the HTLC objects in Channel itself:
53 ///
54 /// Upon receipt of an HTLC from a peer, we'll give it a PendingHTLCStatus indicating if it should
55 /// forward the HTLC with information it will give back to us when it does so, or if it should Fail
56 /// the HTLC with the relevant message for the Channel to handle giving to the remote peer.
57 ///
58 /// When a Channel forwards an HTLC to its peer, it will give us back the PendingForwardHTLCInfo
59 /// which we will use to construct an outbound HTLC, with a relevant HTLCSource::PreviousHopData
60 /// filled in to indicate where it came from (which we can use to either fail-backwards or fulfill
61 /// the HTLC backwards along the relevant path).
62 /// Alternatively, we can fill an outbound HTLC with a HTLCSource::OutboundRoute indicating this is
63 /// our payment, which we can use to decode errors or inform the user that the payment was sent.
64 mod channel_held_info {
65         use ln::msgs;
66         use ln::router::Route;
67         use secp256k1::key::SecretKey;
68         use secp256k1::ecdh::SharedSecret;
69
70         /// Stores the info we will need to send when we want to forward an HTLC onwards
71         #[derive(Clone)] // See Channel::revoke_and_ack for why, tl;dr: Rust bug
72         pub struct PendingForwardHTLCInfo {
73                 pub(super) onion_packet: Option<msgs::OnionPacket>,
74                 pub(super) incoming_shared_secret: SharedSecret,
75                 pub(super) payment_hash: [u8; 32],
76                 pub(super) short_channel_id: u64,
77                 pub(super) amt_to_forward: u64,
78                 pub(super) outgoing_cltv_value: u32,
79         }
80
81         #[derive(Clone)] // See Channel::revoke_and_ack for why, tl;dr: Rust bug
82         pub enum HTLCFailureMsg {
83                 Relay(msgs::UpdateFailHTLC),
84                 Malformed(msgs::UpdateFailMalformedHTLC),
85         }
86
87         /// Stores whether we can't forward an HTLC or relevant forwarding info
88         #[derive(Clone)] // See Channel::revoke_and_ack for why, tl;dr: Rust bug
89         pub enum PendingHTLCStatus {
90                 Forward(PendingForwardHTLCInfo),
91                 Fail(HTLCFailureMsg),
92         }
93
94         /// Tracks the inbound corresponding to an outbound HTLC
95         #[derive(Clone)]
96         pub struct HTLCPreviousHopData {
97                 pub(super) short_channel_id: u64,
98                 pub(super) htlc_id: u64,
99                 pub(super) incoming_packet_shared_secret: SharedSecret,
100         }
101
102         /// Tracks the inbound corresponding to an outbound HTLC
103         #[derive(Clone)]
104         pub enum HTLCSource {
105                 PreviousHopData(HTLCPreviousHopData),
106                 OutboundRoute {
107                         route: Route,
108                         session_priv: SecretKey,
109                         /// Technically we can recalculate this from the route, but we cache it here to avoid
110                         /// doing a double-pass on route when we get a failure back
111                         first_hop_htlc_msat: u64,
112                 },
113         }
114         #[cfg(test)]
115         impl HTLCSource {
116                 pub fn dummy() -> Self {
117                         HTLCSource::OutboundRoute {
118                                 route: Route { hops: Vec::new() },
119                                 session_priv: SecretKey::from_slice(&::secp256k1::Secp256k1::without_caps(), &[1; 32]).unwrap(),
120                                 first_hop_htlc_msat: 0,
121                         }
122                 }
123         }
124
125         #[derive(Clone)] // See Channel::revoke_and_ack for why, tl;dr: Rust bug
126         pub(crate) enum HTLCFailReason {
127                 ErrorPacket {
128                         err: msgs::OnionErrorPacket,
129                 },
130                 Reason {
131                         failure_code: u16,
132                         data: Vec<u8>,
133                 }
134         }
135 }
136 pub(super) use self::channel_held_info::*;
137
138 struct MsgHandleErrInternal {
139         err: msgs::HandleError,
140         needs_channel_force_close: bool,
141 }
142 impl MsgHandleErrInternal {
143         #[inline]
144         fn send_err_msg_no_close(err: &'static str, channel_id: [u8; 32]) -> Self {
145                 Self {
146                         err: HandleError {
147                                 err,
148                                 action: Some(msgs::ErrorAction::SendErrorMessage {
149                                         msg: msgs::ErrorMessage {
150                                                 channel_id,
151                                                 data: err.to_string()
152                                         },
153                                 }),
154                         },
155                         needs_channel_force_close: false,
156                 }
157         }
158         #[inline]
159         fn send_err_msg_close_chan(err: &'static str, channel_id: [u8; 32]) -> Self {
160                 Self {
161                         err: HandleError {
162                                 err,
163                                 action: Some(msgs::ErrorAction::SendErrorMessage {
164                                         msg: msgs::ErrorMessage {
165                                                 channel_id,
166                                                 data: err.to_string()
167                                         },
168                                 }),
169                         },
170                         needs_channel_force_close: true,
171                 }
172         }
173         #[inline]
174         fn from_maybe_close(err: msgs::HandleError) -> Self {
175                 Self { err, needs_channel_force_close: true }
176         }
177         #[inline]
178         fn from_no_close(err: msgs::HandleError) -> Self {
179                 Self { err, needs_channel_force_close: false }
180         }
181         #[inline]
182         fn from_chan_no_close(err: ChannelError, channel_id: [u8; 32]) -> Self {
183                 Self {
184                         err: match err {
185                                 ChannelError::Ignore(msg) => HandleError {
186                                         err: msg,
187                                         action: Some(msgs::ErrorAction::IgnoreError),
188                                 },
189                                 ChannelError::Close(msg) => HandleError {
190                                         err: msg,
191                                         action: Some(msgs::ErrorAction::SendErrorMessage {
192                                                 msg: msgs::ErrorMessage {
193                                                         channel_id,
194                                                         data: msg.to_string()
195                                                 },
196                                         }),
197                                 },
198                         },
199                         needs_channel_force_close: false,
200                 }
201         }
202         #[inline]
203         fn from_chan_maybe_close(err: ChannelError, channel_id: [u8; 32]) -> Self {
204                 Self {
205                         err: match err {
206                                 ChannelError::Ignore(msg) => HandleError {
207                                         err: msg,
208                                         action: Some(msgs::ErrorAction::IgnoreError),
209                                 },
210                                 ChannelError::Close(msg) => HandleError {
211                                         err: msg,
212                                         action: Some(msgs::ErrorAction::SendErrorMessage {
213                                                 msg: msgs::ErrorMessage {
214                                                         channel_id,
215                                                         data: msg.to_string()
216                                                 },
217                                         }),
218                                 },
219                         },
220                         needs_channel_force_close: true,
221                 }
222         }
223 }
224
225 /// Pass to fail_htlc_backwwards to indicate the reason to fail the payment
226 /// after a PaymentReceived event.
227 #[derive(PartialEq)]
228 pub enum PaymentFailReason {
229         /// Indicate the preimage for payment_hash is not known after a PaymentReceived event
230         PreimageUnknown,
231         /// Indicate the payment amount is incorrect ( received is < expected or > 2*expected ) after a PaymentReceived event
232         AmountMismatch,
233 }
234
235 /// We hold back HTLCs we intend to relay for a random interval in the range (this, 5*this). This
236 /// provides some limited amount of privacy. Ideally this would range from somewhere like 1 second
237 /// to 30 seconds, but people expect lightning to be, you know, kinda fast, sadly. We could
238 /// probably increase this significantly.
239 const MIN_HTLC_RELAY_HOLDING_CELL_MILLIS: u32 = 50;
240
241 struct HTLCForwardInfo {
242         prev_short_channel_id: u64,
243         prev_htlc_id: u64,
244         forward_info: PendingForwardHTLCInfo,
245 }
246
247 struct ChannelHolder {
248         by_id: HashMap<[u8; 32], Channel>,
249         short_to_id: HashMap<u64, [u8; 32]>,
250         next_forward: Instant,
251         /// short channel id -> forward infos. Key of 0 means payments received
252         /// Note that while this is held in the same mutex as the channels themselves, no consistency
253         /// guarantees are made about there existing a channel with the short id here, nor the short
254         /// ids in the PendingForwardHTLCInfo!
255         forward_htlcs: HashMap<u64, Vec<HTLCForwardInfo>>,
256         /// Note that while this is held in the same mutex as the channels themselves, no consistency
257         /// guarantees are made about the channels given here actually existing anymore by the time you
258         /// go to read them!
259         claimable_htlcs: HashMap<[u8; 32], Vec<HTLCPreviousHopData>>,
260         /// Messages to send to peers - pushed to in the same lock that they are generated in (except
261         /// for broadcast messages, where ordering isn't as strict).
262         pending_msg_events: Vec<events::MessageSendEvent>,
263 }
264 struct MutChannelHolder<'a> {
265         by_id: &'a mut HashMap<[u8; 32], Channel>,
266         short_to_id: &'a mut HashMap<u64, [u8; 32]>,
267         next_forward: &'a mut Instant,
268         forward_htlcs: &'a mut HashMap<u64, Vec<HTLCForwardInfo>>,
269         claimable_htlcs: &'a mut HashMap<[u8; 32], Vec<HTLCPreviousHopData>>,
270         pending_msg_events: &'a mut Vec<events::MessageSendEvent>,
271 }
272 impl ChannelHolder {
273         fn borrow_parts(&mut self) -> MutChannelHolder {
274                 MutChannelHolder {
275                         by_id: &mut self.by_id,
276                         short_to_id: &mut self.short_to_id,
277                         next_forward: &mut self.next_forward,
278                         forward_htlcs: &mut self.forward_htlcs,
279                         claimable_htlcs: &mut self.claimable_htlcs,
280                         pending_msg_events: &mut self.pending_msg_events,
281                 }
282         }
283 }
284
285 #[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
286 const ERR: () = "You need at least 32 bit pointers (well, usize, but we'll assume they're the same) for ChannelManager::latest_block_height";
287
288 /// Manager which keeps track of a number of channels and sends messages to the appropriate
289 /// channel, also tracking HTLC preimages and forwarding onion packets appropriately.
290 ///
291 /// Implements ChannelMessageHandler, handling the multi-channel parts and passing things through
292 /// to individual Channels.
293 pub struct ChannelManager {
294         genesis_hash: Sha256dHash,
295         fee_estimator: Arc<FeeEstimator>,
296         monitor: Arc<ManyChannelMonitor>,
297         chain_monitor: Arc<ChainWatchInterface>,
298         tx_broadcaster: Arc<BroadcasterInterface>,
299
300         announce_channels_publicly: bool,
301         fee_proportional_millionths: u32,
302         latest_block_height: AtomicUsize,
303         secp_ctx: Secp256k1<secp256k1::All>,
304
305         channel_state: Mutex<ChannelHolder>,
306         our_network_key: SecretKey,
307
308         pending_events: Mutex<Vec<events::Event>>,
309
310         keys_manager: Arc<KeysInterface>,
311
312         logger: Arc<Logger>,
313 }
314
315 /// The minimum number of blocks between an inbound HTLC's CLTV and the corresponding outbound
316 /// HTLC's CLTV. This should always be a few blocks greater than channelmonitor::CLTV_CLAIM_BUFFER,
317 /// ie the node we forwarded the payment on to should always have enough room to reliably time out
318 /// the HTLC via a full update_fail_htlc/commitment_signed dance before we hit the
319 /// CLTV_CLAIM_BUFFER point (we static assert that its at least 3 blocks more).
320 const CLTV_EXPIRY_DELTA: u16 = 6 * 24 * 2; //TODO?
321 const CLTV_FAR_FAR_AWAY: u32 = 6 * 24 * 7; //TODO?
322
323 // Check that our CLTV_EXPIRY is at least CLTV_CLAIM_BUFFER + 2*HTLC_FAIL_TIMEOUT_BLOCKS, ie that
324 // if the next-hop peer fails the HTLC within HTLC_FAIL_TIMEOUT_BLOCKS then we'll still have
325 // HTLC_FAIL_TIMEOUT_BLOCKS left to fail it backwards ourselves before hitting the
326 // CLTV_CLAIM_BUFFER point and failing the channel on-chain to time out the HTLC.
327 #[deny(const_err)]
328 #[allow(dead_code)]
329 const CHECK_CLTV_EXPIRY_SANITY: u32 = CLTV_EXPIRY_DELTA as u32 - 2*HTLC_FAIL_TIMEOUT_BLOCKS - CLTV_CLAIM_BUFFER;
330
331 // Check for ability of an attacker to make us fail on-chain by delaying inbound claim. See
332 // ChannelMontior::would_broadcast_at_height for a description of why this is needed.
333 #[deny(const_err)]
334 #[allow(dead_code)]
335 const CHECK_CLTV_EXPIRY_SANITY_2: u32 = CLTV_EXPIRY_DELTA as u32 - HTLC_FAIL_TIMEOUT_BLOCKS - 2*CLTV_CLAIM_BUFFER;
336
337 macro_rules! secp_call {
338         ( $res: expr, $err: expr ) => {
339                 match $res {
340                         Ok(key) => key,
341                         Err(_) => return Err($err),
342                 }
343         };
344 }
345
346 struct OnionKeys {
347         #[cfg(test)]
348         shared_secret: SharedSecret,
349         #[cfg(test)]
350         blinding_factor: [u8; 32],
351         ephemeral_pubkey: PublicKey,
352         rho: [u8; 32],
353         mu: [u8; 32],
354 }
355
356 /// Details of a channel, as returned by ChannelManager::list_channels and ChannelManager::list_usable_channels
357 pub struct ChannelDetails {
358         /// The channel's ID (prior to funding transaction generation, this is a random 32 bytes,
359         /// thereafter this is the txid of the funding transaction xor the funding transaction output).
360         /// Note that this means this value is *not* persistent - it can change once during the
361         /// lifetime of the channel.
362         pub channel_id: [u8; 32],
363         /// The position of the funding transaction in the chain. None if the funding transaction has
364         /// not yet been confirmed and the channel fully opened.
365         pub short_channel_id: Option<u64>,
366         /// The node_id of our counterparty
367         pub remote_network_id: PublicKey,
368         /// The value, in satoshis, of this channel as appears in the funding output
369         pub channel_value_satoshis: u64,
370         /// The user_id passed in to create_channel, or 0 if the channel was inbound.
371         pub user_id: u64,
372 }
373
374 impl ChannelManager {
375         /// Constructs a new ChannelManager to hold several channels and route between them.
376         ///
377         /// This is the main "logic hub" for all channel-related actions, and implements
378         /// ChannelMessageHandler.
379         ///
380         /// fee_proportional_millionths is an optional fee to charge any payments routed through us.
381         /// Non-proportional fees are fixed according to our risk using the provided fee estimator.
382         ///
383         /// panics if channel_value_satoshis is >= `MAX_FUNDING_SATOSHIS`!
384         pub fn new(fee_proportional_millionths: u32, announce_channels_publicly: bool, network: Network, feeest: Arc<FeeEstimator>, monitor: Arc<ManyChannelMonitor>, chain_monitor: Arc<ChainWatchInterface>, tx_broadcaster: Arc<BroadcasterInterface>, logger: Arc<Logger>, keys_manager: Arc<KeysInterface>) -> Result<Arc<ChannelManager>, secp256k1::Error> {
385                 let secp_ctx = Secp256k1::new();
386
387                 let res = Arc::new(ChannelManager {
388                         genesis_hash: genesis_block(network).header.bitcoin_hash(),
389                         fee_estimator: feeest.clone(),
390                         monitor: monitor.clone(),
391                         chain_monitor,
392                         tx_broadcaster,
393
394                         announce_channels_publicly,
395                         fee_proportional_millionths,
396                         latest_block_height: AtomicUsize::new(0), //TODO: Get an init value (generally need to replay recent chain on chain_monitor registration)
397                         secp_ctx,
398
399                         channel_state: Mutex::new(ChannelHolder{
400                                 by_id: HashMap::new(),
401                                 short_to_id: HashMap::new(),
402                                 next_forward: Instant::now(),
403                                 forward_htlcs: HashMap::new(),
404                                 claimable_htlcs: HashMap::new(),
405                                 pending_msg_events: Vec::new(),
406                         }),
407                         our_network_key: keys_manager.get_node_secret(),
408
409                         pending_events: Mutex::new(Vec::new()),
410
411                         keys_manager,
412
413                         logger,
414                 });
415                 let weak_res = Arc::downgrade(&res);
416                 res.chain_monitor.register_listener(weak_res);
417                 Ok(res)
418         }
419
420         /// Creates a new outbound channel to the given remote node and with the given value.
421         ///
422         /// user_id will be provided back as user_channel_id in FundingGenerationReady and
423         /// FundingBroadcastSafe events to allow tracking of which events correspond with which
424         /// create_channel call. Note that user_channel_id defaults to 0 for inbound channels, so you
425         /// may wish to avoid using 0 for user_id here.
426         ///
427         /// If successful, will generate a SendOpenChannel message event, so you should probably poll
428         /// PeerManager::process_events afterwards.
429         ///
430         /// Raises APIError::APIMisuseError when channel_value_satoshis > 2**24 or push_msat being greater than channel_value_satoshis * 1k
431         pub fn create_channel(&self, their_network_key: PublicKey, channel_value_satoshis: u64, push_msat: u64, user_id: u64) -> Result<(), APIError> {
432                 let channel = Channel::new_outbound(&*self.fee_estimator, &self.keys_manager, their_network_key, channel_value_satoshis, push_msat, self.announce_channels_publicly, user_id, Arc::clone(&self.logger))?;
433                 let res = channel.get_open_channel(self.genesis_hash.clone(), &*self.fee_estimator);
434                 let mut channel_state = self.channel_state.lock().unwrap();
435                 match channel_state.by_id.entry(channel.channel_id()) {
436                         hash_map::Entry::Occupied(_) => {
437                                 if cfg!(feature = "fuzztarget") {
438                                         return Err(APIError::APIMisuseError { err: "Fuzzy bad RNG" });
439                                 } else {
440                                         panic!("RNG is bad???");
441                                 }
442                         },
443                         hash_map::Entry::Vacant(entry) => { entry.insert(channel); }
444                 }
445                 channel_state.pending_msg_events.push(events::MessageSendEvent::SendOpenChannel {
446                         node_id: their_network_key,
447                         msg: res,
448                 });
449                 Ok(())
450         }
451
452         /// Gets the list of open channels, in random order. See ChannelDetail field documentation for
453         /// more information.
454         pub fn list_channels(&self) -> Vec<ChannelDetails> {
455                 let channel_state = self.channel_state.lock().unwrap();
456                 let mut res = Vec::with_capacity(channel_state.by_id.len());
457                 for (channel_id, channel) in channel_state.by_id.iter() {
458                         res.push(ChannelDetails {
459                                 channel_id: (*channel_id).clone(),
460                                 short_channel_id: channel.get_short_channel_id(),
461                                 remote_network_id: channel.get_their_node_id(),
462                                 channel_value_satoshis: channel.get_value_satoshis(),
463                                 user_id: channel.get_user_id(),
464                         });
465                 }
466                 res
467         }
468
469         /// Gets the list of usable channels, in random order. Useful as an argument to
470         /// Router::get_route to ensure non-announced channels are used.
471         pub fn list_usable_channels(&self) -> Vec<ChannelDetails> {
472                 let channel_state = self.channel_state.lock().unwrap();
473                 let mut res = Vec::with_capacity(channel_state.by_id.len());
474                 for (channel_id, channel) in channel_state.by_id.iter() {
475                         // Note we use is_live here instead of usable which leads to somewhat confused
476                         // internal/external nomenclature, but that's ok cause that's probably what the user
477                         // really wanted anyway.
478                         if channel.is_live() {
479                                 res.push(ChannelDetails {
480                                         channel_id: (*channel_id).clone(),
481                                         short_channel_id: channel.get_short_channel_id(),
482                                         remote_network_id: channel.get_their_node_id(),
483                                         channel_value_satoshis: channel.get_value_satoshis(),
484                                         user_id: channel.get_user_id(),
485                                 });
486                         }
487                 }
488                 res
489         }
490
491         /// Begins the process of closing a channel. After this call (plus some timeout), no new HTLCs
492         /// will be accepted on the given channel, and after additional timeout/the closing of all
493         /// pending HTLCs, the channel will be closed on chain.
494         ///
495         /// May generate a SendShutdown message event on success, which should be relayed.
496         pub fn close_channel(&self, channel_id: &[u8; 32]) -> Result<(), APIError> {
497                 let (mut failed_htlcs, chan_option) = {
498                         let mut channel_state_lock = self.channel_state.lock().unwrap();
499                         let channel_state = channel_state_lock.borrow_parts();
500                         match channel_state.by_id.entry(channel_id.clone()) {
501                                 hash_map::Entry::Occupied(mut chan_entry) => {
502                                         let (shutdown_msg, failed_htlcs) = chan_entry.get_mut().get_shutdown()?;
503                                         channel_state.pending_msg_events.push(events::MessageSendEvent::SendShutdown {
504                                                 node_id: chan_entry.get().get_their_node_id(),
505                                                 msg: shutdown_msg
506                                         });
507                                         if chan_entry.get().is_shutdown() {
508                                                 if let Some(short_id) = chan_entry.get().get_short_channel_id() {
509                                                         channel_state.short_to_id.remove(&short_id);
510                                                 }
511                                                 (failed_htlcs, Some(chan_entry.remove_entry().1))
512                                         } else { (failed_htlcs, None) }
513                                 },
514                                 hash_map::Entry::Vacant(_) => return Err(APIError::ChannelUnavailable{err: "No such channel"})
515                         }
516                 };
517                 for htlc_source in failed_htlcs.drain(..) {
518                         // unknown_next_peer...I dunno who that is anymore....
519                         self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source.0, &htlc_source.1, HTLCFailReason::Reason { failure_code: 0x4000 | 10, data: Vec::new() });
520                 }
521                 let chan_update = if let Some(chan) = chan_option {
522                         if let Ok(update) = self.get_channel_update(&chan) {
523                                 Some(update)
524                         } else { None }
525                 } else { None };
526
527                 if let Some(update) = chan_update {
528                         let mut channel_state = self.channel_state.lock().unwrap();
529                         channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
530                                 msg: update
531                         });
532                 }
533
534                 Ok(())
535         }
536
537         #[inline]
538         fn finish_force_close_channel(&self, shutdown_res: (Vec<Transaction>, Vec<(HTLCSource, [u8; 32])>)) {
539                 let (local_txn, mut failed_htlcs) = shutdown_res;
540                 for htlc_source in failed_htlcs.drain(..) {
541                         // unknown_next_peer...I dunno who that is anymore....
542                         self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source.0, &htlc_source.1, HTLCFailReason::Reason { failure_code: 0x4000 | 10, data: Vec::new() });
543                 }
544                 for tx in local_txn {
545                         self.tx_broadcaster.broadcast_transaction(&tx);
546                 }
547                 //TODO: We need to have a way where outbound HTLC claims can result in us claiming the
548                 //now-on-chain HTLC output for ourselves (and, thereafter, passing the HTLC backwards).
549                 //TODO: We need to handle monitoring of pending offered HTLCs which just hit the chain and
550                 //may be claimed, resulting in us claiming the inbound HTLCs (and back-failing after
551                 //timeouts are hit and our claims confirm).
552                 //TODO: In any case, we need to make sure we remove any pending htlc tracking (via
553                 //fail_backwards or claim_funds) eventually for all HTLCs that were in the channel
554         }
555
556         /// Force closes a channel, immediately broadcasting the latest local commitment transaction to
557         /// the chain and rejecting new HTLCs on the given channel.
558         pub fn force_close_channel(&self, channel_id: &[u8; 32]) {
559                 let mut chan = {
560                         let mut channel_state_lock = self.channel_state.lock().unwrap();
561                         let channel_state = channel_state_lock.borrow_parts();
562                         if let Some(chan) = channel_state.by_id.remove(channel_id) {
563                                 if let Some(short_id) = chan.get_short_channel_id() {
564                                         channel_state.short_to_id.remove(&short_id);
565                                 }
566                                 chan
567                         } else {
568                                 return;
569                         }
570                 };
571                 self.finish_force_close_channel(chan.force_shutdown());
572                 if let Ok(update) = self.get_channel_update(&chan) {
573                         let mut channel_state = self.channel_state.lock().unwrap();
574                         channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
575                                 msg: update
576                         });
577                 }
578         }
579
580         /// Force close all channels, immediately broadcasting the latest local commitment transaction
581         /// for each to the chain and rejecting new HTLCs on each.
582         pub fn force_close_all_channels(&self) {
583                 for chan in self.list_channels() {
584                         self.force_close_channel(&chan.channel_id);
585                 }
586         }
587
588         fn handle_monitor_update_fail(&self, mut channel_state_lock: MutexGuard<ChannelHolder>, channel_id: &[u8; 32], err: ChannelMonitorUpdateErr, reason: RAACommitmentOrder) {
589                 match err {
590                         ChannelMonitorUpdateErr::PermanentFailure => {
591                                 let mut chan = {
592                                         let channel_state = channel_state_lock.borrow_parts();
593                                         let chan = channel_state.by_id.remove(channel_id).expect("monitor_update_failed must be called within the same lock as the channel get!");
594                                         if let Some(short_id) = chan.get_short_channel_id() {
595                                                 channel_state.short_to_id.remove(&short_id);
596                                         }
597                                         chan
598                                 };
599                                 mem::drop(channel_state_lock);
600                                 self.finish_force_close_channel(chan.force_shutdown());
601                                 if let Ok(update) = self.get_channel_update(&chan) {
602                                         let mut channel_state = self.channel_state.lock().unwrap();
603                                         channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
604                                                 msg: update
605                                         });
606                                 }
607                         },
608                         ChannelMonitorUpdateErr::TemporaryFailure => {
609                                 let channel = channel_state_lock.by_id.get_mut(channel_id).expect("monitor_update_failed must be called within the same lock as the channel get!");
610                                 channel.monitor_update_failed(reason);
611                         },
612                 }
613         }
614
615         #[inline]
616         fn gen_rho_mu_from_shared_secret(shared_secret: &SharedSecret) -> ([u8; 32], [u8; 32]) {
617                 ({
618                         let mut hmac = Hmac::new(Sha256::new(), &[0x72, 0x68, 0x6f]); // rho
619                         hmac.input(&shared_secret[..]);
620                         let mut res = [0; 32];
621                         hmac.raw_result(&mut res);
622                         res
623                 },
624                 {
625                         let mut hmac = Hmac::new(Sha256::new(), &[0x6d, 0x75]); // mu
626                         hmac.input(&shared_secret[..]);
627                         let mut res = [0; 32];
628                         hmac.raw_result(&mut res);
629                         res
630                 })
631         }
632
633         #[inline]
634         fn gen_um_from_shared_secret(shared_secret: &SharedSecret) -> [u8; 32] {
635                 let mut hmac = Hmac::new(Sha256::new(), &[0x75, 0x6d]); // um
636                 hmac.input(&shared_secret[..]);
637                 let mut res = [0; 32];
638                 hmac.raw_result(&mut res);
639                 res
640         }
641
642         #[inline]
643         fn gen_ammag_from_shared_secret(shared_secret: &SharedSecret) -> [u8; 32] {
644                 let mut hmac = Hmac::new(Sha256::new(), &[0x61, 0x6d, 0x6d, 0x61, 0x67]); // ammag
645                 hmac.input(&shared_secret[..]);
646                 let mut res = [0; 32];
647                 hmac.raw_result(&mut res);
648                 res
649         }
650
651         // can only fail if an intermediary hop has an invalid public key or session_priv is invalid
652         #[inline]
653         fn construct_onion_keys_callback<T: secp256k1::Signing, FType: FnMut(SharedSecret, [u8; 32], PublicKey, &RouteHop)> (secp_ctx: &Secp256k1<T>, route: &Route, session_priv: &SecretKey, mut callback: FType) -> Result<(), secp256k1::Error> {
654                 let mut blinded_priv = session_priv.clone();
655                 let mut blinded_pub = PublicKey::from_secret_key(secp_ctx, &blinded_priv);
656
657                 for hop in route.hops.iter() {
658                         let shared_secret = SharedSecret::new(secp_ctx, &hop.pubkey, &blinded_priv);
659
660                         let mut sha = Sha256::new();
661                         sha.input(&blinded_pub.serialize()[..]);
662                         sha.input(&shared_secret[..]);
663                         let mut blinding_factor = [0u8; 32];
664                         sha.result(&mut blinding_factor);
665
666                         let ephemeral_pubkey = blinded_pub;
667
668                         blinded_priv.mul_assign(secp_ctx, &SecretKey::from_slice(secp_ctx, &blinding_factor)?)?;
669                         blinded_pub = PublicKey::from_secret_key(secp_ctx, &blinded_priv);
670
671                         callback(shared_secret, blinding_factor, ephemeral_pubkey, hop);
672                 }
673
674                 Ok(())
675         }
676
677         // can only fail if an intermediary hop has an invalid public key or session_priv is invalid
678         fn construct_onion_keys<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, route: &Route, session_priv: &SecretKey) -> Result<Vec<OnionKeys>, secp256k1::Error> {
679                 let mut res = Vec::with_capacity(route.hops.len());
680
681                 Self::construct_onion_keys_callback(secp_ctx, route, session_priv, |shared_secret, _blinding_factor, ephemeral_pubkey, _| {
682                         let (rho, mu) = ChannelManager::gen_rho_mu_from_shared_secret(&shared_secret);
683
684                         res.push(OnionKeys {
685                                 #[cfg(test)]
686                                 shared_secret,
687                                 #[cfg(test)]
688                                 blinding_factor: _blinding_factor,
689                                 ephemeral_pubkey,
690                                 rho,
691                                 mu,
692                         });
693                 })?;
694
695                 Ok(res)
696         }
697
698         /// returns the hop data, as well as the first-hop value_msat and CLTV value we should send.
699         fn build_onion_payloads(route: &Route, starting_htlc_offset: u32) -> Result<(Vec<msgs::OnionHopData>, u64, u32), APIError> {
700                 let mut cur_value_msat = 0u64;
701                 let mut cur_cltv = starting_htlc_offset;
702                 let mut last_short_channel_id = 0;
703                 let mut res: Vec<msgs::OnionHopData> = Vec::with_capacity(route.hops.len());
704                 internal_traits::test_no_dealloc::<msgs::OnionHopData>(None);
705                 unsafe { res.set_len(route.hops.len()); }
706
707                 for (idx, hop) in route.hops.iter().enumerate().rev() {
708                         // First hop gets special values so that it can check, on receipt, that everything is
709                         // exactly as it should be (and the next hop isn't trying to probe to find out if we're
710                         // the intended recipient).
711                         let value_msat = if cur_value_msat == 0 { hop.fee_msat } else { cur_value_msat };
712                         let cltv = if cur_cltv == starting_htlc_offset { hop.cltv_expiry_delta + starting_htlc_offset } else { cur_cltv };
713                         res[idx] = msgs::OnionHopData {
714                                 realm: 0,
715                                 data: msgs::OnionRealm0HopData {
716                                         short_channel_id: last_short_channel_id,
717                                         amt_to_forward: value_msat,
718                                         outgoing_cltv_value: cltv,
719                                 },
720                                 hmac: [0; 32],
721                         };
722                         cur_value_msat += hop.fee_msat;
723                         if cur_value_msat >= 21000000 * 100000000 * 1000 {
724                                 return Err(APIError::RouteError{err: "Channel fees overflowed?!"});
725                         }
726                         cur_cltv += hop.cltv_expiry_delta as u32;
727                         if cur_cltv >= 500000000 {
728                                 return Err(APIError::RouteError{err: "Channel CLTV overflowed?!"});
729                         }
730                         last_short_channel_id = hop.short_channel_id;
731                 }
732                 Ok((res, cur_value_msat, cur_cltv))
733         }
734
735         #[inline]
736         fn shift_arr_right(arr: &mut [u8; 20*65]) {
737                 unsafe {
738                         ptr::copy(arr[0..].as_ptr(), arr[65..].as_mut_ptr(), 19*65);
739                 }
740                 for i in 0..65 {
741                         arr[i] = 0;
742                 }
743         }
744
745         #[inline]
746         fn xor_bufs(dst: &mut[u8], src: &[u8]) {
747                 assert_eq!(dst.len(), src.len());
748
749                 for i in 0..dst.len() {
750                         dst[i] ^= src[i];
751                 }
752         }
753
754         const ZERO:[u8; 21*65] = [0; 21*65];
755         fn construct_onion_packet(mut payloads: Vec<msgs::OnionHopData>, onion_keys: Vec<OnionKeys>, associated_data: &[u8; 32]) -> msgs::OnionPacket {
756                 let mut buf = Vec::with_capacity(21*65);
757                 buf.resize(21*65, 0);
758
759                 let filler = {
760                         let iters = payloads.len() - 1;
761                         let end_len = iters * 65;
762                         let mut res = Vec::with_capacity(end_len);
763                         res.resize(end_len, 0);
764
765                         for (i, keys) in onion_keys.iter().enumerate() {
766                                 if i == payloads.len() - 1 { continue; }
767                                 let mut chacha = ChaCha20::new(&keys.rho, &[0u8; 8]);
768                                 chacha.process(&ChannelManager::ZERO, &mut buf); // We don't have a seek function :(
769                                 ChannelManager::xor_bufs(&mut res[0..(i + 1)*65], &buf[(20 - i)*65..21*65]);
770                         }
771                         res
772                 };
773
774                 let mut packet_data = [0; 20*65];
775                 let mut hmac_res = [0; 32];
776
777                 for (i, (payload, keys)) in payloads.iter_mut().zip(onion_keys.iter()).rev().enumerate() {
778                         ChannelManager::shift_arr_right(&mut packet_data);
779                         payload.hmac = hmac_res;
780                         packet_data[0..65].copy_from_slice(&payload.encode()[..]);
781
782                         let mut chacha = ChaCha20::new(&keys.rho, &[0u8; 8]);
783                         chacha.process(&packet_data, &mut buf[0..20*65]);
784                         packet_data[..].copy_from_slice(&buf[0..20*65]);
785
786                         if i == 0 {
787                                 packet_data[20*65 - filler.len()..20*65].copy_from_slice(&filler[..]);
788                         }
789
790                         let mut hmac = Hmac::new(Sha256::new(), &keys.mu);
791                         hmac.input(&packet_data);
792                         hmac.input(&associated_data[..]);
793                         hmac.raw_result(&mut hmac_res);
794                 }
795
796                 msgs::OnionPacket{
797                         version: 0,
798                         public_key: Ok(onion_keys.first().unwrap().ephemeral_pubkey),
799                         hop_data: packet_data,
800                         hmac: hmac_res,
801                 }
802         }
803
804         /// Encrypts a failure packet. raw_packet can either be a
805         /// msgs::DecodedOnionErrorPacket.encode() result or a msgs::OnionErrorPacket.data element.
806         fn encrypt_failure_packet(shared_secret: &SharedSecret, raw_packet: &[u8]) -> msgs::OnionErrorPacket {
807                 let ammag = ChannelManager::gen_ammag_from_shared_secret(&shared_secret);
808
809                 let mut packet_crypted = Vec::with_capacity(raw_packet.len());
810                 packet_crypted.resize(raw_packet.len(), 0);
811                 let mut chacha = ChaCha20::new(&ammag, &[0u8; 8]);
812                 chacha.process(&raw_packet, &mut packet_crypted[..]);
813                 msgs::OnionErrorPacket {
814                         data: packet_crypted,
815                 }
816         }
817
818         fn build_failure_packet(shared_secret: &SharedSecret, failure_type: u16, failure_data: &[u8]) -> msgs::DecodedOnionErrorPacket {
819                 assert!(failure_data.len() <= 256 - 2);
820
821                 let um = ChannelManager::gen_um_from_shared_secret(&shared_secret);
822
823                 let failuremsg = {
824                         let mut res = Vec::with_capacity(2 + failure_data.len());
825                         res.push(((failure_type >> 8) & 0xff) as u8);
826                         res.push(((failure_type >> 0) & 0xff) as u8);
827                         res.extend_from_slice(&failure_data[..]);
828                         res
829                 };
830                 let pad = {
831                         let mut res = Vec::with_capacity(256 - 2 - failure_data.len());
832                         res.resize(256 - 2 - failure_data.len(), 0);
833                         res
834                 };
835                 let mut packet = msgs::DecodedOnionErrorPacket {
836                         hmac: [0; 32],
837                         failuremsg: failuremsg,
838                         pad: pad,
839                 };
840
841                 let mut hmac = Hmac::new(Sha256::new(), &um);
842                 hmac.input(&packet.encode()[32..]);
843                 hmac.raw_result(&mut packet.hmac);
844
845                 packet
846         }
847
848         #[inline]
849         fn build_first_hop_failure_packet(shared_secret: &SharedSecret, failure_type: u16, failure_data: &[u8]) -> msgs::OnionErrorPacket {
850                 let failure_packet = ChannelManager::build_failure_packet(shared_secret, failure_type, failure_data);
851                 ChannelManager::encrypt_failure_packet(shared_secret, &failure_packet.encode()[..])
852         }
853
854         fn decode_update_add_htlc_onion(&self, msg: &msgs::UpdateAddHTLC) -> (PendingHTLCStatus, MutexGuard<ChannelHolder>) {
855                 macro_rules! get_onion_hash {
856                         () => {
857                                 {
858                                         let mut sha = Sha256::new();
859                                         sha.input(&msg.onion_routing_packet.hop_data);
860                                         let mut onion_hash = [0; 32];
861                                         sha.result(&mut onion_hash);
862                                         onion_hash
863                                 }
864                         }
865                 }
866
867                 if let Err(_) = msg.onion_routing_packet.public_key {
868                         log_info!(self, "Failed to accept/forward incoming HTLC with invalid ephemeral pubkey");
869                         return (PendingHTLCStatus::Fail(HTLCFailureMsg::Malformed(msgs::UpdateFailMalformedHTLC {
870                                 channel_id: msg.channel_id,
871                                 htlc_id: msg.htlc_id,
872                                 sha256_of_onion: get_onion_hash!(),
873                                 failure_code: 0x8000 | 0x4000 | 6,
874                         })), self.channel_state.lock().unwrap());
875                 }
876
877                 let shared_secret = SharedSecret::new(&self.secp_ctx, &msg.onion_routing_packet.public_key.unwrap(), &self.our_network_key);
878                 let (rho, mu) = ChannelManager::gen_rho_mu_from_shared_secret(&shared_secret);
879
880                 let mut channel_state = None;
881                 macro_rules! return_err {
882                         ($msg: expr, $err_code: expr, $data: expr) => {
883                                 {
884                                         log_info!(self, "Failed to accept/forward incoming HTLC: {}", $msg);
885                                         if channel_state.is_none() {
886                                                 channel_state = Some(self.channel_state.lock().unwrap());
887                                         }
888                                         return (PendingHTLCStatus::Fail(HTLCFailureMsg::Relay(msgs::UpdateFailHTLC {
889                                                 channel_id: msg.channel_id,
890                                                 htlc_id: msg.htlc_id,
891                                                 reason: ChannelManager::build_first_hop_failure_packet(&shared_secret, $err_code, $data),
892                                         })), channel_state.unwrap());
893                                 }
894                         }
895                 }
896
897                 if msg.onion_routing_packet.version != 0 {
898                         //TODO: Spec doesn't indicate if we should only hash hop_data here (and in other
899                         //sha256_of_onion error data packets), or the entire onion_routing_packet. Either way,
900                         //the hash doesn't really serve any purpuse - in the case of hashing all data, the
901                         //receiving node would have to brute force to figure out which version was put in the
902                         //packet by the node that send us the message, in the case of hashing the hop_data, the
903                         //node knows the HMAC matched, so they already know what is there...
904                         return_err!("Unknown onion packet version", 0x8000 | 0x4000 | 4, &get_onion_hash!());
905                 }
906
907                 let mut hmac = Hmac::new(Sha256::new(), &mu);
908                 hmac.input(&msg.onion_routing_packet.hop_data);
909                 hmac.input(&msg.payment_hash);
910                 if hmac.result() != MacResult::new(&msg.onion_routing_packet.hmac) {
911                         return_err!("HMAC Check failed", 0x8000 | 0x4000 | 5, &get_onion_hash!());
912                 }
913
914                 let mut chacha = ChaCha20::new(&rho, &[0u8; 8]);
915                 let next_hop_data = {
916                         let mut decoded = [0; 65];
917                         chacha.process(&msg.onion_routing_packet.hop_data[0..65], &mut decoded);
918                         match msgs::OnionHopData::read(&mut Cursor::new(&decoded[..])) {
919                                 Err(err) => {
920                                         let error_code = match err {
921                                                 msgs::DecodeError::UnknownVersion => 0x4000 | 1, // unknown realm byte
922                                                 _ => 0x2000 | 2, // Should never happen
923                                         };
924                                         return_err!("Unable to decode our hop data", error_code, &[0;0]);
925                                 },
926                                 Ok(msg) => msg
927                         }
928                 };
929
930                 let pending_forward_info = if next_hop_data.hmac == [0; 32] {
931                                 // OUR PAYMENT!
932                                 // final_expiry_too_soon
933                                 if (msg.cltv_expiry as u64) < self.latest_block_height.load(Ordering::Acquire) as u64 + (CLTV_CLAIM_BUFFER + HTLC_FAIL_TIMEOUT_BLOCKS) as u64 {
934                                         return_err!("The final CLTV expiry is too soon to handle", 17, &[0;0]);
935                                 }
936                                 // final_incorrect_htlc_amount
937                                 if next_hop_data.data.amt_to_forward > msg.amount_msat {
938                                         return_err!("Upstream node sent less than we were supposed to receive in payment", 19, &byte_utils::be64_to_array(msg.amount_msat));
939                                 }
940                                 // final_incorrect_cltv_expiry
941                                 if next_hop_data.data.outgoing_cltv_value != msg.cltv_expiry {
942                                         return_err!("Upstream node set CLTV to the wrong value", 18, &byte_utils::be32_to_array(msg.cltv_expiry));
943                                 }
944
945                                 // Note that we could obviously respond immediately with an update_fulfill_htlc
946                                 // message, however that would leak that we are the recipient of this payment, so
947                                 // instead we stay symmetric with the forwarding case, only responding (after a
948                                 // delay) once they've send us a commitment_signed!
949
950                                 PendingHTLCStatus::Forward(PendingForwardHTLCInfo {
951                                         onion_packet: None,
952                                         payment_hash: msg.payment_hash.clone(),
953                                         short_channel_id: 0,
954                                         incoming_shared_secret: shared_secret.clone(),
955                                         amt_to_forward: next_hop_data.data.amt_to_forward,
956                                         outgoing_cltv_value: next_hop_data.data.outgoing_cltv_value,
957                                 })
958                         } else {
959                                 let mut new_packet_data = [0; 20*65];
960                                 chacha.process(&msg.onion_routing_packet.hop_data[65..], &mut new_packet_data[0..19*65]);
961                                 chacha.process(&ChannelManager::ZERO[0..65], &mut new_packet_data[19*65..]);
962
963                                 let mut new_pubkey = msg.onion_routing_packet.public_key.unwrap();
964
965                                 let blinding_factor = {
966                                         let mut sha = Sha256::new();
967                                         sha.input(&new_pubkey.serialize()[..]);
968                                         sha.input(&shared_secret[..]);
969                                         let mut res = [0u8; 32];
970                                         sha.result(&mut res);
971                                         match SecretKey::from_slice(&self.secp_ctx, &res) {
972                                                 Err(_) => {
973                                                         return_err!("Blinding factor is an invalid private key", 0x8000 | 0x4000 | 6, &get_onion_hash!());
974                                                 },
975                                                 Ok(key) => key
976                                         }
977                                 };
978
979                                 if let Err(_) = new_pubkey.mul_assign(&self.secp_ctx, &blinding_factor) {
980                                         return_err!("New blinding factor is an invalid private key", 0x8000 | 0x4000 | 6, &get_onion_hash!());
981                                 }
982
983                                 let outgoing_packet = msgs::OnionPacket {
984                                         version: 0,
985                                         public_key: Ok(new_pubkey),
986                                         hop_data: new_packet_data,
987                                         hmac: next_hop_data.hmac.clone(),
988                                 };
989
990                                 PendingHTLCStatus::Forward(PendingForwardHTLCInfo {
991                                         onion_packet: Some(outgoing_packet),
992                                         payment_hash: msg.payment_hash.clone(),
993                                         short_channel_id: next_hop_data.data.short_channel_id,
994                                         incoming_shared_secret: shared_secret.clone(),
995                                         amt_to_forward: next_hop_data.data.amt_to_forward,
996                                         outgoing_cltv_value: next_hop_data.data.outgoing_cltv_value,
997                                 })
998                         };
999
1000                 channel_state = Some(self.channel_state.lock().unwrap());
1001                 if let &PendingHTLCStatus::Forward(PendingForwardHTLCInfo { ref onion_packet, ref short_channel_id, ref amt_to_forward, ref outgoing_cltv_value, .. }) = &pending_forward_info {
1002                         if onion_packet.is_some() { // If short_channel_id is 0 here, we'll reject them in the body here
1003                                 let id_option = channel_state.as_ref().unwrap().short_to_id.get(&short_channel_id).cloned();
1004                                 let forwarding_id = match id_option {
1005                                         None => { // unknown_next_peer
1006                                                 return_err!("Don't have available channel for forwarding as requested.", 0x4000 | 10, &[0;0]);
1007                                         },
1008                                         Some(id) => id.clone(),
1009                                 };
1010                                 if let Some((err, code, chan_update)) = loop {
1011                                         let chan = channel_state.as_mut().unwrap().by_id.get_mut(&forwarding_id).unwrap();
1012
1013                                         // Note that we could technically not return an error yet here and just hope
1014                                         // that the connection is reestablished or monitor updated by the time we get
1015                                         // around to doing the actual forward, but better to fail early if we can and
1016                                         // hopefully an attacker trying to path-trace payments cannot make this occur
1017                                         // on a small/per-node/per-channel scale.
1018                                         if !chan.is_live() { // channel_disabled
1019                                                 break Some(("Forwarding channel is not in a ready state.", 0x1000 | 20, Some(self.get_channel_update(chan).unwrap())));
1020                                         }
1021                                         if *amt_to_forward < chan.get_their_htlc_minimum_msat() { // amount_below_minimum
1022                                                 break Some(("HTLC amount was below the htlc_minimum_msat", 0x1000 | 11, Some(self.get_channel_update(chan).unwrap())));
1023                                         }
1024                                         let fee = amt_to_forward.checked_mul(self.fee_proportional_millionths as u64).and_then(|prop_fee| { (prop_fee / 1000000).checked_add(chan.get_our_fee_base_msat(&*self.fee_estimator) as u64) });
1025                                         if fee.is_none() || msg.amount_msat < fee.unwrap() || (msg.amount_msat - fee.unwrap()) < *amt_to_forward { // fee_insufficient
1026                                                 break Some(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones", 0x1000 | 12, Some(self.get_channel_update(chan).unwrap())));
1027                                         }
1028                                         if (msg.cltv_expiry as u64) < (*outgoing_cltv_value) as u64 + CLTV_EXPIRY_DELTA as u64 { // incorrect_cltv_expiry
1029                                                 break Some(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta", 0x1000 | 13, Some(self.get_channel_update(chan).unwrap())));
1030                                         }
1031                                         let cur_height = self.latest_block_height.load(Ordering::Acquire) as u32 + 1;
1032                                         // We want to have at least HTLC_FAIL_TIMEOUT_BLOCKS to fail prior to going on chain CLAIM_BUFFER blocks before expiration
1033                                         if msg.cltv_expiry <= cur_height + CLTV_CLAIM_BUFFER + HTLC_FAIL_TIMEOUT_BLOCKS as u32 { // expiry_too_soon
1034                                                 break Some(("CLTV expiry is too close", 0x1000 | 14, Some(self.get_channel_update(chan).unwrap())));
1035                                         }
1036                                         if msg.cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 { // expiry_too_far
1037                                                 break Some(("CLTV expiry is too far in the future", 21, None));
1038                                         }
1039                                         break None;
1040                                 }
1041                                 {
1042                                         let mut res = Vec::with_capacity(8 + 128);
1043                                         if code == 0x1000 | 11 || code == 0x1000 | 12 {
1044                                                 res.extend_from_slice(&byte_utils::be64_to_array(msg.amount_msat));
1045                                         }
1046                                         else if code == 0x1000 | 13 {
1047                                                 res.extend_from_slice(&byte_utils::be32_to_array(msg.cltv_expiry));
1048                                         }
1049                                         if let Some(chan_update) = chan_update {
1050                                                 res.extend_from_slice(&chan_update.encode_with_len()[..]);
1051                                         }
1052                                         return_err!(err, code, &res[..]);
1053                                 }
1054                         }
1055                 }
1056
1057                 (pending_forward_info, channel_state.unwrap())
1058         }
1059
1060         /// only fails if the channel does not yet have an assigned short_id
1061         /// May be called with channel_state already locked!
1062         fn get_channel_update(&self, chan: &Channel) -> Result<msgs::ChannelUpdate, HandleError> {
1063                 let short_channel_id = match chan.get_short_channel_id() {
1064                         None => return Err(HandleError{err: "Channel not yet established", action: None}),
1065                         Some(id) => id,
1066                 };
1067
1068                 let were_node_one = PublicKey::from_secret_key(&self.secp_ctx, &self.our_network_key).serialize()[..] < chan.get_their_node_id().serialize()[..];
1069
1070                 let unsigned = msgs::UnsignedChannelUpdate {
1071                         chain_hash: self.genesis_hash,
1072                         short_channel_id: short_channel_id,
1073                         timestamp: chan.get_channel_update_count(),
1074                         flags: (!were_node_one) as u16 | ((!chan.is_live() as u16) << 1),
1075                         cltv_expiry_delta: CLTV_EXPIRY_DELTA,
1076                         htlc_minimum_msat: chan.get_our_htlc_minimum_msat(),
1077                         fee_base_msat: chan.get_our_fee_base_msat(&*self.fee_estimator),
1078                         fee_proportional_millionths: self.fee_proportional_millionths,
1079                         excess_data: Vec::new(),
1080                 };
1081
1082                 let msg_hash = Sha256dHash::from_data(&unsigned.encode()[..]);
1083                 let sig = self.secp_ctx.sign(&Message::from_slice(&msg_hash[..]).unwrap(), &self.our_network_key);
1084
1085                 Ok(msgs::ChannelUpdate {
1086                         signature: sig,
1087                         contents: unsigned
1088                 })
1089         }
1090
1091         /// Sends a payment along a given route.
1092         ///
1093         /// Value parameters are provided via the last hop in route, see documentation for RouteHop
1094         /// fields for more info.
1095         ///
1096         /// Note that if the payment_hash already exists elsewhere (eg you're sending a duplicative
1097         /// payment), we don't do anything to stop you! We always try to ensure that if the provided
1098         /// next hop knows the preimage to payment_hash they can claim an additional amount as
1099         /// specified in the last hop in the route! Thus, you should probably do your own
1100         /// payment_preimage tracking (which you should already be doing as they represent "proof of
1101         /// payment") and prevent double-sends yourself.
1102         ///
1103         /// May generate a SendHTLCs message event on success, which should be relayed.
1104         ///
1105         /// Raises APIError::RoutError when invalid route or forward parameter
1106         /// (cltv_delta, fee, node public key) is specified
1107         pub fn send_payment(&self, route: Route, payment_hash: [u8; 32]) -> Result<(), APIError> {
1108                 if route.hops.len() < 1 || route.hops.len() > 20 {
1109                         return Err(APIError::RouteError{err: "Route didn't go anywhere/had bogus size"});
1110                 }
1111                 let our_node_id = self.get_our_node_id();
1112                 for (idx, hop) in route.hops.iter().enumerate() {
1113                         if idx != route.hops.len() - 1 && hop.pubkey == our_node_id {
1114                                 return Err(APIError::RouteError{err: "Route went through us but wasn't a simple rebalance loop to us"});
1115                         }
1116                 }
1117
1118                 let session_priv = SecretKey::from_slice(&self.secp_ctx, &{
1119                         let mut session_key = [0; 32];
1120                         rng::fill_bytes(&mut session_key);
1121                         session_key
1122                 }).expect("RNG is bad!");
1123
1124                 let cur_height = self.latest_block_height.load(Ordering::Acquire) as u32 + 1;
1125
1126                 let onion_keys = secp_call!(ChannelManager::construct_onion_keys(&self.secp_ctx, &route, &session_priv),
1127                                 APIError::RouteError{err: "Pubkey along hop was maliciously selected"});
1128                 let (onion_payloads, htlc_msat, htlc_cltv) = ChannelManager::build_onion_payloads(&route, cur_height)?;
1129                 let onion_packet = ChannelManager::construct_onion_packet(onion_payloads, onion_keys, &payment_hash);
1130
1131                 let mut channel_state = self.channel_state.lock().unwrap();
1132
1133                 let id = match channel_state.short_to_id.get(&route.hops.first().unwrap().short_channel_id) {
1134                         None => return Err(APIError::ChannelUnavailable{err: "No channel available with first hop!"}),
1135                         Some(id) => id.clone(),
1136                 };
1137
1138                 let res = {
1139                         let chan = channel_state.by_id.get_mut(&id).unwrap();
1140                         if chan.get_their_node_id() != route.hops.first().unwrap().pubkey {
1141                                 return Err(APIError::RouteError{err: "Node ID mismatch on first hop!"});
1142                         }
1143                         if chan.is_awaiting_monitor_update() {
1144                                 return Err(APIError::MonitorUpdateFailed);
1145                         }
1146                         if !chan.is_live() {
1147                                 return Err(APIError::ChannelUnavailable{err: "Peer for first hop currently disconnected!"});
1148                         }
1149                         chan.send_htlc_and_commit(htlc_msat, payment_hash.clone(), htlc_cltv, HTLCSource::OutboundRoute {
1150                                 route: route.clone(),
1151                                 session_priv: session_priv.clone(),
1152                                 first_hop_htlc_msat: htlc_msat,
1153                         }, onion_packet).map_err(|he| APIError::ChannelUnavailable{err: he.err})?
1154                 };
1155                 match res {
1156                         Some((update_add, commitment_signed, chan_monitor)) => {
1157                                 if let Err(e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1158                                         self.handle_monitor_update_fail(channel_state, &id, e, RAACommitmentOrder::CommitmentFirst);
1159                                         return Err(APIError::MonitorUpdateFailed);
1160                                 }
1161
1162                                 channel_state.pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
1163                                         node_id: route.hops.first().unwrap().pubkey,
1164                                         updates: msgs::CommitmentUpdate {
1165                                                 update_add_htlcs: vec![update_add],
1166                                                 update_fulfill_htlcs: Vec::new(),
1167                                                 update_fail_htlcs: Vec::new(),
1168                                                 update_fail_malformed_htlcs: Vec::new(),
1169                                                 update_fee: None,
1170                                                 commitment_signed,
1171                                         },
1172                                 });
1173                         },
1174                         None => {},
1175                 }
1176
1177                 Ok(())
1178         }
1179
1180         /// Call this upon creation of a funding transaction for the given channel.
1181         ///
1182         /// Panics if a funding transaction has already been provided for this channel.
1183         ///
1184         /// May panic if the funding_txo is duplicative with some other channel (note that this should
1185         /// be trivially prevented by using unique funding transaction keys per-channel).
1186         pub fn funding_transaction_generated(&self, temporary_channel_id: &[u8; 32], funding_txo: OutPoint) {
1187                 let (chan, msg, chan_monitor) = {
1188                         let mut channel_state = self.channel_state.lock().unwrap();
1189                         match channel_state.by_id.remove(temporary_channel_id) {
1190                                 Some(mut chan) => {
1191                                         match chan.get_outbound_funding_created(funding_txo) {
1192                                                 Ok(funding_msg) => {
1193                                                         (chan, funding_msg.0, funding_msg.1)
1194                                                 },
1195                                                 Err(e) => {
1196                                                         log_error!(self, "Got bad signatures: {}!", e.err);
1197                                                         channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError {
1198                                                                 node_id: chan.get_their_node_id(),
1199                                                                 action: e.action,
1200                                                         });
1201                                                         return;
1202                                                 },
1203                                         }
1204                                 },
1205                                 None => return
1206                         }
1207                 };
1208                 // Because we have exclusive ownership of the channel here we can release the channel_state
1209                 // lock before add_update_monitor
1210                 if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1211                         unimplemented!();
1212                 }
1213
1214                 let mut channel_state = self.channel_state.lock().unwrap();
1215                 channel_state.pending_msg_events.push(events::MessageSendEvent::SendFundingCreated {
1216                         node_id: chan.get_their_node_id(),
1217                         msg: msg,
1218                 });
1219                 match channel_state.by_id.entry(chan.channel_id()) {
1220                         hash_map::Entry::Occupied(_) => {
1221                                 panic!("Generated duplicate funding txid?");
1222                         },
1223                         hash_map::Entry::Vacant(e) => {
1224                                 e.insert(chan);
1225                         }
1226                 }
1227         }
1228
1229         fn get_announcement_sigs(&self, chan: &Channel) -> Option<msgs::AnnouncementSignatures> {
1230                 if !chan.should_announce() { return None }
1231
1232                 let (announcement, our_bitcoin_sig) = match chan.get_channel_announcement(self.get_our_node_id(), self.genesis_hash.clone()) {
1233                         Ok(res) => res,
1234                         Err(_) => return None, // Only in case of state precondition violations eg channel is closing
1235                 };
1236                 let msghash = Message::from_slice(&Sha256dHash::from_data(&announcement.encode()[..])[..]).unwrap();
1237                 let our_node_sig = self.secp_ctx.sign(&msghash, &self.our_network_key);
1238
1239                 Some(msgs::AnnouncementSignatures {
1240                         channel_id: chan.channel_id(),
1241                         short_channel_id: chan.get_short_channel_id().unwrap(),
1242                         node_signature: our_node_sig,
1243                         bitcoin_signature: our_bitcoin_sig,
1244                 })
1245         }
1246
1247         /// Processes HTLCs which are pending waiting on random forward delay.
1248         ///
1249         /// Should only really ever be called in response to an PendingHTLCsForwardable event.
1250         /// Will likely generate further events.
1251         pub fn process_pending_htlc_forwards(&self) {
1252                 let mut new_events = Vec::new();
1253                 let mut failed_forwards = Vec::new();
1254                 {
1255                         let mut channel_state_lock = self.channel_state.lock().unwrap();
1256                         let channel_state = channel_state_lock.borrow_parts();
1257
1258                         if cfg!(not(feature = "fuzztarget")) && Instant::now() < *channel_state.next_forward {
1259                                 return;
1260                         }
1261
1262                         for (short_chan_id, mut pending_forwards) in channel_state.forward_htlcs.drain() {
1263                                 if short_chan_id != 0 {
1264                                         let forward_chan_id = match channel_state.short_to_id.get(&short_chan_id) {
1265                                                 Some(chan_id) => chan_id.clone(),
1266                                                 None => {
1267                                                         failed_forwards.reserve(pending_forwards.len());
1268                                                         for HTLCForwardInfo { prev_short_channel_id, prev_htlc_id, forward_info } in pending_forwards.drain(..) {
1269                                                                 let htlc_source = HTLCSource::PreviousHopData(HTLCPreviousHopData {
1270                                                                         short_channel_id: prev_short_channel_id,
1271                                                                         htlc_id: prev_htlc_id,
1272                                                                         incoming_packet_shared_secret: forward_info.incoming_shared_secret,
1273                                                                 });
1274                                                                 failed_forwards.push((htlc_source, forward_info.payment_hash, 0x4000 | 10, None));
1275                                                         }
1276                                                         continue;
1277                                                 }
1278                                         };
1279                                         let forward_chan = &mut channel_state.by_id.get_mut(&forward_chan_id).unwrap();
1280
1281                                         let mut add_htlc_msgs = Vec::new();
1282                                         for HTLCForwardInfo { prev_short_channel_id, prev_htlc_id, forward_info } in pending_forwards.drain(..) {
1283                                                 let htlc_source = HTLCSource::PreviousHopData(HTLCPreviousHopData {
1284                                                         short_channel_id: prev_short_channel_id,
1285                                                         htlc_id: prev_htlc_id,
1286                                                         incoming_packet_shared_secret: forward_info.incoming_shared_secret,
1287                                                 });
1288                                                 match forward_chan.send_htlc(forward_info.amt_to_forward, forward_info.payment_hash, forward_info.outgoing_cltv_value, htlc_source.clone(), forward_info.onion_packet.unwrap()) {
1289                                                         Err(_e) => {
1290                                                                 let chan_update = self.get_channel_update(forward_chan).unwrap();
1291                                                                 failed_forwards.push((htlc_source, forward_info.payment_hash, 0x1000 | 7, Some(chan_update)));
1292                                                                 continue;
1293                                                         },
1294                                                         Ok(update_add) => {
1295                                                                 match update_add {
1296                                                                         Some(msg) => { add_htlc_msgs.push(msg); },
1297                                                                         None => {
1298                                                                                 // Nothing to do here...we're waiting on a remote
1299                                                                                 // revoke_and_ack before we can add anymore HTLCs. The Channel
1300                                                                                 // will automatically handle building the update_add_htlc and
1301                                                                                 // commitment_signed messages when we can.
1302                                                                                 // TODO: Do some kind of timer to set the channel as !is_live()
1303                                                                                 // as we don't really want others relying on us relaying through
1304                                                                                 // this channel currently :/.
1305                                                                         }
1306                                                                 }
1307                                                         }
1308                                                 }
1309                                         }
1310
1311                                         if !add_htlc_msgs.is_empty() {
1312                                                 let (commitment_msg, monitor) = match forward_chan.send_commitment() {
1313                                                         Ok(res) => res,
1314                                                         Err(e) => {
1315                                                                 if let &Some(msgs::ErrorAction::DisconnectPeer{msg: Some(ref _err_msg)}) = &e.action {
1316                                                                 } else if let &Some(msgs::ErrorAction::SendErrorMessage{msg: ref _err_msg}) = &e.action {
1317                                                                 } else {
1318                                                                         panic!("Stated return value requirements in send_commitment() were not met");
1319                                                                 }
1320                                                                 //TODO: Handle...this is bad!
1321                                                                 continue;
1322                                                         },
1323                                                 };
1324                                                 if let Err(_e) = self.monitor.add_update_monitor(monitor.get_funding_txo().unwrap(), monitor) {
1325                                                         unimplemented!();// but def dont push the event...
1326                                                 }
1327                                                 channel_state.pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
1328                                                         node_id: forward_chan.get_their_node_id(),
1329                                                         updates: msgs::CommitmentUpdate {
1330                                                                 update_add_htlcs: add_htlc_msgs,
1331                                                                 update_fulfill_htlcs: Vec::new(),
1332                                                                 update_fail_htlcs: Vec::new(),
1333                                                                 update_fail_malformed_htlcs: Vec::new(),
1334                                                                 update_fee: None,
1335                                                                 commitment_signed: commitment_msg,
1336                                                         },
1337                                                 });
1338                                         }
1339                                 } else {
1340                                         for HTLCForwardInfo { prev_short_channel_id, prev_htlc_id, forward_info } in pending_forwards.drain(..) {
1341                                                 let prev_hop_data = HTLCPreviousHopData {
1342                                                         short_channel_id: prev_short_channel_id,
1343                                                         htlc_id: prev_htlc_id,
1344                                                         incoming_packet_shared_secret: forward_info.incoming_shared_secret,
1345                                                 };
1346                                                 match channel_state.claimable_htlcs.entry(forward_info.payment_hash) {
1347                                                         hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(prev_hop_data),
1348                                                         hash_map::Entry::Vacant(entry) => { entry.insert(vec![prev_hop_data]); },
1349                                                 };
1350                                                 new_events.push(events::Event::PaymentReceived {
1351                                                         payment_hash: forward_info.payment_hash,
1352                                                         amt: forward_info.amt_to_forward,
1353                                                 });
1354                                         }
1355                                 }
1356                         }
1357                 }
1358
1359                 for (htlc_source, payment_hash, failure_code, update) in failed_forwards.drain(..) {
1360                         match update {
1361                                 None => self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source, &payment_hash, HTLCFailReason::Reason { failure_code, data: Vec::new() }),
1362                                 Some(chan_update) => self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source, &payment_hash, HTLCFailReason::Reason { failure_code, data: chan_update.encode_with_len() }),
1363                         };
1364                 }
1365
1366                 if new_events.is_empty() { return }
1367                 let mut events = self.pending_events.lock().unwrap();
1368                 events.append(&mut new_events);
1369         }
1370
1371         /// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect after a PaymentReceived event.
1372         pub fn fail_htlc_backwards(&self, payment_hash: &[u8; 32], reason: PaymentFailReason) -> bool {
1373                 let mut channel_state = Some(self.channel_state.lock().unwrap());
1374                 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(payment_hash);
1375                 if let Some(mut sources) = removed_source {
1376                         for htlc_with_hash in sources.drain(..) {
1377                                 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
1378                                 self.fail_htlc_backwards_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_hash, HTLCFailReason::Reason { failure_code: if reason == PaymentFailReason::PreimageUnknown {0x4000 | 15} else {0x4000 | 16}, data: Vec::new() });
1379                         }
1380                         true
1381                 } else { false }
1382         }
1383
1384         /// Fails an HTLC backwards to the sender of it to us.
1385         /// Note that while we take a channel_state lock as input, we do *not* assume consistency here.
1386         /// There are several callsites that do stupid things like loop over a list of payment_hashes
1387         /// to fail and take the channel_state lock for each iteration (as we take ownership and may
1388         /// drop it). In other words, no assumptions are made that entries in claimable_htlcs point to
1389         /// still-available channels.
1390         fn fail_htlc_backwards_internal(&self, mut channel_state_lock: MutexGuard<ChannelHolder>, source: HTLCSource, payment_hash: &[u8; 32], onion_error: HTLCFailReason) {
1391                 match source {
1392                         HTLCSource::OutboundRoute { .. } => {
1393                                 mem::drop(channel_state_lock);
1394                                 if let &HTLCFailReason::ErrorPacket { ref err } = &onion_error {
1395                                         let (channel_update, payment_retryable) = self.process_onion_failure(&source, err.data.clone());
1396                                         if let Some(update) = channel_update {
1397                                                 self.channel_state.lock().unwrap().pending_msg_events.push(
1398                                                         events::MessageSendEvent::PaymentFailureNetworkUpdate {
1399                                                                 update,
1400                                                         }
1401                                                 );
1402                                         }
1403                                         self.pending_events.lock().unwrap().push(events::Event::PaymentFailed {
1404                                                 payment_hash: payment_hash.clone(),
1405                                                 rejected_by_dest: !payment_retryable,
1406                                         });
1407                                 } else {
1408                                         panic!("should have onion error packet here");
1409                                 }
1410                         },
1411                         HTLCSource::PreviousHopData(HTLCPreviousHopData { short_channel_id, htlc_id, incoming_packet_shared_secret }) => {
1412                                 let err_packet = match onion_error {
1413                                         HTLCFailReason::Reason { failure_code, data } => {
1414                                                 let packet = ChannelManager::build_failure_packet(&incoming_packet_shared_secret, failure_code, &data[..]).encode();
1415                                                 ChannelManager::encrypt_failure_packet(&incoming_packet_shared_secret, &packet)
1416                                         },
1417                                         HTLCFailReason::ErrorPacket { err } => {
1418                                                 ChannelManager::encrypt_failure_packet(&incoming_packet_shared_secret, &err.data)
1419                                         }
1420                                 };
1421
1422                                 let channel_state = channel_state_lock.borrow_parts();
1423
1424                                 let chan_id = match channel_state.short_to_id.get(&short_channel_id) {
1425                                         Some(chan_id) => chan_id.clone(),
1426                                         None => return
1427                                 };
1428
1429                                 let chan = channel_state.by_id.get_mut(&chan_id).unwrap();
1430                                 match chan.get_update_fail_htlc_and_commit(htlc_id, err_packet) {
1431                                         Ok(Some((msg, commitment_msg, chan_monitor))) => {
1432                                                 if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1433                                                         unimplemented!();
1434                                                 }
1435                                                 channel_state.pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
1436                                                         node_id: chan.get_their_node_id(),
1437                                                         updates: msgs::CommitmentUpdate {
1438                                                                 update_add_htlcs: Vec::new(),
1439                                                                 update_fulfill_htlcs: Vec::new(),
1440                                                                 update_fail_htlcs: vec![msg],
1441                                                                 update_fail_malformed_htlcs: Vec::new(),
1442                                                                 update_fee: None,
1443                                                                 commitment_signed: commitment_msg,
1444                                                         },
1445                                                 });
1446                                         },
1447                                         Ok(None) => {},
1448                                         Err(_e) => {
1449                                                 //TODO: Do something with e?
1450                                                 return;
1451                                         },
1452                                 }
1453                         },
1454                 }
1455         }
1456
1457         /// Provides a payment preimage in response to a PaymentReceived event, returning true and
1458         /// generating message events for the net layer to claim the payment, if possible. Thus, you
1459         /// should probably kick the net layer to go send messages if this returns true!
1460         ///
1461         /// May panic if called except in response to a PaymentReceived event.
1462         pub fn claim_funds(&self, payment_preimage: [u8; 32]) -> bool {
1463                 let mut sha = Sha256::new();
1464                 sha.input(&payment_preimage);
1465                 let mut payment_hash = [0; 32];
1466                 sha.result(&mut payment_hash);
1467
1468                 let mut channel_state = Some(self.channel_state.lock().unwrap());
1469                 let removed_source = channel_state.as_mut().unwrap().claimable_htlcs.remove(&payment_hash);
1470                 if let Some(mut sources) = removed_source {
1471                         for htlc_with_hash in sources.drain(..) {
1472                                 if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
1473                                 self.claim_funds_internal(channel_state.take().unwrap(), HTLCSource::PreviousHopData(htlc_with_hash), payment_preimage);
1474                         }
1475                         true
1476                 } else { false }
1477         }
1478         fn claim_funds_internal(&self, mut channel_state_lock: MutexGuard<ChannelHolder>, source: HTLCSource, payment_preimage: [u8; 32]) {
1479                 match source {
1480                         HTLCSource::OutboundRoute { .. } => {
1481                                 mem::drop(channel_state_lock);
1482                                 let mut pending_events = self.pending_events.lock().unwrap();
1483                                 pending_events.push(events::Event::PaymentSent {
1484                                         payment_preimage
1485                                 });
1486                         },
1487                         HTLCSource::PreviousHopData(HTLCPreviousHopData { short_channel_id, htlc_id, .. }) => {
1488                                 //TODO: Delay the claimed_funds relaying just like we do outbound relay!
1489                                 let channel_state = channel_state_lock.borrow_parts();
1490
1491                                 let chan_id = match channel_state.short_to_id.get(&short_channel_id) {
1492                                         Some(chan_id) => chan_id.clone(),
1493                                         None => {
1494                                                 // TODO: There is probably a channel manager somewhere that needs to
1495                                                 // learn the preimage as the channel already hit the chain and that's
1496                                                 // why its missing.
1497                                                 return
1498                                         }
1499                                 };
1500
1501                                 let chan = channel_state.by_id.get_mut(&chan_id).unwrap();
1502                                 match chan.get_update_fulfill_htlc_and_commit(htlc_id, payment_preimage) {
1503                                         Ok((msgs, monitor_option)) => {
1504                                                 if let Some(chan_monitor) = monitor_option {
1505                                                         if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1506                                                                 unimplemented!();// but def dont push the event...
1507                                                         }
1508                                                 }
1509                                                 if let Some((msg, commitment_signed)) = msgs {
1510                                                         channel_state.pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
1511                                                                 node_id: chan.get_their_node_id(),
1512                                                                 updates: msgs::CommitmentUpdate {
1513                                                                         update_add_htlcs: Vec::new(),
1514                                                                         update_fulfill_htlcs: vec![msg],
1515                                                                         update_fail_htlcs: Vec::new(),
1516                                                                         update_fail_malformed_htlcs: Vec::new(),
1517                                                                         update_fee: None,
1518                                                                         commitment_signed,
1519                                                                 }
1520                                                         });
1521                                                 }
1522                                         },
1523                                         Err(_e) => {
1524                                                 // TODO: There is probably a channel manager somewhere that needs to
1525                                                 // learn the preimage as the channel may be about to hit the chain.
1526                                                 //TODO: Do something with e?
1527                                                 return
1528                                         },
1529                                 }
1530                         },
1531                 }
1532         }
1533
1534         /// Gets the node_id held by this ChannelManager
1535         pub fn get_our_node_id(&self) -> PublicKey {
1536                 PublicKey::from_secret_key(&self.secp_ctx, &self.our_network_key)
1537         }
1538
1539         /// Used to restore channels to normal operation after a
1540         /// ChannelMonitorUpdateErr::TemporaryFailure was returned from a channel monitor update
1541         /// operation.
1542         pub fn test_restore_channel_monitor(&self) {
1543                 let mut close_results = Vec::new();
1544                 let mut htlc_forwards = Vec::new();
1545                 let mut htlc_failures = Vec::new();
1546
1547                 {
1548                         let mut channel_lock = self.channel_state.lock().unwrap();
1549                         let channel_state = channel_lock.borrow_parts();
1550                         let short_to_id = channel_state.short_to_id;
1551                         let pending_msg_events = channel_state.pending_msg_events;
1552                         channel_state.by_id.retain(|_, channel| {
1553                                 if channel.is_awaiting_monitor_update() {
1554                                         let chan_monitor = channel.channel_monitor();
1555                                         if let Err(e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1556                                                 match e {
1557                                                         ChannelMonitorUpdateErr::PermanentFailure => {
1558                                                                 if let Some(short_id) = channel.get_short_channel_id() {
1559                                                                         short_to_id.remove(&short_id);
1560                                                                 }
1561                                                                 close_results.push(channel.force_shutdown());
1562                                                                 if let Ok(update) = self.get_channel_update(&channel) {
1563                                                                         pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
1564                                                                                 msg: update
1565                                                                         });
1566                                                                 }
1567                                                                 false
1568                                                         },
1569                                                         ChannelMonitorUpdateErr::TemporaryFailure => true,
1570                                                 }
1571                                         } else {
1572                                                 let (raa, commitment_update, order, pending_forwards, mut pending_failures) = channel.monitor_updating_restored();
1573                                                 if !pending_forwards.is_empty() {
1574                                                         htlc_forwards.push((channel.get_short_channel_id().expect("We can't have pending forwards before funding confirmation"), pending_forwards));
1575                                                 }
1576                                                 htlc_failures.append(&mut pending_failures);
1577
1578                                                 macro_rules! handle_cs { () => {
1579                                                         if let Some(update) = commitment_update {
1580                                                                 pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
1581                                                                         node_id: channel.get_their_node_id(),
1582                                                                         updates: update,
1583                                                                 });
1584                                                         }
1585                                                 } }
1586                                                 macro_rules! handle_raa { () => {
1587                                                         if let Some(revoke_and_ack) = raa {
1588                                                                 pending_msg_events.push(events::MessageSendEvent::SendRevokeAndACK {
1589                                                                         node_id: channel.get_their_node_id(),
1590                                                                         msg: revoke_and_ack,
1591                                                                 });
1592                                                         }
1593                                                 } }
1594                                                 match order {
1595                                                         RAACommitmentOrder::CommitmentFirst => {
1596                                                                 handle_cs!();
1597                                                                 handle_raa!();
1598                                                         },
1599                                                         RAACommitmentOrder::RevokeAndACKFirst => {
1600                                                                 handle_raa!();
1601                                                                 handle_cs!();
1602                                                         },
1603                                                 }
1604                                                 true
1605                                         }
1606                                 } else { true }
1607                         });
1608                 }
1609
1610                 for failure in htlc_failures.drain(..) {
1611                         self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
1612                 }
1613                 self.forward_htlcs(&mut htlc_forwards[..]);
1614
1615                 for res in close_results.drain(..) {
1616                         self.finish_force_close_channel(res);
1617                 }
1618         }
1619
1620         fn internal_open_channel(&self, their_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), MsgHandleErrInternal> {
1621                 if msg.chain_hash != self.genesis_hash {
1622                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Unknown genesis block hash", msg.temporary_channel_id.clone()));
1623                 }
1624
1625                 let channel = Channel::new_from_req(&*self.fee_estimator, &self.keys_manager, their_node_id.clone(), msg, 0, false, self.announce_channels_publicly, Arc::clone(&self.logger))
1626                         .map_err(|e| MsgHandleErrInternal::from_chan_no_close(e, msg.temporary_channel_id))?;
1627                 let mut channel_state_lock = self.channel_state.lock().unwrap();
1628                 let channel_state = channel_state_lock.borrow_parts();
1629                 match channel_state.by_id.entry(channel.channel_id()) {
1630                         hash_map::Entry::Occupied(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("temporary_channel_id collision!", msg.temporary_channel_id.clone())),
1631                         hash_map::Entry::Vacant(entry) => {
1632                                 channel_state.pending_msg_events.push(events::MessageSendEvent::SendAcceptChannel {
1633                                         node_id: their_node_id.clone(),
1634                                         msg: channel.get_accept_channel(),
1635                                 });
1636                                 entry.insert(channel);
1637                         }
1638                 }
1639                 Ok(())
1640         }
1641
1642         fn internal_accept_channel(&self, their_node_id: &PublicKey, msg: &msgs::AcceptChannel) -> Result<(), MsgHandleErrInternal> {
1643                 let (value, output_script, user_id) = {
1644                         let mut channel_state = self.channel_state.lock().unwrap();
1645                         match channel_state.by_id.get_mut(&msg.temporary_channel_id) {
1646                                 Some(chan) => {
1647                                         if chan.get_their_node_id() != *their_node_id {
1648                                                 //TODO: see issue #153, need a consistent behavior on obnoxious behavior from random node
1649                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.temporary_channel_id));
1650                                         }
1651                                         chan.accept_channel(&msg)
1652                                                 .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.temporary_channel_id))?;
1653                                         (chan.get_value_satoshis(), chan.get_funding_redeemscript().to_v0_p2wsh(), chan.get_user_id())
1654                                 },
1655                                 //TODO: same as above
1656                                 None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.temporary_channel_id))
1657                         }
1658                 };
1659                 let mut pending_events = self.pending_events.lock().unwrap();
1660                 pending_events.push(events::Event::FundingGenerationReady {
1661                         temporary_channel_id: msg.temporary_channel_id,
1662                         channel_value_satoshis: value,
1663                         output_script: output_script,
1664                         user_channel_id: user_id,
1665                 });
1666                 Ok(())
1667         }
1668
1669         fn internal_funding_created(&self, their_node_id: &PublicKey, msg: &msgs::FundingCreated) -> Result<(), MsgHandleErrInternal> {
1670                 let (chan, funding_msg, monitor_update) = {
1671                         let mut channel_state = self.channel_state.lock().unwrap();
1672                         match channel_state.by_id.entry(msg.temporary_channel_id.clone()) {
1673                                 hash_map::Entry::Occupied(mut chan) => {
1674                                         if chan.get().get_their_node_id() != *their_node_id {
1675                                                 //TODO: here and below MsgHandleErrInternal, #153 case
1676                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.temporary_channel_id));
1677                                         }
1678                                         match chan.get_mut().funding_created(msg) {
1679                                                 Ok((funding_msg, monitor_update)) => {
1680                                                         (chan.remove(), funding_msg, monitor_update)
1681                                                 },
1682                                                 Err(e) => {
1683                                                         return Err(e).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))
1684                                                 }
1685                                         }
1686                                 },
1687                                 hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.temporary_channel_id))
1688                         }
1689                 };
1690                 // Because we have exclusive ownership of the channel here we can release the channel_state
1691                 // lock before add_update_monitor
1692                 if let Err(_e) = self.monitor.add_update_monitor(monitor_update.get_funding_txo().unwrap(), monitor_update) {
1693                         unimplemented!();
1694                 }
1695                 let mut channel_state_lock = self.channel_state.lock().unwrap();
1696                 let channel_state = channel_state_lock.borrow_parts();
1697                 match channel_state.by_id.entry(funding_msg.channel_id) {
1698                         hash_map::Entry::Occupied(_) => {
1699                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Already had channel with the new channel_id", funding_msg.channel_id))
1700                         },
1701                         hash_map::Entry::Vacant(e) => {
1702                                 channel_state.pending_msg_events.push(events::MessageSendEvent::SendFundingSigned {
1703                                         node_id: their_node_id.clone(),
1704                                         msg: funding_msg,
1705                                 });
1706                                 e.insert(chan);
1707                         }
1708                 }
1709                 Ok(())
1710         }
1711
1712         fn internal_funding_signed(&self, their_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1713                 let (funding_txo, user_id) = {
1714                         let mut channel_state = self.channel_state.lock().unwrap();
1715                         match channel_state.by_id.get_mut(&msg.channel_id) {
1716                                 Some(chan) => {
1717                                         if chan.get_their_node_id() != *their_node_id {
1718                                                 //TODO: here and below MsgHandleErrInternal, #153 case
1719                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1720                                         }
1721                                         let chan_monitor = chan.funding_signed(&msg).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))?;
1722                                         if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
1723                                                 unimplemented!();
1724                                         }
1725                                         (chan.get_funding_txo().unwrap(), chan.get_user_id())
1726                                 },
1727                                 None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1728                         }
1729                 };
1730                 let mut pending_events = self.pending_events.lock().unwrap();
1731                 pending_events.push(events::Event::FundingBroadcastSafe {
1732                         funding_txo: funding_txo,
1733                         user_channel_id: user_id,
1734                 });
1735                 Ok(())
1736         }
1737
1738         fn internal_funding_locked(&self, their_node_id: &PublicKey, msg: &msgs::FundingLocked) -> Result<(), MsgHandleErrInternal> {
1739                 let mut channel_state_lock = self.channel_state.lock().unwrap();
1740                 let channel_state = channel_state_lock.borrow_parts();
1741                 match channel_state.by_id.get_mut(&msg.channel_id) {
1742                         Some(chan) => {
1743                                 if chan.get_their_node_id() != *their_node_id {
1744                                         //TODO: here and below MsgHandleErrInternal, #153 case
1745                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1746                                 }
1747                                 chan.funding_locked(&msg)
1748                                         .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?;
1749                                 if let Some(announcement_sigs) = self.get_announcement_sigs(chan) {
1750                                         channel_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
1751                                                 node_id: their_node_id.clone(),
1752                                                 msg: announcement_sigs,
1753                                         });
1754                                 }
1755                                 Ok(())
1756                         },
1757                         None => Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1758                 }
1759         }
1760
1761         fn internal_shutdown(&self, their_node_id: &PublicKey, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>), MsgHandleErrInternal> {
1762                 let (mut res, chan_option) = {
1763                         let mut channel_state_lock = self.channel_state.lock().unwrap();
1764                         let channel_state = channel_state_lock.borrow_parts();
1765
1766                         match channel_state.by_id.entry(msg.channel_id.clone()) {
1767                                 hash_map::Entry::Occupied(mut chan_entry) => {
1768                                         if chan_entry.get().get_their_node_id() != *their_node_id {
1769                                                 //TODO: here and below MsgHandleErrInternal, #153 case
1770                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1771                                         }
1772                                         let res = chan_entry.get_mut().shutdown(&*self.fee_estimator, &msg).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))?;
1773                                         if chan_entry.get().is_shutdown() {
1774                                                 if let Some(short_id) = chan_entry.get().get_short_channel_id() {
1775                                                         channel_state.short_to_id.remove(&short_id);
1776                                                 }
1777                                                 (res, Some(chan_entry.remove_entry().1))
1778                                         } else { (res, None) }
1779                                 },
1780                                 hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1781                         }
1782                 };
1783                 for htlc_source in res.2.drain(..) {
1784                         // unknown_next_peer...I dunno who that is anymore....
1785                         self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source.0, &htlc_source.1, HTLCFailReason::Reason { failure_code: 0x4000 | 10, data: Vec::new() });
1786                 }
1787                 if let Some(chan) = chan_option {
1788                         if let Ok(update) = self.get_channel_update(&chan) {
1789                                 let mut channel_state = self.channel_state.lock().unwrap();
1790                                 channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
1791                                         msg: update
1792                                 });
1793                         }
1794                 }
1795                 Ok((res.0, res.1))
1796         }
1797
1798         fn internal_closing_signed(&self, their_node_id: &PublicKey, msg: &msgs::ClosingSigned) -> Result<Option<msgs::ClosingSigned>, MsgHandleErrInternal> {
1799                 let (res, chan_option) = {
1800                         let mut channel_state_lock = self.channel_state.lock().unwrap();
1801                         let channel_state = channel_state_lock.borrow_parts();
1802                         match channel_state.by_id.entry(msg.channel_id.clone()) {
1803                                 hash_map::Entry::Occupied(mut chan_entry) => {
1804                                         if chan_entry.get().get_their_node_id() != *their_node_id {
1805                                                 //TODO: here and below MsgHandleErrInternal, #153 case
1806                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1807                                         }
1808                                         let res = chan_entry.get_mut().closing_signed(&*self.fee_estimator, &msg).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))?;
1809                                         if res.1.is_some() {
1810                                                 // We're done with this channel, we've got a signed closing transaction and
1811                                                 // will send the closing_signed back to the remote peer upon return. This
1812                                                 // also implies there are no pending HTLCs left on the channel, so we can
1813                                                 // fully delete it from tracking (the channel monitor is still around to
1814                                                 // watch for old state broadcasts)!
1815                                                 if let Some(short_id) = chan_entry.get().get_short_channel_id() {
1816                                                         channel_state.short_to_id.remove(&short_id);
1817                                                 }
1818                                                 (res, Some(chan_entry.remove_entry().1))
1819                                         } else { (res, None) }
1820                                 },
1821                                 hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1822                         }
1823                 };
1824                 if let Some(broadcast_tx) = res.1 {
1825                         self.tx_broadcaster.broadcast_transaction(&broadcast_tx);
1826                 }
1827                 if let Some(chan) = chan_option {
1828                         if let Ok(update) = self.get_channel_update(&chan) {
1829                                 let mut channel_state = self.channel_state.lock().unwrap();
1830                                 channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
1831                                         msg: update
1832                                 });
1833                         }
1834                 }
1835                 Ok(res.0)
1836         }
1837
1838         fn internal_update_add_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateAddHTLC) -> Result<(), MsgHandleErrInternal> {
1839                 //TODO: BOLT 4 points out a specific attack where a peer may re-send an onion packet and
1840                 //determine the state of the payment based on our response/if we forward anything/the time
1841                 //we take to respond. We should take care to avoid allowing such an attack.
1842                 //
1843                 //TODO: There exists a further attack where a node may garble the onion data, forward it to
1844                 //us repeatedly garbled in different ways, and compare our error messages, which are
1845                 //encrypted with the same key. Its not immediately obvious how to usefully exploit that,
1846                 //but we should prevent it anyway.
1847
1848                 let (pending_forward_info, mut channel_state_lock) = self.decode_update_add_htlc_onion(msg);
1849                 let channel_state = channel_state_lock.borrow_parts();
1850
1851                 match channel_state.by_id.get_mut(&msg.channel_id) {
1852                         Some(chan) => {
1853                                 if chan.get_their_node_id() != *their_node_id {
1854                                         //TODO: here MsgHandleErrInternal, #153 case
1855                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1856                                 }
1857                                 if !chan.is_usable() {
1858                                         return Err(MsgHandleErrInternal::from_no_close(HandleError{err: "Channel not yet available for receiving HTLCs", action: Some(msgs::ErrorAction::IgnoreError)}));
1859                                 }
1860                                 chan.update_add_htlc(&msg, pending_forward_info).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))
1861                         },
1862                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1863                 }
1864         }
1865
1866         fn internal_update_fulfill_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFulfillHTLC) -> Result<(), MsgHandleErrInternal> {
1867                 let mut channel_state = self.channel_state.lock().unwrap();
1868                 let htlc_source = match channel_state.by_id.get_mut(&msg.channel_id) {
1869                         Some(chan) => {
1870                                 if chan.get_their_node_id() != *their_node_id {
1871                                         //TODO: here and below MsgHandleErrInternal, #153 case
1872                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
1873                                 }
1874                                 chan.update_fulfill_htlc(&msg)
1875                                         .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?.clone()
1876                         },
1877                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
1878                 };
1879                 self.claim_funds_internal(channel_state, htlc_source, msg.payment_preimage.clone());
1880                 Ok(())
1881         }
1882
1883         // Process failure we got back from upstream on a payment we sent. Returns update and a boolean
1884         // indicating that the payment itself failed
1885         fn process_onion_failure(&self, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>) -> (Option<msgs::HTLCFailChannelUpdate>, bool) {
1886                 if let &HTLCSource::OutboundRoute { ref route, ref session_priv, ref first_hop_htlc_msat } = htlc_source {
1887                         macro_rules! onion_failure_log {
1888                                 ( $error_code_textual: expr, $error_code: expr, $reported_name: expr, $reported_value: expr ) => {
1889                                         log_trace!(self, "{}({:#x}) {}({})", $error_code_textual, $error_code, $reported_name, $reported_value);
1890                                 };
1891                                 ( $error_code_textual: expr, $error_code: expr ) => {
1892                                         log_trace!(self, "{}({})", $error_code_textual, $error_code);
1893                                 };
1894                         }
1895
1896                         const BADONION: u16 = 0x8000;
1897                         const PERM: u16 = 0x4000;
1898                         const UPDATE: u16 = 0x1000;
1899
1900                         let mut res = None;
1901                         let mut htlc_msat = *first_hop_htlc_msat;
1902
1903                         // Handle packed channel/node updates for passing back for the route handler
1904                         Self::construct_onion_keys_callback(&self.secp_ctx, route, session_priv, |shared_secret, _, _, route_hop| {
1905                                 if res.is_some() { return; }
1906
1907                                 let incoming_htlc_msat = htlc_msat;
1908                                 let amt_to_forward = htlc_msat - route_hop.fee_msat;
1909                                 htlc_msat = amt_to_forward;
1910
1911                                 let ammag = ChannelManager::gen_ammag_from_shared_secret(&shared_secret);
1912
1913                                 let mut decryption_tmp = Vec::with_capacity(packet_decrypted.len());
1914                                 decryption_tmp.resize(packet_decrypted.len(), 0);
1915                                 let mut chacha = ChaCha20::new(&ammag, &[0u8; 8]);
1916                                 chacha.process(&packet_decrypted, &mut decryption_tmp[..]);
1917                                 packet_decrypted = decryption_tmp;
1918
1919                                 let is_from_final_node = route.hops.last().unwrap().pubkey == route_hop.pubkey;
1920
1921                                 if let Ok(err_packet) = msgs::DecodedOnionErrorPacket::read(&mut Cursor::new(&packet_decrypted)) {
1922                                         let um = ChannelManager::gen_um_from_shared_secret(&shared_secret);
1923                                         let mut hmac = Hmac::new(Sha256::new(), &um);
1924                                         hmac.input(&err_packet.encode()[32..]);
1925                                         let mut calc_tag = [0u8; 32];
1926                                         hmac.raw_result(&mut calc_tag);
1927
1928                                         if crypto::util::fixed_time_eq(&calc_tag, &err_packet.hmac) {
1929                                                 if err_packet.failuremsg.len() < 2 {
1930                                                         // Useless packet that we can't use but it passed HMAC, so it
1931                                                         // definitely came from the peer in question
1932                                                         res = Some((None, !is_from_final_node));
1933                                                 } else {
1934                                                         let error_code = byte_utils::slice_to_be16(&err_packet.failuremsg[0..2]);
1935
1936                                                         match error_code & 0xff {
1937                                                                 1|2|3 => {
1938                                                                         // either from an intermediate or final node
1939                                                                         //   invalid_realm(PERM|1),
1940                                                                         //   temporary_node_failure(NODE|2)
1941                                                                         //   permanent_node_failure(PERM|NODE|2)
1942                                                                         //   required_node_feature_mssing(PERM|NODE|3)
1943                                                                         res = Some((Some(msgs::HTLCFailChannelUpdate::NodeFailure {
1944                                                                                 node_id: route_hop.pubkey,
1945                                                                                 is_permanent: error_code & PERM == PERM,
1946                                                                         }), !(error_code & PERM == PERM && is_from_final_node)));
1947                                                                         // node returning invalid_realm is removed from network_map,
1948                                                                         // although NODE flag is not set, TODO: or remove channel only?
1949                                                                         // retry payment when removed node is not a final node
1950                                                                         return;
1951                                                                 },
1952                                                                 _ => {}
1953                                                         }
1954
1955                                                         if is_from_final_node {
1956                                                                 let payment_retryable = match error_code {
1957                                                                         c if c == PERM|15 => false, // unknown_payment_hash
1958                                                                         c if c == PERM|16 => false, // incorrect_payment_amount
1959                                                                         17 => true, // final_expiry_too_soon
1960                                                                         18 if err_packet.failuremsg.len() == 6 => { // final_incorrect_cltv_expiry
1961                                                                                 let _reported_cltv_expiry = byte_utils::slice_to_be32(&err_packet.failuremsg[2..2+4]);
1962                                                                                 true
1963                                                                         },
1964                                                                         19 if err_packet.failuremsg.len() == 10 => { // final_incorrect_htlc_amount
1965                                                                                 let _reported_incoming_htlc_msat = byte_utils::slice_to_be64(&err_packet.failuremsg[2..2+8]);
1966                                                                                 true
1967                                                                         },
1968                                                                         _ => {
1969                                                                                 // A final node has sent us either an invalid code or an error_code that
1970                                                                                 // MUST be sent from the processing node, or the formmat of failuremsg
1971                                                                                 // does not coform to the spec.
1972                                                                                 // Remove it from the network map and don't may retry payment
1973                                                                                 res = Some((Some(msgs::HTLCFailChannelUpdate::NodeFailure {
1974                                                                                         node_id: route_hop.pubkey,
1975                                                                                         is_permanent: true,
1976                                                                                 }), false));
1977                                                                                 return;
1978                                                                         }
1979                                                                 };
1980                                                                 res = Some((None, payment_retryable));
1981                                                                 return;
1982                                                         }
1983
1984                                                         // now, error_code should be only from the intermediate nodes
1985                                                         match error_code {
1986                                                                 _c if error_code & PERM == PERM => {
1987                                                                         res = Some((Some(msgs::HTLCFailChannelUpdate::ChannelClosed {
1988                                                                                 short_channel_id: route_hop.short_channel_id,
1989                                                                                 is_permanent: true,
1990                                                                         }), false));
1991                                                                 },
1992                                                                 _c if error_code & UPDATE == UPDATE => {
1993                                                                         let offset = match error_code {
1994                                                                                 c if c == UPDATE|7  => 0, // temporary_channel_failure
1995                                                                                 c if c == UPDATE|11 => 8, // amount_below_minimum
1996                                                                                 c if c == UPDATE|12 => 8, // fee_insufficient
1997                                                                                 c if c == UPDATE|13 => 4, // incorrect_cltv_expiry
1998                                                                                 c if c == UPDATE|14 => 0, // expiry_too_soon
1999                                                                                 c if c == UPDATE|20 => 2, // channel_disabled
2000                                                                                 _ =>  {
2001                                                                                         // node sending unknown code
2002                                                                                         res = Some((Some(msgs::HTLCFailChannelUpdate::NodeFailure {
2003                                                                                                 node_id: route_hop.pubkey,
2004                                                                                                 is_permanent: true,
2005                                                                                         }), false));
2006                                                                                         return;
2007                                                                                 }
2008                                                                         };
2009
2010                                                                         if err_packet.failuremsg.len() >= offset + 2 {
2011                                                                                 let update_len = byte_utils::slice_to_be16(&err_packet.failuremsg[offset+2..offset+4]) as usize;
2012                                                                                 if err_packet.failuremsg.len() >= offset + 4 + update_len {
2013                                                                                         if let Ok(chan_update) = msgs::ChannelUpdate::read(&mut Cursor::new(&err_packet.failuremsg[offset + 4..offset + 4 + update_len])) {
2014                                                                                                 // if channel_update should NOT have caused the failure:
2015                                                                                                 // MAY treat the channel_update as invalid.
2016                                                                                                 let is_chan_update_invalid = match error_code {
2017                                                                                                         c if c == UPDATE|7 => { // temporary_channel_failure
2018                                                                                                                 false
2019                                                                                                         },
2020                                                                                                         c if c == UPDATE|11 => { // amount_below_minimum
2021                                                                                                                 let reported_htlc_msat = byte_utils::slice_to_be64(&err_packet.failuremsg[2..2+8]);
2022                                                                                                                 onion_failure_log!("amount_below_minimum", UPDATE|11, "htlc_msat", reported_htlc_msat);
2023                                                                                                                 incoming_htlc_msat > chan_update.contents.htlc_minimum_msat
2024                                                                                                         },
2025                                                                                                         c if c == UPDATE|12 => { // fee_insufficient
2026                                                                                                                 let reported_htlc_msat = byte_utils::slice_to_be64(&err_packet.failuremsg[2..2+8]);
2027                                                                                                                 let new_fee =  amt_to_forward.checked_mul(chan_update.contents.fee_proportional_millionths as u64).and_then(|prop_fee| { (prop_fee / 1000000).checked_add(chan_update.contents.fee_base_msat as u64) });
2028                                                                                                                 onion_failure_log!("fee_insufficient", UPDATE|12, "htlc_msat", reported_htlc_msat);
2029                                                                                                                 new_fee.is_none() || incoming_htlc_msat >= new_fee.unwrap() && incoming_htlc_msat >= amt_to_forward + new_fee.unwrap()
2030                                                                                                         }
2031                                                                                                         c if c == UPDATE|13 => { // incorrect_cltv_expiry
2032                                                                                                                 let reported_cltv_expiry = byte_utils::slice_to_be32(&err_packet.failuremsg[2..2+4]);
2033                                                                                                                 onion_failure_log!("incorrect_cltv_expiry", UPDATE|13, "cltv_expiry", reported_cltv_expiry);
2034                                                                                                                 route_hop.cltv_expiry_delta as u16 >= chan_update.contents.cltv_expiry_delta
2035                                                                                                         },
2036                                                                                                         c if c == UPDATE|20 => { // channel_disabled
2037                                                                                                                 let reported_flags = byte_utils::slice_to_be16(&err_packet.failuremsg[2..2+2]);
2038                                                                                                                 onion_failure_log!("channel_disabled", UPDATE|20, "flags", reported_flags);
2039                                                                                                                 chan_update.contents.flags & 0x01 == 0x01
2040                                                                                                         },
2041                                                                                                         c if c == UPDATE|21 => true, // expiry_too_far
2042                                                                                                         _ => { unreachable!(); },
2043                                                                                                 };
2044
2045                                                                                                 let msg = if is_chan_update_invalid { None } else {
2046                                                                                                         Some(msgs::HTLCFailChannelUpdate::ChannelUpdateMessage {
2047                                                                                                                 msg: chan_update,
2048                                                                                                         })
2049                                                                                                 };
2050                                                                                                 res = Some((msg, true));
2051                                                                                                 return;
2052                                                                                         }
2053                                                                                 }
2054                                                                         }
2055                                                                 },
2056                                                                 _c if error_code & BADONION == BADONION => {
2057                                                                         //TODO
2058                                                                 },
2059                                                                 14 => { // expiry_too_soon
2060                                                                         res = Some((None, true));
2061                                                                         return;
2062                                                                 }
2063                                                                 _ => {
2064                                                                         // node sending unknown code
2065                                                                         res = Some((Some(msgs::HTLCFailChannelUpdate::NodeFailure {
2066                                                                                 node_id: route_hop.pubkey,
2067                                                                                 is_permanent: true,
2068                                                                         }), false));
2069                                                                         return;
2070                                                                 }
2071                                                         }
2072                                                 }
2073                                         }
2074                                 }
2075                         }).expect("Route that we sent via spontaneously grew invalid keys in the middle of it?");
2076                         res.unwrap_or((None, true))
2077                 } else { ((None, true)) }
2078         }
2079
2080         fn internal_update_fail_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailHTLC) -> Result<(), MsgHandleErrInternal> {
2081                 let mut channel_state = self.channel_state.lock().unwrap();
2082                 match channel_state.by_id.get_mut(&msg.channel_id) {
2083                         Some(chan) => {
2084                                 if chan.get_their_node_id() != *their_node_id {
2085                                         //TODO: here and below MsgHandleErrInternal, #153 case
2086                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2087                                 }
2088                                 chan.update_fail_htlc(&msg, HTLCFailReason::ErrorPacket { err: msg.reason.clone() })
2089                                         .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))
2090                         },
2091                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2092                 }?;
2093                 Ok(())
2094         }
2095
2096         fn internal_update_fail_malformed_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailMalformedHTLC) -> Result<(), MsgHandleErrInternal> {
2097                 let mut channel_state = self.channel_state.lock().unwrap();
2098                 match channel_state.by_id.get_mut(&msg.channel_id) {
2099                         Some(chan) => {
2100                                 if chan.get_their_node_id() != *their_node_id {
2101                                         //TODO: here and below MsgHandleErrInternal, #153 case
2102                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2103                                 }
2104                                 if (msg.failure_code & 0x8000) != 0 {
2105                                         return Err(MsgHandleErrInternal::send_err_msg_close_chan("Got update_fail_malformed_htlc with BADONION set", msg.channel_id));
2106                                 }
2107                                 chan.update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() })
2108                                         .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?;
2109                                 Ok(())
2110                         },
2111                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2112                 }
2113         }
2114
2115         fn internal_commitment_signed(&self, their_node_id: &PublicKey, msg: &msgs::CommitmentSigned) -> Result<(msgs::RevokeAndACK, Option<msgs::CommitmentSigned>), MsgHandleErrInternal> {
2116                 let (revoke_and_ack, commitment_signed) = {
2117                         let mut channel_state = self.channel_state.lock().unwrap();
2118                         match channel_state.by_id.get_mut(&msg.channel_id) {
2119                                 Some(chan) => {
2120                                         if chan.get_their_node_id() != *their_node_id {
2121                                                 //TODO: here and below MsgHandleErrInternal, #153 case
2122                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2123                                         }
2124                                         let (revoke_and_ack, commitment_signed, chan_monitor) = chan.commitment_signed(&msg).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))?;
2125                                         if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
2126                                                 unimplemented!();
2127                                         }
2128                                         (revoke_and_ack, commitment_signed)
2129                                 },
2130                                 None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2131                         }
2132                 };
2133                 Ok((revoke_and_ack, commitment_signed))
2134         }
2135
2136         #[inline]
2137         fn forward_htlcs(&self, per_source_pending_forwards: &mut [(u64, Vec<(PendingForwardHTLCInfo, u64)>)]) {
2138                 for &mut (prev_short_channel_id, ref mut pending_forwards) in per_source_pending_forwards {
2139                         let mut forward_event = None;
2140                         if !pending_forwards.is_empty() {
2141                                 let mut channel_state = self.channel_state.lock().unwrap();
2142                                 if channel_state.forward_htlcs.is_empty() {
2143                                         forward_event = Some(Instant::now() + Duration::from_millis(((rng::rand_f32() * 4.0 + 1.0) * MIN_HTLC_RELAY_HOLDING_CELL_MILLIS as f32) as u64));
2144                                         channel_state.next_forward = forward_event.unwrap();
2145                                 }
2146                                 for (forward_info, prev_htlc_id) in pending_forwards.drain(..) {
2147                                         match channel_state.forward_htlcs.entry(forward_info.short_channel_id) {
2148                                                 hash_map::Entry::Occupied(mut entry) => {
2149                                                         entry.get_mut().push(HTLCForwardInfo { prev_short_channel_id, prev_htlc_id, forward_info });
2150                                                 },
2151                                                 hash_map::Entry::Vacant(entry) => {
2152                                                         entry.insert(vec!(HTLCForwardInfo { prev_short_channel_id, prev_htlc_id, forward_info }));
2153                                                 }
2154                                         }
2155                                 }
2156                         }
2157                         match forward_event {
2158                                 Some(time) => {
2159                                         let mut pending_events = self.pending_events.lock().unwrap();
2160                                         pending_events.push(events::Event::PendingHTLCsForwardable {
2161                                                 time_forwardable: time
2162                                         });
2163                                 }
2164                                 None => {},
2165                         }
2166                 }
2167         }
2168
2169         fn internal_revoke_and_ack(&self, their_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<Option<msgs::CommitmentUpdate>, MsgHandleErrInternal> {
2170                 let ((res, pending_forwards, mut pending_failures), short_channel_id) = {
2171                         let mut channel_state = self.channel_state.lock().unwrap();
2172                         match channel_state.by_id.get_mut(&msg.channel_id) {
2173                                 Some(chan) => {
2174                                         if chan.get_their_node_id() != *their_node_id {
2175                                                 //TODO: here and below MsgHandleErrInternal, #153 case
2176                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2177                                         }
2178                                         let (res, pending_forwards, pending_failures, chan_monitor) = chan.revoke_and_ack(&msg).map_err(|e| MsgHandleErrInternal::from_maybe_close(e))?;
2179                                         if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
2180                                                 unimplemented!();
2181                                         }
2182                                         ((res, pending_forwards, pending_failures), chan.get_short_channel_id().expect("RAA should only work on a short-id-available channel"))
2183                                 },
2184                                 None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2185                         }
2186                 };
2187                 for failure in pending_failures.drain(..) {
2188                         self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), failure.0, &failure.1, failure.2);
2189                 }
2190                 self.forward_htlcs(&mut [(short_channel_id, pending_forwards)]);
2191
2192                 Ok(res)
2193         }
2194
2195         fn internal_update_fee(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
2196                 let mut channel_state = self.channel_state.lock().unwrap();
2197                 match channel_state.by_id.get_mut(&msg.channel_id) {
2198                         Some(chan) => {
2199                                 if chan.get_their_node_id() != *their_node_id {
2200                                         //TODO: here and below MsgHandleErrInternal, #153 case
2201                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2202                                 }
2203                                 chan.update_fee(&*self.fee_estimator, &msg).map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))
2204                         },
2205                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2206                 }
2207         }
2208
2209         fn internal_announcement_signatures(&self, their_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
2210                 let mut channel_state_lock = self.channel_state.lock().unwrap();
2211                 let channel_state = channel_state_lock.borrow_parts();
2212
2213                 match channel_state.by_id.get_mut(&msg.channel_id) {
2214                         Some(chan) => {
2215                                 if chan.get_their_node_id() != *their_node_id {
2216                                         return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2217                                 }
2218                                 if !chan.is_usable() {
2219                                         return Err(MsgHandleErrInternal::from_no_close(HandleError{err: "Got an announcement_signatures before we were ready for it", action: Some(msgs::ErrorAction::IgnoreError)}));
2220                                 }
2221
2222                                 let our_node_id = self.get_our_node_id();
2223                                 let (announcement, our_bitcoin_sig) = chan.get_channel_announcement(our_node_id.clone(), self.genesis_hash.clone())
2224                                         .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?;
2225
2226                                 let were_node_one = announcement.node_id_1 == our_node_id;
2227                                 let msghash = Message::from_slice(&Sha256dHash::from_data(&announcement.encode()[..])[..]).unwrap();
2228                                 let bad_sig_action = MsgHandleErrInternal::send_err_msg_close_chan("Bad announcement_signatures node_signature", msg.channel_id);
2229                                 secp_call!(self.secp_ctx.verify(&msghash, &msg.node_signature, if were_node_one { &announcement.node_id_2 } else { &announcement.node_id_1 }), bad_sig_action);
2230                                 secp_call!(self.secp_ctx.verify(&msghash, &msg.bitcoin_signature, if were_node_one { &announcement.bitcoin_key_2 } else { &announcement.bitcoin_key_1 }), bad_sig_action);
2231
2232                                 let our_node_sig = self.secp_ctx.sign(&msghash, &self.our_network_key);
2233
2234                                 channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
2235                                         msg: msgs::ChannelAnnouncement {
2236                                                 node_signature_1: if were_node_one { our_node_sig } else { msg.node_signature },
2237                                                 node_signature_2: if were_node_one { msg.node_signature } else { our_node_sig },
2238                                                 bitcoin_signature_1: if were_node_one { our_bitcoin_sig } else { msg.bitcoin_signature },
2239                                                 bitcoin_signature_2: if were_node_one { msg.bitcoin_signature } else { our_bitcoin_sig },
2240                                                 contents: announcement,
2241                                         },
2242                                         update_msg: self.get_channel_update(chan).unwrap(), // can only fail if we're not in a ready state
2243                                 });
2244                         },
2245                         None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2246                 }
2247                 Ok(())
2248         }
2249
2250         fn internal_channel_reestablish(&self, their_node_id: &PublicKey, msg: &msgs::ChannelReestablish) -> Result<(Option<msgs::FundingLocked>, Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder), MsgHandleErrInternal> {
2251                 let res = {
2252                         let mut channel_state = self.channel_state.lock().unwrap();
2253                         match channel_state.by_id.get_mut(&msg.channel_id) {
2254                                 Some(chan) => {
2255                                         if chan.get_their_node_id() != *their_node_id {
2256                                                 return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
2257                                         }
2258                                         let (funding_locked, revoke_and_ack, commitment_update, channel_monitor, order) = chan.channel_reestablish(msg)
2259                                                 .map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?;
2260                                         if let Some(monitor) = channel_monitor {
2261                                                 if let Err(_e) = self.monitor.add_update_monitor(monitor.get_funding_txo().unwrap(), monitor) {
2262                                                         unimplemented!();
2263                                                 }
2264                                         }
2265                                         Ok((funding_locked, revoke_and_ack, commitment_update, order))
2266                                 },
2267                                 None => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel", msg.channel_id))
2268                         }
2269                 };
2270
2271                 res
2272         }
2273
2274         /// Begin Update fee process. Allowed only on an outbound channel.
2275         /// If successful, will generate a UpdateHTLCs event, so you should probably poll
2276         /// PeerManager::process_events afterwards.
2277         /// Note: This API is likely to change!
2278         #[doc(hidden)]
2279         pub fn update_fee(&self, channel_id: [u8;32], feerate_per_kw: u64) -> Result<(), APIError> {
2280                 let mut channel_state_lock = self.channel_state.lock().unwrap();
2281                 let channel_state = channel_state_lock.borrow_parts();
2282
2283                 match channel_state.by_id.get_mut(&channel_id) {
2284                         None => return Err(APIError::APIMisuseError{err: "Failed to find corresponding channel"}),
2285                         Some(chan) => {
2286                                 if !chan.is_outbound() {
2287                                         return Err(APIError::APIMisuseError{err: "update_fee cannot be sent for an inbound channel"});
2288                                 }
2289                                 if chan.is_awaiting_monitor_update() {
2290                                         return Err(APIError::MonitorUpdateFailed);
2291                                 }
2292                                 if !chan.is_live() {
2293                                         return Err(APIError::ChannelUnavailable{err: "Channel is either not yet fully established or peer is currently disconnected"});
2294                                 }
2295                                 if let Some((update_fee, commitment_signed, chan_monitor)) = chan.send_update_fee_and_commit(feerate_per_kw).map_err(|e| APIError::APIMisuseError{err: e.err})? {
2296                                         if let Err(_e) = self.monitor.add_update_monitor(chan_monitor.get_funding_txo().unwrap(), chan_monitor) {
2297                                                 unimplemented!();
2298                                         }
2299                                         channel_state.pending_msg_events.push(events::MessageSendEvent::UpdateHTLCs {
2300                                                 node_id: chan.get_their_node_id(),
2301                                                 updates: msgs::CommitmentUpdate {
2302                                                         update_add_htlcs: Vec::new(),
2303                                                         update_fulfill_htlcs: Vec::new(),
2304                                                         update_fail_htlcs: Vec::new(),
2305                                                         update_fail_malformed_htlcs: Vec::new(),
2306                                                         update_fee: Some(update_fee),
2307                                                         commitment_signed,
2308                                                 },
2309                                         });
2310                                 }
2311                         },
2312                 }
2313                 Ok(())
2314         }
2315 }
2316
2317 impl events::MessageSendEventsProvider for ChannelManager {
2318         fn get_and_clear_pending_msg_events(&self) -> Vec<events::MessageSendEvent> {
2319                 let mut ret = Vec::new();
2320                 let mut channel_state = self.channel_state.lock().unwrap();
2321                 mem::swap(&mut ret, &mut channel_state.pending_msg_events);
2322                 ret
2323         }
2324 }
2325
2326 impl events::EventsProvider for ChannelManager {
2327         fn get_and_clear_pending_events(&self) -> Vec<events::Event> {
2328                 let mut ret = Vec::new();
2329                 let mut pending_events = self.pending_events.lock().unwrap();
2330                 mem::swap(&mut ret, &mut *pending_events);
2331                 ret
2332         }
2333 }
2334
2335 impl ChainListener for ChannelManager {
2336         fn block_connected(&self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[u32]) {
2337                 let mut failed_channels = Vec::new();
2338                 {
2339                         let mut channel_lock = self.channel_state.lock().unwrap();
2340                         let channel_state = channel_lock.borrow_parts();
2341                         let short_to_id = channel_state.short_to_id;
2342                         let pending_msg_events = channel_state.pending_msg_events;
2343                         channel_state.by_id.retain(|_, channel| {
2344                                 let chan_res = channel.block_connected(header, height, txn_matched, indexes_of_txn_matched);
2345                                 if let Ok(Some(funding_locked)) = chan_res {
2346                                         pending_msg_events.push(events::MessageSendEvent::SendFundingLocked {
2347                                                 node_id: channel.get_their_node_id(),
2348                                                 msg: funding_locked,
2349                                         });
2350                                         if let Some(announcement_sigs) = self.get_announcement_sigs(channel) {
2351                                                 pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
2352                                                         node_id: channel.get_their_node_id(),
2353                                                         msg: announcement_sigs,
2354                                                 });
2355                                         }
2356                                         short_to_id.insert(channel.get_short_channel_id().unwrap(), channel.channel_id());
2357                                 } else if let Err(e) = chan_res {
2358                                         pending_msg_events.push(events::MessageSendEvent::HandleError {
2359                                                 node_id: channel.get_their_node_id(),
2360                                                 action: e.action,
2361                                         });
2362                                         if channel.is_shutdown() {
2363                                                 return false;
2364                                         }
2365                                 }
2366                                 if let Some(funding_txo) = channel.get_funding_txo() {
2367                                         for tx in txn_matched {
2368                                                 for inp in tx.input.iter() {
2369                                                         if inp.previous_output == funding_txo.into_bitcoin_outpoint() {
2370                                                                 if let Some(short_id) = channel.get_short_channel_id() {
2371                                                                         short_to_id.remove(&short_id);
2372                                                                 }
2373                                                                 // It looks like our counterparty went on-chain. We go ahead and
2374                                                                 // broadcast our latest local state as well here, just in case its
2375                                                                 // some kind of SPV attack, though we expect these to be dropped.
2376                                                                 failed_channels.push(channel.force_shutdown());
2377                                                                 if let Ok(update) = self.get_channel_update(&channel) {
2378                                                                         pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
2379                                                                                 msg: update
2380                                                                         });
2381                                                                 }
2382                                                                 return false;
2383                                                         }
2384                                                 }
2385                                         }
2386                                 }
2387                                 if channel.is_funding_initiated() && channel.channel_monitor().would_broadcast_at_height(height) {
2388                                         if let Some(short_id) = channel.get_short_channel_id() {
2389                                                 short_to_id.remove(&short_id);
2390                                         }
2391                                         failed_channels.push(channel.force_shutdown());
2392                                         // If would_broadcast_at_height() is true, the channel_monitor will broadcast
2393                                         // the latest local tx for us, so we should skip that here (it doesn't really
2394                                         // hurt anything, but does make tests a bit simpler).
2395                                         failed_channels.last_mut().unwrap().0 = Vec::new();
2396                                         if let Ok(update) = self.get_channel_update(&channel) {
2397                                                 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
2398                                                         msg: update
2399                                                 });
2400                                         }
2401                                         return false;
2402                                 }
2403                                 true
2404                         });
2405                 }
2406                 for failure in failed_channels.drain(..) {
2407                         self.finish_force_close_channel(failure);
2408                 }
2409                 self.latest_block_height.store(height as usize, Ordering::Release);
2410         }
2411
2412         /// We force-close the channel without letting our counterparty participate in the shutdown
2413         fn block_disconnected(&self, header: &BlockHeader) {
2414                 let mut failed_channels = Vec::new();
2415                 {
2416                         let mut channel_lock = self.channel_state.lock().unwrap();
2417                         let channel_state = channel_lock.borrow_parts();
2418                         let short_to_id = channel_state.short_to_id;
2419                         let pending_msg_events = channel_state.pending_msg_events;
2420                         channel_state.by_id.retain(|_,  v| {
2421                                 if v.block_disconnected(header) {
2422                                         if let Some(short_id) = v.get_short_channel_id() {
2423                                                 short_to_id.remove(&short_id);
2424                                         }
2425                                         failed_channels.push(v.force_shutdown());
2426                                         if let Ok(update) = self.get_channel_update(&v) {
2427                                                 pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
2428                                                         msg: update
2429                                                 });
2430                                         }
2431                                         false
2432                                 } else {
2433                                         true
2434                                 }
2435                         });
2436                 }
2437                 for failure in failed_channels.drain(..) {
2438                         self.finish_force_close_channel(failure);
2439                 }
2440                 self.latest_block_height.fetch_sub(1, Ordering::AcqRel);
2441         }
2442 }
2443
2444 macro_rules! handle_error {
2445         ($self: ident, $internal: expr, $their_node_id: expr) => {
2446                 match $internal {
2447                         Ok(msg) => Ok(msg),
2448                         Err(MsgHandleErrInternal { err, needs_channel_force_close }) => {
2449                                 if needs_channel_force_close {
2450                                         match &err.action {
2451                                                 &Some(msgs::ErrorAction::DisconnectPeer { msg: Some(ref msg) }) => {
2452                                                         if msg.channel_id == [0; 32] {
2453                                                                 $self.peer_disconnected(&$their_node_id, true);
2454                                                         } else {
2455                                                                 $self.force_close_channel(&msg.channel_id);
2456                                                         }
2457                                                 },
2458                                                 &Some(msgs::ErrorAction::DisconnectPeer { msg: None }) => {},
2459                                                 &Some(msgs::ErrorAction::IgnoreError) => {},
2460                                                 &Some(msgs::ErrorAction::SendErrorMessage { ref msg }) => {
2461                                                         if msg.channel_id == [0; 32] {
2462                                                                 $self.peer_disconnected(&$their_node_id, true);
2463                                                         } else {
2464                                                                 $self.force_close_channel(&msg.channel_id);
2465                                                         }
2466                                                 },
2467                                                 &None => {},
2468                                         }
2469                                 }
2470                                 Err(err)
2471                         },
2472                 }
2473         }
2474 }
2475
2476 impl ChannelMessageHandler for ChannelManager {
2477         //TODO: Handle errors and close channel (or so)
2478         fn handle_open_channel(&self, their_node_id: &PublicKey, msg: &msgs::OpenChannel) -> Result<(), HandleError> {
2479                 handle_error!(self, self.internal_open_channel(their_node_id, msg), their_node_id)
2480         }
2481
2482         fn handle_accept_channel(&self, their_node_id: &PublicKey, msg: &msgs::AcceptChannel) -> Result<(), HandleError> {
2483                 handle_error!(self, self.internal_accept_channel(their_node_id, msg), their_node_id)
2484         }
2485
2486         fn handle_funding_created(&self, their_node_id: &PublicKey, msg: &msgs::FundingCreated) -> Result<(), HandleError> {
2487                 handle_error!(self, self.internal_funding_created(their_node_id, msg), their_node_id)
2488         }
2489
2490         fn handle_funding_signed(&self, their_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), HandleError> {
2491                 handle_error!(self, self.internal_funding_signed(their_node_id, msg), their_node_id)
2492         }
2493
2494         fn handle_funding_locked(&self, their_node_id: &PublicKey, msg: &msgs::FundingLocked) -> Result<(), HandleError> {
2495                 handle_error!(self, self.internal_funding_locked(their_node_id, msg), their_node_id)
2496         }
2497
2498         fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>), HandleError> {
2499                 handle_error!(self, self.internal_shutdown(their_node_id, msg), their_node_id)
2500         }
2501
2502         fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &msgs::ClosingSigned) -> Result<Option<msgs::ClosingSigned>, HandleError> {
2503                 handle_error!(self, self.internal_closing_signed(their_node_id, msg), their_node_id)
2504         }
2505
2506         fn handle_update_add_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateAddHTLC) -> Result<(), msgs::HandleError> {
2507                 handle_error!(self, self.internal_update_add_htlc(their_node_id, msg), their_node_id)
2508         }
2509
2510         fn handle_update_fulfill_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFulfillHTLC) -> Result<(), HandleError> {
2511                 handle_error!(self, self.internal_update_fulfill_htlc(their_node_id, msg), their_node_id)
2512         }
2513
2514         fn handle_update_fail_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailHTLC) -> Result<(), HandleError> {
2515                 handle_error!(self, self.internal_update_fail_htlc(their_node_id, msg), their_node_id)
2516         }
2517
2518         fn handle_update_fail_malformed_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFailMalformedHTLC) -> Result<(), HandleError> {
2519                 handle_error!(self, self.internal_update_fail_malformed_htlc(their_node_id, msg), their_node_id)
2520         }
2521
2522         fn handle_commitment_signed(&self, their_node_id: &PublicKey, msg: &msgs::CommitmentSigned) -> Result<(msgs::RevokeAndACK, Option<msgs::CommitmentSigned>), HandleError> {
2523                 handle_error!(self, self.internal_commitment_signed(their_node_id, msg), their_node_id)
2524         }
2525
2526         fn handle_revoke_and_ack(&self, their_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<Option<msgs::CommitmentUpdate>, HandleError> {
2527                 handle_error!(self, self.internal_revoke_and_ack(their_node_id, msg), their_node_id)
2528         }
2529
2530         fn handle_update_fee(&self, their_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), HandleError> {
2531                 handle_error!(self, self.internal_update_fee(their_node_id, msg), their_node_id)
2532         }
2533
2534         fn handle_announcement_signatures(&self, their_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), HandleError> {
2535                 handle_error!(self, self.internal_announcement_signatures(their_node_id, msg), their_node_id)
2536         }
2537
2538         fn handle_channel_reestablish(&self, their_node_id: &PublicKey, msg: &msgs::ChannelReestablish) -> Result<(Option<msgs::FundingLocked>, Option<msgs::RevokeAndACK>, Option<msgs::CommitmentUpdate>, RAACommitmentOrder), HandleError> {
2539                 handle_error!(self, self.internal_channel_reestablish(their_node_id, msg), their_node_id)
2540         }
2541
2542         fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool) {
2543                 let mut failed_channels = Vec::new();
2544                 let mut failed_payments = Vec::new();
2545                 {
2546                         let mut channel_state_lock = self.channel_state.lock().unwrap();
2547                         let channel_state = channel_state_lock.borrow_parts();
2548                         let short_to_id = channel_state.short_to_id;
2549                         let pending_msg_events = channel_state.pending_msg_events;
2550                         if no_connection_possible {
2551                                 channel_state.by_id.retain(|_, chan| {
2552                                         if chan.get_their_node_id() == *their_node_id {
2553                                                 if let Some(short_id) = chan.get_short_channel_id() {
2554                                                         short_to_id.remove(&short_id);
2555                                                 }
2556                                                 failed_channels.push(chan.force_shutdown());
2557                                                 if let Ok(update) = self.get_channel_update(&chan) {
2558                                                         pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
2559                                                                 msg: update
2560                                                         });
2561                                                 }
2562                                                 false
2563                                         } else {
2564                                                 true
2565                                         }
2566                                 });
2567                         } else {
2568                                 channel_state.by_id.retain(|_, chan| {
2569                                         if chan.get_their_node_id() == *their_node_id {
2570                                                 //TODO: mark channel disabled (and maybe announce such after a timeout).
2571                                                 let failed_adds = chan.remove_uncommitted_htlcs_and_mark_paused();
2572                                                 if !failed_adds.is_empty() {
2573                                                         let chan_update = self.get_channel_update(&chan).map(|u| u.encode_with_len()).unwrap(); // Cannot add/recv HTLCs before we have a short_id so unwrap is safe
2574                                                         failed_payments.push((chan_update, failed_adds));
2575                                                 }
2576                                                 if chan.is_shutdown() {
2577                                                         if let Some(short_id) = chan.get_short_channel_id() {
2578                                                                 short_to_id.remove(&short_id);
2579                                                         }
2580                                                         return false;
2581                                                 }
2582                                         }
2583                                         true
2584                                 })
2585                         }
2586                 }
2587                 for failure in failed_channels.drain(..) {
2588                         self.finish_force_close_channel(failure);
2589                 }
2590                 for (chan_update, mut htlc_sources) in failed_payments {
2591                         for (htlc_source, payment_hash) in htlc_sources.drain(..) {
2592                                 self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), htlc_source, &payment_hash, HTLCFailReason::Reason { failure_code: 0x1000 | 7, data: chan_update.clone() });
2593                         }
2594                 }
2595         }
2596
2597         fn peer_connected(&self, their_node_id: &PublicKey) -> Vec<msgs::ChannelReestablish> {
2598                 let mut res = Vec::new();
2599                 let mut channel_state = self.channel_state.lock().unwrap();
2600                 channel_state.by_id.retain(|_, chan| {
2601                         if chan.get_their_node_id() == *their_node_id {
2602                                 if !chan.have_received_message() {
2603                                         // If we created this (outbound) channel while we were disconnected from the
2604                                         // peer we probably failed to send the open_channel message, which is now
2605                                         // lost. We can't have had anything pending related to this channel, so we just
2606                                         // drop it.
2607                                         false
2608                                 } else {
2609                                         res.push(chan.get_channel_reestablish());
2610                                         true
2611                                 }
2612                         } else { true }
2613                 });
2614                 //TODO: Also re-broadcast announcement_signatures
2615                 res
2616         }
2617
2618         fn handle_error(&self, their_node_id: &PublicKey, msg: &msgs::ErrorMessage) {
2619                 if msg.channel_id == [0; 32] {
2620                         for chan in self.list_channels() {
2621                                 if chan.remote_network_id == *their_node_id {
2622                                         self.force_close_channel(&chan.channel_id);
2623                                 }
2624                         }
2625                 } else {
2626                         self.force_close_channel(&msg.channel_id);
2627                 }
2628         }
2629 }
2630
2631 #[cfg(test)]
2632 mod tests {
2633         use chain::chaininterface;
2634         use chain::transaction::OutPoint;
2635         use chain::chaininterface::ChainListener;
2636         use chain::keysinterface::KeysInterface;
2637         use chain::keysinterface;
2638         use ln::channelmanager::{ChannelManager,OnionKeys,PaymentFailReason};
2639         use ln::channelmonitor::{ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS};
2640         use ln::router::{Route, RouteHop, Router};
2641         use ln::msgs;
2642         use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
2643         use util::test_utils;
2644         use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
2645         use util::errors::APIError;
2646         use util::logger::Logger;
2647         use util::ser::Writeable;
2648
2649         use bitcoin::util::hash::Sha256dHash;
2650         use bitcoin::blockdata::block::{Block, BlockHeader};
2651         use bitcoin::blockdata::transaction::{Transaction, TxOut};
2652         use bitcoin::blockdata::constants::genesis_block;
2653         use bitcoin::network::constants::Network;
2654         use bitcoin::network::serialize::serialize;
2655         use bitcoin::network::serialize::BitcoinHash;
2656
2657         use hex;
2658
2659         use secp256k1::{Secp256k1, Message};
2660         use secp256k1::key::{PublicKey,SecretKey};
2661
2662         use crypto::sha2::Sha256;
2663         use crypto::digest::Digest;
2664
2665         use rand::{thread_rng,Rng};
2666
2667         use std::cell::RefCell;
2668         use std::collections::{BTreeSet, HashMap};
2669         use std::default::Default;
2670         use std::rc::Rc;
2671         use std::sync::{Arc, Mutex};
2672         use std::sync::atomic::Ordering;
2673         use std::time::Instant;
2674         use std::mem;
2675
2676         fn build_test_onion_keys() -> Vec<OnionKeys> {
2677                 // Keys from BOLT 4, used in both test vector tests
2678                 let secp_ctx = Secp256k1::new();
2679
2680                 let route = Route {
2681                         hops: vec!(
2682                                         RouteHop {
2683                                                 pubkey: PublicKey::from_slice(&secp_ctx, &hex::decode("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap(),
2684                                                 short_channel_id: 0, fee_msat: 0, cltv_expiry_delta: 0 // Test vectors are garbage and not generateble from a RouteHop, we fill in payloads manually
2685                                         },
2686                                         RouteHop {
2687                                                 pubkey: PublicKey::from_slice(&secp_ctx, &hex::decode("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c").unwrap()[..]).unwrap(),
2688                                                 short_channel_id: 0, fee_msat: 0, cltv_expiry_delta: 0 // Test vectors are garbage and not generateble from a RouteHop, we fill in payloads manually
2689                                         },
2690                                         RouteHop {
2691                                                 pubkey: PublicKey::from_slice(&secp_ctx, &hex::decode("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007").unwrap()[..]).unwrap(),
2692                                                 short_channel_id: 0, fee_msat: 0, cltv_expiry_delta: 0 // Test vectors are garbage and not generateble from a RouteHop, we fill in payloads manually
2693                                         },
2694                                         RouteHop {
2695                                                 pubkey: PublicKey::from_slice(&secp_ctx, &hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]).unwrap(),
2696                                                 short_channel_id: 0, fee_msat: 0, cltv_expiry_delta: 0 // Test vectors are garbage and not generateble from a RouteHop, we fill in payloads manually
2697                                         },
2698                                         RouteHop {
2699                                                 pubkey: PublicKey::from_slice(&secp_ctx, &hex::decode("02edabbd16b41c8371b92ef2f04c1185b4f03b6dcd52ba9b78d9d7c89c8f221145").unwrap()[..]).unwrap(),
2700                                                 short_channel_id: 0, fee_msat: 0, cltv_expiry_delta: 0 // Test vectors are garbage and not generateble from a RouteHop, we fill in payloads manually
2701                                         },
2702                         ),
2703                 };
2704
2705                 let session_priv = SecretKey::from_slice(&secp_ctx, &hex::decode("4141414141414141414141414141414141414141414141414141414141414141").unwrap()[..]).unwrap();
2706
2707                 let onion_keys = ChannelManager::construct_onion_keys(&secp_ctx, &route, &session_priv).unwrap();
2708                 assert_eq!(onion_keys.len(), route.hops.len());
2709                 onion_keys
2710         }
2711
2712         #[test]
2713         fn onion_vectors() {
2714                 // Packet creation test vectors from BOLT 4
2715                 let onion_keys = build_test_onion_keys();
2716
2717                 assert_eq!(onion_keys[0].shared_secret[..], hex::decode("53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66").unwrap()[..]);
2718                 assert_eq!(onion_keys[0].blinding_factor[..], hex::decode("2ec2e5da605776054187180343287683aa6a51b4b1c04d6dd49c45d8cffb3c36").unwrap()[..]);
2719                 assert_eq!(onion_keys[0].ephemeral_pubkey.serialize()[..], hex::decode("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]);
2720                 assert_eq!(onion_keys[0].rho, hex::decode("ce496ec94def95aadd4bec15cdb41a740c9f2b62347c4917325fcc6fb0453986").unwrap()[..]);
2721                 assert_eq!(onion_keys[0].mu, hex::decode("b57061dc6d0a2b9f261ac410c8b26d64ac5506cbba30267a649c28c179400eba").unwrap()[..]);
2722
2723                 assert_eq!(onion_keys[1].shared_secret[..], hex::decode("a6519e98832a0b179f62123b3567c106db99ee37bef036e783263602f3488fae").unwrap()[..]);
2724                 assert_eq!(onion_keys[1].blinding_factor[..], hex::decode("bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f").unwrap()[..]);
2725                 assert_eq!(onion_keys[1].ephemeral_pubkey.serialize()[..], hex::decode("028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2").unwrap()[..]);
2726                 assert_eq!(onion_keys[1].rho, hex::decode("450ffcabc6449094918ebe13d4f03e433d20a3d28a768203337bc40b6e4b2c59").unwrap()[..]);
2727                 assert_eq!(onion_keys[1].mu, hex::decode("05ed2b4a3fb023c2ff5dd6ed4b9b6ea7383f5cfe9d59c11d121ec2c81ca2eea9").unwrap()[..]);
2728
2729                 assert_eq!(onion_keys[2].shared_secret[..], hex::decode("3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c34120b30bc9c04891cc").unwrap()[..]);
2730                 assert_eq!(onion_keys[2].blinding_factor[..], hex::decode("a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5").unwrap()[..]);
2731                 assert_eq!(onion_keys[2].ephemeral_pubkey.serialize()[..], hex::decode("03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0").unwrap()[..]);
2732                 assert_eq!(onion_keys[2].rho, hex::decode("11bf5c4f960239cb37833936aa3d02cea82c0f39fd35f566109c41f9eac8deea").unwrap()[..]);
2733                 assert_eq!(onion_keys[2].mu, hex::decode("caafe2820fa00eb2eeb78695ae452eba38f5a53ed6d53518c5c6edf76f3f5b78").unwrap()[..]);
2734
2735                 assert_eq!(onion_keys[3].shared_secret[..], hex::decode("21e13c2d7cfe7e18836df50872466117a295783ab8aab0e7ecc8c725503ad02d").unwrap()[..]);
2736                 assert_eq!(onion_keys[3].blinding_factor[..], hex::decode("7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262").unwrap()[..]);
2737                 assert_eq!(onion_keys[3].ephemeral_pubkey.serialize()[..], hex::decode("031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595").unwrap()[..]);
2738                 assert_eq!(onion_keys[3].rho, hex::decode("cbe784ab745c13ff5cffc2fbe3e84424aa0fd669b8ead4ee562901a4a4e89e9e").unwrap()[..]);
2739                 assert_eq!(onion_keys[3].mu, hex::decode("5052aa1b3d9f0655a0932e50d42f0c9ba0705142c25d225515c45f47c0036ee9").unwrap()[..]);
2740
2741                 assert_eq!(onion_keys[4].shared_secret[..], hex::decode("b5756b9b542727dbafc6765a49488b023a725d631af688fc031217e90770c328").unwrap()[..]);
2742                 assert_eq!(onion_keys[4].blinding_factor[..], hex::decode("c96e00dddaf57e7edcd4fb5954be5b65b09f17cb6d20651b4e90315be5779205").unwrap()[..]);
2743                 assert_eq!(onion_keys[4].ephemeral_pubkey.serialize()[..], hex::decode("03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4").unwrap()[..]);
2744                 assert_eq!(onion_keys[4].rho, hex::decode("034e18b8cc718e8af6339106e706c52d8df89e2b1f7e9142d996acf88df8799b").unwrap()[..]);
2745                 assert_eq!(onion_keys[4].mu, hex::decode("8e45e5c61c2b24cb6382444db6698727afb063adecd72aada233d4bf273d975a").unwrap()[..]);
2746
2747                 // Test vectors below are flat-out wrong: they claim to set outgoing_cltv_value to non-0 :/
2748                 let payloads = vec!(
2749                         msgs::OnionHopData {
2750                                 realm: 0,
2751                                 data: msgs::OnionRealm0HopData {
2752                                         short_channel_id: 0,
2753                                         amt_to_forward: 0,
2754                                         outgoing_cltv_value: 0,
2755                                 },
2756                                 hmac: [0; 32],
2757                         },
2758                         msgs::OnionHopData {
2759                                 realm: 0,
2760                                 data: msgs::OnionRealm0HopData {
2761                                         short_channel_id: 0x0101010101010101,
2762                                         amt_to_forward: 0x0100000001,
2763                                         outgoing_cltv_value: 0,
2764                                 },
2765                                 hmac: [0; 32],
2766                         },
2767                         msgs::OnionHopData {
2768                                 realm: 0,
2769                                 data: msgs::OnionRealm0HopData {
2770                                         short_channel_id: 0x0202020202020202,
2771                                         amt_to_forward: 0x0200000002,
2772                                         outgoing_cltv_value: 0,
2773                                 },
2774                                 hmac: [0; 32],
2775                         },
2776                         msgs::OnionHopData {
2777                                 realm: 0,
2778                                 data: msgs::OnionRealm0HopData {
2779                                         short_channel_id: 0x0303030303030303,
2780                                         amt_to_forward: 0x0300000003,
2781                                         outgoing_cltv_value: 0,
2782                                 },
2783                                 hmac: [0; 32],
2784                         },
2785                         msgs::OnionHopData {
2786                                 realm: 0,
2787                                 data: msgs::OnionRealm0HopData {
2788                                         short_channel_id: 0x0404040404040404,
2789                                         amt_to_forward: 0x0400000004,
2790                                         outgoing_cltv_value: 0,
2791                                 },
2792                                 hmac: [0; 32],
2793                         },
2794                 );
2795
2796                 let packet = ChannelManager::construct_onion_packet(payloads, onion_keys, &[0x42; 32]);
2797                 // Just check the final packet encoding, as it includes all the per-hop vectors in it
2798                 // anyway...
2799                 assert_eq!(packet.encode(), hex::decode("0002eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619e5f14350c2a76fc232b5e46d421e9615471ab9e0bc887beff8c95fdb878f7b3a716a996c7845c93d90e4ecbb9bde4ece2f69425c99e4bc820e44485455f135edc0d10f7d61ab590531cf08000179a333a347f8b4072f216400406bdf3bf038659793d4a1fd7b246979e3150a0a4cb052c9ec69acf0f48c3d39cd55675fe717cb7d80ce721caad69320c3a469a202f1e468c67eaf7a7cd8226d0fd32f7b48084dca885d56047694762b67021713ca673929c163ec36e04e40ca8e1c6d17569419d3039d9a1ec866abe044a9ad635778b961fc0776dc832b3a451bd5d35072d2269cf9b040f6b7a7dad84fb114ed413b1426cb96ceaf83825665ed5a1d002c1687f92465b49ed4c7f0218ff8c6c7dd7221d589c65b3b9aaa71a41484b122846c7c7b57e02e679ea8469b70e14fe4f70fee4d87b910cf144be6fe48eef24da475c0b0bcc6565ae82cd3f4e3b24c76eaa5616c6111343306ab35c1fe5ca4a77c0e314ed7dba39d6f1e0de791719c241a939cc493bea2bae1c1e932679ea94d29084278513c77b899cc98059d06a27d171b0dbdf6bee13ddc4fc17a0c4d2827d488436b57baa167544138ca2e64a11b43ac8a06cd0c2fba2d4d900ed2d9205305e2d7383cc98dacb078133de5f6fb6bed2ef26ba92cea28aafc3b9948dd9ae5559e8bd6920b8cea462aa445ca6a95e0e7ba52961b181c79e73bd581821df2b10173727a810c92b83b5ba4a0403eb710d2ca10689a35bec6c3a708e9e92f7d78ff3c5d9989574b00c6736f84c199256e76e19e78f0c98a9d580b4a658c84fc8f2096c2fbea8f5f8c59d0fdacb3be2802ef802abbecb3aba4acaac69a0e965abd8981e9896b1f6ef9d60f7a164b371af869fd0e48073742825e9434fc54da837e120266d53302954843538ea7c6c3dbfb4ff3b2fdbe244437f2a153ccf7bdb4c92aa08102d4f3cff2ae5ef86fab4653595e6a5837fa2f3e29f27a9cde5966843fb847a4a61f1e76c281fe8bb2b0a181d096100db5a1a5ce7a910238251a43ca556712eaadea167fb4d7d75825e440f3ecd782036d7574df8bceacb397abefc5f5254d2722215c53ff54af8299aaaad642c6d72a14d27882d9bbd539e1cc7a527526ba89b8c037ad09120e98ab042d3e8652b31ae0e478516bfaf88efca9f3676ffe99d2819dcaeb7610a626695f53117665d267d3f7abebd6bbd6733f645c72c389f03855bdf1e4b8075b516569b118233a0f0971d24b83113c0b096f5216a207ca99a7cddc81c130923fe3d91e7508c9ac5f2e914ff5dccab9e558566fa14efb34ac98d878580814b94b73acbfde9072f30b881f7f0fff42d4045d1ace6322d86a97d164aa84d93a60498065cc7c20e636f5862dc81531a88c60305a2e59a985be327a6902e4bed986dbf4a0b50c217af0ea7fdf9ab37f9ea1a1aaa72f54cf40154ea9b269f1a7c09f9f43245109431a175d50e2db0132337baa0ef97eed0fcf20489da36b79a1172faccc2f7ded7c60e00694282d93359c4682135642bc81f433574aa8ef0c97b4ade7ca372c5ffc23c7eddd839bab4e0f14d6df15c9dbeab176bec8b5701cf054eb3072f6dadc98f88819042bf10c407516ee58bce33fbe3b3d86a54255e577db4598e30a135361528c101683a5fcde7e8ba53f3456254be8f45fe3a56120ae96ea3773631fcb3873aa3abd91bcff00bd38bd43697a2e789e00da6077482e7b1b1a677b5afae4c54e6cbdf7377b694eb7d7a5b913476a5be923322d3de06060fd5e819635232a2cf4f0731da13b8546d1d6d4f8d75b9fce6c2341a71b0ea6f780df54bfdb0dd5cd9855179f602f9172307c7268724c3618e6817abd793adc214a0dc0bc616816632f27ea336fb56dfd").unwrap());
2800         }
2801
2802         #[test]
2803         fn test_failure_packet_onion() {
2804                 // Returning Errors test vectors from BOLT 4
2805
2806                 let onion_keys = build_test_onion_keys();
2807                 let onion_error = ChannelManager::build_failure_packet(&onion_keys[4].shared_secret, 0x2002, &[0; 0]);
2808                 assert_eq!(onion_error.encode(), hex::decode("4c2fc8bc08510334b6833ad9c3e79cd1b52ae59dfe5c2a4b23ead50f09f7ee0b0002200200fe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap());
2809
2810                 let onion_packet_1 = ChannelManager::encrypt_failure_packet(&onion_keys[4].shared_secret, &onion_error.encode()[..]);
2811                 assert_eq!(onion_packet_1.data, hex::decode("a5e6bd0c74cb347f10cce367f949098f2457d14c046fd8a22cb96efb30b0fdcda8cb9168b50f2fd45edd73c1b0c8b33002df376801ff58aaa94000bf8a86f92620f343baef38a580102395ae3abf9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f18fb4afb4aa074fb26c4d702f42968888550a3bded8c05247e045b866baef0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9082b8f1c465371a9894dd8c243fb4847e004f5256b3e90e2edde4c9fb3082ddfe4d1e734cacd96ef0706bf63c9984e22dc98851bcccd1c3494351feb458c9c6af41c0044bea3c47552b1d992ae542b17a2d0bba1a096c78d169034ecb55b6e3a7263c26017f033031228833c1daefc0dedb8cf7c3e37c9c37ebfe42f3225c326e8bcfd338804c145b16e34e4").unwrap());
2812
2813                 let onion_packet_2 = ChannelManager::encrypt_failure_packet(&onion_keys[3].shared_secret, &onion_packet_1.data[..]);
2814                 assert_eq!(onion_packet_2.data, hex::decode("c49a1ce81680f78f5f2000cda36268de34a3f0a0662f55b4e837c83a8773c22aa081bab1616a0011585323930fa5b9fae0c85770a2279ff59ec427ad1bbff9001c0cd1497004bd2a0f68b50704cf6d6a4bf3c8b6a0833399a24b3456961ba00736785112594f65b6b2d44d9f5ea4e49b5e1ec2af978cbe31c67114440ac51a62081df0ed46d4a3df295da0b0fe25c0115019f03f15ec86fabb4c852f83449e812f141a9395b3f70b766ebbd4ec2fae2b6955bd8f32684c15abfe8fd3a6261e52650e8807a92158d9f1463261a925e4bfba44bd20b166d532f0017185c3a6ac7957adefe45559e3072c8dc35abeba835a8cb01a71a15c736911126f27d46a36168ca5ef7dccd4e2886212602b181463e0dd30185c96348f9743a02aca8ec27c0b90dca270").unwrap());
2815
2816                 let onion_packet_3 = ChannelManager::encrypt_failure_packet(&onion_keys[2].shared_secret, &onion_packet_2.data[..]);
2817                 assert_eq!(onion_packet_3.data, hex::decode("a5d3e8634cfe78b2307d87c6d90be6fe7855b4f2cc9b1dfb19e92e4b79103f61ff9ac25f412ddfb7466e74f81b3e545563cdd8f5524dae873de61d7bdfccd496af2584930d2b566b4f8d3881f8c043df92224f38cf094cfc09d92655989531524593ec6d6caec1863bdfaa79229b5020acc034cd6deeea1021c50586947b9b8e6faa83b81fbfa6133c0af5d6b07c017f7158fa94f0d206baf12dda6b68f785b773b360fd0497e16cc402d779c8d48d0fa6315536ef0660f3f4e1865f5b38ea49c7da4fd959de4e83ff3ab686f059a45c65ba2af4a6a79166aa0f496bf04d06987b6d2ea205bdb0d347718b9aeff5b61dfff344993a275b79717cd815b6ad4c0beb568c4ac9c36ff1c315ec1119a1993c4b61e6eaa0375e0aaf738ac691abd3263bf937e3").unwrap());
2818
2819                 let onion_packet_4 = ChannelManager::encrypt_failure_packet(&onion_keys[1].shared_secret, &onion_packet_3.data[..]);
2820                 assert_eq!(onion_packet_4.data, hex::decode("aac3200c4968f56b21f53e5e374e3a2383ad2b1b6501bbcc45abc31e59b26881b7dfadbb56ec8dae8857add94e6702fb4c3a4de22e2e669e1ed926b04447fc73034bb730f4932acd62727b75348a648a1128744657ca6a4e713b9b646c3ca66cac02cdab44dd3439890ef3aaf61708714f7375349b8da541b2548d452d84de7084bb95b3ac2345201d624d31f4d52078aa0fa05a88b4e20202bd2b86ac5b52919ea305a8949de95e935eed0319cf3cf19ebea61d76ba92532497fcdc9411d06bcd4275094d0a4a3c5d3a945e43305a5a9256e333e1f64dbca5fcd4e03a39b9012d197506e06f29339dfee3331995b21615337ae060233d39befea925cc262873e0530408e6990f1cbd233a150ef7b004ff6166c70c68d9f8c853c1abca640b8660db2921").unwrap());
2821
2822                 let onion_packet_5 = ChannelManager::encrypt_failure_packet(&onion_keys[0].shared_secret, &onion_packet_4.data[..]);
2823                 assert_eq!(onion_packet_5.data, hex::decode("9c5add3963fc7f6ed7f148623c84134b5647e1306419dbe2174e523fa9e2fbed3a06a19f899145610741c83ad40b7712aefaddec8c6baf7325d92ea4ca4d1df8bce517f7e54554608bf2bd8071a4f52a7a2f7ffbb1413edad81eeea5785aa9d990f2865dc23b4bc3c301a94eec4eabebca66be5cf638f693ec256aec514620cc28ee4a94bd9565bc4d4962b9d3641d4278fb319ed2b84de5b665f307a2db0f7fbb757366067d88c50f7e829138fde4f78d39b5b5802f1b92a8a820865af5cc79f9f30bc3f461c66af95d13e5e1f0381c184572a91dee1c849048a647a1158cf884064deddbf1b0b88dfe2f791428d0ba0f6fb2f04e14081f69165ae66d9297c118f0907705c9c4954a199bae0bb96fad763d690e7daa6cfda59ba7f2c8d11448b604d12d").unwrap());
2824         }
2825
2826         fn confirm_transaction(chain: &chaininterface::ChainWatchInterfaceUtil, tx: &Transaction, chan_id: u32) {
2827                 assert!(chain.does_match_tx(tx));
2828                 let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
2829                 chain.block_connected_checked(&header, 1, &[tx; 1], &[chan_id; 1]);
2830                 for i in 2..100 {
2831                         header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
2832                         chain.block_connected_checked(&header, i, &[tx; 0], &[0; 0]);
2833                 }
2834         }
2835
2836         struct Node {
2837                 chain_monitor: Arc<chaininterface::ChainWatchInterfaceUtil>,
2838                 tx_broadcaster: Arc<test_utils::TestBroadcaster>,
2839                 chan_monitor: Arc<test_utils::TestChannelMonitor>,
2840                 node: Arc<ChannelManager>,
2841                 router: Router,
2842                 network_payment_count: Rc<RefCell<u8>>,
2843                 network_chan_count: Rc<RefCell<u32>>,
2844         }
2845         impl Drop for Node {
2846                 fn drop(&mut self) {
2847                         if !::std::thread::panicking() {
2848                                 // Check that we processed all pending events
2849                                 assert_eq!(self.node.get_and_clear_pending_msg_events().len(), 0);
2850                                 assert_eq!(self.node.get_and_clear_pending_events().len(), 0);
2851                                 assert_eq!(self.chan_monitor.added_monitors.lock().unwrap().len(), 0);
2852                         }
2853                 }
2854         }
2855
2856         fn create_chan_between_nodes(node_a: &Node, node_b: &Node) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
2857                 create_chan_between_nodes_with_value(node_a, node_b, 100000, 10001)
2858         }
2859
2860         fn create_chan_between_nodes_with_value(node_a: &Node, node_b: &Node, channel_value: u64, push_msat: u64) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
2861                 let (funding_locked, channel_id, tx) = create_chan_between_nodes_with_value_a(node_a, node_b, channel_value, push_msat);
2862                 let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(node_a, node_b, &funding_locked);
2863                 (announcement, as_update, bs_update, channel_id, tx)
2864         }
2865
2866         macro_rules! get_event_msg {
2867                 ($node: expr, $event_type: path, $node_id: expr) => {
2868                         {
2869                                 let events = $node.node.get_and_clear_pending_msg_events();
2870                                 assert_eq!(events.len(), 1);
2871                                 match events[0] {
2872                                         $event_type { ref node_id, ref msg } => {
2873                                                 assert_eq!(*node_id, $node_id);
2874                                                 (*msg).clone()
2875                                         },
2876                                         _ => panic!("Unexpected event"),
2877                                 }
2878                         }
2879                 }
2880         }
2881
2882         fn create_chan_between_nodes_with_value_init(node_a: &Node, node_b: &Node, channel_value: u64, push_msat: u64) -> Transaction {
2883                 node_a.node.create_channel(node_b.node.get_our_node_id(), channel_value, push_msat, 42).unwrap();
2884                 node_b.node.handle_open_channel(&node_a.node.get_our_node_id(), &get_event_msg!(node_a, MessageSendEvent::SendOpenChannel, node_b.node.get_our_node_id())).unwrap();
2885                 node_a.node.handle_accept_channel(&node_b.node.get_our_node_id(), &get_event_msg!(node_b, MessageSendEvent::SendAcceptChannel, node_a.node.get_our_node_id())).unwrap();
2886
2887                 let chan_id = *node_a.network_chan_count.borrow();
2888                 let tx;
2889                 let funding_output;
2890
2891                 let events_2 = node_a.node.get_and_clear_pending_events();
2892                 assert_eq!(events_2.len(), 1);
2893                 match events_2[0] {
2894                         Event::FundingGenerationReady { ref temporary_channel_id, ref channel_value_satoshis, ref output_script, user_channel_id } => {
2895                                 assert_eq!(*channel_value_satoshis, channel_value);
2896                                 assert_eq!(user_channel_id, 42);
2897
2898                                 tx = Transaction { version: chan_id as u32, lock_time: 0, input: Vec::new(), output: vec![TxOut {
2899                                         value: *channel_value_satoshis, script_pubkey: output_script.clone(),
2900                                 }]};
2901                                 funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
2902
2903                                 node_a.node.funding_transaction_generated(&temporary_channel_id, funding_output);
2904                                 let mut added_monitors = node_a.chan_monitor.added_monitors.lock().unwrap();
2905                                 assert_eq!(added_monitors.len(), 1);
2906                                 assert_eq!(added_monitors[0].0, funding_output);
2907                                 added_monitors.clear();
2908                         },
2909                         _ => panic!("Unexpected event"),
2910                 }
2911
2912                 node_b.node.handle_funding_created(&node_a.node.get_our_node_id(), &get_event_msg!(node_a, MessageSendEvent::SendFundingCreated, node_b.node.get_our_node_id())).unwrap();
2913                 {
2914                         let mut added_monitors = node_b.chan_monitor.added_monitors.lock().unwrap();
2915                         assert_eq!(added_monitors.len(), 1);
2916                         assert_eq!(added_monitors[0].0, funding_output);
2917                         added_monitors.clear();
2918                 }
2919
2920                 node_a.node.handle_funding_signed(&node_b.node.get_our_node_id(), &get_event_msg!(node_b, MessageSendEvent::SendFundingSigned, node_a.node.get_our_node_id())).unwrap();
2921                 {
2922                         let mut added_monitors = node_a.chan_monitor.added_monitors.lock().unwrap();
2923                         assert_eq!(added_monitors.len(), 1);
2924                         assert_eq!(added_monitors[0].0, funding_output);
2925                         added_monitors.clear();
2926                 }
2927
2928                 let events_4 = node_a.node.get_and_clear_pending_events();
2929                 assert_eq!(events_4.len(), 1);
2930                 match events_4[0] {
2931                         Event::FundingBroadcastSafe { ref funding_txo, user_channel_id } => {
2932                                 assert_eq!(user_channel_id, 42);
2933                                 assert_eq!(*funding_txo, funding_output);
2934                         },
2935                         _ => panic!("Unexpected event"),
2936                 };
2937
2938                 tx
2939         }
2940
2941         fn create_chan_between_nodes_with_value_confirm(node_a: &Node, node_b: &Node, tx: &Transaction) -> ((msgs::FundingLocked, msgs::AnnouncementSignatures), [u8; 32]) {
2942                 confirm_transaction(&node_b.chain_monitor, &tx, tx.version);
2943                 node_a.node.handle_funding_locked(&node_b.node.get_our_node_id(), &get_event_msg!(node_b, MessageSendEvent::SendFundingLocked, node_a.node.get_our_node_id())).unwrap();
2944
2945                 let channel_id;
2946
2947                 confirm_transaction(&node_a.chain_monitor, &tx, tx.version);
2948                 let events_6 = node_a.node.get_and_clear_pending_msg_events();
2949                 assert_eq!(events_6.len(), 2);
2950                 ((match events_6[0] {
2951                         MessageSendEvent::SendFundingLocked { ref node_id, ref msg } => {
2952                                 channel_id = msg.channel_id.clone();
2953                                 assert_eq!(*node_id, node_b.node.get_our_node_id());
2954                                 msg.clone()
2955                         },
2956                         _ => panic!("Unexpected event"),
2957                 }, match events_6[1] {
2958                         MessageSendEvent::SendAnnouncementSignatures { ref node_id, ref msg } => {
2959                                 assert_eq!(*node_id, node_b.node.get_our_node_id());
2960                                 msg.clone()
2961                         },
2962                         _ => panic!("Unexpected event"),
2963                 }), channel_id)
2964         }
2965
2966         fn create_chan_between_nodes_with_value_a(node_a: &Node, node_b: &Node, channel_value: u64, push_msat: u64) -> ((msgs::FundingLocked, msgs::AnnouncementSignatures), [u8; 32], Transaction) {
2967                 let tx = create_chan_between_nodes_with_value_init(node_a, node_b, channel_value, push_msat);
2968                 let (msgs, chan_id) = create_chan_between_nodes_with_value_confirm(node_a, node_b, &tx);
2969                 (msgs, chan_id, tx)
2970         }
2971
2972         fn create_chan_between_nodes_with_value_b(node_a: &Node, node_b: &Node, as_funding_msgs: &(msgs::FundingLocked, msgs::AnnouncementSignatures)) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate) {
2973                 node_b.node.handle_funding_locked(&node_a.node.get_our_node_id(), &as_funding_msgs.0).unwrap();
2974                 let bs_announcement_sigs = get_event_msg!(node_b, MessageSendEvent::SendAnnouncementSignatures, node_a.node.get_our_node_id());
2975                 node_b.node.handle_announcement_signatures(&node_a.node.get_our_node_id(), &as_funding_msgs.1).unwrap();
2976
2977                 let events_7 = node_b.node.get_and_clear_pending_msg_events();
2978                 assert_eq!(events_7.len(), 1);
2979                 let (announcement, bs_update) = match events_7[0] {
2980                         MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
2981                                 (msg, update_msg)
2982                         },
2983                         _ => panic!("Unexpected event"),
2984                 };
2985
2986                 node_a.node.handle_announcement_signatures(&node_b.node.get_our_node_id(), &bs_announcement_sigs).unwrap();
2987                 let events_8 = node_a.node.get_and_clear_pending_msg_events();
2988                 assert_eq!(events_8.len(), 1);
2989                 let as_update = match events_8[0] {
2990                         MessageSendEvent::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
2991                                 assert!(*announcement == *msg);
2992                                 update_msg
2993                         },
2994                         _ => panic!("Unexpected event"),
2995                 };
2996
2997                 *node_a.network_chan_count.borrow_mut() += 1;
2998
2999                 ((*announcement).clone(), (*as_update).clone(), (*bs_update).clone())
3000         }
3001
3002         fn create_announced_chan_between_nodes(nodes: &Vec<Node>, a: usize, b: usize) -> (msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
3003                 create_announced_chan_between_nodes_with_value(nodes, a, b, 100000, 10001)
3004         }
3005
3006         fn create_announced_chan_between_nodes_with_value(nodes: &Vec<Node>, a: usize, b: usize, channel_value: u64, push_msat: u64) -> (msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
3007                 let chan_announcement = create_chan_between_nodes_with_value(&nodes[a], &nodes[b], channel_value, push_msat);
3008                 for node in nodes {
3009                         assert!(node.router.handle_channel_announcement(&chan_announcement.0).unwrap());
3010                         node.router.handle_channel_update(&chan_announcement.1).unwrap();
3011                         node.router.handle_channel_update(&chan_announcement.2).unwrap();
3012                 }
3013                 (chan_announcement.1, chan_announcement.2, chan_announcement.3, chan_announcement.4)
3014         }
3015
3016         macro_rules! check_spends {
3017                 ($tx: expr, $spends_tx: expr) => {
3018                         {
3019                                 let mut funding_tx_map = HashMap::new();
3020                                 let spends_tx = $spends_tx;
3021                                 funding_tx_map.insert(spends_tx.txid(), spends_tx);
3022                                 $tx.verify(&funding_tx_map).unwrap();
3023                         }
3024                 }
3025         }
3026
3027         fn close_channel(outbound_node: &Node, inbound_node: &Node, channel_id: &[u8; 32], funding_tx: Transaction, close_inbound_first: bool) -> (msgs::ChannelUpdate, msgs::ChannelUpdate) {
3028                 let (node_a, broadcaster_a) = if close_inbound_first { (&inbound_node.node, &inbound_node.tx_broadcaster) } else { (&outbound_node.node, &outbound_node.tx_broadcaster) };
3029                 let (node_b, broadcaster_b) = if close_inbound_first { (&outbound_node.node, &outbound_node.tx_broadcaster) } else { (&inbound_node.node, &inbound_node.tx_broadcaster) };
3030                 let (tx_a, tx_b);
3031
3032                 node_a.close_channel(channel_id).unwrap();
3033                 let events_1 = node_a.get_and_clear_pending_msg_events();
3034                 assert_eq!(events_1.len(), 1);
3035                 let shutdown_a = match events_1[0] {
3036                         MessageSendEvent::SendShutdown { ref node_id, ref msg } => {
3037                                 assert_eq!(node_id, &node_b.get_our_node_id());
3038                                 msg.clone()
3039                         },
3040                         _ => panic!("Unexpected event"),
3041                 };
3042
3043                 let (shutdown_b, mut closing_signed_b) = node_b.handle_shutdown(&node_a.get_our_node_id(), &shutdown_a).unwrap();
3044                 if !close_inbound_first {
3045                         assert!(closing_signed_b.is_none());
3046                 }
3047                 let (empty_a, mut closing_signed_a) = node_a.handle_shutdown(&node_b.get_our_node_id(), &shutdown_b.unwrap()).unwrap();
3048                 assert!(empty_a.is_none());
3049                 if close_inbound_first {
3050                         assert!(closing_signed_a.is_none());
3051                         closing_signed_a = node_a.handle_closing_signed(&node_b.get_our_node_id(), &closing_signed_b.unwrap()).unwrap();
3052                         assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
3053                         tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
3054
3055                         let empty_b = node_b.handle_closing_signed(&node_a.get_our_node_id(), &closing_signed_a.unwrap()).unwrap();
3056                         assert!(empty_b.is_none());
3057                         assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
3058                         tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);
3059                 } else {
3060                         closing_signed_b = node_b.handle_closing_signed(&node_a.get_our_node_id(), &closing_signed_a.unwrap()).unwrap();
3061                         assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
3062                         tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);
3063
3064                         let empty_a2 = node_a.handle_closing_signed(&node_b.get_our_node_id(), &closing_signed_b.unwrap()).unwrap();
3065                         assert!(empty_a2.is_none());
3066                         assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
3067                         tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
3068                 }
3069                 assert_eq!(tx_a, tx_b);
3070                 check_spends!(tx_a, funding_tx);
3071
3072                 let events_2 = node_a.get_and_clear_pending_msg_events();
3073                 assert_eq!(events_2.len(), 1);
3074                 let as_update = match events_2[0] {
3075                         MessageSendEvent::BroadcastChannelUpdate { ref msg } => {
3076                                 msg.clone()
3077                         },
3078                         _ => panic!("Unexpected event"),
3079                 };
3080
3081                 let events_3 = node_b.get_and_clear_pending_msg_events();
3082                 assert_eq!(events_3.len(), 1);
3083                 let bs_update = match events_3[0] {
3084                         MessageSendEvent::BroadcastChannelUpdate { ref msg } => {
3085                                 msg.clone()
3086                         },
3087                         _ => panic!("Unexpected event"),
3088                 };
3089
3090                 (as_update, bs_update)
3091         }
3092
3093         struct SendEvent {
3094                 node_id: PublicKey,
3095                 msgs: Vec<msgs::UpdateAddHTLC>,
3096                 commitment_msg: msgs::CommitmentSigned,
3097         }
3098         impl SendEvent {
3099                 fn from_commitment_update(node_id: PublicKey, updates: msgs::CommitmentUpdate) -> SendEvent {
3100                         assert!(updates.update_fulfill_htlcs.is_empty());
3101                         assert!(updates.update_fail_htlcs.is_empty());
3102                         assert!(updates.update_fail_malformed_htlcs.is_empty());
3103                         assert!(updates.update_fee.is_none());
3104                         SendEvent { node_id: node_id, msgs: updates.update_add_htlcs, commitment_msg: updates.commitment_signed }
3105                 }
3106
3107                 fn from_event(event: MessageSendEvent) -> SendEvent {
3108                         match event {
3109                                 MessageSendEvent::UpdateHTLCs { node_id, updates } => SendEvent::from_commitment_update(node_id, updates),
3110                                 _ => panic!("Unexpected event type!"),
3111                         }
3112                 }
3113         }
3114
3115         macro_rules! check_added_monitors {
3116                 ($node: expr, $count: expr) => {
3117                         {
3118                                 let mut added_monitors = $node.chan_monitor.added_monitors.lock().unwrap();
3119                                 assert_eq!(added_monitors.len(), $count);
3120                                 added_monitors.clear();
3121                         }
3122                 }
3123         }
3124
3125         macro_rules! commitment_signed_dance {
3126                 ($node_a: expr, $node_b: expr, $commitment_signed: expr, $fail_backwards: expr) => {
3127                         {
3128                                 check_added_monitors!($node_a, 0);
3129                                 let (as_revoke_and_ack, as_commitment_signed) = $node_a.node.handle_commitment_signed(&$node_b.node.get_our_node_id(), &$commitment_signed).unwrap();
3130                                 check_added_monitors!($node_a, 1);
3131                                 check_added_monitors!($node_b, 0);
3132                                 assert!($node_b.node.handle_revoke_and_ack(&$node_a.node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
3133                                 check_added_monitors!($node_b, 1);
3134                                 let (bs_revoke_and_ack, bs_none) = $node_b.node.handle_commitment_signed(&$node_a.node.get_our_node_id(), &as_commitment_signed.unwrap()).unwrap();
3135                                 assert!(bs_none.is_none());
3136                                 check_added_monitors!($node_b, 1);
3137                                 if $fail_backwards {
3138                                         assert!($node_a.node.get_and_clear_pending_events().is_empty());
3139                                         assert!($node_a.node.get_and_clear_pending_msg_events().is_empty());
3140                                 }
3141                                 assert!($node_a.node.handle_revoke_and_ack(&$node_b.node.get_our_node_id(), &bs_revoke_and_ack).unwrap().is_none());
3142                                 {
3143                                         let mut added_monitors = $node_a.chan_monitor.added_monitors.lock().unwrap();
3144                                         if $fail_backwards {
3145                                                 assert_eq!(added_monitors.len(), 2);
3146                                                 assert!(added_monitors[0].0 != added_monitors[1].0);
3147                                         } else {
3148                                                 assert_eq!(added_monitors.len(), 1);
3149                                         }
3150                                         added_monitors.clear();
3151                                 }
3152                         }
3153                 }
3154         }
3155
3156         macro_rules! get_payment_preimage_hash {
3157                 ($node: expr) => {
3158                         {
3159                                 let payment_preimage = [*$node.network_payment_count.borrow(); 32];
3160                                 *$node.network_payment_count.borrow_mut() += 1;
3161                                 let mut payment_hash = [0; 32];
3162                                 let mut sha = Sha256::new();
3163                                 sha.input(&payment_preimage[..]);
3164                                 sha.result(&mut payment_hash);
3165                                 (payment_preimage, payment_hash)
3166                         }
3167                 }
3168         }
3169
3170         fn send_along_route(origin_node: &Node, route: Route, expected_route: &[&Node], recv_value: u64) -> ([u8; 32], [u8; 32]) {
3171                 let (our_payment_preimage, our_payment_hash) = get_payment_preimage_hash!(origin_node);
3172
3173                 let mut payment_event = {
3174                         origin_node.node.send_payment(route, our_payment_hash).unwrap();
3175                         check_added_monitors!(origin_node, 1);
3176
3177                         let mut events = origin_node.node.get_and_clear_pending_msg_events();
3178                         assert_eq!(events.len(), 1);
3179                         SendEvent::from_event(events.remove(0))
3180                 };
3181                 let mut prev_node = origin_node;
3182
3183                 for (idx, &node) in expected_route.iter().enumerate() {
3184                         assert_eq!(node.node.get_our_node_id(), payment_event.node_id);
3185
3186                         node.node.handle_update_add_htlc(&prev_node.node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
3187                         check_added_monitors!(node, 0);
3188                         commitment_signed_dance!(node, prev_node, payment_event.commitment_msg, false);
3189
3190                         let events_1 = node.node.get_and_clear_pending_events();
3191                         assert_eq!(events_1.len(), 1);
3192                         match events_1[0] {
3193                                 Event::PendingHTLCsForwardable { .. } => { },
3194                                 _ => panic!("Unexpected event"),
3195                         };
3196
3197                         node.node.channel_state.lock().unwrap().next_forward = Instant::now();
3198                         node.node.process_pending_htlc_forwards();
3199
3200                         if idx == expected_route.len() - 1 {
3201                                 let events_2 = node.node.get_and_clear_pending_events();
3202                                 assert_eq!(events_2.len(), 1);
3203                                 match events_2[0] {
3204                                         Event::PaymentReceived { ref payment_hash, amt } => {
3205                                                 assert_eq!(our_payment_hash, *payment_hash);
3206                                                 assert_eq!(amt, recv_value);
3207                                         },
3208                                         _ => panic!("Unexpected event"),
3209                                 }
3210                         } else {
3211                                 let mut events_2 = node.node.get_and_clear_pending_msg_events();
3212                                 assert_eq!(events_2.len(), 1);
3213                                 check_added_monitors!(node, 1);
3214                                 payment_event = SendEvent::from_event(events_2.remove(0));
3215                                 assert_eq!(payment_event.msgs.len(), 1);
3216                         }
3217
3218                         prev_node = node;
3219                 }
3220
3221                 (our_payment_preimage, our_payment_hash)
3222         }
3223
3224         fn claim_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_preimage: [u8; 32]) {
3225                 assert!(expected_route.last().unwrap().node.claim_funds(our_payment_preimage));
3226                 check_added_monitors!(expected_route.last().unwrap(), 1);
3227
3228                 let mut next_msgs: Option<(msgs::UpdateFulfillHTLC, msgs::CommitmentSigned)> = None;
3229                 macro_rules! update_fulfill_dance {
3230                         ($node: expr, $prev_node: expr, $last_node: expr) => {
3231                                 {
3232                                         $node.node.handle_update_fulfill_htlc(&$prev_node.node.get_our_node_id(), &next_msgs.as_ref().unwrap().0).unwrap();
3233                                         if $last_node {
3234                                                 check_added_monitors!($node, 0);
3235                                         } else {
3236                                                 check_added_monitors!($node, 1);
3237                                         }
3238                                         commitment_signed_dance!($node, $prev_node, next_msgs.as_ref().unwrap().1, false);
3239                                 }
3240                         }
3241                 }
3242
3243                 let mut expected_next_node = expected_route.last().unwrap().node.get_our_node_id();
3244                 let mut prev_node = expected_route.last().unwrap();
3245                 for (idx, node) in expected_route.iter().rev().enumerate() {
3246                         assert_eq!(expected_next_node, node.node.get_our_node_id());
3247                         if next_msgs.is_some() {
3248                                 update_fulfill_dance!(node, prev_node, false);
3249                         }
3250
3251                         let events = node.node.get_and_clear_pending_msg_events();
3252                         if !skip_last || idx != expected_route.len() - 1 {
3253                                 assert_eq!(events.len(), 1);
3254                                 match events[0] {
3255                                         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 } } => {
3256                                                 assert!(update_add_htlcs.is_empty());
3257                                                 assert_eq!(update_fulfill_htlcs.len(), 1);
3258                                                 assert!(update_fail_htlcs.is_empty());
3259                                                 assert!(update_fail_malformed_htlcs.is_empty());
3260                                                 assert!(update_fee.is_none());
3261                                                 expected_next_node = node_id.clone();
3262                                                 next_msgs = Some((update_fulfill_htlcs[0].clone(), commitment_signed.clone()));
3263                                         },
3264                                         _ => panic!("Unexpected event"),
3265                                 }
3266                         } else {
3267                                 assert!(events.is_empty());
3268                         }
3269                         if !skip_last && idx == expected_route.len() - 1 {
3270                                 assert_eq!(expected_next_node, origin_node.node.get_our_node_id());
3271                         }
3272
3273                         prev_node = node;
3274                 }
3275
3276                 if !skip_last {
3277                         update_fulfill_dance!(origin_node, expected_route.first().unwrap(), true);
3278                         let events = origin_node.node.get_and_clear_pending_events();
3279                         assert_eq!(events.len(), 1);
3280                         match events[0] {
3281                                 Event::PaymentSent { payment_preimage } => {
3282                                         assert_eq!(payment_preimage, our_payment_preimage);
3283                                 },
3284                                 _ => panic!("Unexpected event"),
3285                         }
3286                 }
3287         }
3288
3289         fn claim_payment(origin_node: &Node, expected_route: &[&Node], our_payment_preimage: [u8; 32]) {
3290                 claim_payment_along_route(origin_node, expected_route, false, our_payment_preimage);
3291         }
3292
3293         const TEST_FINAL_CLTV: u32 = 32;
3294
3295         fn route_payment(origin_node: &Node, expected_route: &[&Node], recv_value: u64) -> ([u8; 32], [u8; 32]) {
3296                 let route = origin_node.router.get_route(&expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV).unwrap();
3297                 assert_eq!(route.hops.len(), expected_route.len());
3298                 for (node, hop) in expected_route.iter().zip(route.hops.iter()) {
3299                         assert_eq!(hop.pubkey, node.node.get_our_node_id());
3300                 }
3301
3302                 send_along_route(origin_node, route, expected_route, recv_value)
3303         }
3304
3305         fn route_over_limit(origin_node: &Node, expected_route: &[&Node], recv_value: u64) {
3306                 let route = origin_node.router.get_route(&expected_route.last().unwrap().node.get_our_node_id(), None, &Vec::new(), recv_value, TEST_FINAL_CLTV).unwrap();
3307                 assert_eq!(route.hops.len(), expected_route.len());
3308                 for (node, hop) in expected_route.iter().zip(route.hops.iter()) {
3309                         assert_eq!(hop.pubkey, node.node.get_our_node_id());
3310                 }
3311
3312                 let (_, our_payment_hash) = get_payment_preimage_hash!(origin_node);
3313
3314                 let err = origin_node.node.send_payment(route, our_payment_hash).err().unwrap();
3315                 match err {
3316                         APIError::ChannelUnavailable{err} => assert_eq!(err, "Cannot send value that would put us over our max HTLC value in flight"),
3317                         _ => panic!("Unknown error variants"),
3318                 };
3319         }
3320
3321         fn send_payment(origin: &Node, expected_route: &[&Node], recv_value: u64) {
3322                 let our_payment_preimage = route_payment(&origin, expected_route, recv_value).0;
3323                 claim_payment(&origin, expected_route, our_payment_preimage);
3324         }
3325
3326         fn fail_payment_along_route(origin_node: &Node, expected_route: &[&Node], skip_last: bool, our_payment_hash: [u8; 32]) {
3327                 assert!(expected_route.last().unwrap().node.fail_htlc_backwards(&our_payment_hash, PaymentFailReason::PreimageUnknown));
3328                 check_added_monitors!(expected_route.last().unwrap(), 1);
3329
3330                 let mut next_msgs: Option<(msgs::UpdateFailHTLC, msgs::CommitmentSigned)> = None;
3331                 macro_rules! update_fail_dance {
3332                         ($node: expr, $prev_node: expr, $last_node: expr) => {
3333                                 {
3334                                         $node.node.handle_update_fail_htlc(&$prev_node.node.get_our_node_id(), &next_msgs.as_ref().unwrap().0).unwrap();
3335                                         commitment_signed_dance!($node, $prev_node, next_msgs.as_ref().unwrap().1, !$last_node);
3336                                 }
3337                         }
3338                 }
3339
3340                 let mut expected_next_node = expected_route.last().unwrap().node.get_our_node_id();
3341                 let mut prev_node = expected_route.last().unwrap();
3342                 for (idx, node) in expected_route.iter().rev().enumerate() {
3343                         assert_eq!(expected_next_node, node.node.get_our_node_id());
3344                         if next_msgs.is_some() {
3345                                 // We may be the "last node" for the purpose of the commitment dance if we're
3346                                 // skipping the last node (implying it is disconnected) and we're the
3347                                 // second-to-last node!
3348                                 update_fail_dance!(node, prev_node, skip_last && idx == expected_route.len() - 1);
3349                         }
3350
3351                         let events = node.node.get_and_clear_pending_msg_events();
3352                         if !skip_last || idx != expected_route.len() - 1 {
3353                                 assert_eq!(events.len(), 1);
3354                                 match events[0] {
3355                                         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 } } => {
3356                                                 assert!(update_add_htlcs.is_empty());
3357                                                 assert!(update_fulfill_htlcs.is_empty());
3358                                                 assert_eq!(update_fail_htlcs.len(), 1);
3359                                                 assert!(update_fail_malformed_htlcs.is_empty());
3360                                                 assert!(update_fee.is_none());
3361                                                 expected_next_node = node_id.clone();
3362                                                 next_msgs = Some((update_fail_htlcs[0].clone(), commitment_signed.clone()));
3363                                         },
3364                                         _ => panic!("Unexpected event"),
3365                                 }
3366                         } else {
3367                                 assert!(events.is_empty());
3368                         }
3369                         if !skip_last && idx == expected_route.len() - 1 {
3370                                 assert_eq!(expected_next_node, origin_node.node.get_our_node_id());
3371                         }
3372
3373                         prev_node = node;
3374                 }
3375
3376                 if !skip_last {
3377                         update_fail_dance!(origin_node, expected_route.first().unwrap(), true);
3378
3379                         let events = origin_node.node.get_and_clear_pending_events();
3380                         assert_eq!(events.len(), 1);
3381                         match events[0] {
3382                                 Event::PaymentFailed { payment_hash, rejected_by_dest } => {
3383                                         assert_eq!(payment_hash, our_payment_hash);
3384                                         assert!(rejected_by_dest);
3385                                 },
3386                                 _ => panic!("Unexpected event"),
3387                         }
3388                 }
3389         }
3390
3391         fn fail_payment(origin_node: &Node, expected_route: &[&Node], our_payment_hash: [u8; 32]) {
3392                 fail_payment_along_route(origin_node, expected_route, false, our_payment_hash);
3393         }
3394
3395         fn create_network(node_count: usize) -> Vec<Node> {
3396                 let mut nodes = Vec::new();
3397                 let mut rng = thread_rng();
3398                 let secp_ctx = Secp256k1::new();
3399                 let logger: Arc<Logger> = Arc::new(test_utils::TestLogger::new());
3400
3401                 let chan_count = Rc::new(RefCell::new(0));
3402                 let payment_count = Rc::new(RefCell::new(0));
3403
3404                 for _ in 0..node_count {
3405                         let feeest = Arc::new(test_utils::TestFeeEstimator { sat_per_kw: 253 });
3406                         let chain_monitor = Arc::new(chaininterface::ChainWatchInterfaceUtil::new(Network::Testnet, Arc::clone(&logger)));
3407                         let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
3408                         let mut seed = [0; 32];
3409                         rng.fill_bytes(&mut seed);
3410                         let keys_manager = Arc::new(keysinterface::KeysManager::new(&seed, Network::Testnet, Arc::clone(&logger)));
3411                         let chan_monitor = Arc::new(test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone()));
3412                         let node = ChannelManager::new(0, true, Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger), keys_manager.clone()).unwrap();
3413                         let router = Router::new(PublicKey::from_secret_key(&secp_ctx, &keys_manager.get_node_secret()), chain_monitor.clone(), Arc::clone(&logger));
3414                         nodes.push(Node { chain_monitor, tx_broadcaster, chan_monitor, node, router,
3415                                 network_payment_count: payment_count.clone(),
3416                                 network_chan_count: chan_count.clone(),
3417                         });
3418                 }
3419
3420                 nodes
3421         }
3422
3423         #[test]
3424         fn test_async_inbound_update_fee() {
3425                 let mut nodes = create_network(2);
3426                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3427                 let channel_id = chan.2;
3428
3429                 macro_rules! get_feerate {
3430                         ($node: expr) => {{
3431                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3432                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3433                                 chan.get_feerate()
3434                         }}
3435                 }
3436
3437                 // balancing
3438                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
3439
3440                 // A                                        B
3441                 // update_fee                            ->
3442                 // send (1) commitment_signed            -.
3443                 //                                       <- update_add_htlc/commitment_signed
3444                 // send (2) RAA (awaiting remote revoke) -.
3445                 // (1) commitment_signed is delivered    ->
3446                 //                                       .- send (3) RAA (awaiting remote revoke)
3447                 // (2) RAA is delivered                  ->
3448                 //                                       .- send (4) commitment_signed
3449                 //                                       <- (3) RAA is delivered
3450                 // send (5) commitment_signed            -.
3451                 //                                       <- (4) commitment_signed is delivered
3452                 // send (6) RAA                          -.
3453                 // (5) commitment_signed is delivered    ->
3454                 //                                       <- RAA
3455                 // (6) RAA is delivered                  ->
3456
3457                 // First nodes[0] generates an update_fee
3458                 nodes[0].node.update_fee(channel_id, get_feerate!(nodes[0]) + 20).unwrap();
3459                 check_added_monitors!(nodes[0], 1);
3460
3461                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3462                 assert_eq!(events_0.len(), 1);
3463                 let (update_msg, commitment_signed) = match events_0[0] { // (1)
3464                         MessageSendEvent::UpdateHTLCs { updates: msgs::CommitmentUpdate { ref update_fee, ref commitment_signed, .. }, .. } => {
3465                                 (update_fee.as_ref(), commitment_signed)
3466                         },
3467                         _ => panic!("Unexpected event"),
3468                 };
3469
3470                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3471
3472                 // ...but before it's delivered, nodes[1] starts to send a payment back to nodes[0]...
3473                 let (_, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
3474                 nodes[1].node.send_payment(nodes[1].router.get_route(&nodes[0].node.get_our_node_id(), None, &Vec::new(), 40000, TEST_FINAL_CLTV).unwrap(), our_payment_hash).unwrap();
3475                 check_added_monitors!(nodes[1], 1);
3476
3477                 let payment_event = {
3478                         let mut events_1 = nodes[1].node.get_and_clear_pending_msg_events();
3479                         assert_eq!(events_1.len(), 1);
3480                         SendEvent::from_event(events_1.remove(0))
3481                 };
3482                 assert_eq!(payment_event.node_id, nodes[0].node.get_our_node_id());
3483                 assert_eq!(payment_event.msgs.len(), 1);
3484
3485                 // ...now when the messages get delivered everyone should be happy
3486                 nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
3487                 let (as_revoke_msg, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &payment_event.commitment_msg).unwrap(); // (2)
3488                 assert!(as_commitment_signed.is_none()); // nodes[0] is awaiting nodes[1] revoke_and_ack
3489                 check_added_monitors!(nodes[0], 1);
3490
3491                 // deliver(1), generate (3):
3492                 let (bs_revoke_msg, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
3493                 assert!(bs_commitment_signed.is_none()); // nodes[1] is awaiting nodes[0] revoke_and_ack
3494                 check_added_monitors!(nodes[1], 1);
3495
3496                 let bs_update = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_msg).unwrap(); // deliver (2)
3497                 assert!(bs_update.as_ref().unwrap().update_add_htlcs.is_empty()); // (4)
3498                 assert!(bs_update.as_ref().unwrap().update_fulfill_htlcs.is_empty()); // (4)
3499                 assert!(bs_update.as_ref().unwrap().update_fail_htlcs.is_empty()); // (4)
3500                 assert!(bs_update.as_ref().unwrap().update_fail_malformed_htlcs.is_empty()); // (4)
3501                 assert!(bs_update.as_ref().unwrap().update_fee.is_none()); // (4)
3502                 check_added_monitors!(nodes[1], 1);
3503
3504                 let as_update = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_msg).unwrap(); // deliver (3)
3505                 assert!(as_update.as_ref().unwrap().update_add_htlcs.is_empty()); // (5)
3506                 assert!(as_update.as_ref().unwrap().update_fulfill_htlcs.is_empty()); // (5)
3507                 assert!(as_update.as_ref().unwrap().update_fail_htlcs.is_empty()); // (5)
3508                 assert!(as_update.as_ref().unwrap().update_fail_malformed_htlcs.is_empty()); // (5)
3509                 assert!(as_update.as_ref().unwrap().update_fee.is_none()); // (5)
3510                 check_added_monitors!(nodes[0], 1);
3511
3512                 let (as_second_revoke, as_second_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_update.unwrap().commitment_signed).unwrap(); // deliver (4)
3513                 assert!(as_second_commitment_signed.is_none()); // only (6)
3514                 check_added_monitors!(nodes[0], 1);
3515
3516                 let (bs_second_revoke, bs_second_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_update.unwrap().commitment_signed).unwrap(); // deliver (5)
3517                 assert!(bs_second_commitment_signed.is_none());
3518                 check_added_monitors!(nodes[1], 1);
3519
3520                 assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke).unwrap().is_none());
3521                 check_added_monitors!(nodes[0], 1);
3522
3523                 let events_2 = nodes[0].node.get_and_clear_pending_events();
3524                 assert_eq!(events_2.len(), 1);
3525                 match events_2[0] {
3526                         Event::PendingHTLCsForwardable {..} => {}, // If we actually processed we'd receive the payment
3527                         _ => panic!("Unexpected event"),
3528                 }
3529
3530                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_revoke).unwrap().is_none()); // deliver (6)
3531                 check_added_monitors!(nodes[1], 1);
3532         }
3533
3534         #[test]
3535         fn test_update_fee_unordered_raa() {
3536                 // Just the intro to the previous test followed by an out-of-order RAA (which caused a
3537                 // crash in an earlier version of the update_fee patch)
3538                 let mut nodes = create_network(2);
3539                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3540                 let channel_id = chan.2;
3541
3542                 macro_rules! get_feerate {
3543                         ($node: expr) => {{
3544                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3545                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3546                                 chan.get_feerate()
3547                         }}
3548                 }
3549
3550                 // balancing
3551                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
3552
3553                 // First nodes[0] generates an update_fee
3554                 nodes[0].node.update_fee(channel_id, get_feerate!(nodes[0]) + 20).unwrap();
3555                 check_added_monitors!(nodes[0], 1);
3556
3557                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3558                 assert_eq!(events_0.len(), 1);
3559                 let update_msg = match events_0[0] { // (1)
3560                         MessageSendEvent::UpdateHTLCs { updates: msgs::CommitmentUpdate { ref update_fee, .. }, .. } => {
3561                                 update_fee.as_ref()
3562                         },
3563                         _ => panic!("Unexpected event"),
3564                 };
3565
3566                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3567
3568                 // ...but before it's delivered, nodes[1] starts to send a payment back to nodes[0]...
3569                 let (_, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
3570                 nodes[1].node.send_payment(nodes[1].router.get_route(&nodes[0].node.get_our_node_id(), None, &Vec::new(), 40000, TEST_FINAL_CLTV).unwrap(), our_payment_hash).unwrap();
3571                 check_added_monitors!(nodes[1], 1);
3572
3573                 let payment_event = {
3574                         let mut events_1 = nodes[1].node.get_and_clear_pending_msg_events();
3575                         assert_eq!(events_1.len(), 1);
3576                         SendEvent::from_event(events_1.remove(0))
3577                 };
3578                 assert_eq!(payment_event.node_id, nodes[0].node.get_our_node_id());
3579                 assert_eq!(payment_event.msgs.len(), 1);
3580
3581                 // ...now when the messages get delivered everyone should be happy
3582                 nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
3583                 let (as_revoke_msg, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &payment_event.commitment_msg).unwrap(); // (2)
3584                 assert!(as_commitment_signed.is_none()); // nodes[0] is awaiting nodes[1] revoke_and_ack
3585                 check_added_monitors!(nodes[0], 1);
3586
3587                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_msg).unwrap().is_none()); // deliver (2)
3588                 check_added_monitors!(nodes[1], 1);
3589
3590                 // We can't continue, sadly, because our (1) now has a bogus signature
3591         }
3592
3593         #[test]
3594         fn test_multi_flight_update_fee() {
3595                 let nodes = create_network(2);
3596                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3597                 let channel_id = chan.2;
3598
3599                 macro_rules! get_feerate {
3600                         ($node: expr) => {{
3601                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3602                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3603                                 chan.get_feerate()
3604                         }}
3605                 }
3606
3607                 // A                                        B
3608                 // update_fee/commitment_signed          ->
3609                 //                                       .- send (1) RAA and (2) commitment_signed
3610                 // update_fee (never committed)          ->
3611                 // (3) update_fee                        ->
3612                 // We have to manually generate the above update_fee, it is allowed by the protocol but we
3613                 // don't track which updates correspond to which revoke_and_ack responses so we're in
3614                 // AwaitingRAA mode and will not generate the update_fee yet.
3615                 //                                       <- (1) RAA delivered
3616                 // (3) is generated and send (4) CS      -.
3617                 // Note that A cannot generate (4) prior to (1) being delivered as it otherwise doesn't
3618                 // know the per_commitment_point to use for it.
3619                 //                                       <- (2) commitment_signed delivered
3620                 // revoke_and_ack                        ->
3621                 //                                          B should send no response here
3622                 // (4) commitment_signed delivered       ->
3623                 //                                       <- RAA/commitment_signed delivered
3624                 // revoke_and_ack                        ->
3625
3626                 // First nodes[0] generates an update_fee
3627                 let initial_feerate = get_feerate!(nodes[0]);
3628                 nodes[0].node.update_fee(channel_id, initial_feerate + 20).unwrap();
3629                 check_added_monitors!(nodes[0], 1);
3630
3631                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3632                 assert_eq!(events_0.len(), 1);
3633                 let (update_msg_1, commitment_signed_1) = match events_0[0] { // (1)
3634                         MessageSendEvent::UpdateHTLCs { updates: msgs::CommitmentUpdate { ref update_fee, ref commitment_signed, .. }, .. } => {
3635                                 (update_fee.as_ref().unwrap(), commitment_signed)
3636                         },
3637                         _ => panic!("Unexpected event"),
3638                 };
3639
3640                 // Deliver first update_fee/commitment_signed pair, generating (1) and (2):
3641                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg_1).unwrap();
3642                 let (bs_revoke_msg, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed_1).unwrap();
3643                 check_added_monitors!(nodes[1], 1);
3644
3645                 // nodes[0] is awaiting a revoke from nodes[1] before it will create a new commitment
3646                 // transaction:
3647                 nodes[0].node.update_fee(channel_id, initial_feerate + 40).unwrap();
3648                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
3649                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
3650
3651                 // Create the (3) update_fee message that nodes[0] will generate before it does...
3652                 let mut update_msg_2 = msgs::UpdateFee {
3653                         channel_id: update_msg_1.channel_id.clone(),
3654                         feerate_per_kw: (initial_feerate + 30) as u32,
3655                 };
3656
3657                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), &update_msg_2).unwrap();
3658
3659                 update_msg_2.feerate_per_kw = (initial_feerate + 40) as u32;
3660                 // Deliver (3)
3661                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), &update_msg_2).unwrap();
3662
3663                 // Deliver (1), generating (3) and (4)
3664                 let as_second_update = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_msg).unwrap();
3665                 check_added_monitors!(nodes[0], 1);
3666                 assert!(as_second_update.as_ref().unwrap().update_add_htlcs.is_empty());
3667                 assert!(as_second_update.as_ref().unwrap().update_fulfill_htlcs.is_empty());
3668                 assert!(as_second_update.as_ref().unwrap().update_fail_htlcs.is_empty());
3669                 assert!(as_second_update.as_ref().unwrap().update_fail_malformed_htlcs.is_empty());
3670                 // Check that the update_fee newly generated matches what we delivered:
3671                 assert_eq!(as_second_update.as_ref().unwrap().update_fee.as_ref().unwrap().channel_id, update_msg_2.channel_id);
3672                 assert_eq!(as_second_update.as_ref().unwrap().update_fee.as_ref().unwrap().feerate_per_kw, update_msg_2.feerate_per_kw);
3673
3674                 // Deliver (2) commitment_signed
3675                 let (as_revoke_msg, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), bs_commitment_signed.as_ref().unwrap()).unwrap();
3676                 check_added_monitors!(nodes[0], 1);
3677                 assert!(as_commitment_signed.is_none());
3678
3679                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_msg).unwrap().is_none());
3680                 check_added_monitors!(nodes[1], 1);
3681
3682                 // Delever (4)
3683                 let (bs_second_revoke, bs_second_commitment) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_second_update.unwrap().commitment_signed).unwrap();
3684                 check_added_monitors!(nodes[1], 1);
3685
3686                 assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke).unwrap().is_none());
3687                 check_added_monitors!(nodes[0], 1);
3688
3689                 let (as_second_revoke, as_second_commitment) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_commitment.unwrap()).unwrap();
3690                 assert!(as_second_commitment.is_none());
3691                 check_added_monitors!(nodes[0], 1);
3692
3693                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_second_revoke).unwrap().is_none());
3694                 check_added_monitors!(nodes[1], 1);
3695         }
3696
3697         #[test]
3698         fn test_update_fee_vanilla() {
3699                 let nodes = create_network(2);
3700                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3701                 let channel_id = chan.2;
3702
3703                 macro_rules! get_feerate {
3704                         ($node: expr) => {{
3705                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3706                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3707                                 chan.get_feerate()
3708                         }}
3709                 }
3710
3711                 let feerate = get_feerate!(nodes[0]);
3712                 nodes[0].node.update_fee(channel_id, feerate+20).unwrap();
3713
3714                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3715                 assert_eq!(events_0.len(), 1);
3716                 let (update_msg, commitment_signed) = match events_0[0] {
3717                                 MessageSendEvent::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
3718                                 (update_fee.as_ref(), commitment_signed)
3719                         },
3720                         _ => panic!("Unexpected event"),
3721                 };
3722                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3723
3724                 let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
3725                 let commitment_signed = commitment_signed.unwrap();
3726                 check_added_monitors!(nodes[0], 1);
3727                 check_added_monitors!(nodes[1], 1);
3728
3729                 let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
3730                 assert!(resp_option.is_none());
3731                 check_added_monitors!(nodes[0], 1);
3732
3733                 let (revoke_msg, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
3734                 assert!(commitment_signed.is_none());
3735                 check_added_monitors!(nodes[0], 1);
3736
3737                 let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg).unwrap();
3738                 assert!(resp_option.is_none());
3739                 check_added_monitors!(nodes[1], 1);
3740         }
3741
3742         #[test]
3743         fn test_update_fee_with_fundee_update_add_htlc() {
3744                 let mut nodes = create_network(2);
3745                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3746                 let channel_id = chan.2;
3747
3748                 macro_rules! get_feerate {
3749                         ($node: expr) => {{
3750                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3751                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3752                                 chan.get_feerate()
3753                         }}
3754                 }
3755
3756                 // balancing
3757                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
3758
3759                 let feerate = get_feerate!(nodes[0]);
3760                 nodes[0].node.update_fee(channel_id, feerate+20).unwrap();
3761
3762                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3763                 assert_eq!(events_0.len(), 1);
3764                 let (update_msg, commitment_signed) = match events_0[0] {
3765                                 MessageSendEvent::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
3766                                 (update_fee.as_ref(), commitment_signed)
3767                         },
3768                         _ => panic!("Unexpected event"),
3769                 };
3770                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3771                 check_added_monitors!(nodes[0], 1);
3772                 let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
3773                 let commitment_signed = commitment_signed.unwrap();
3774                 check_added_monitors!(nodes[1], 1);
3775
3776                 let route = nodes[1].router.get_route(&nodes[0].node.get_our_node_id(), None, &Vec::new(), 800000, TEST_FINAL_CLTV).unwrap();
3777
3778                 let (our_payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[1]);
3779
3780                 // nothing happens since node[1] is in AwaitingRemoteRevoke
3781                 nodes[1].node.send_payment(route, our_payment_hash).unwrap();
3782                 {
3783                         let mut added_monitors = nodes[0].chan_monitor.added_monitors.lock().unwrap();
3784                         assert_eq!(added_monitors.len(), 0);
3785                         added_monitors.clear();
3786                 }
3787                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
3788                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
3789                 // node[1] has nothing to do
3790
3791                 let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
3792                 assert!(resp_option.is_none());
3793                 check_added_monitors!(nodes[0], 1);
3794
3795                 let (revoke_msg, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
3796                 assert!(commitment_signed.is_none());
3797                 check_added_monitors!(nodes[0], 1);
3798                 let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg).unwrap();
3799                 // AwaitingRemoteRevoke ends here
3800
3801                 let commitment_update = resp_option.unwrap();
3802                 assert_eq!(commitment_update.update_add_htlcs.len(), 1);
3803                 assert_eq!(commitment_update.update_fulfill_htlcs.len(), 0);
3804                 assert_eq!(commitment_update.update_fail_htlcs.len(), 0);
3805                 assert_eq!(commitment_update.update_fail_malformed_htlcs.len(), 0);
3806                 assert_eq!(commitment_update.update_fee.is_none(), true);
3807
3808                 nodes[0].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &commitment_update.update_add_htlcs[0]).unwrap();
3809                 let (revoke, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_update.commitment_signed).unwrap();
3810                 check_added_monitors!(nodes[0], 1);
3811                 check_added_monitors!(nodes[1], 1);
3812                 let commitment_signed = commitment_signed.unwrap();
3813                 let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke).unwrap();
3814                 check_added_monitors!(nodes[1], 1);
3815                 assert!(resp_option.is_none());
3816
3817                 let (revoke, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &commitment_signed).unwrap();
3818                 check_added_monitors!(nodes[1], 1);
3819                 assert!(commitment_signed.is_none());
3820                 let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke).unwrap();
3821                 check_added_monitors!(nodes[0], 1);
3822                 assert!(resp_option.is_none());
3823
3824                 let events = nodes[0].node.get_and_clear_pending_events();
3825                 assert_eq!(events.len(), 1);
3826                 match events[0] {
3827                         Event::PendingHTLCsForwardable { .. } => { },
3828                         _ => panic!("Unexpected event"),
3829                 };
3830                 nodes[0].node.channel_state.lock().unwrap().next_forward = Instant::now();
3831                 nodes[0].node.process_pending_htlc_forwards();
3832
3833                 let events = nodes[0].node.get_and_clear_pending_events();
3834                 assert_eq!(events.len(), 1);
3835                 match events[0] {
3836                         Event::PaymentReceived { .. } => { },
3837                         _ => panic!("Unexpected event"),
3838                 };
3839
3840                 claim_payment(&nodes[1], &vec!(&nodes[0])[..], our_payment_preimage);
3841
3842                 send_payment(&nodes[1], &vec!(&nodes[0])[..], 800000);
3843                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 800000);
3844                 close_channel(&nodes[0], &nodes[1], &chan.2, chan.3, true);
3845         }
3846
3847         #[test]
3848         fn test_update_fee() {
3849                 let nodes = create_network(2);
3850                 let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
3851                 let channel_id = chan.2;
3852
3853                 macro_rules! get_feerate {
3854                         ($node: expr) => {{
3855                                 let chan_lock = $node.node.channel_state.lock().unwrap();
3856                                 let chan = chan_lock.by_id.get(&channel_id).unwrap();
3857                                 chan.get_feerate()
3858                         }}
3859                 }
3860
3861                 // A                                        B
3862                 // (1) update_fee/commitment_signed      ->
3863                 //                                       <- (2) revoke_and_ack
3864                 //                                       .- send (3) commitment_signed
3865                 // (4) update_fee/commitment_signed      ->
3866                 //                                       .- send (5) revoke_and_ack (no CS as we're awaiting a revoke)
3867                 //                                       <- (3) commitment_signed delivered
3868                 // send (6) revoke_and_ack               -.
3869                 //                                       <- (5) deliver revoke_and_ack
3870                 // (6) deliver revoke_and_ack            ->
3871                 //                                       .- send (7) commitment_signed in response to (4)
3872                 //                                       <- (7) deliver commitment_signed
3873                 // revoke_and_ack                        ->
3874
3875                 // Create and deliver (1)...
3876                 let feerate = get_feerate!(nodes[0]);
3877                 nodes[0].node.update_fee(channel_id, feerate+20).unwrap();
3878
3879                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3880                 assert_eq!(events_0.len(), 1);
3881                 let (update_msg, commitment_signed) = match events_0[0] {
3882                                 MessageSendEvent::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
3883                                 (update_fee.as_ref(), commitment_signed)
3884                         },
3885                         _ => panic!("Unexpected event"),
3886                 };
3887                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3888
3889                 // Generate (2) and (3):
3890                 let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
3891                 let commitment_signed_0 = commitment_signed.unwrap();
3892                 check_added_monitors!(nodes[0], 1);
3893                 check_added_monitors!(nodes[1], 1);
3894
3895                 // Deliver (2):
3896                 let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
3897                 assert!(resp_option.is_none());
3898                 check_added_monitors!(nodes[0], 1);
3899
3900                 // Create and deliver (4)...
3901                 nodes[0].node.update_fee(channel_id, feerate+30).unwrap();
3902                 let events_0 = nodes[0].node.get_and_clear_pending_msg_events();
3903                 assert_eq!(events_0.len(), 1);
3904                 let (update_msg, commitment_signed) = match events_0[0] {
3905                                 MessageSendEvent::UpdateHTLCs { node_id:_, updates: msgs::CommitmentUpdate { update_add_htlcs:_, update_fulfill_htlcs:_, update_fail_htlcs:_, update_fail_malformed_htlcs:_, ref update_fee, ref commitment_signed } } => {
3906                                 (update_fee.as_ref(), commitment_signed)
3907                         },
3908                         _ => panic!("Unexpected event"),
3909                 };
3910                 nodes[1].node.handle_update_fee(&nodes[0].node.get_our_node_id(), update_msg.unwrap()).unwrap();
3911
3912                 let (revoke_msg, commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), commitment_signed).unwrap();
3913                 // ... creating (5)
3914                 assert!(commitment_signed.is_none());
3915                 check_added_monitors!(nodes[0], 1);
3916                 check_added_monitors!(nodes[1], 1);
3917
3918                 // Handle (3), creating (6):
3919                 let (revoke_msg_0, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed_0).unwrap();
3920                 assert!(commitment_signed.is_none());
3921                 check_added_monitors!(nodes[0], 1);
3922
3923                 // Deliver (5):
3924                 let resp_option = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &revoke_msg).unwrap();
3925                 assert!(resp_option.is_none());
3926                 check_added_monitors!(nodes[0], 1);
3927
3928                 // Deliver (6), creating (7):
3929                 let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg_0).unwrap();
3930                 let commitment_signed = resp_option.unwrap().commitment_signed;
3931                 check_added_monitors!(nodes[1], 1);
3932
3933                 // Deliver (7)
3934                 let (revoke_msg, commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
3935                 assert!(commitment_signed.is_none());
3936                 check_added_monitors!(nodes[0], 1);
3937                 let resp_option = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &revoke_msg).unwrap();
3938                 assert!(resp_option.is_none());
3939                 check_added_monitors!(nodes[1], 1);
3940
3941                 assert_eq!(get_feerate!(nodes[0]), feerate + 30);
3942                 assert_eq!(get_feerate!(nodes[1]), feerate + 30);
3943                 close_channel(&nodes[0], &nodes[1], &chan.2, chan.3, true);
3944         }
3945
3946         #[test]
3947         fn fake_network_test() {
3948                 // Simple test which builds a network of ChannelManagers, connects them to each other, and
3949                 // tests that payments get routed and transactions broadcast in semi-reasonable ways.
3950                 let nodes = create_network(4);
3951
3952                 // Create some initial channels
3953                 let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
3954                 let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2);
3955                 let chan_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
3956
3957                 // Rebalance the network a bit by relaying one payment through all the channels...
3958                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
3959                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
3960                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
3961                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
3962
3963                 // Send some more payments
3964                 send_payment(&nodes[1], &vec!(&nodes[2], &nodes[3])[..], 1000000);
3965                 send_payment(&nodes[3], &vec!(&nodes[2], &nodes[1], &nodes[0])[..], 1000000);
3966                 send_payment(&nodes[3], &vec!(&nodes[2], &nodes[1])[..], 1000000);
3967
3968                 // Test failure packets
3969                 let payment_hash_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 1000000).1;
3970                 fail_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], payment_hash_1);
3971
3972                 // Add a new channel that skips 3
3973                 let chan_4 = create_announced_chan_between_nodes(&nodes, 1, 3);
3974
3975                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], 1000000);
3976                 send_payment(&nodes[2], &vec!(&nodes[3])[..], 1000000);
3977                 send_payment(&nodes[1], &vec!(&nodes[3])[..], 8000000);
3978                 send_payment(&nodes[1], &vec!(&nodes[3])[..], 8000000);
3979                 send_payment(&nodes[1], &vec!(&nodes[3])[..], 8000000);
3980                 send_payment(&nodes[1], &vec!(&nodes[3])[..], 8000000);
3981                 send_payment(&nodes[1], &vec!(&nodes[3])[..], 8000000);
3982
3983                 // Do some rebalance loop payments, simultaneously
3984                 let mut hops = Vec::with_capacity(3);
3985                 hops.push(RouteHop {
3986                         pubkey: nodes[2].node.get_our_node_id(),
3987                         short_channel_id: chan_2.0.contents.short_channel_id,
3988                         fee_msat: 0,
3989                         cltv_expiry_delta: chan_3.0.contents.cltv_expiry_delta as u32
3990                 });
3991                 hops.push(RouteHop {
3992                         pubkey: nodes[3].node.get_our_node_id(),
3993                         short_channel_id: chan_3.0.contents.short_channel_id,
3994                         fee_msat: 0,
3995                         cltv_expiry_delta: chan_4.1.contents.cltv_expiry_delta as u32
3996                 });
3997                 hops.push(RouteHop {
3998                         pubkey: nodes[1].node.get_our_node_id(),
3999                         short_channel_id: chan_4.0.contents.short_channel_id,
4000                         fee_msat: 1000000,
4001                         cltv_expiry_delta: TEST_FINAL_CLTV,
4002                 });
4003                 hops[1].fee_msat = chan_4.1.contents.fee_base_msat as u64 + chan_4.1.contents.fee_proportional_millionths as u64 * hops[2].fee_msat as u64 / 1000000;
4004                 hops[0].fee_msat = chan_3.0.contents.fee_base_msat as u64 + chan_3.0.contents.fee_proportional_millionths as u64 * hops[1].fee_msat as u64 / 1000000;
4005                 let payment_preimage_1 = send_along_route(&nodes[1], Route { hops }, &vec!(&nodes[2], &nodes[3], &nodes[1])[..], 1000000).0;
4006
4007                 let mut hops = Vec::with_capacity(3);
4008                 hops.push(RouteHop {
4009                         pubkey: nodes[3].node.get_our_node_id(),
4010                         short_channel_id: chan_4.0.contents.short_channel_id,
4011                         fee_msat: 0,
4012                         cltv_expiry_delta: chan_3.1.contents.cltv_expiry_delta as u32
4013                 });
4014                 hops.push(RouteHop {
4015                         pubkey: nodes[2].node.get_our_node_id(),
4016                         short_channel_id: chan_3.0.contents.short_channel_id,
4017                         fee_msat: 0,
4018                         cltv_expiry_delta: chan_2.1.contents.cltv_expiry_delta as u32
4019                 });
4020                 hops.push(RouteHop {
4021                         pubkey: nodes[1].node.get_our_node_id(),
4022                         short_channel_id: chan_2.0.contents.short_channel_id,
4023                         fee_msat: 1000000,
4024                         cltv_expiry_delta: TEST_FINAL_CLTV,
4025                 });
4026                 hops[1].fee_msat = chan_2.1.contents.fee_base_msat as u64 + chan_2.1.contents.fee_proportional_millionths as u64 * hops[2].fee_msat as u64 / 1000000;
4027                 hops[0].fee_msat = chan_3.1.contents.fee_base_msat as u64 + chan_3.1.contents.fee_proportional_millionths as u64 * hops[1].fee_msat as u64 / 1000000;
4028                 let payment_hash_2 = send_along_route(&nodes[1], Route { hops }, &vec!(&nodes[3], &nodes[2], &nodes[1])[..], 1000000).1;
4029
4030                 // Claim the rebalances...
4031                 fail_payment(&nodes[1], &vec!(&nodes[3], &nodes[2], &nodes[1])[..], payment_hash_2);
4032                 claim_payment(&nodes[1], &vec!(&nodes[2], &nodes[3], &nodes[1])[..], payment_preimage_1);
4033
4034                 // Add a duplicate new channel from 2 to 4
4035                 let chan_5 = create_announced_chan_between_nodes(&nodes, 1, 3);
4036
4037                 // Send some payments across both channels
4038                 let payment_preimage_3 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], 3000000).0;
4039                 let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], 3000000).0;
4040                 let payment_preimage_5 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], 3000000).0;
4041
4042                 route_over_limit(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], 3000000);
4043
4044                 //TODO: Test that routes work again here as we've been notified that the channel is full
4045
4046                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], payment_preimage_3);
4047                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], payment_preimage_4);
4048                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[3])[..], payment_preimage_5);
4049
4050                 // Close down the channels...
4051                 close_channel(&nodes[0], &nodes[1], &chan_1.2, chan_1.3, true);
4052                 close_channel(&nodes[1], &nodes[2], &chan_2.2, chan_2.3, false);
4053                 close_channel(&nodes[2], &nodes[3], &chan_3.2, chan_3.3, true);
4054                 close_channel(&nodes[1], &nodes[3], &chan_4.2, chan_4.3, false);
4055                 close_channel(&nodes[1], &nodes[3], &chan_5.2, chan_5.3, false);
4056         }
4057
4058         #[test]
4059         fn duplicate_htlc_test() {
4060                 // Test that we accept duplicate payment_hash HTLCs across the network and that
4061                 // claiming/failing them are all separate and don't effect each other
4062                 let mut nodes = create_network(6);
4063
4064                 // Create some initial channels to route via 3 to 4/5 from 0/1/2
4065                 create_announced_chan_between_nodes(&nodes, 0, 3);
4066                 create_announced_chan_between_nodes(&nodes, 1, 3);
4067                 create_announced_chan_between_nodes(&nodes, 2, 3);
4068                 create_announced_chan_between_nodes(&nodes, 3, 4);
4069                 create_announced_chan_between_nodes(&nodes, 3, 5);
4070
4071                 let (payment_preimage, payment_hash) = route_payment(&nodes[0], &vec!(&nodes[3], &nodes[4])[..], 1000000);
4072
4073                 *nodes[0].network_payment_count.borrow_mut() -= 1;
4074                 assert_eq!(route_payment(&nodes[1], &vec!(&nodes[3])[..], 1000000).0, payment_preimage);
4075
4076                 *nodes[0].network_payment_count.borrow_mut() -= 1;
4077                 assert_eq!(route_payment(&nodes[2], &vec!(&nodes[3], &nodes[5])[..], 1000000).0, payment_preimage);
4078
4079                 claim_payment(&nodes[0], &vec!(&nodes[3], &nodes[4])[..], payment_preimage);
4080                 fail_payment(&nodes[2], &vec!(&nodes[3], &nodes[5])[..], payment_hash);
4081                 claim_payment(&nodes[1], &vec!(&nodes[3])[..], payment_preimage);
4082         }
4083
4084         #[derive(PartialEq)]
4085         enum HTLCType { NONE, TIMEOUT, SUCCESS }
4086         /// Tests that the given node has broadcast transactions for the given Channel
4087         ///
4088         /// First checks that the latest local commitment tx has been broadcast, unless an explicit
4089         /// commitment_tx is provided, which may be used to test that a remote commitment tx was
4090         /// broadcast and the revoked outputs were claimed.
4091         ///
4092         /// Next tests that there is (or is not) a transaction that spends the commitment transaction
4093         /// that appears to be the type of HTLC transaction specified in has_htlc_tx.
4094         ///
4095         /// All broadcast transactions must be accounted for in one of the above three types of we'll
4096         /// also fail.
4097         fn test_txn_broadcast(node: &Node, chan: &(msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction), commitment_tx: Option<Transaction>, has_htlc_tx: HTLCType) -> Vec<Transaction> {
4098                 let mut node_txn = node.tx_broadcaster.txn_broadcasted.lock().unwrap();
4099                 assert!(node_txn.len() >= if commitment_tx.is_some() { 0 } else { 1 } + if has_htlc_tx == HTLCType::NONE { 0 } else { 1 });
4100
4101                 let mut res = Vec::with_capacity(2);
4102                 node_txn.retain(|tx| {
4103                         if tx.input.len() == 1 && tx.input[0].previous_output.txid == chan.3.txid() {
4104                                 check_spends!(tx, chan.3.clone());
4105                                 if commitment_tx.is_none() {
4106                                         res.push(tx.clone());
4107                                 }
4108                                 false
4109                         } else { true }
4110                 });
4111                 if let Some(explicit_tx) = commitment_tx {
4112                         res.push(explicit_tx.clone());
4113                 }
4114
4115                 assert_eq!(res.len(), 1);
4116
4117                 if has_htlc_tx != HTLCType::NONE {
4118                         node_txn.retain(|tx| {
4119                                 if tx.input.len() == 1 && tx.input[0].previous_output.txid == res[0].txid() {
4120                                         check_spends!(tx, res[0].clone());
4121                                         if has_htlc_tx == HTLCType::TIMEOUT {
4122                                                 assert!(tx.lock_time != 0);
4123                                         } else {
4124                                                 assert!(tx.lock_time == 0);
4125                                         }
4126                                         res.push(tx.clone());
4127                                         false
4128                                 } else { true }
4129                         });
4130                         assert_eq!(res.len(), 2);
4131                 }
4132
4133                 assert!(node_txn.is_empty());
4134                 res
4135         }
4136
4137         /// Tests that the given node has broadcast a claim transaction against the provided revoked
4138         /// HTLC transaction.
4139         fn test_revoked_htlc_claim_txn_broadcast(node: &Node, revoked_tx: Transaction) {
4140                 let mut node_txn = node.tx_broadcaster.txn_broadcasted.lock().unwrap();
4141                 assert_eq!(node_txn.len(), 1);
4142                 node_txn.retain(|tx| {
4143                         if tx.input.len() == 1 && tx.input[0].previous_output.txid == revoked_tx.txid() {
4144                                 check_spends!(tx, revoked_tx.clone());
4145                                 false
4146                         } else { true }
4147                 });
4148                 assert!(node_txn.is_empty());
4149         }
4150
4151         fn check_preimage_claim(node: &Node, prev_txn: &Vec<Transaction>) -> Vec<Transaction> {
4152                 let mut node_txn = node.tx_broadcaster.txn_broadcasted.lock().unwrap();
4153
4154                 assert!(node_txn.len() >= 1);
4155                 assert_eq!(node_txn[0].input.len(), 1);
4156                 let mut found_prev = false;
4157
4158                 for tx in prev_txn {
4159                         if node_txn[0].input[0].previous_output.txid == tx.txid() {
4160                                 check_spends!(node_txn[0], tx.clone());
4161                                 assert!(node_txn[0].input[0].witness[2].len() > 106); // must spend an htlc output
4162                                 assert_eq!(tx.input.len(), 1); // must spend a commitment tx
4163
4164                                 found_prev = true;
4165                                 break;
4166                         }
4167                 }
4168                 assert!(found_prev);
4169
4170                 let mut res = Vec::new();
4171                 mem::swap(&mut *node_txn, &mut res);
4172                 res
4173         }
4174
4175         fn get_announce_close_broadcast_events(nodes: &Vec<Node>, a: usize, b: usize) {
4176                 let events_1 = nodes[a].node.get_and_clear_pending_msg_events();
4177                 assert_eq!(events_1.len(), 1);
4178                 let as_update = match events_1[0] {
4179                         MessageSendEvent::BroadcastChannelUpdate { ref msg } => {
4180                                 msg.clone()
4181                         },
4182                         _ => panic!("Unexpected event"),
4183                 };
4184
4185                 let events_2 = nodes[b].node.get_and_clear_pending_msg_events();
4186                 assert_eq!(events_2.len(), 1);
4187                 let bs_update = match events_2[0] {
4188                         MessageSendEvent::BroadcastChannelUpdate { ref msg } => {
4189                                 msg.clone()
4190                         },
4191                         _ => panic!("Unexpected event"),
4192                 };
4193
4194                 for node in nodes {
4195                         node.router.handle_channel_update(&as_update).unwrap();
4196                         node.router.handle_channel_update(&bs_update).unwrap();
4197                 }
4198         }
4199
4200         macro_rules! expect_pending_htlcs_forwardable {
4201                 ($node: expr) => {{
4202                         let events = $node.node.get_and_clear_pending_events();
4203                         assert_eq!(events.len(), 1);
4204                         match events[0] {
4205                                 Event::PendingHTLCsForwardable { .. } => { },
4206                                 _ => panic!("Unexpected event"),
4207                         };
4208                         $node.node.channel_state.lock().unwrap().next_forward = Instant::now();
4209                         $node.node.process_pending_htlc_forwards();
4210                 }}
4211         }
4212
4213         #[test]
4214         fn channel_reserve_test() {
4215                 use util::rng;
4216                 use std::sync::atomic::Ordering;
4217                 use ln::msgs::HandleError;
4218
4219                 macro_rules! get_channel_value_stat {
4220                         ($node: expr, $channel_id: expr) => {{
4221                                 let chan_lock = $node.node.channel_state.lock().unwrap();
4222                                 let chan = chan_lock.by_id.get(&$channel_id).unwrap();
4223                                 chan.get_value_stat()
4224                         }}
4225                 }
4226
4227                 let mut nodes = create_network(3);
4228                 let chan_1 = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1900, 1001);
4229                 let chan_2 = create_announced_chan_between_nodes_with_value(&nodes, 1, 2, 1900, 1001);
4230
4231                 let mut stat01 = get_channel_value_stat!(nodes[0], chan_1.2);
4232                 let mut stat11 = get_channel_value_stat!(nodes[1], chan_1.2);
4233
4234                 let mut stat12 = get_channel_value_stat!(nodes[1], chan_2.2);
4235                 let mut stat22 = get_channel_value_stat!(nodes[2], chan_2.2);
4236
4237                 macro_rules! get_route_and_payment_hash {
4238                         ($recv_value: expr) => {{
4239                                 let route = nodes[0].router.get_route(&nodes.last().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV).unwrap();
4240                                 let (payment_preimage, payment_hash) = get_payment_preimage_hash!(nodes[0]);
4241                                 (route, payment_hash, payment_preimage)
4242                         }}
4243                 };
4244
4245                 macro_rules! expect_forward {
4246                         ($node: expr) => {{
4247                                 let mut events = $node.node.get_and_clear_pending_msg_events();
4248                                 assert_eq!(events.len(), 1);
4249                                 check_added_monitors!($node, 1);
4250                                 let payment_event = SendEvent::from_event(events.remove(0));
4251                                 payment_event
4252                         }}
4253                 }
4254
4255                 macro_rules! expect_payment_received {
4256                         ($node: expr, $expected_payment_hash: expr, $expected_recv_value: expr) => {
4257                                 let events = $node.node.get_and_clear_pending_events();
4258                                 assert_eq!(events.len(), 1);
4259                                 match events[0] {
4260                                         Event::PaymentReceived { ref payment_hash, amt } => {
4261                                                 assert_eq!($expected_payment_hash, *payment_hash);
4262                                                 assert_eq!($expected_recv_value, amt);
4263                                         },
4264                                         _ => panic!("Unexpected event"),
4265                                 }
4266                         }
4267                 };
4268
4269                 let feemsat = 239; // somehow we know?
4270                 let total_fee_msat = (nodes.len() - 2) as u64 * 239;
4271
4272                 let recv_value_0 = stat01.their_max_htlc_value_in_flight_msat - total_fee_msat;
4273
4274                 // attempt to send amt_msat > their_max_htlc_value_in_flight_msat
4275                 {
4276                         let (route, our_payment_hash, _) = get_route_and_payment_hash!(recv_value_0 + 1);
4277                         assert!(route.hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
4278                         let err = nodes[0].node.send_payment(route, our_payment_hash).err().unwrap();
4279                         match err {
4280                                 APIError::ChannelUnavailable{err} => assert_eq!(err, "Cannot send value that would put us over our max HTLC value in flight"),
4281                                 _ => panic!("Unknown error variants"),
4282                         }
4283                 }
4284
4285                 let mut htlc_id = 0;
4286                 // channel reserve is bigger than their_max_htlc_value_in_flight_msat so loop to deplete
4287                 // nodes[0]'s wealth
4288                 loop {
4289                         let amt_msat = recv_value_0 + total_fee_msat;
4290                         if stat01.value_to_self_msat - amt_msat < stat01.channel_reserve_msat {
4291                                 break;
4292                         }
4293                         send_payment(&nodes[0], &vec![&nodes[1], &nodes[2]][..], recv_value_0);
4294                         htlc_id += 1;
4295
4296                         let (stat01_, stat11_, stat12_, stat22_) = (
4297                                 get_channel_value_stat!(nodes[0], chan_1.2),
4298                                 get_channel_value_stat!(nodes[1], chan_1.2),
4299                                 get_channel_value_stat!(nodes[1], chan_2.2),
4300                                 get_channel_value_stat!(nodes[2], chan_2.2),
4301                         );
4302
4303                         assert_eq!(stat01_.value_to_self_msat, stat01.value_to_self_msat - amt_msat);
4304                         assert_eq!(stat11_.value_to_self_msat, stat11.value_to_self_msat + amt_msat);
4305                         assert_eq!(stat12_.value_to_self_msat, stat12.value_to_self_msat - (amt_msat - feemsat));
4306                         assert_eq!(stat22_.value_to_self_msat, stat22.value_to_self_msat + (amt_msat - feemsat));
4307                         stat01 = stat01_; stat11 = stat11_; stat12 = stat12_; stat22 = stat22_;
4308                 }
4309
4310                 {
4311                         let recv_value = stat01.value_to_self_msat - stat01.channel_reserve_msat - total_fee_msat;
4312                         // attempt to get channel_reserve violation
4313                         let (route, our_payment_hash, _) = get_route_and_payment_hash!(recv_value + 1);
4314                         let err = nodes[0].node.send_payment(route.clone(), our_payment_hash).err().unwrap();
4315                         match err {
4316                                 APIError::ChannelUnavailable{err} => assert_eq!(err, "Cannot send value that would put us over our reserve value"),
4317                                 _ => panic!("Unknown error variants"),
4318                         }
4319                 }
4320
4321                 // adding pending output
4322                 let recv_value_1 = (stat01.value_to_self_msat - stat01.channel_reserve_msat - total_fee_msat)/2;
4323                 let amt_msat_1 = recv_value_1 + total_fee_msat;
4324
4325                 let (route_1, our_payment_hash_1, our_payment_preimage_1) = get_route_and_payment_hash!(recv_value_1);
4326                 let payment_event_1 = {
4327                         nodes[0].node.send_payment(route_1, our_payment_hash_1).unwrap();
4328                         check_added_monitors!(nodes[0], 1);
4329
4330                         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
4331                         assert_eq!(events.len(), 1);
4332                         SendEvent::from_event(events.remove(0))
4333                 };
4334                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event_1.msgs[0]).unwrap();
4335
4336                 // channel reserve test with htlc pending output > 0
4337                 let recv_value_2 = stat01.value_to_self_msat - amt_msat_1 - stat01.channel_reserve_msat - total_fee_msat;
4338                 {
4339                         let (route, our_payment_hash, _) = get_route_and_payment_hash!(recv_value_2 + 1);
4340                         match nodes[0].node.send_payment(route, our_payment_hash).err().unwrap() {
4341                                 APIError::ChannelUnavailable{err} => assert_eq!(err, "Cannot send value that would put us over our reserve value"),
4342                                 _ => panic!("Unknown error variants"),
4343                         }
4344                 }
4345
4346                 {
4347                         // test channel_reserve test on nodes[1] side
4348                         let (route, our_payment_hash, _) = get_route_and_payment_hash!(recv_value_2 + 1);
4349
4350                         // Need to manually create update_add_htlc message to go around the channel reserve check in send_htlc()
4351                         let secp_ctx = Secp256k1::new();
4352                         let session_priv = SecretKey::from_slice(&secp_ctx, &{
4353                                 let mut session_key = [0; 32];
4354                                 rng::fill_bytes(&mut session_key);
4355                                 session_key
4356                         }).expect("RNG is bad!");
4357
4358                         let cur_height = nodes[0].node.latest_block_height.load(Ordering::Acquire) as u32 + 1;
4359                         let onion_keys = ChannelManager::construct_onion_keys(&secp_ctx, &route, &session_priv).unwrap();
4360                         let (onion_payloads, htlc_msat, htlc_cltv) = ChannelManager::build_onion_payloads(&route, cur_height).unwrap();
4361                         let onion_packet = ChannelManager::construct_onion_packet(onion_payloads, onion_keys, &our_payment_hash);
4362                         let msg = msgs::UpdateAddHTLC {
4363                                 channel_id: chan_1.2,
4364                                 htlc_id,
4365                                 amount_msat: htlc_msat,
4366                                 payment_hash: our_payment_hash,
4367                                 cltv_expiry: htlc_cltv,
4368                                 onion_routing_packet: onion_packet,
4369                         };
4370
4371                         let err = nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &msg).err().unwrap();
4372                         match err {
4373                                 HandleError{err, .. } => assert_eq!(err, "Remote HTLC add would put them over their reserve value"),
4374                         }
4375                 }
4376
4377                 // split the rest to test holding cell
4378                 let recv_value_21 = recv_value_2/2;
4379                 let recv_value_22 = recv_value_2 - recv_value_21 - total_fee_msat;
4380                 {
4381                         let stat = get_channel_value_stat!(nodes[0], chan_1.2);
4382                         assert_eq!(stat.value_to_self_msat - (stat.pending_outbound_htlcs_amount_msat + recv_value_21 + recv_value_22 + total_fee_msat + total_fee_msat), stat.channel_reserve_msat);
4383                 }
4384
4385                 // now see if they go through on both sides
4386                 let (route_21, our_payment_hash_21, our_payment_preimage_21) = get_route_and_payment_hash!(recv_value_21);
4387                 // but this will stuck in the holding cell
4388                 nodes[0].node.send_payment(route_21, our_payment_hash_21).unwrap();
4389                 check_added_monitors!(nodes[0], 0);
4390                 let events = nodes[0].node.get_and_clear_pending_events();
4391                 assert_eq!(events.len(), 0);
4392
4393                 // test with outbound holding cell amount > 0
4394                 {
4395                         let (route, our_payment_hash, _) = get_route_and_payment_hash!(recv_value_22+1);
4396                         match nodes[0].node.send_payment(route, our_payment_hash).err().unwrap() {
4397                                 APIError::ChannelUnavailable{err} => assert_eq!(err, "Cannot send value that would put us over our reserve value"),
4398                                 _ => panic!("Unknown error variants"),
4399                         }
4400                 }
4401
4402                 let (route_22, our_payment_hash_22, our_payment_preimage_22) = get_route_and_payment_hash!(recv_value_22);
4403                 // this will also stuck in the holding cell
4404                 nodes[0].node.send_payment(route_22, our_payment_hash_22).unwrap();
4405                 check_added_monitors!(nodes[0], 0);
4406                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
4407                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
4408
4409                 // flush the pending htlc
4410                 let (as_revoke_and_ack, as_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event_1.commitment_msg).unwrap();
4411                 check_added_monitors!(nodes[1], 1);
4412
4413                 let commitment_update_2 = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &as_revoke_and_ack).unwrap().unwrap();
4414                 check_added_monitors!(nodes[0], 1);
4415                 let (bs_revoke_and_ack, bs_none) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &as_commitment_signed.unwrap()).unwrap();
4416                 assert!(bs_none.is_none());
4417                 check_added_monitors!(nodes[0], 1);
4418                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &bs_revoke_and_ack).unwrap().is_none());
4419                 check_added_monitors!(nodes[1], 1);
4420
4421                 expect_pending_htlcs_forwardable!(nodes[1]);
4422
4423                 let ref payment_event_11 = expect_forward!(nodes[1]);
4424                 nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event_11.msgs[0]).unwrap();
4425                 commitment_signed_dance!(nodes[2], nodes[1], payment_event_11.commitment_msg, false);
4426
4427                 expect_pending_htlcs_forwardable!(nodes[2]);
4428                 expect_payment_received!(nodes[2], our_payment_hash_1, recv_value_1);
4429
4430                 // flush the htlcs in the holding cell
4431                 assert_eq!(commitment_update_2.update_add_htlcs.len(), 2);
4432                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &commitment_update_2.update_add_htlcs[0]).unwrap();
4433                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &commitment_update_2.update_add_htlcs[1]).unwrap();
4434                 commitment_signed_dance!(nodes[1], nodes[0], &commitment_update_2.commitment_signed, false);
4435                 expect_pending_htlcs_forwardable!(nodes[1]);
4436
4437                 let ref payment_event_3 = expect_forward!(nodes[1]);
4438                 assert_eq!(payment_event_3.msgs.len(), 2);
4439                 nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event_3.msgs[0]).unwrap();
4440                 nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event_3.msgs[1]).unwrap();
4441
4442                 commitment_signed_dance!(nodes[2], nodes[1], &payment_event_3.commitment_msg, false);
4443                 expect_pending_htlcs_forwardable!(nodes[2]);
4444
4445                 let events = nodes[2].node.get_and_clear_pending_events();
4446                 assert_eq!(events.len(), 2);
4447                 match events[0] {
4448                         Event::PaymentReceived { ref payment_hash, amt } => {
4449                                 assert_eq!(our_payment_hash_21, *payment_hash);
4450                                 assert_eq!(recv_value_21, amt);
4451                         },
4452                         _ => panic!("Unexpected event"),
4453                 }
4454                 match events[1] {
4455                         Event::PaymentReceived { ref payment_hash, amt } => {
4456                                 assert_eq!(our_payment_hash_22, *payment_hash);
4457                                 assert_eq!(recv_value_22, amt);
4458                         },
4459                         _ => panic!("Unexpected event"),
4460                 }
4461
4462                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), our_payment_preimage_1);
4463                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), our_payment_preimage_21);
4464                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), our_payment_preimage_22);
4465
4466                 let expected_value_to_self = stat01.value_to_self_msat - (recv_value_1 + total_fee_msat) - (recv_value_21 + total_fee_msat) - (recv_value_22 + total_fee_msat);
4467                 let stat0 = get_channel_value_stat!(nodes[0], chan_1.2);
4468                 assert_eq!(stat0.value_to_self_msat, expected_value_to_self);
4469                 assert_eq!(stat0.value_to_self_msat, stat0.channel_reserve_msat);
4470
4471                 let stat2 = get_channel_value_stat!(nodes[2], chan_2.2);
4472                 assert_eq!(stat2.value_to_self_msat, stat22.value_to_self_msat + recv_value_1 + recv_value_21 + recv_value_22);
4473         }
4474
4475         #[test]
4476         fn channel_monitor_network_test() {
4477                 // Simple test which builds a network of ChannelManagers, connects them to each other, and
4478                 // tests that ChannelMonitor is able to recover from various states.
4479                 let nodes = create_network(5);
4480
4481                 // Create some initial channels
4482                 let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
4483                 let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2);
4484                 let chan_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
4485                 let chan_4 = create_announced_chan_between_nodes(&nodes, 3, 4);
4486
4487                 // Rebalance the network a bit by relaying one payment through all the channels...
4488                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3], &nodes[4])[..], 8000000);
4489                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3], &nodes[4])[..], 8000000);
4490                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3], &nodes[4])[..], 8000000);
4491                 send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3], &nodes[4])[..], 8000000);
4492
4493                 // Simple case with no pending HTLCs:
4494                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), true);
4495                 {
4496                         let mut node_txn = test_txn_broadcast(&nodes[1], &chan_1, None, HTLCType::NONE);
4497                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4498                         nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn.drain(..).next().unwrap()] }, 1);
4499                         test_txn_broadcast(&nodes[0], &chan_1, None, HTLCType::NONE);
4500                 }
4501                 get_announce_close_broadcast_events(&nodes, 0, 1);
4502                 assert_eq!(nodes[0].node.list_channels().len(), 0);
4503                 assert_eq!(nodes[1].node.list_channels().len(), 1);
4504
4505                 // One pending HTLC is discarded by the force-close:
4506                 let payment_preimage_1 = route_payment(&nodes[1], &vec!(&nodes[2], &nodes[3])[..], 3000000).0;
4507
4508                 // Simple case of one pending HTLC to HTLC-Timeout
4509                 nodes[1].node.peer_disconnected(&nodes[2].node.get_our_node_id(), true);
4510                 {
4511                         let mut node_txn = test_txn_broadcast(&nodes[1], &chan_2, None, HTLCType::TIMEOUT);
4512                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4513                         nodes[2].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn.drain(..).next().unwrap()] }, 1);
4514                         test_txn_broadcast(&nodes[2], &chan_2, None, HTLCType::NONE);
4515                 }
4516                 get_announce_close_broadcast_events(&nodes, 1, 2);
4517                 assert_eq!(nodes[1].node.list_channels().len(), 0);
4518                 assert_eq!(nodes[2].node.list_channels().len(), 1);
4519
4520                 macro_rules! claim_funds {
4521                         ($node: expr, $prev_node: expr, $preimage: expr) => {
4522                                 {
4523                                         assert!($node.node.claim_funds($preimage));
4524                                         check_added_monitors!($node, 1);
4525
4526                                         let events = $node.node.get_and_clear_pending_msg_events();
4527                                         assert_eq!(events.len(), 1);
4528                                         match events[0] {
4529                                                 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, .. } } => {
4530                                                         assert!(update_add_htlcs.is_empty());
4531                                                         assert!(update_fail_htlcs.is_empty());
4532                                                         assert_eq!(*node_id, $prev_node.node.get_our_node_id());
4533                                                 },
4534                                                 _ => panic!("Unexpected event"),
4535                                         };
4536                                 }
4537                         }
4538                 }
4539
4540                 // nodes[3] gets the preimage, but nodes[2] already disconnected, resulting in a nodes[2]
4541                 // HTLC-Timeout and a nodes[3] claim against it (+ its own announces)
4542                 nodes[2].node.peer_disconnected(&nodes[3].node.get_our_node_id(), true);
4543                 {
4544                         let node_txn = test_txn_broadcast(&nodes[2], &chan_3, None, HTLCType::TIMEOUT);
4545
4546                         // Claim the payment on nodes[3], giving it knowledge of the preimage
4547                         claim_funds!(nodes[3], nodes[2], payment_preimage_1);
4548
4549                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4550                         nodes[3].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn[0].clone()] }, 1);
4551
4552                         check_preimage_claim(&nodes[3], &node_txn);
4553                 }
4554                 get_announce_close_broadcast_events(&nodes, 2, 3);
4555                 assert_eq!(nodes[2].node.list_channels().len(), 0);
4556                 assert_eq!(nodes[3].node.list_channels().len(), 1);
4557
4558                 { // Cheat and reset nodes[4]'s height to 1
4559                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4560                         nodes[4].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![] }, 1);
4561                 }
4562
4563                 assert_eq!(nodes[3].node.latest_block_height.load(Ordering::Acquire), 1);
4564                 assert_eq!(nodes[4].node.latest_block_height.load(Ordering::Acquire), 1);
4565                 // One pending HTLC to time out:
4566                 let payment_preimage_2 = route_payment(&nodes[3], &vec!(&nodes[4])[..], 3000000).0;
4567                 // CLTV expires at TEST_FINAL_CLTV + 1 (current height) + 1 (added in send_payment for
4568                 // buffer space).
4569
4570                 {
4571                         let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4572                         nodes[3].chain_monitor.block_connected_checked(&header, 2, &Vec::new()[..], &[0; 0]);
4573                         for i in 3..TEST_FINAL_CLTV + 2 + HTLC_FAIL_TIMEOUT_BLOCKS + 1 {
4574                                 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4575                                 nodes[3].chain_monitor.block_connected_checked(&header, i, &Vec::new()[..], &[0; 0]);
4576                         }
4577
4578                         let node_txn = test_txn_broadcast(&nodes[3], &chan_4, None, HTLCType::TIMEOUT);
4579
4580                         // Claim the payment on nodes[4], giving it knowledge of the preimage
4581                         claim_funds!(nodes[4], nodes[3], payment_preimage_2);
4582
4583                         header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4584                         nodes[4].chain_monitor.block_connected_checked(&header, 2, &Vec::new()[..], &[0; 0]);
4585                         for i in 3..TEST_FINAL_CLTV + 2 - CLTV_CLAIM_BUFFER + 1 {
4586                                 header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4587                                 nodes[4].chain_monitor.block_connected_checked(&header, i, &Vec::new()[..], &[0; 0]);
4588                         }
4589
4590                         test_txn_broadcast(&nodes[4], &chan_4, None, HTLCType::SUCCESS);
4591
4592                         header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4593                         nodes[4].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn[0].clone()] }, TEST_FINAL_CLTV - 5);
4594
4595                         check_preimage_claim(&nodes[4], &node_txn);
4596                 }
4597                 get_announce_close_broadcast_events(&nodes, 3, 4);
4598                 assert_eq!(nodes[3].node.list_channels().len(), 0);
4599                 assert_eq!(nodes[4].node.list_channels().len(), 0);
4600
4601                 // Create some new channels:
4602                 let chan_5 = create_announced_chan_between_nodes(&nodes, 0, 1);
4603
4604                 // A pending HTLC which will be revoked:
4605                 let payment_preimage_3 = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
4606                 // Get the will-be-revoked local txn from nodes[0]
4607                 let revoked_local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.iter().next().unwrap().1.last_local_commitment_txn.clone();
4608                 assert_eq!(revoked_local_txn.len(), 2); // First commitment tx, then HTLC tx
4609                 assert_eq!(revoked_local_txn[0].input.len(), 1);
4610                 assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, chan_5.3.txid());
4611                 assert_eq!(revoked_local_txn[0].output.len(), 2); // Only HTLC and output back to 0 are present
4612                 assert_eq!(revoked_local_txn[1].input.len(), 1);
4613                 assert_eq!(revoked_local_txn[1].input[0].previous_output.txid, revoked_local_txn[0].txid());
4614                 assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), 133); // HTLC-Timeout
4615                 // Revoke the old state
4616                 claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_3);
4617
4618                 {
4619                         let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4620                         nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4621                         {
4622                                 let mut node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
4623                                 assert_eq!(node_txn.len(), 3);
4624                                 assert_eq!(node_txn.pop().unwrap(), node_txn[0]); // An outpoint registration will result in a 2nd block_connected
4625                                 assert_eq!(node_txn[0].input.len(), 2); // We should claim the revoked output and the HTLC output
4626
4627                                 check_spends!(node_txn[0], revoked_local_txn[0].clone());
4628                                 node_txn.swap_remove(0);
4629                         }
4630                         test_txn_broadcast(&nodes[1], &chan_5, None, HTLCType::NONE);
4631
4632                         nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4633                         let node_txn = test_txn_broadcast(&nodes[0], &chan_5, Some(revoked_local_txn[0].clone()), HTLCType::TIMEOUT);
4634                         header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4635                         nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn[1].clone()] }, 1);
4636                         test_revoked_htlc_claim_txn_broadcast(&nodes[1], node_txn[1].clone());
4637                 }
4638                 get_announce_close_broadcast_events(&nodes, 0, 1);
4639                 assert_eq!(nodes[0].node.list_channels().len(), 0);
4640                 assert_eq!(nodes[1].node.list_channels().len(), 0);
4641         }
4642
4643         #[test]
4644         fn revoked_output_claim() {
4645                 // Simple test to ensure a node will claim a revoked output when a stale remote commitment
4646                 // transaction is broadcast by its counterparty
4647                 let nodes = create_network(2);
4648                 let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
4649                 // node[0] is gonna to revoke an old state thus node[1] should be able to claim the revoked output
4650                 let revoked_local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.get(&chan_1.2).unwrap().last_local_commitment_txn.clone();
4651                 assert_eq!(revoked_local_txn.len(), 1);
4652                 // Only output is the full channel value back to nodes[0]:
4653                 assert_eq!(revoked_local_txn[0].output.len(), 1);
4654                 // Send a payment through, updating everyone's latest commitment txn
4655                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 5000000);
4656
4657                 // Inform nodes[1] that nodes[0] broadcast a stale tx
4658                 let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4659                 nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4660                 let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
4661                 assert_eq!(node_txn.len(), 3); // nodes[1] will broadcast justice tx twice, and its own local state once
4662
4663                 assert_eq!(node_txn[0], node_txn[2]);
4664
4665                 check_spends!(node_txn[0], revoked_local_txn[0].clone());
4666                 check_spends!(node_txn[1], chan_1.3.clone());
4667
4668                 // Inform nodes[0] that a watchtower cheated on its behalf, so it will force-close the chan
4669                 nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4670                 get_announce_close_broadcast_events(&nodes, 0, 1);
4671         }
4672
4673         #[test]
4674         fn claim_htlc_outputs_shared_tx() {
4675                 // Node revoked old state, htlcs haven't time out yet, claim them in shared justice tx
4676                 let nodes = create_network(2);
4677
4678                 // Create some new channel:
4679                 let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
4680
4681                 // Rebalance the network to generate htlc in the two directions
4682                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
4683                 // node[0] is gonna to revoke an old state thus node[1] should be able to claim both offered/received HTLC outputs on top of commitment tx
4684                 let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
4685                 let _payment_preimage_2 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3000000).0;
4686
4687                 // Get the will-be-revoked local txn from node[0]
4688                 let revoked_local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.get(&chan_1.2).unwrap().last_local_commitment_txn.clone();
4689                 assert_eq!(revoked_local_txn.len(), 2); // commitment tx + 1 HTLC-Timeout tx
4690                 assert_eq!(revoked_local_txn[0].input.len(), 1);
4691                 assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, chan_1.3.txid());
4692                 assert_eq!(revoked_local_txn[1].input.len(), 1);
4693                 assert_eq!(revoked_local_txn[1].input[0].previous_output.txid, revoked_local_txn[0].txid());
4694                 assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), 133); // HTLC-Timeout
4695                 check_spends!(revoked_local_txn[1], revoked_local_txn[0].clone());
4696
4697                 //Revoke the old state
4698                 claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_1);
4699
4700                 {
4701                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4702
4703                         nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4704
4705                         nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
4706                         let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
4707                         assert_eq!(node_txn.len(), 4);
4708
4709                         assert_eq!(node_txn[0].input.len(), 3); // Claim the revoked output + both revoked HTLC outputs
4710                         check_spends!(node_txn[0], revoked_local_txn[0].clone());
4711
4712                         assert_eq!(node_txn[0], node_txn[3]); // justice tx is duplicated due to block re-scanning
4713
4714                         let mut witness_lens = BTreeSet::new();
4715                         witness_lens.insert(node_txn[0].input[0].witness.last().unwrap().len());
4716                         witness_lens.insert(node_txn[0].input[1].witness.last().unwrap().len());
4717                         witness_lens.insert(node_txn[0].input[2].witness.last().unwrap().len());
4718                         assert_eq!(witness_lens.len(), 3);
4719                         assert_eq!(*witness_lens.iter().skip(0).next().unwrap(), 77); // revoked to_local
4720                         assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), 133); // revoked offered HTLC
4721                         assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), 138); // revoked received HTLC
4722
4723                         // Next nodes[1] broadcasts its current local tx state:
4724                         assert_eq!(node_txn[1].input.len(), 1);
4725                         assert_eq!(node_txn[1].input[0].previous_output.txid, chan_1.3.txid()); //Spending funding tx unique txouput, tx broadcasted by ChannelManager
4726
4727                         assert_eq!(node_txn[2].input.len(), 1);
4728                         let witness_script = node_txn[2].clone().input[0].witness.pop().unwrap();
4729                         assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
4730                         assert_eq!(node_txn[2].input[0].previous_output.txid, node_txn[1].txid());
4731                         assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
4732                         assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[1].previous_output.txid);
4733                 }
4734                 get_announce_close_broadcast_events(&nodes, 0, 1);
4735                 assert_eq!(nodes[0].node.list_channels().len(), 0);
4736                 assert_eq!(nodes[1].node.list_channels().len(), 0);
4737         }
4738
4739         #[test]
4740         fn claim_htlc_outputs_single_tx() {
4741                 // Node revoked old state, htlcs have timed out, claim each of them in separated justice tx
4742                 let nodes = create_network(2);
4743
4744                 let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
4745
4746                 // Rebalance the network to generate htlc in the two directions
4747                 send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
4748                 // node[0] is gonna to revoke an old state thus node[1] should be able to claim both offered/received HTLC outputs on top of commitment tx, but this
4749                 // time as two different claim transactions as we're gonna to timeout htlc with given a high current height
4750                 let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
4751                 let _payment_preimage_2 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3000000).0;
4752
4753                 // Get the will-be-revoked local txn from node[0]
4754                 let revoked_local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.get(&chan_1.2).unwrap().last_local_commitment_txn.clone();
4755
4756                 //Revoke the old state
4757                 claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_1);
4758
4759                 {
4760                         let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4761
4762                         nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 200);
4763
4764                         nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 200);
4765                         let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
4766                         assert_eq!(node_txn.len(), 12); // ChannelManager : 2, ChannelMontitor: 8 (1 standard revoked output, 2 revocation htlc tx, 1 local commitment tx + 1 htlc timeout tx) * 2 (block-rescan)
4767
4768                         assert_eq!(node_txn[0], node_txn[7]);
4769                         assert_eq!(node_txn[1], node_txn[8]);
4770                         assert_eq!(node_txn[2], node_txn[9]);
4771                         assert_eq!(node_txn[3], node_txn[10]);
4772                         assert_eq!(node_txn[4], node_txn[11]);
4773                         assert_eq!(node_txn[3], node_txn[5]); //local commitment tx + htlc timeout tx broadcated by ChannelManger
4774                         assert_eq!(node_txn[4], node_txn[6]);
4775
4776                         assert_eq!(node_txn[0].input.len(), 1);
4777                         assert_eq!(node_txn[1].input.len(), 1);
4778                         assert_eq!(node_txn[2].input.len(), 1);
4779
4780                         let mut revoked_tx_map = HashMap::new();
4781                         revoked_tx_map.insert(revoked_local_txn[0].txid(), revoked_local_txn[0].clone());
4782                         node_txn[0].verify(&revoked_tx_map).unwrap();
4783                         node_txn[1].verify(&revoked_tx_map).unwrap();
4784                         node_txn[2].verify(&revoked_tx_map).unwrap();
4785
4786                         let mut witness_lens = BTreeSet::new();
4787                         witness_lens.insert(node_txn[0].input[0].witness.last().unwrap().len());
4788                         witness_lens.insert(node_txn[1].input[0].witness.last().unwrap().len());
4789                         witness_lens.insert(node_txn[2].input[0].witness.last().unwrap().len());
4790                         assert_eq!(witness_lens.len(), 3);
4791                         assert_eq!(*witness_lens.iter().skip(0).next().unwrap(), 77); // revoked to_local
4792                         assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), 133); // revoked offered HTLC
4793                         assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), 138); // revoked received HTLC
4794
4795                         assert_eq!(node_txn[3].input.len(), 1);
4796                         check_spends!(node_txn[3], chan_1.3.clone());
4797
4798                         assert_eq!(node_txn[4].input.len(), 1);
4799                         let witness_script = node_txn[4].input[0].witness.last().unwrap();
4800                         assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
4801                         assert_eq!(node_txn[4].input[0].previous_output.txid, node_txn[3].txid());
4802                         assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
4803                         assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[1].input[0].previous_output.txid);
4804                 }
4805                 get_announce_close_broadcast_events(&nodes, 0, 1);
4806                 assert_eq!(nodes[0].node.list_channels().len(), 0);
4807                 assert_eq!(nodes[1].node.list_channels().len(), 0);
4808         }
4809
4810         #[test]
4811         fn test_htlc_ignore_latest_remote_commitment() {
4812                 // Test that HTLC transactions spending the latest remote commitment transaction are simply
4813                 // ignored if we cannot claim them. This originally tickled an invalid unwrap().
4814                 let nodes = create_network(2);
4815                 create_announced_chan_between_nodes(&nodes, 0, 1);
4816
4817                 route_payment(&nodes[0], &[&nodes[1]], 10000000);
4818                 nodes[0].node.force_close_channel(&nodes[0].node.list_channels()[0].channel_id);
4819                 {
4820                         let events = nodes[0].node.get_and_clear_pending_msg_events();
4821                         assert_eq!(events.len(), 1);
4822                         match events[0] {
4823                                 MessageSendEvent::BroadcastChannelUpdate { msg: msgs::ChannelUpdate { contents: msgs::UnsignedChannelUpdate { flags, .. }, .. } } => {
4824                                         assert_eq!(flags & 0b10, 0b10);
4825                                 },
4826                                 _ => panic!("Unexpected event"),
4827                         }
4828                 }
4829
4830                 let node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
4831                 assert_eq!(node_txn.len(), 2);
4832
4833                 let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4834                 nodes[1].chain_monitor.block_connected_checked(&header, 1, &[&node_txn[0], &node_txn[1]], &[1; 2]);
4835
4836                 {
4837                         let events = nodes[1].node.get_and_clear_pending_msg_events();
4838                         assert_eq!(events.len(), 1);
4839                         match events[0] {
4840                                 MessageSendEvent::BroadcastChannelUpdate { msg: msgs::ChannelUpdate { contents: msgs::UnsignedChannelUpdate { flags, .. }, .. } } => {
4841                                         assert_eq!(flags & 0b10, 0b10);
4842                                 },
4843                                 _ => panic!("Unexpected event"),
4844                         }
4845                 }
4846
4847                 // Duplicate the block_connected call since this may happen due to other listeners
4848                 // registering new transactions
4849                 nodes[1].chain_monitor.block_connected_checked(&header, 1, &[&node_txn[0], &node_txn[1]], &[1; 2]);
4850         }
4851
4852         #[test]
4853         fn test_force_close_fail_back() {
4854                 // Check which HTLCs are failed-backwards on channel force-closure
4855                 let mut nodes = create_network(3);
4856                 create_announced_chan_between_nodes(&nodes, 0, 1);
4857                 create_announced_chan_between_nodes(&nodes, 1, 2);
4858
4859                 let route = nodes[0].router.get_route(&nodes[2].node.get_our_node_id(), None, &Vec::new(), 1000000, 42).unwrap();
4860
4861                 let (our_payment_preimage, our_payment_hash) = get_payment_preimage_hash!(nodes[0]);
4862
4863                 let mut payment_event = {
4864                         nodes[0].node.send_payment(route, our_payment_hash).unwrap();
4865                         check_added_monitors!(nodes[0], 1);
4866
4867                         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
4868                         assert_eq!(events.len(), 1);
4869                         SendEvent::from_event(events.remove(0))
4870                 };
4871
4872                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
4873                 commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
4874
4875                 let events_1 = nodes[1].node.get_and_clear_pending_events();
4876                 assert_eq!(events_1.len(), 1);
4877                 match events_1[0] {
4878                         Event::PendingHTLCsForwardable { .. } => { },
4879                         _ => panic!("Unexpected event"),
4880                 };
4881
4882                 nodes[1].node.channel_state.lock().unwrap().next_forward = Instant::now();
4883                 nodes[1].node.process_pending_htlc_forwards();
4884
4885                 let mut events_2 = nodes[1].node.get_and_clear_pending_msg_events();
4886                 assert_eq!(events_2.len(), 1);
4887                 payment_event = SendEvent::from_event(events_2.remove(0));
4888                 assert_eq!(payment_event.msgs.len(), 1);
4889
4890                 check_added_monitors!(nodes[1], 1);
4891                 nodes[2].node.handle_update_add_htlc(&nodes[1].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
4892                 nodes[2].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &payment_event.commitment_msg).unwrap();
4893                 check_added_monitors!(nodes[2], 1);
4894
4895                 // nodes[2] now has the latest commitment transaction, but hasn't revoked its previous
4896                 // state or updated nodes[1]' state. Now force-close and broadcast that commitment/HTLC
4897                 // transaction and ensure nodes[1] doesn't fail-backwards (this was originally a bug!).
4898
4899                 nodes[2].node.force_close_channel(&payment_event.commitment_msg.channel_id);
4900                 let events_3 = nodes[2].node.get_and_clear_pending_msg_events();
4901                 assert_eq!(events_3.len(), 1);
4902                 match events_3[0] {
4903                         MessageSendEvent::BroadcastChannelUpdate { msg: msgs::ChannelUpdate { contents: msgs::UnsignedChannelUpdate { flags, .. }, .. } } => {
4904                                 assert_eq!(flags & 0b10, 0b10);
4905                         },
4906                         _ => panic!("Unexpected event"),
4907                 }
4908
4909                 let tx = {
4910                         let mut node_txn = nodes[2].tx_broadcaster.txn_broadcasted.lock().unwrap();
4911                         // Note that we don't bother broadcasting the HTLC-Success transaction here as we don't
4912                         // have a use for it unless nodes[2] learns the preimage somehow, the funds will go
4913                         // back to nodes[1] upon timeout otherwise.
4914                         assert_eq!(node_txn.len(), 1);
4915                         node_txn.remove(0)
4916                 };
4917
4918                 let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4919                 nodes[1].chain_monitor.block_connected_checked(&header, 1, &[&tx], &[1]);
4920
4921                 let events_4 = nodes[1].node.get_and_clear_pending_msg_events();
4922                 // Note no UpdateHTLCs event here from nodes[1] to nodes[0]!
4923                 assert_eq!(events_4.len(), 1);
4924                 match events_4[0] {
4925                         MessageSendEvent::BroadcastChannelUpdate { msg: msgs::ChannelUpdate { contents: msgs::UnsignedChannelUpdate { flags, .. }, .. } } => {
4926                                 assert_eq!(flags & 0b10, 0b10);
4927                         },
4928                         _ => panic!("Unexpected event"),
4929                 }
4930
4931                 // Now check that if we add the preimage to ChannelMonitor it broadcasts our HTLC-Success..
4932                 {
4933                         let mut monitors = nodes[2].chan_monitor.simple_monitor.monitors.lock().unwrap();
4934                         monitors.get_mut(&OutPoint::new(Sha256dHash::from(&payment_event.commitment_msg.channel_id[..]), 0)).unwrap()
4935                                 .provide_payment_preimage(&our_payment_hash, &our_payment_preimage);
4936                 }
4937                 nodes[2].chain_monitor.block_connected_checked(&header, 1, &[&tx], &[1]);
4938                 let node_txn = nodes[2].tx_broadcaster.txn_broadcasted.lock().unwrap();
4939                 assert_eq!(node_txn.len(), 1);
4940                 assert_eq!(node_txn[0].input.len(), 1);
4941                 assert_eq!(node_txn[0].input[0].previous_output.txid, tx.txid());
4942                 assert_eq!(node_txn[0].lock_time, 0); // Must be an HTLC-Success
4943                 assert_eq!(node_txn[0].input[0].witness.len(), 5); // Must be an HTLC-Success
4944
4945                 check_spends!(node_txn[0], tx);
4946         }
4947
4948         #[test]
4949         fn test_unconf_chan() {
4950                 // After creating a chan between nodes, we disconnect all blocks previously seen to force a channel close on nodes[0] side
4951                 let nodes = create_network(2);
4952                 create_announced_chan_between_nodes(&nodes, 0, 1);
4953
4954                 let channel_state = nodes[0].node.channel_state.lock().unwrap();
4955                 assert_eq!(channel_state.by_id.len(), 1);
4956                 assert_eq!(channel_state.short_to_id.len(), 1);
4957                 mem::drop(channel_state);
4958
4959                 let mut headers = Vec::new();
4960                 let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4961                 headers.push(header.clone());
4962                 for _i in 2..100 {
4963                         header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
4964                         headers.push(header.clone());
4965                 }
4966                 while !headers.is_empty() {
4967                         nodes[0].node.block_disconnected(&headers.pop().unwrap());
4968                 }
4969                 {
4970                         let events = nodes[0].node.get_and_clear_pending_msg_events();
4971                         assert_eq!(events.len(), 1);
4972                         match events[0] {
4973                                 MessageSendEvent::BroadcastChannelUpdate { msg: msgs::ChannelUpdate { contents: msgs::UnsignedChannelUpdate { flags, .. }, .. } } => {
4974                                         assert_eq!(flags & 0b10, 0b10);
4975                                 },
4976                                 _ => panic!("Unexpected event"),
4977                         }
4978                 }
4979                 let channel_state = nodes[0].node.channel_state.lock().unwrap();
4980                 assert_eq!(channel_state.by_id.len(), 0);
4981                 assert_eq!(channel_state.short_to_id.len(), 0);
4982         }
4983
4984         /// pending_htlc_adds includes both the holding cell and in-flight update_add_htlcs, whereas
4985         /// for claims/fails they are separated out.
4986         fn reconnect_nodes(node_a: &Node, node_b: &Node, pre_all_htlcs: bool, pending_htlc_adds: (i64, i64), pending_htlc_claims: (usize, usize), pending_cell_htlc_claims: (usize, usize), pending_cell_htlc_fails: (usize, usize), pending_raa: (bool, bool)) {
4987                 let reestablish_1 = node_a.node.peer_connected(&node_b.node.get_our_node_id());
4988                 let reestablish_2 = node_b.node.peer_connected(&node_a.node.get_our_node_id());
4989
4990                 let mut resp_1 = Vec::new();
4991                 for msg in reestablish_1 {
4992                         resp_1.push(node_b.node.handle_channel_reestablish(&node_a.node.get_our_node_id(), &msg).unwrap());
4993                 }
4994                 if pending_cell_htlc_claims.0 != 0 || pending_cell_htlc_fails.0 != 0 {
4995                         check_added_monitors!(node_b, 1);
4996                 } else {
4997                         check_added_monitors!(node_b, 0);
4998                 }
4999
5000                 let mut resp_2 = Vec::new();
5001                 for msg in reestablish_2 {
5002                         resp_2.push(node_a.node.handle_channel_reestablish(&node_b.node.get_our_node_id(), &msg).unwrap());
5003                 }
5004                 if pending_cell_htlc_claims.1 != 0 || pending_cell_htlc_fails.1 != 0 {
5005                         check_added_monitors!(node_a, 1);
5006                 } else {
5007                         check_added_monitors!(node_a, 0);
5008                 }
5009
5010                 // We dont yet support both needing updates, as that would require a different commitment dance:
5011                 assert!((pending_htlc_adds.0 == 0 && pending_htlc_claims.0 == 0 && pending_cell_htlc_claims.0 == 0 && pending_cell_htlc_fails.0 == 0) ||
5012                         (pending_htlc_adds.1 == 0 && pending_htlc_claims.1 == 0 && pending_cell_htlc_claims.1 == 0 && pending_cell_htlc_fails.1 == 0));
5013
5014                 for chan_msgs in resp_1.drain(..) {
5015                         if pre_all_htlcs {
5016                                 node_a.node.handle_funding_locked(&node_b.node.get_our_node_id(), &chan_msgs.0.unwrap()).unwrap();
5017                                 let announcement_event = node_a.node.get_and_clear_pending_msg_events();
5018                                 if !announcement_event.is_empty() {
5019                                         assert_eq!(announcement_event.len(), 1);
5020                                         if let MessageSendEvent::SendAnnouncementSignatures { .. } = announcement_event[0] {
5021                                                 //TODO: Test announcement_sigs re-sending
5022                                         } else { panic!("Unexpected event!"); }
5023                                 }
5024                         } else {
5025                                 assert!(chan_msgs.0.is_none());
5026                         }
5027                         if pending_raa.0 {
5028                                 assert!(chan_msgs.3 == msgs::RAACommitmentOrder::RevokeAndACKFirst);
5029                                 assert!(node_a.node.handle_revoke_and_ack(&node_b.node.get_our_node_id(), &chan_msgs.1.unwrap()).unwrap().is_none());
5030                                 check_added_monitors!(node_a, 1);
5031                         } else {
5032                                 assert!(chan_msgs.1.is_none());
5033                         }
5034                         if pending_htlc_adds.0 != 0 || pending_htlc_claims.0 != 0 || pending_cell_htlc_claims.0 != 0 || pending_cell_htlc_fails.0 != 0 {
5035                                 let commitment_update = chan_msgs.2.unwrap();
5036                                 if pending_htlc_adds.0 != -1 { // We use -1 to denote a response commitment_signed
5037                                         assert_eq!(commitment_update.update_add_htlcs.len(), pending_htlc_adds.0 as usize);
5038                                 } else {
5039                                         assert!(commitment_update.update_add_htlcs.is_empty());
5040                                 }
5041                                 assert_eq!(commitment_update.update_fulfill_htlcs.len(), pending_htlc_claims.0 + pending_cell_htlc_claims.0);
5042                                 assert_eq!(commitment_update.update_fail_htlcs.len(), pending_cell_htlc_fails.0);
5043                                 assert!(commitment_update.update_fail_malformed_htlcs.is_empty());
5044                                 for update_add in commitment_update.update_add_htlcs {
5045                                         node_a.node.handle_update_add_htlc(&node_b.node.get_our_node_id(), &update_add).unwrap();
5046                                 }
5047                                 for update_fulfill in commitment_update.update_fulfill_htlcs {
5048                                         node_a.node.handle_update_fulfill_htlc(&node_b.node.get_our_node_id(), &update_fulfill).unwrap();
5049                                 }
5050                                 for update_fail in commitment_update.update_fail_htlcs {
5051                                         node_a.node.handle_update_fail_htlc(&node_b.node.get_our_node_id(), &update_fail).unwrap();
5052                                 }
5053
5054                                 if pending_htlc_adds.0 != -1 { // We use -1 to denote a response commitment_signed
5055                                         commitment_signed_dance!(node_a, node_b, commitment_update.commitment_signed, false);
5056                                 } else {
5057                                         let (as_revoke_and_ack, as_commitment_signed) = node_a.node.handle_commitment_signed(&node_b.node.get_our_node_id(), &commitment_update.commitment_signed).unwrap();
5058                                         check_added_monitors!(node_a, 1);
5059                                         assert!(as_commitment_signed.is_none());
5060                                         assert!(node_b.node.handle_revoke_and_ack(&node_a.node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
5061                                         check_added_monitors!(node_b, 1);
5062                                 }
5063                         } else {
5064                                 assert!(chan_msgs.2.is_none());
5065                         }
5066                 }
5067
5068                 for chan_msgs in resp_2.drain(..) {
5069                         if pre_all_htlcs {
5070                                 node_b.node.handle_funding_locked(&node_a.node.get_our_node_id(), &chan_msgs.0.unwrap()).unwrap();
5071                                 let announcement_event = node_b.node.get_and_clear_pending_msg_events();
5072                                 if !announcement_event.is_empty() {
5073                                         assert_eq!(announcement_event.len(), 1);
5074                                         if let MessageSendEvent::SendAnnouncementSignatures { .. } = announcement_event[0] {
5075                                                 //TODO: Test announcement_sigs re-sending
5076                                         } else { panic!("Unexpected event!"); }
5077                                 }
5078                         } else {
5079                                 assert!(chan_msgs.0.is_none());
5080                         }
5081                         if pending_raa.1 {
5082                                 assert!(chan_msgs.3 == msgs::RAACommitmentOrder::RevokeAndACKFirst);
5083                                 assert!(node_b.node.handle_revoke_and_ack(&node_a.node.get_our_node_id(), &chan_msgs.1.unwrap()).unwrap().is_none());
5084                                 check_added_monitors!(node_b, 1);
5085                         } else {
5086                                 assert!(chan_msgs.1.is_none());
5087                         }
5088                         if pending_htlc_adds.1 != 0 || pending_htlc_claims.1 != 0 || pending_cell_htlc_claims.1 != 0 || pending_cell_htlc_fails.1 != 0 {
5089                                 let commitment_update = chan_msgs.2.unwrap();
5090                                 if pending_htlc_adds.1 != -1 { // We use -1 to denote a response commitment_signed
5091                                         assert_eq!(commitment_update.update_add_htlcs.len(), pending_htlc_adds.1 as usize);
5092                                 }
5093                                 assert_eq!(commitment_update.update_fulfill_htlcs.len(), pending_htlc_claims.0 + pending_cell_htlc_claims.0);
5094                                 assert_eq!(commitment_update.update_fail_htlcs.len(), pending_cell_htlc_fails.0);
5095                                 assert!(commitment_update.update_fail_malformed_htlcs.is_empty());
5096                                 for update_add in commitment_update.update_add_htlcs {
5097                                         node_b.node.handle_update_add_htlc(&node_a.node.get_our_node_id(), &update_add).unwrap();
5098                                 }
5099                                 for update_fulfill in commitment_update.update_fulfill_htlcs {
5100                                         node_b.node.handle_update_fulfill_htlc(&node_a.node.get_our_node_id(), &update_fulfill).unwrap();
5101                                 }
5102                                 for update_fail in commitment_update.update_fail_htlcs {
5103                                         node_b.node.handle_update_fail_htlc(&node_a.node.get_our_node_id(), &update_fail).unwrap();
5104                                 }
5105
5106                                 if pending_htlc_adds.1 != -1 { // We use -1 to denote a response commitment_signed
5107                                         commitment_signed_dance!(node_b, node_a, commitment_update.commitment_signed, false);
5108                                 } else {
5109                                         let (bs_revoke_and_ack, bs_commitment_signed) = node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &commitment_update.commitment_signed).unwrap();
5110                                         check_added_monitors!(node_b, 1);
5111                                         assert!(bs_commitment_signed.is_none());
5112                                         assert!(node_a.node.handle_revoke_and_ack(&node_b.node.get_our_node_id(), &bs_revoke_and_ack).unwrap().is_none());
5113                                         check_added_monitors!(node_a, 1);
5114                                 }
5115                         } else {
5116                                 assert!(chan_msgs.2.is_none());
5117                         }
5118                 }
5119         }
5120
5121         #[test]
5122         fn test_simple_peer_disconnect() {
5123                 // Test that we can reconnect when there are no lost messages
5124                 let nodes = create_network(3);
5125                 create_announced_chan_between_nodes(&nodes, 0, 1);
5126                 create_announced_chan_between_nodes(&nodes, 1, 2);
5127
5128                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5129                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5130                 reconnect_nodes(&nodes[0], &nodes[1], true, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5131
5132                 let payment_preimage_1 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
5133                 let payment_hash_2 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
5134                 fail_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), payment_hash_2);
5135                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), payment_preimage_1);
5136
5137                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5138                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5139                 reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5140
5141                 let payment_preimage_3 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
5142                 let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).0;
5143                 let payment_hash_5 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
5144                 let payment_hash_6 = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2])[..], 1000000).1;
5145
5146                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5147                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5148
5149                 claim_payment_along_route(&nodes[0], &vec!(&nodes[1], &nodes[2]), true, payment_preimage_3);
5150                 fail_payment_along_route(&nodes[0], &[&nodes[1], &nodes[2]], true, payment_hash_5);
5151
5152                 reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (1, 0), (1, 0), (false, false));
5153                 {
5154                         let events = nodes[0].node.get_and_clear_pending_events();
5155                         assert_eq!(events.len(), 2);
5156                         match events[0] {
5157                                 Event::PaymentSent { payment_preimage } => {
5158                                         assert_eq!(payment_preimage, payment_preimage_3);
5159                                 },
5160                                 _ => panic!("Unexpected event"),
5161                         }
5162                         match events[1] {
5163                                 Event::PaymentFailed { payment_hash, rejected_by_dest } => {
5164                                         assert_eq!(payment_hash, payment_hash_5);
5165                                         assert!(rejected_by_dest);
5166                                 },
5167                                 _ => panic!("Unexpected event"),
5168                         }
5169                 }
5170
5171                 claim_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), payment_preimage_4);
5172                 fail_payment(&nodes[0], &vec!(&nodes[1], &nodes[2]), payment_hash_6);
5173         }
5174
5175         fn do_test_drop_messages_peer_disconnect(messages_delivered: u8) {
5176                 // Test that we can reconnect when in-flight HTLC updates get dropped
5177                 let mut nodes = create_network(2);
5178                 if messages_delivered == 0 {
5179                         create_chan_between_nodes_with_value_a(&nodes[0], &nodes[1], 100000, 10001);
5180                         // nodes[1] doesn't receive the funding_locked message (it'll be re-sent on reconnect)
5181                 } else {
5182                         create_announced_chan_between_nodes(&nodes, 0, 1);
5183                 }
5184
5185                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), Some(&nodes[0].node.list_usable_channels()), &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5186                 let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
5187
5188                 let payment_event = {
5189                         nodes[0].node.send_payment(route.clone(), payment_hash_1).unwrap();
5190                         check_added_monitors!(nodes[0], 1);
5191
5192                         let mut events = nodes[0].node.get_and_clear_pending_msg_events();
5193                         assert_eq!(events.len(), 1);
5194                         SendEvent::from_event(events.remove(0))
5195                 };
5196                 assert_eq!(nodes[1].node.get_our_node_id(), payment_event.node_id);
5197
5198                 if messages_delivered < 2 {
5199                         // Drop the payment_event messages, and let them get re-generated in reconnect_nodes!
5200                 } else {
5201                         nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
5202                         let (bs_revoke_and_ack, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg).unwrap();
5203                         check_added_monitors!(nodes[1], 1);
5204
5205                         if messages_delivered >= 3 {
5206                                 assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack).unwrap().is_none());
5207                                 check_added_monitors!(nodes[0], 1);
5208
5209                                 if messages_delivered >= 4 {
5210                                         let (as_revoke_and_ack, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_commitment_signed.unwrap()).unwrap();
5211                                         assert!(as_commitment_signed.is_none());
5212                                         check_added_monitors!(nodes[0], 1);
5213
5214                                         if messages_delivered >= 5 {
5215                                                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
5216                                                 check_added_monitors!(nodes[1], 1);
5217                                         }
5218                                 }
5219                         }
5220                 }
5221
5222                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5223                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5224                 if messages_delivered < 2 {
5225                         // Even if the funding_locked messages get exchanged, as long as nothing further was
5226                         // received on either side, both sides will need to resend them.
5227                         reconnect_nodes(&nodes[0], &nodes[1], true, (0, 1), (0, 0), (0, 0), (0, 0), (false, false));
5228                 } else if messages_delivered == 2 {
5229                         // nodes[0] still wants its RAA + commitment_signed
5230                         reconnect_nodes(&nodes[0], &nodes[1], false, (-1, 0), (0, 0), (0, 0), (0, 0), (true, false));
5231                 } else if messages_delivered == 3 {
5232                         // nodes[0] still wants its commitment_signed
5233                         reconnect_nodes(&nodes[0], &nodes[1], false, (-1, 0), (0, 0), (0, 0), (0, 0), (false, false));
5234                 } else if messages_delivered == 4 {
5235                         // nodes[1] still wants its final RAA
5236                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, true));
5237                 } else if messages_delivered == 5 {
5238                         // Everything was delivered...
5239                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5240                 }
5241
5242                 let events_1 = nodes[1].node.get_and_clear_pending_events();
5243                 assert_eq!(events_1.len(), 1);
5244                 match events_1[0] {
5245                         Event::PendingHTLCsForwardable { .. } => { },
5246                         _ => panic!("Unexpected event"),
5247                 };
5248
5249                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5250                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5251                 reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5252
5253                 nodes[1].node.channel_state.lock().unwrap().next_forward = Instant::now();
5254                 nodes[1].node.process_pending_htlc_forwards();
5255
5256                 let events_2 = nodes[1].node.get_and_clear_pending_events();
5257                 assert_eq!(events_2.len(), 1);
5258                 match events_2[0] {
5259                         Event::PaymentReceived { ref payment_hash, amt } => {
5260                                 assert_eq!(payment_hash_1, *payment_hash);
5261                                 assert_eq!(amt, 1000000);
5262                         },
5263                         _ => panic!("Unexpected event"),
5264                 }
5265
5266                 nodes[1].node.claim_funds(payment_preimage_1);
5267                 check_added_monitors!(nodes[1], 1);
5268
5269                 let events_3 = nodes[1].node.get_and_clear_pending_msg_events();
5270                 assert_eq!(events_3.len(), 1);
5271                 let (update_fulfill_htlc, commitment_signed) = match events_3[0] {
5272                         MessageSendEvent::UpdateHTLCs { ref node_id, ref updates } => {
5273                                 assert_eq!(*node_id, nodes[0].node.get_our_node_id());
5274                                 assert!(updates.update_add_htlcs.is_empty());
5275                                 assert!(updates.update_fail_htlcs.is_empty());
5276                                 assert_eq!(updates.update_fulfill_htlcs.len(), 1);
5277                                 assert!(updates.update_fail_malformed_htlcs.is_empty());
5278                                 assert!(updates.update_fee.is_none());
5279                                 (updates.update_fulfill_htlcs[0].clone(), updates.commitment_signed.clone())
5280                         },
5281                         _ => panic!("Unexpected event"),
5282                 };
5283
5284                 if messages_delivered >= 1 {
5285                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_htlc).unwrap();
5286
5287                         let events_4 = nodes[0].node.get_and_clear_pending_events();
5288                         assert_eq!(events_4.len(), 1);
5289                         match events_4[0] {
5290                                 Event::PaymentSent { ref payment_preimage } => {
5291                                         assert_eq!(payment_preimage_1, *payment_preimage);
5292                                 },
5293                                 _ => panic!("Unexpected event"),
5294                         }
5295
5296                         if messages_delivered >= 2 {
5297                                 let (as_revoke_and_ack, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &commitment_signed).unwrap();
5298                                 check_added_monitors!(nodes[0], 1);
5299
5300                                 if messages_delivered >= 3 {
5301                                         assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
5302                                         check_added_monitors!(nodes[1], 1);
5303
5304                                         if messages_delivered >= 4 {
5305                                                 let (bs_revoke_and_ack, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment_signed.unwrap()).unwrap();
5306                                                 assert!(bs_commitment_signed.is_none());
5307                                                 check_added_monitors!(nodes[1], 1);
5308
5309                                                 if messages_delivered >= 5 {
5310                                                         assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack).unwrap().is_none());
5311                                                         check_added_monitors!(nodes[0], 1);
5312                                                 }
5313                                         }
5314                                 }
5315                         }
5316                 }
5317
5318                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5319                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5320                 if messages_delivered < 2 {
5321                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (1, 0), (0, 0), (0, 0), (false, false));
5322                         //TODO: Deduplicate PaymentSent events, then enable this if:
5323                         //if messages_delivered < 1 {
5324                                 let events_4 = nodes[0].node.get_and_clear_pending_events();
5325                                 assert_eq!(events_4.len(), 1);
5326                                 match events_4[0] {
5327                                         Event::PaymentSent { ref payment_preimage } => {
5328                                                 assert_eq!(payment_preimage_1, *payment_preimage);
5329                                         },
5330                                         _ => panic!("Unexpected event"),
5331                                 }
5332                         //}
5333                 } else if messages_delivered == 2 {
5334                         // nodes[0] still wants its RAA + commitment_signed
5335                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, -1), (0, 0), (0, 0), (0, 0), (false, true));
5336                 } else if messages_delivered == 3 {
5337                         // nodes[0] still wants its commitment_signed
5338                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, -1), (0, 0), (0, 0), (0, 0), (false, false));
5339                 } else if messages_delivered == 4 {
5340                         // nodes[1] still wants its final RAA
5341                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (true, false));
5342                 } else if messages_delivered == 5 {
5343                         // Everything was delivered...
5344                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5345                 }
5346
5347                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5348                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5349                 reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5350
5351                 // Channel should still work fine...
5352                 let payment_preimage_2 = send_along_route(&nodes[0], route, &[&nodes[1]], 1000000).0;
5353                 claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
5354         }
5355
5356         #[test]
5357         fn test_drop_messages_peer_disconnect_a() {
5358                 do_test_drop_messages_peer_disconnect(0);
5359                 do_test_drop_messages_peer_disconnect(1);
5360                 do_test_drop_messages_peer_disconnect(2);
5361         }
5362
5363         #[test]
5364         fn test_drop_messages_peer_disconnect_b() {
5365                 do_test_drop_messages_peer_disconnect(3);
5366                 do_test_drop_messages_peer_disconnect(4);
5367                 do_test_drop_messages_peer_disconnect(5);
5368         }
5369
5370         #[test]
5371         fn test_funding_peer_disconnect() {
5372                 // Test that we can lock in our funding tx while disconnected
5373                 let nodes = create_network(2);
5374                 let tx = create_chan_between_nodes_with_value_init(&nodes[0], &nodes[1], 100000, 10001);
5375
5376                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5377                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5378
5379                 confirm_transaction(&nodes[0].chain_monitor, &tx, tx.version);
5380                 let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
5381                 assert_eq!(events_1.len(), 1);
5382                 match events_1[0] {
5383                         MessageSendEvent::SendFundingLocked { ref node_id, msg: _ } => {
5384                                 assert_eq!(*node_id, nodes[1].node.get_our_node_id());
5385                         },
5386                         _ => panic!("Unexpected event"),
5387                 }
5388
5389                 confirm_transaction(&nodes[1].chain_monitor, &tx, tx.version);
5390                 let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
5391                 assert_eq!(events_2.len(), 1);
5392                 match events_2[0] {
5393                         MessageSendEvent::SendFundingLocked { ref node_id, msg: _ } => {
5394                                 assert_eq!(*node_id, nodes[0].node.get_our_node_id());
5395                         },
5396                         _ => panic!("Unexpected event"),
5397                 }
5398
5399                 reconnect_nodes(&nodes[0], &nodes[1], true, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5400                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5401                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5402                 reconnect_nodes(&nodes[0], &nodes[1], true, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5403
5404                 // TODO: We shouldn't need to manually pass list_usable_chanels here once we support
5405                 // rebroadcasting announcement_signatures upon reconnect.
5406
5407                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), Some(&nodes[0].node.list_usable_channels()), &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5408                 let (payment_preimage, _) = send_along_route(&nodes[0], route, &[&nodes[1]], 1000000);
5409                 claim_payment(&nodes[0], &[&nodes[1]], payment_preimage);
5410         }
5411
5412         #[test]
5413         fn test_drop_messages_peer_disconnect_dual_htlc() {
5414                 // Test that we can handle reconnecting when both sides of a channel have pending
5415                 // commitment_updates when we disconnect.
5416                 let mut nodes = create_network(2);
5417                 create_announced_chan_between_nodes(&nodes, 0, 1);
5418
5419                 let (payment_preimage_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
5420
5421                 // Now try to send a second payment which will fail to send
5422                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5423                 let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
5424
5425                 nodes[0].node.send_payment(route.clone(), payment_hash_2).unwrap();
5426                 check_added_monitors!(nodes[0], 1);
5427
5428                 let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
5429                 assert_eq!(events_1.len(), 1);
5430                 match events_1[0] {
5431                         MessageSendEvent::UpdateHTLCs { .. } => {},
5432                         _ => panic!("Unexpected event"),
5433                 }
5434
5435                 assert!(nodes[1].node.claim_funds(payment_preimage_1));
5436                 check_added_monitors!(nodes[1], 1);
5437
5438                 let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
5439                 assert_eq!(events_2.len(), 1);
5440                 match events_2[0] {
5441                         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 } } => {
5442                                 assert_eq!(*node_id, nodes[0].node.get_our_node_id());
5443                                 assert!(update_add_htlcs.is_empty());
5444                                 assert_eq!(update_fulfill_htlcs.len(), 1);
5445                                 assert!(update_fail_htlcs.is_empty());
5446                                 assert!(update_fail_malformed_htlcs.is_empty());
5447                                 assert!(update_fee.is_none());
5448
5449                                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_htlcs[0]).unwrap();
5450                                 let events_3 = nodes[0].node.get_and_clear_pending_events();
5451                                 assert_eq!(events_3.len(), 1);
5452                                 match events_3[0] {
5453                                         Event::PaymentSent { ref payment_preimage } => {
5454                                                 assert_eq!(*payment_preimage, payment_preimage_1);
5455                                         },
5456                                         _ => panic!("Unexpected event"),
5457                                 }
5458
5459                                 let (_, commitment_update) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), commitment_signed).unwrap();
5460                                 assert!(commitment_update.is_none());
5461                                 check_added_monitors!(nodes[0], 1);
5462                         },
5463                         _ => panic!("Unexpected event"),
5464                 }
5465
5466                 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5467                 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5468
5469                 let reestablish_1 = nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id());
5470                 assert_eq!(reestablish_1.len(), 1);
5471                 let reestablish_2 = nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id());
5472                 assert_eq!(reestablish_2.len(), 1);
5473
5474                 let as_resp = nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]).unwrap();
5475                 let bs_resp = nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]).unwrap();
5476
5477                 assert!(as_resp.0.is_none());
5478                 assert!(bs_resp.0.is_none());
5479
5480                 assert!(bs_resp.1.is_none());
5481                 assert!(bs_resp.2.is_none());
5482
5483                 assert!(as_resp.3 == msgs::RAACommitmentOrder::CommitmentFirst);
5484
5485                 assert_eq!(as_resp.2.as_ref().unwrap().update_add_htlcs.len(), 1);
5486                 assert!(as_resp.2.as_ref().unwrap().update_fulfill_htlcs.is_empty());
5487                 assert!(as_resp.2.as_ref().unwrap().update_fail_htlcs.is_empty());
5488                 assert!(as_resp.2.as_ref().unwrap().update_fail_malformed_htlcs.is_empty());
5489                 assert!(as_resp.2.as_ref().unwrap().update_fee.is_none());
5490                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &as_resp.2.as_ref().unwrap().update_add_htlcs[0]).unwrap();
5491                 let (bs_revoke_and_ack, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_resp.2.as_ref().unwrap().commitment_signed).unwrap();
5492                 assert!(bs_commitment_signed.is_none());
5493                 check_added_monitors!(nodes[1], 1);
5494
5495                 let bs_second_commitment_signed = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), as_resp.1.as_ref().unwrap()).unwrap().unwrap();
5496                 assert!(bs_second_commitment_signed.update_add_htlcs.is_empty());
5497                 assert!(bs_second_commitment_signed.update_fulfill_htlcs.is_empty());
5498                 assert!(bs_second_commitment_signed.update_fail_htlcs.is_empty());
5499                 assert!(bs_second_commitment_signed.update_fail_malformed_htlcs.is_empty());
5500                 assert!(bs_second_commitment_signed.update_fee.is_none());
5501                 check_added_monitors!(nodes[1], 1);
5502
5503                 let as_commitment_signed = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack).unwrap().unwrap();
5504                 assert!(as_commitment_signed.update_add_htlcs.is_empty());
5505                 assert!(as_commitment_signed.update_fulfill_htlcs.is_empty());
5506                 assert!(as_commitment_signed.update_fail_htlcs.is_empty());
5507                 assert!(as_commitment_signed.update_fail_malformed_htlcs.is_empty());
5508                 assert!(as_commitment_signed.update_fee.is_none());
5509                 check_added_monitors!(nodes[0], 1);
5510
5511                 let (as_revoke_and_ack, as_second_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_commitment_signed.commitment_signed).unwrap();
5512                 assert!(as_second_commitment_signed.is_none());
5513                 check_added_monitors!(nodes[0], 1);
5514
5515                 let (bs_second_revoke_and_ack, bs_third_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment_signed.commitment_signed).unwrap();
5516                 assert!(bs_third_commitment_signed.is_none());
5517                 check_added_monitors!(nodes[1], 1);
5518
5519                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
5520                 check_added_monitors!(nodes[1], 1);
5521
5522                 let events_4 = nodes[1].node.get_and_clear_pending_events();
5523                 assert_eq!(events_4.len(), 1);
5524                 match events_4[0] {
5525                         Event::PendingHTLCsForwardable { .. } => { },
5526                         _ => panic!("Unexpected event"),
5527                 };
5528
5529                 nodes[1].node.channel_state.lock().unwrap().next_forward = Instant::now();
5530                 nodes[1].node.process_pending_htlc_forwards();
5531
5532                 let events_5 = nodes[1].node.get_and_clear_pending_events();
5533                 assert_eq!(events_5.len(), 1);
5534                 match events_5[0] {
5535                         Event::PaymentReceived { ref payment_hash, amt: _ } => {
5536                                 assert_eq!(payment_hash_2, *payment_hash);
5537                         },
5538                         _ => panic!("Unexpected event"),
5539                 }
5540
5541                 assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke_and_ack).unwrap().is_none());
5542                 check_added_monitors!(nodes[0], 1);
5543
5544                 claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
5545         }
5546
5547         #[test]
5548         fn test_simple_monitor_permanent_update_fail() {
5549                 // Test that we handle a simple permanent monitor update failure
5550                 let mut nodes = create_network(2);
5551                 create_announced_chan_between_nodes(&nodes, 0, 1);
5552
5553                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5554                 let (_, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
5555
5556                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
5557                 if let Err(APIError::MonitorUpdateFailed) = nodes[0].node.send_payment(route, payment_hash_1) {} else { panic!(); }
5558                 check_added_monitors!(nodes[0], 1);
5559
5560                 let events_1 = nodes[0].node.get_and_clear_pending_msg_events();
5561                 assert_eq!(events_1.len(), 1);
5562                 match events_1[0] {
5563                         MessageSendEvent::BroadcastChannelUpdate { .. } => {},
5564                         _ => panic!("Unexpected event"),
5565                 };
5566
5567                 // TODO: Once we hit the chain with the failure transaction we should check that we get a
5568                 // PaymentFailed event
5569
5570                 assert_eq!(nodes[0].node.list_channels().len(), 0);
5571         }
5572
5573         fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
5574                 // Test that we can recover from a simple temporary monitor update failure optionally with
5575                 // a disconnect in between
5576                 let mut nodes = create_network(2);
5577                 create_announced_chan_between_nodes(&nodes, 0, 1);
5578
5579                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5580                 let (payment_preimage_1, payment_hash_1) = get_payment_preimage_hash!(nodes[0]);
5581
5582                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
5583                 if let Err(APIError::MonitorUpdateFailed) = nodes[0].node.send_payment(route.clone(), payment_hash_1) {} else { panic!(); }
5584                 check_added_monitors!(nodes[0], 1);
5585
5586                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
5587                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
5588                 assert_eq!(nodes[0].node.list_channels().len(), 1);
5589
5590                 if disconnect {
5591                         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5592                         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5593                         reconnect_nodes(&nodes[0], &nodes[1], true, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5594                 }
5595
5596                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Ok(());
5597                 nodes[0].node.test_restore_channel_monitor();
5598                 check_added_monitors!(nodes[0], 1);
5599
5600                 let mut events_2 = nodes[0].node.get_and_clear_pending_msg_events();
5601                 assert_eq!(events_2.len(), 1);
5602                 let payment_event = SendEvent::from_event(events_2.pop().unwrap());
5603                 assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
5604                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
5605                 commitment_signed_dance!(nodes[1], nodes[0], payment_event.commitment_msg, false);
5606
5607                 expect_pending_htlcs_forwardable!(nodes[1]);
5608
5609                 let events_3 = nodes[1].node.get_and_clear_pending_events();
5610                 assert_eq!(events_3.len(), 1);
5611                 match events_3[0] {
5612                         Event::PaymentReceived { ref payment_hash, amt } => {
5613                                 assert_eq!(payment_hash_1, *payment_hash);
5614                                 assert_eq!(amt, 1000000);
5615                         },
5616                         _ => panic!("Unexpected event"),
5617                 }
5618
5619                 claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_1);
5620
5621                 // Now set it to failed again...
5622                 let (_, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
5623                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
5624                 if let Err(APIError::MonitorUpdateFailed) = nodes[0].node.send_payment(route, payment_hash_2) {} else { panic!(); }
5625                 check_added_monitors!(nodes[0], 1);
5626
5627                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
5628                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
5629                 assert_eq!(nodes[0].node.list_channels().len(), 1);
5630
5631                 if disconnect {
5632                         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5633                         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5634                         reconnect_nodes(&nodes[0], &nodes[1], false, (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
5635                 }
5636
5637                 // ...and make sure we can force-close a TemporaryFailure channel with a PermanentFailure
5638                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::PermanentFailure);
5639                 nodes[0].node.test_restore_channel_monitor();
5640                 check_added_monitors!(nodes[0], 1);
5641
5642                 let events_5 = nodes[0].node.get_and_clear_pending_msg_events();
5643                 assert_eq!(events_5.len(), 1);
5644                 match events_5[0] {
5645                         MessageSendEvent::BroadcastChannelUpdate { .. } => {},
5646                         _ => panic!("Unexpected event"),
5647                 }
5648
5649                 // TODO: Once we hit the chain with the failure transaction we should check that we get a
5650                 // PaymentFailed event
5651
5652                 assert_eq!(nodes[0].node.list_channels().len(), 0);
5653         }
5654
5655         #[test]
5656         fn test_simple_monitor_temporary_update_fail() {
5657                 do_test_simple_monitor_temporary_update_fail(false);
5658                 do_test_simple_monitor_temporary_update_fail(true);
5659         }
5660
5661         fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
5662                 let disconnect_flags = 8 | 16;
5663
5664                 // Test that we can recover from a temporary monitor update failure with some in-flight
5665                 // HTLCs going on at the same time potentially with some disconnection thrown in.
5666                 // * First we route a payment, then get a temporary monitor update failure when trying to
5667                 //   route a second payment. We then claim the first payment.
5668                 // * If disconnect_count is set, we will disconnect at this point (which is likely as
5669                 //   TemporaryFailure likely indicates net disconnect which resulted in failing to update
5670                 //   the ChannelMonitor on a watchtower).
5671                 // * If !(disconnect_count & 16) we deliver a update_fulfill_htlc/CS for the first payment
5672                 //   immediately, otherwise we wait sconnect and deliver them via the reconnect
5673                 //   channel_reestablish processing (ie disconnect_count & 16 makes no sense if
5674                 //   disconnect_count & !disconnect_flags is 0).
5675                 // * We then update the channel monitor, reconnecting if disconnect_count is set and walk
5676                 //   through message sending, potentially disconnect/reconnecting multiple times based on
5677                 //   disconnect_count, to get the update_fulfill_htlc through.
5678                 // * We then walk through more message exchanges to get the original update_add_htlc
5679                 //   through, swapping message ordering based on disconnect_count & 8 and optionally
5680                 //   disconnect/reconnecting based on disconnect_count.
5681                 let mut nodes = create_network(2);
5682                 create_announced_chan_between_nodes(&nodes, 0, 1);
5683
5684                 let (payment_preimage_1, _) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
5685
5686                 // Now try to send a second payment which will fail to send
5687                 let route = nodes[0].router.get_route(&nodes[1].node.get_our_node_id(), None, &Vec::new(), 1000000, TEST_FINAL_CLTV).unwrap();
5688                 let (payment_preimage_2, payment_hash_2) = get_payment_preimage_hash!(nodes[0]);
5689
5690                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure);
5691                 if let Err(APIError::MonitorUpdateFailed) = nodes[0].node.send_payment(route.clone(), payment_hash_2) {} else { panic!(); }
5692                 check_added_monitors!(nodes[0], 1);
5693
5694                 assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
5695                 assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
5696                 assert_eq!(nodes[0].node.list_channels().len(), 1);
5697
5698                 // Claim the previous payment, which will result in a update_fulfill_htlc/CS from nodes[1]
5699                 // but nodes[0] won't respond since it is frozen.
5700                 assert!(nodes[1].node.claim_funds(payment_preimage_1));
5701                 check_added_monitors!(nodes[1], 1);
5702                 let events_2 = nodes[1].node.get_and_clear_pending_msg_events();
5703                 assert_eq!(events_2.len(), 1);
5704                 let (bs_initial_fulfill, bs_initial_commitment_signed) = match events_2[0] {
5705                         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 } } => {
5706                                 assert_eq!(*node_id, nodes[0].node.get_our_node_id());
5707                                 assert!(update_add_htlcs.is_empty());
5708                                 assert_eq!(update_fulfill_htlcs.len(), 1);
5709                                 assert!(update_fail_htlcs.is_empty());
5710                                 assert!(update_fail_malformed_htlcs.is_empty());
5711                                 assert!(update_fee.is_none());
5712
5713                                 if (disconnect_count & 16) == 0 {
5714                                         nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &update_fulfill_htlcs[0]).unwrap();
5715                                         let events_3 = nodes[0].node.get_and_clear_pending_events();
5716                                         assert_eq!(events_3.len(), 1);
5717                                         match events_3[0] {
5718                                                 Event::PaymentSent { ref payment_preimage } => {
5719                                                         assert_eq!(*payment_preimage, payment_preimage_1);
5720                                                 },
5721                                                 _ => panic!("Unexpected event"),
5722                                         }
5723
5724                                         if let Err(msgs::HandleError{err, action: Some(msgs::ErrorAction::IgnoreError) }) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), commitment_signed) {
5725                                                 assert_eq!(err, "Previous monitor update failure prevented generation of RAA");
5726                                         } else { panic!(); }
5727                                 }
5728
5729                                 (update_fulfill_htlcs[0].clone(), commitment_signed.clone())
5730                         },
5731                         _ => panic!("Unexpected event"),
5732                 };
5733
5734                 if disconnect_count & !disconnect_flags > 0 {
5735                         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5736                         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5737                 }
5738
5739                 // Now fix monitor updating...
5740                 *nodes[0].chan_monitor.update_ret.lock().unwrap() = Ok(());
5741                 nodes[0].node.test_restore_channel_monitor();
5742                 check_added_monitors!(nodes[0], 1);
5743
5744                 macro_rules! disconnect_reconnect_peers { () => { {
5745                         nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
5746                         nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
5747
5748                         let reestablish_1 = nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id());
5749                         assert_eq!(reestablish_1.len(), 1);
5750                         let reestablish_2 = nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id());
5751                         assert_eq!(reestablish_2.len(), 1);
5752
5753                         let as_resp = nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]).unwrap();
5754                         let bs_resp = nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]).unwrap();
5755
5756                         assert!(as_resp.0.is_none());
5757                         assert!(bs_resp.0.is_none());
5758
5759                         (reestablish_1, reestablish_2, as_resp, bs_resp)
5760                 } } }
5761
5762                 let (payment_event, initial_revoke_and_ack) = if disconnect_count & !disconnect_flags > 0 {
5763                         assert!(nodes[0].node.get_and_clear_pending_events().is_empty());
5764                         assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
5765
5766                         let reestablish_1 = nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id());
5767                         assert_eq!(reestablish_1.len(), 1);
5768                         let reestablish_2 = nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id());
5769                         assert_eq!(reestablish_2.len(), 1);
5770
5771                         let mut as_resp = nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]).unwrap();
5772                         check_added_monitors!(nodes[0], 0);
5773                         let mut bs_resp = nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]).unwrap();
5774                         check_added_monitors!(nodes[1], 0);
5775
5776                         assert!(as_resp.0.is_none());
5777                         assert!(bs_resp.0.is_none());
5778
5779                         assert!(bs_resp.1.is_none());
5780                         if (disconnect_count & 16) == 0 {
5781                                 assert!(bs_resp.2.is_none());
5782
5783                                 assert!(as_resp.1.is_some());
5784                                 assert!(as_resp.2.is_some());
5785                                 assert!(as_resp.3 == msgs::RAACommitmentOrder::CommitmentFirst);
5786                         } else {
5787                                 assert!(bs_resp.2.as_ref().unwrap().update_add_htlcs.is_empty());
5788                                 assert!(bs_resp.2.as_ref().unwrap().update_fail_htlcs.is_empty());
5789                                 assert!(bs_resp.2.as_ref().unwrap().update_fail_malformed_htlcs.is_empty());
5790                                 assert!(bs_resp.2.as_ref().unwrap().update_fee.is_none());
5791                                 assert!(bs_resp.2.as_ref().unwrap().update_fulfill_htlcs == vec![bs_initial_fulfill]);
5792                                 assert!(bs_resp.2.as_ref().unwrap().commitment_signed == bs_initial_commitment_signed);
5793
5794                                 assert!(as_resp.1.is_none());
5795
5796                                 nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().update_fulfill_htlcs[0]).unwrap();
5797                                 let events_3 = nodes[0].node.get_and_clear_pending_events();
5798                                 assert_eq!(events_3.len(), 1);
5799                                 match events_3[0] {
5800                                         Event::PaymentSent { ref payment_preimage } => {
5801                                                 assert_eq!(*payment_preimage, payment_preimage_1);
5802                                         },
5803                                         _ => panic!("Unexpected event"),
5804                                 }
5805
5806                                 let (as_resp_raa, as_resp_cu) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_resp.2.as_ref().unwrap().commitment_signed).unwrap();
5807                                 assert!(as_resp_cu.is_none());
5808                                 check_added_monitors!(nodes[0], 1);
5809
5810                                 as_resp.1 = Some(as_resp_raa);
5811                                 bs_resp.2 = None;
5812                         }
5813
5814                         if disconnect_count & !disconnect_flags > 1 {
5815                                 let (second_reestablish_1, second_reestablish_2, second_as_resp, second_bs_resp) = disconnect_reconnect_peers!();
5816
5817                                 if (disconnect_count & 16) == 0 {
5818                                         assert!(reestablish_1 == second_reestablish_1);
5819                                         assert!(reestablish_2 == second_reestablish_2);
5820                                 }
5821                                 assert!(as_resp == second_as_resp);
5822                                 assert!(bs_resp == second_bs_resp);
5823                         }
5824
5825                         (SendEvent::from_commitment_update(nodes[1].node.get_our_node_id(), as_resp.2.unwrap()), as_resp.1.unwrap())
5826                 } else {
5827                         let mut events_4 = nodes[0].node.get_and_clear_pending_msg_events();
5828                         assert_eq!(events_4.len(), 2);
5829                         (SendEvent::from_event(events_4.remove(0)), match events_4[0] {
5830                                 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
5831                                         assert_eq!(*node_id, nodes[1].node.get_our_node_id());
5832                                         msg.clone()
5833                                 },
5834                                 _ => panic!("Unexpected event"),
5835                         })
5836                 };
5837
5838                 assert_eq!(payment_event.node_id, nodes[1].node.get_our_node_id());
5839
5840                 nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]).unwrap();
5841                 let (bs_revoke_and_ack, bs_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg).unwrap();
5842                 assert!(bs_commitment_signed.is_none()); // nodes[1] is awaiting an RAA from nodes[0] still
5843                 check_added_monitors!(nodes[1], 1);
5844
5845                 if disconnect_count & !disconnect_flags > 2 {
5846                         let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
5847
5848                         assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
5849                         assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
5850
5851                         assert!(as_resp.2.is_none());
5852                         assert!(bs_resp.2.is_none());
5853                 }
5854
5855                 let as_commitment_update;
5856                 let bs_second_commitment_update;
5857
5858                 macro_rules! handle_bs_raa { () => {
5859                         as_commitment_update = nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_revoke_and_ack).unwrap().unwrap();
5860                         assert!(as_commitment_update.update_add_htlcs.is_empty());
5861                         assert!(as_commitment_update.update_fulfill_htlcs.is_empty());
5862                         assert!(as_commitment_update.update_fail_htlcs.is_empty());
5863                         assert!(as_commitment_update.update_fail_malformed_htlcs.is_empty());
5864                         assert!(as_commitment_update.update_fee.is_none());
5865                         check_added_monitors!(nodes[0], 1);
5866                 } }
5867
5868                 macro_rules! handle_initial_raa { () => {
5869                         bs_second_commitment_update = nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &initial_revoke_and_ack).unwrap().unwrap();
5870                         assert!(bs_second_commitment_update.update_add_htlcs.is_empty());
5871                         assert!(bs_second_commitment_update.update_fulfill_htlcs.is_empty());
5872                         assert!(bs_second_commitment_update.update_fail_htlcs.is_empty());
5873                         assert!(bs_second_commitment_update.update_fail_malformed_htlcs.is_empty());
5874                         assert!(bs_second_commitment_update.update_fee.is_none());
5875                         check_added_monitors!(nodes[1], 1);
5876                 } }
5877
5878                 if (disconnect_count & 8) == 0 {
5879                         handle_bs_raa!();
5880
5881                         if disconnect_count & !disconnect_flags > 3 {
5882                                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
5883
5884                                 assert!(as_resp.1.unwrap() == initial_revoke_and_ack);
5885                                 assert!(bs_resp.1.is_none());
5886
5887                                 assert!(as_resp.2.unwrap() == as_commitment_update);
5888                                 assert!(bs_resp.2.is_none());
5889
5890                                 assert!(as_resp.3 == msgs::RAACommitmentOrder::RevokeAndACKFirst);
5891                         }
5892
5893                         handle_initial_raa!();
5894
5895                         if disconnect_count & !disconnect_flags > 4 {
5896                                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
5897
5898                                 assert!(as_resp.1.is_none());
5899                                 assert!(bs_resp.1.is_none());
5900
5901                                 assert!(as_resp.2.unwrap() == as_commitment_update);
5902                                 assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
5903                         }
5904                 } else {
5905                         handle_initial_raa!();
5906
5907                         if disconnect_count & !disconnect_flags > 3 {
5908                                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
5909
5910                                 assert!(as_resp.1.is_none());
5911                                 assert!(bs_resp.1.unwrap() == bs_revoke_and_ack);
5912
5913                                 assert!(as_resp.2.is_none());
5914                                 assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
5915
5916                                 assert!(bs_resp.3 == msgs::RAACommitmentOrder::RevokeAndACKFirst);
5917                         }
5918
5919                         handle_bs_raa!();
5920
5921                         if disconnect_count & !disconnect_flags > 4 {
5922                                 let (_, _, as_resp, bs_resp) = disconnect_reconnect_peers!();
5923
5924                                 assert!(as_resp.1.is_none());
5925                                 assert!(bs_resp.1.is_none());
5926
5927                                 assert!(as_resp.2.unwrap() == as_commitment_update);
5928                                 assert!(bs_resp.2.unwrap() == bs_second_commitment_update);
5929                         }
5930                 }
5931
5932                 let (as_revoke_and_ack, as_commitment_signed) = nodes[0].node.handle_commitment_signed(&nodes[1].node.get_our_node_id(), &bs_second_commitment_update.commitment_signed).unwrap();
5933                 assert!(as_commitment_signed.is_none());
5934                 check_added_monitors!(nodes[0], 1);
5935
5936                 let (bs_second_revoke_and_ack, bs_third_commitment_signed) = nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &as_commitment_update.commitment_signed).unwrap();
5937                 assert!(bs_third_commitment_signed.is_none());
5938                 check_added_monitors!(nodes[1], 1);
5939
5940                 assert!(nodes[1].node.handle_revoke_and_ack(&nodes[0].node.get_our_node_id(), &as_revoke_and_ack).unwrap().is_none());
5941                 check_added_monitors!(nodes[1], 1);
5942
5943                 assert!(nodes[0].node.handle_revoke_and_ack(&nodes[1].node.get_our_node_id(), &bs_second_revoke_and_ack).unwrap().is_none());
5944                 check_added_monitors!(nodes[0], 1);
5945
5946                 expect_pending_htlcs_forwardable!(nodes[1]);
5947
5948                 let events_5 = nodes[1].node.get_and_clear_pending_events();
5949                 assert_eq!(events_5.len(), 1);
5950                 match events_5[0] {
5951                         Event::PaymentReceived { ref payment_hash, amt } => {
5952                                 assert_eq!(payment_hash_2, *payment_hash);
5953                                 assert_eq!(amt, 1000000);
5954                         },
5955                         _ => panic!("Unexpected event"),
5956                 }
5957
5958                 claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_2);
5959         }
5960
5961         #[test]
5962         fn test_monitor_temporary_update_fail_a() {
5963                 do_test_monitor_temporary_update_fail(0);
5964                 do_test_monitor_temporary_update_fail(1);
5965                 do_test_monitor_temporary_update_fail(2);
5966                 do_test_monitor_temporary_update_fail(3);
5967                 do_test_monitor_temporary_update_fail(4);
5968                 do_test_monitor_temporary_update_fail(5);
5969         }
5970
5971         #[test]
5972         fn test_monitor_temporary_update_fail_b() {
5973                 do_test_monitor_temporary_update_fail(2 | 8);
5974                 do_test_monitor_temporary_update_fail(3 | 8);
5975                 do_test_monitor_temporary_update_fail(4 | 8);
5976                 do_test_monitor_temporary_update_fail(5 | 8);
5977         }
5978
5979         #[test]
5980         fn test_monitor_temporary_update_fail_c() {
5981                 do_test_monitor_temporary_update_fail(1 | 16);
5982                 do_test_monitor_temporary_update_fail(2 | 16);
5983                 do_test_monitor_temporary_update_fail(3 | 16);
5984                 do_test_monitor_temporary_update_fail(2 | 8 | 16);
5985                 do_test_monitor_temporary_update_fail(3 | 8 | 16);
5986         }
5987
5988         #[test]
5989         fn test_invalid_channel_announcement() {
5990                 //Test BOLT 7 channel_announcement msg requirement for final node, gather data to build customed channel_announcement msgs
5991                 let secp_ctx = Secp256k1::new();
5992                 let nodes = create_network(2);
5993
5994                 let chan_announcement = create_chan_between_nodes(&nodes[0], &nodes[1]);
5995
5996                 let a_channel_lock = nodes[0].node.channel_state.lock().unwrap();
5997                 let b_channel_lock = nodes[1].node.channel_state.lock().unwrap();
5998                 let as_chan = a_channel_lock.by_id.get(&chan_announcement.3).unwrap();
5999                 let bs_chan = b_channel_lock.by_id.get(&chan_announcement.3).unwrap();
6000
6001                 let _ = nodes[0].router.handle_htlc_fail_channel_update(&msgs::HTLCFailChannelUpdate::ChannelClosed { short_channel_id : as_chan.get_short_channel_id().unwrap(), is_permanent: false } );
6002
6003                 let as_bitcoin_key = PublicKey::from_secret_key(&secp_ctx, &as_chan.get_local_keys().funding_key);
6004                 let bs_bitcoin_key = PublicKey::from_secret_key(&secp_ctx, &bs_chan.get_local_keys().funding_key);
6005
6006                 let as_network_key = nodes[0].node.get_our_node_id();
6007                 let bs_network_key = nodes[1].node.get_our_node_id();
6008
6009                 let were_node_one = as_bitcoin_key.serialize()[..] < bs_bitcoin_key.serialize()[..];
6010
6011                 let mut chan_announcement;
6012
6013                 macro_rules! dummy_unsigned_msg {
6014                         () => {
6015                                 msgs::UnsignedChannelAnnouncement {
6016                                         features: msgs::GlobalFeatures::new(),
6017                                         chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
6018                                         short_channel_id: as_chan.get_short_channel_id().unwrap(),
6019                                         node_id_1: if were_node_one { as_network_key } else { bs_network_key },
6020                                         node_id_2: if were_node_one { bs_network_key } else { as_network_key },
6021                                         bitcoin_key_1: if were_node_one { as_bitcoin_key } else { bs_bitcoin_key },
6022                                         bitcoin_key_2: if were_node_one { bs_bitcoin_key } else { as_bitcoin_key },
6023                                         excess_data: Vec::new(),
6024                                 };
6025                         }
6026                 }
6027
6028                 macro_rules! sign_msg {
6029                         ($unsigned_msg: expr) => {
6030                                 let msghash = Message::from_slice(&Sha256dHash::from_data(&$unsigned_msg.encode()[..])[..]).unwrap();
6031                                 let as_bitcoin_sig = secp_ctx.sign(&msghash, &as_chan.get_local_keys().funding_key);
6032                                 let bs_bitcoin_sig = secp_ctx.sign(&msghash, &bs_chan.get_local_keys().funding_key);
6033                                 let as_node_sig = secp_ctx.sign(&msghash, &nodes[0].node.our_network_key);
6034                                 let bs_node_sig = secp_ctx.sign(&msghash, &nodes[1].node.our_network_key);
6035                                 chan_announcement = msgs::ChannelAnnouncement {
6036                                         node_signature_1 : if were_node_one { as_node_sig } else { bs_node_sig},
6037                                         node_signature_2 : if were_node_one { bs_node_sig } else { as_node_sig},
6038                                         bitcoin_signature_1: if were_node_one { as_bitcoin_sig } else { bs_bitcoin_sig },
6039                                         bitcoin_signature_2 : if were_node_one { bs_bitcoin_sig } else { as_bitcoin_sig },
6040                                         contents: $unsigned_msg
6041                                 }
6042                         }
6043                 }
6044
6045                 let unsigned_msg = dummy_unsigned_msg!();
6046                 sign_msg!(unsigned_msg);
6047                 assert_eq!(nodes[0].router.handle_channel_announcement(&chan_announcement).unwrap(), true);
6048                 let _ = nodes[0].router.handle_htlc_fail_channel_update(&msgs::HTLCFailChannelUpdate::ChannelClosed { short_channel_id : as_chan.get_short_channel_id().unwrap(), is_permanent: false } );
6049
6050                 // Configured with Network::Testnet
6051                 let mut unsigned_msg = dummy_unsigned_msg!();
6052                 unsigned_msg.chain_hash = genesis_block(Network::Bitcoin).header.bitcoin_hash();
6053                 sign_msg!(unsigned_msg);
6054                 assert!(nodes[0].router.handle_channel_announcement(&chan_announcement).is_err());
6055
6056                 let mut unsigned_msg = dummy_unsigned_msg!();
6057                 unsigned_msg.chain_hash = Sha256dHash::from_data(&[1,2,3,4,5,6,7,8,9]);
6058                 sign_msg!(unsigned_msg);
6059                 assert!(nodes[0].router.handle_channel_announcement(&chan_announcement).is_err());
6060         }
6061 }