X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=28101991cf700c35fab7e781e7389979564a0361;hb=bd16a1e409413ed0762d87c166819ad1fa62fa8b;hp=b4b238e820b2c6d4ad0f1e9f0ccf096010bd21ec;hpb=7d2d04798daa9c78f183424f73f3fea6c8564573;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index b4b238e8..28101991 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -2014,13 +2014,29 @@ where L::Target: Logger {
 
 	let max_total_routing_fee_msat = route_params.max_total_routing_fee_msat.unwrap_or(u64::max_value());
 
+	let first_hop_count = first_hops.map(|hops| hops.len()).unwrap_or(0);
 	log_trace!(logger, "Searching for a route from payer {} to {} {} MPP and {} first hops {}overriding the network graph of {} nodes and {} channels with a fee limit of {} msat",
 		our_node_pubkey, LoggedPayeePubkey(payment_params.payee.node_id()),
 		if allow_mpp { "with" } else { "without" },
-		first_hops.map(|hops| hops.len()).unwrap_or(0), if first_hops.is_some() { "" } else { "not " },
+		first_hop_count, if first_hops.is_some() { "" } else { "not " },
 		network_graph.nodes().len(), network_graph.channels().len(),
 		max_total_routing_fee_msat);
 
+	if first_hop_count < 10 {
+		if let Some(hops) = first_hops {
+			for hop in hops {
+				log_trace!(
+					logger,
+					" First hop through {}/{} can send between {}msat and {}msat (inclusive).",
+					hop.counterparty.node_id,
+					hop.get_outbound_payment_scid().unwrap_or(0),
+					hop.next_outbound_htlc_minimum_msat,
+					hop.next_outbound_htlc_limit_msat
+				);
+			}
+		}
+	}
+
 	// Step (1).
 	// Prepare the data we'll use for payee-to-payer search by
 	// inserting first hops suggested by the caller as targets.
@@ -2227,14 +2243,9 @@ where L::Target: Logger {
 					// around again with a higher amount.
 					if !contributes_sufficient_value {
 						if should_log_candidate {
-							log_trace!(logger, "Ignoring {} due to insufficient value contribution.", LoggedCandidateHop(&$candidate));
-
-							if let Some(details) = first_hop_details {
-								log_trace!(logger,
-									"First hop candidate next_outbound_htlc_limit_msat: {}",
-									details.next_outbound_htlc_limit_msat,
-								);
-							}
+							log_trace!(logger, "Ignoring {} due to insufficient value contribution (channel max {:?}).",
+								LoggedCandidateHop(&$candidate),
+								effective_capacity);
 						}
 						num_ignored_value_contribution += 1;
 					} else if exceeds_max_path_length {
@@ -2263,15 +2274,8 @@ where L::Target: Logger {
 					} else if may_overpay_to_meet_path_minimum_msat {
 						if should_log_candidate {
 							log_trace!(logger,
-								"Ignoring {} to avoid overpaying to meet htlc_minimum_msat limit.",
-								LoggedCandidateHop(&$candidate));
-
-							if let Some(details) = first_hop_details {
-								log_trace!(logger,
-									"First hop candidate next_outbound_htlc_minimum_msat: {}",
-									details.next_outbound_htlc_minimum_msat,
-								);
-							}
+								"Ignoring {} to avoid overpaying to meet htlc_minimum_msat limit ({}).",
+								LoggedCandidateHop(&$candidate), $candidate.htlc_minimum_msat());
 						}
 						num_ignored_avoid_overpayment += 1;
 						hit_minimum_limit = true;
@@ -3329,8 +3333,9 @@ mod tests {
 	#[cfg(c_bindings)]
 	use crate::util::ser::Writer;
 
+	use bitcoin::amount::Amount;
 	use bitcoin::hashes::Hash;
-	use bitcoin::network::constants::Network;
+	use bitcoin::network::Network;
 	use bitcoin::blockdata::constants::ChainHash;
 	use bitcoin::blockdata::script::Builder;
 	use bitcoin::blockdata::opcodes;
@@ -4888,10 +4893,10 @@ mod tests {
 		.push_slice(&PublicKey::from_secret_key(&secp_ctx, &privkeys[0]).serialize())
 		.push_slice(&PublicKey::from_secret_key(&secp_ctx, &privkeys[2]).serialize())
 		.push_opcode(opcodes::all::OP_PUSHNUM_2)
-		.push_opcode(opcodes::all::OP_CHECKMULTISIG).into_script().to_v0_p2wsh();
+		.push_opcode(opcodes::all::OP_CHECKMULTISIG).into_script().to_p2wsh();
 
 		*chain_monitor.utxo_ret.lock().unwrap() =
-			UtxoResult::Sync(Ok(TxOut { value: 15, script_pubkey: good_script.clone() }));
+			UtxoResult::Sync(Ok(TxOut { value: Amount::from_sat(15), script_pubkey: good_script.clone() }));
 		gossip_sync.add_utxo_lookup(Some(chain_monitor));
 
 		add_channel(&gossip_sync, &secp_ctx, &privkeys[0], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(3)), 333);