X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=d3539579c50ae16d8a8d92eb806af6364243327d;hb=07606c18412d4571da30f1079150186dd5c17525;hp=f82ddc80a11abaecf334c04a8110c9c485f696e7;hpb=b66e3c53768f6bc7bc43064f1818051d22477c63;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index f82ddc80..d3539579 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -204,6 +204,15 @@ impl InFlightHtlcs {
 		}
 	}
 
+	/// Adds a known HTLC given the public key of the HTLC source, target, and short channel
+	/// id.
+	pub fn add_inflight_htlc(&mut self, source: &NodeId, target: &NodeId, channel_scid: u64, used_msat: u64){
+		self.0
+			.entry((channel_scid, source < target))
+			.and_modify(|used_liquidity_msat| *used_liquidity_msat += used_msat)
+			.or_insert(used_msat);
+	}
+
 	/// Returns liquidity in msat given the public key of the HTLC source, target, and short channel
 	/// id.
 	pub fn used_liquidity_msat(&self, source: &NodeId, target: &NodeId, channel_scid: u64) -> Option<u64> {
@@ -283,7 +292,7 @@ pub struct BlindedTail {
 }
 
 impl_writeable_tlv_based!(BlindedTail, {
-	(0, hops, vec_type),
+	(0, hops, required_vec),
 	(2, blinding_point, required),
 	(4, excess_final_cltv_expiry_delta, required),
 	(6, final_value_msat, required),
@@ -550,10 +559,10 @@ impl Writeable for PaymentParameters {
 			(1, self.max_total_cltv_expiry_delta, required),
 			(2, self.payee.features(), option),
 			(3, self.max_path_count, required),
-			(4, *clear_hints, vec_type),
+			(4, *clear_hints, required_vec),
 			(5, self.max_channel_saturation_power_of_half, required),
 			(6, self.expiry_time, option),
-			(7, self.previously_failed_channels, vec_type),
+			(7, self.previously_failed_channels, required_vec),
 			(8, *blinded_hints, optional_vec),
 			(9, self.payee.final_cltv_expiry_delta(), option),
 		});
@@ -568,14 +577,13 @@ impl ReadableArgs<u32> for PaymentParameters {
 			(1, max_total_cltv_expiry_delta, (default_value, DEFAULT_MAX_TOTAL_CLTV_EXPIRY_DELTA)),
 			(2, features, (option: ReadableArgs, payee_pubkey.is_some())),
 			(3, max_path_count, (default_value, DEFAULT_MAX_PATH_COUNT)),
-			(4, route_hints, vec_type),
+			(4, clear_route_hints, required_vec),
 			(5, max_channel_saturation_power_of_half, (default_value, DEFAULT_MAX_CHANNEL_SATURATION_POW_HALF)),
 			(6, expiry_time, option),
-			(7, previously_failed_channels, vec_type),
+			(7, previously_failed_channels, optional_vec),
 			(8, blinded_route_hints, optional_vec),
 			(9, final_cltv_expiry_delta, (default_value, default_final_cltv_expiry_delta)),
 		});
-		let clear_route_hints = route_hints.unwrap_or(vec![]);
 		let blinded_route_hints = blinded_route_hints.unwrap_or(vec![]);
 		let payee = if blinded_route_hints.len() != 0 {
 			if clear_route_hints.len() != 0 || payee_pubkey.is_some() { return Err(DecodeError::InvalidValue) }