X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Foutbound_payment.rs;h=cdf5627a7aac6013371cd2b55e3cf14224a8423a;hb=3c837838006670f0e1a6c61608596f9d40e06059;hp=e06ba8d853982ccbd1c3a0c79e2815586158ffcf;hpb=ac57163895b93bb2c0999aed50aca56a15fe4e33;p=rust-lightning

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index e06ba8d8..cdf5627a 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -215,11 +215,19 @@ impl PendingOutboundPayment {
 				PendingOutboundPayment::InvoiceReceived { .. } => { debug_assert!(false); false },
 		};
 		if remove_res {
-			if let PendingOutboundPayment::Retryable { ref mut pending_amt_msat, ref mut pending_fee_msat, .. } = self {
-				let path = path.expect("Fulfilling a payment should always come with a path");
+			if let PendingOutboundPayment::Retryable {
+				ref mut pending_amt_msat, ref mut pending_fee_msat,
+				ref mut remaining_max_total_routing_fee_msat, ..
+			} = self {
+				let path = path.expect("Removing a failed payment should always come with a path");
 				*pending_amt_msat -= path.final_value_msat();
+				let path_fee_msat = path.fee_msat();
 				if let Some(fee_msat) = pending_fee_msat.as_mut() {
-					*fee_msat -= path.fee_msat();
+					*fee_msat -= path_fee_msat;
+				}
+
+				if let Some(max_total_routing_fee_msat) = remaining_max_total_routing_fee_msat.as_mut() {
+					*max_total_routing_fee_msat = max_total_routing_fee_msat.saturating_add(path_fee_msat);
 				}
 			}
 		}
@@ -238,11 +246,19 @@ impl PendingOutboundPayment {
 			PendingOutboundPayment::Abandoned { .. } => false,
 		};
 		if insert_res {
-			if let PendingOutboundPayment::Retryable { ref mut pending_amt_msat, ref mut pending_fee_msat, .. } = self {
-				*pending_amt_msat += path.final_value_msat();
-				if let Some(fee_msat) = pending_fee_msat.as_mut() {
-					*fee_msat += path.fee_msat();
-				}
+			if let PendingOutboundPayment::Retryable {
+				ref mut pending_amt_msat, ref mut pending_fee_msat,
+				ref mut remaining_max_total_routing_fee_msat, .. 
+			} = self {
+					*pending_amt_msat += path.final_value_msat();
+					let path_fee_msat = path.fee_msat();
+					if let Some(fee_msat) = pending_fee_msat.as_mut() {
+						*fee_msat += path_fee_msat;
+					}
+
+					if let Some(max_total_routing_fee_msat) = remaining_max_total_routing_fee_msat.as_mut() {
+						*max_total_routing_fee_msat = max_total_routing_fee_msat.saturating_sub(path_fee_msat);
+					}
 			}
 		}
 		insert_res
@@ -1519,10 +1535,11 @@ impl OutboundPayments {
 	) -> bool where L::Target: Logger {
 		#[cfg(test)]
 		let DecodedOnionFailure {
-			network_update, short_channel_id, payment_retryable, onion_error_code, onion_error_data
+			network_update, short_channel_id, payment_failed_permanently, onion_error_code,
+			onion_error_data
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 		#[cfg(not(test))]
-		let DecodedOnionFailure { network_update, short_channel_id, payment_retryable } =
+		let DecodedOnionFailure { network_update, short_channel_id, payment_failed_permanently } =
 			onion_error.decode_onion_failure(secp_ctx, logger, &source);
 
 		let payment_is_probe = payment_is_probe(payment_hash, &payment_id, probing_cookie_secret);
@@ -1563,8 +1580,8 @@ impl OutboundPayments {
 				payment.get_mut().insert_previously_failed_scid(scid);
 			}
 
-			if payment_is_probe || !is_retryable_now || !payment_retryable {
-				let reason = if !payment_retryable {
+			if payment_is_probe || !is_retryable_now || payment_failed_permanently {
+				let reason = if payment_failed_permanently {
 					PaymentFailureReason::RecipientRejected
 				} else {
 					PaymentFailureReason::RetriesExhausted
@@ -1573,7 +1590,7 @@ impl OutboundPayments {
 				is_retryable_now = false;
 			}
 			if payment.get().remaining_parts() == 0 {
-				if let PendingOutboundPayment::Abandoned { payment_hash, reason, .. }= payment.get() {
+				if let PendingOutboundPayment::Abandoned { payment_hash, reason, .. } = payment.get() {
 					if !payment_is_probe {
 						full_failure_ev = Some(events::Event::PaymentFailed {
 							payment_id: *payment_id,
@@ -1594,7 +1611,7 @@ impl OutboundPayments {
 
 		let path_failure = {
 			if payment_is_probe {
-				if !payment_retryable {
+				if payment_failed_permanently {
 					events::Event::ProbeSuccessful {
 						payment_id: *payment_id,
 						payment_hash: payment_hash.clone(),
@@ -1618,7 +1635,7 @@ impl OutboundPayments {
 				events::Event::PaymentPathFailed {
 					payment_id: Some(*payment_id),
 					payment_hash: payment_hash.clone(),
-					payment_failed_permanently: !payment_retryable,
+					payment_failed_permanently,
 					failure: events::PathFailure::OnPath { network_update },
 					path: path.clone(),
 					short_channel_id,