X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=7495af879c7719aa59fba83418823e90255666f3;hb=90f59060822fceea42841a8a03fed01f2c39eeaa;hp=e27d794b254dc85565474bb0e4c310d7869f98da;hpb=989cb064b5279da3c9e0f3a121637d8bbed81bfb;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index e27d794b..7495af87 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -3723,62 +3723,17 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		counterparty_node_id: &PublicKey
 	) {
 		for (htlc_src, payment_hash) in htlcs_to_fail.drain(..) {
-			match htlc_src {
-				HTLCSource::PreviousHopData(HTLCPreviousHopData { .. }) => {
-					let (failure_code, onion_failure_data) =
-						match self.channel_state.lock().unwrap().by_id.entry(channel_id) {
-							hash_map::Entry::Occupied(chan_entry) => {
-								self.get_htlc_inbound_temp_fail_err_and_data(0x1000|7, &chan_entry.get())
-							},
-							hash_map::Entry::Vacant(_) => (0x4000|10, Vec::new())
-						};
-					let channel_state = self.channel_state.lock().unwrap();
+			let mut channel_state = self.channel_state.lock().unwrap();
+			let (failure_code, onion_failure_data) =
+				match channel_state.by_id.entry(channel_id) {
+					hash_map::Entry::Occupied(chan_entry) => {
+						self.get_htlc_inbound_temp_fail_err_and_data(0x1000|7, &chan_entry.get())
+					},
+					hash_map::Entry::Vacant(_) => (0x4000|10, Vec::new())
+				};
 
-					let receiver = HTLCDestination::NextHopChannel { node_id: Some(counterparty_node_id.clone()), channel_id };
-					self.fail_htlc_backwards_internal(channel_state, htlc_src, &payment_hash, HTLCFailReason::Reason { failure_code, data: onion_failure_data }, receiver)
-				},
-				HTLCSource::OutboundRoute { session_priv, payment_id, path, payment_params, .. } => {
-					let mut session_priv_bytes = [0; 32];
-					session_priv_bytes.copy_from_slice(&session_priv[..]);
-					let mut outbounds = self.pending_outbound_payments.lock().unwrap();
-					if let hash_map::Entry::Occupied(mut payment) = outbounds.entry(payment_id) {
-						if payment.get_mut().remove(&session_priv_bytes, Some(&path)) && !payment.get().is_fulfilled() {
-							let retry = if let Some(payment_params_data) = payment_params {
-								let path_last_hop = path.last().expect("Outbound payments must have had a valid path");
-								Some(RouteParameters {
-									payment_params: payment_params_data,
-									final_value_msat: path_last_hop.fee_msat,
-									final_cltv_expiry_delta: path_last_hop.cltv_expiry_delta,
-								})
-							} else { None };
-							let mut pending_events = self.pending_events.lock().unwrap();
-							pending_events.push(events::Event::PaymentPathFailed {
-								payment_id: Some(payment_id),
-								payment_hash,
-								rejected_by_dest: false,
-								network_update: None,
-								all_paths_failed: payment.get().remaining_parts() == 0,
-								path: path.clone(),
-								short_channel_id: None,
-								retry,
-								#[cfg(test)]
-								error_code: None,
-								#[cfg(test)]
-								error_data: None,
-							});
-							if payment.get().abandoned() && payment.get().remaining_parts() == 0 {
-								pending_events.push(events::Event::PaymentFailed {
-									payment_id,
-									payment_hash: payment.get().payment_hash().expect("PendingOutboundPayments::RetriesExceeded always has a payment hash set"),
-								});
-								payment.remove();
-							}
-						}
-					} else {
-						log_trace!(self.logger, "Received duplicative fail for HTLC with payment_hash {}", log_bytes!(payment_hash.0));
-					}
-				},
-			};
+			let receiver = HTLCDestination::NextHopChannel { node_id: Some(counterparty_node_id.clone()), channel_id };
+			self.fail_htlc_backwards_internal(channel_state, htlc_src, &payment_hash, HTLCFailReason::Reason { failure_code, data: onion_failure_data }, receiver);
 		}
 	}
 
@@ -3870,7 +3825,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							events::Event::PaymentPathFailed {
 								payment_id: Some(payment_id),
 								payment_hash: payment_hash.clone(),
-								rejected_by_dest: !payment_retryable,
+								payment_failed_permanently: !payment_retryable,
 								network_update,
 								all_paths_failed,
 								path: path.clone(),
@@ -3898,19 +3853,29 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						// channel here as we apparently can't relay through them anyway.
 						let scid = path.first().unwrap().short_channel_id;
 						retry.as_mut().map(|r| r.payment_params.previously_failed_channels.push(scid));
-						events::Event::PaymentPathFailed {
-							payment_id: Some(payment_id),
-							payment_hash: payment_hash.clone(),
-							rejected_by_dest: path.len() == 1,
-							network_update: None,
-							all_paths_failed,
-							path: path.clone(),
-							short_channel_id: Some(scid),
-							retry,
+
+						if self.payment_is_probe(payment_hash, &payment_id) {
+							events::Event::ProbeFailed {
+								payment_id: payment_id,
+								payment_hash: payment_hash.clone(),
+								path: path.clone(),
+								short_channel_id: Some(scid),
+							}
+						} else {
+							events::Event::PaymentPathFailed {
+								payment_id: Some(payment_id),
+								payment_hash: payment_hash.clone(),
+								payment_failed_permanently: false,
+								network_update: None,
+								all_paths_failed,
+								path: path.clone(),
+								short_channel_id: Some(scid),
+								retry,
 #[cfg(test)]
-							error_code: Some(*failure_code),
+								error_code: Some(*failure_code),
 #[cfg(test)]
-							error_data: Some(data.clone()),
+								error_data: Some(data.clone()),
+							}
 						}
 					}
 				};
@@ -6157,7 +6122,11 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
 	}
 
 	fn provided_node_features(&self) -> NodeFeatures {
-		NodeFeatures::known()
+		NodeFeatures::known_channel_features()
+	}
+
+	fn provided_init_features(&self, _their_init_features: &PublicKey) -> InitFeatures {
+		InitFeatures::known_channel_features()
 	}
 }