f Account for updated payment params interface

Author: tnull

src/builder.rs

@@ -658,12 +658,14 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 			route_handler: Arc::clone(&p2p_gossip_sync)
 				as Arc<dyn RoutingMessageHandler + Sync + Send>,
 			onion_message_handler: onion_messenger,
+			custom_message_handler: IgnoringMessageHandler {},
 		},
 		GossipSync::Rapid(_) => MessageHandler {
 			chan_handler: Arc::clone(&channel_manager),
 			route_handler: Arc::new(IgnoringMessageHandler {})
 				as Arc<dyn RoutingMessageHandler + Sync + Send>,
 			onion_message_handler: onion_messenger,
+			custom_message_handler: IgnoringMessageHandler {},
 		},
 		GossipSync::None => {
 			unreachable!("We must always have a gossip sync!");
@@ -675,7 +677,6 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		cur_time.as_secs().try_into().map_err(|_| BuildError::InvalidSystemTime)?,
 		&ephemeral_bytes,
 		Arc::clone(&logger),
-		IgnoringMessageHandler {},
 		Arc::clone(&keys_manager),
 	));
 

src/lib.rs

@@ -1147,9 +1147,12 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 			invoice.min_final_cltv_expiry_delta() as u32,
 		)
 		.with_expiry_time(expiry_time.as_secs())
-		.with_route_hints(invoice.route_hints());
+		.with_route_hints(invoice.route_hints())
+		.map_err(|_| Error::InvalidInvoice)?;
 		if let Some(features) = invoice.features() {
-			payment_params = payment_params.with_features(features.clone());
+			payment_params = payment_params
+				.with_bolt11_features(features.clone())
+				.map_err(|_| Error::InvalidInvoice)?;
 		}
 		let route_params = RouteParameters { payment_params, final_value_msat: amount_msat };
 
@@ -1313,9 +1316,12 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 			invoice.min_final_cltv_expiry_delta() as u32,
 		)
 		.with_expiry_time(expiry_time.as_secs())
-		.with_route_hints(invoice.route_hints());
+		.with_route_hints(invoice.route_hints())
+		.map_err(|_| Error::InvalidInvoice)?;
 		if let Some(features) = invoice.features() {
-			payment_params = payment_params.with_features(features.clone());
+			payment_params = payment_params
+				.with_bolt11_features(features.clone())
+				.map_err(|_| Error::InvalidInvoice)?;
 		}
 		let route_params = RouteParameters { payment_params, final_value_msat: amount_msat };
 
@@ -1356,7 +1362,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 				&payer,
 				&route_params,
 				Some(&first_hops.iter().collect::<Vec<_>>()),
-				&inflight_htlcs,
+				inflight_htlcs,
 			)
 			.map_err(|e| {
 				log_error!(self.logger, "Failed to find path for payment probe: {:?}", e);