Add currency conversion support for BOLT 12 offers

fuzz/src/full_stack.rs

@@ -51,7 +51,9 @@ use lightning::ln::peer_handler::{
 };
 use lightning::ln::script::ShutdownScript;
 use lightning::ln::types::ChannelId;
+use lightning::offers::currency::{CurrencyConversion, ExchangeRange};
 use lightning::offers::invoice::UnsignedBolt12Invoice;
+use lightning::offers::offer::CurrencyCode;
 use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::router::{
@@ -184,6 +186,14 @@ impl MessageRouter for FuzzRouter {
 	}
 }
 
+struct FuzzCurrencyConversion {}
+
+impl CurrencyConversion for FuzzCurrencyConversion {
+	fn conversion_range(&self, _currency: CurrencyCode) -> Result<ExchangeRange, ()> {
+		Err(())
+	}
+}
+
 struct TestBroadcaster {
 	txn_broadcasted: Mutex<Vec<Transaction>>,
 }
@@ -239,6 +249,7 @@ type ChannelMan<'a> = ChannelManager<
 	Arc<FuzzEstimator>,
 	&'a FuzzRouter,
 	&'a FuzzRouter,
+	&'a FuzzCurrencyConversion,
 	Arc<dyn Logger + MaybeSend + MaybeSync>,
 >;
 type PeerMan<'a> = PeerManager<
@@ -548,6 +559,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
 	});
 	let fee_est = Arc::new(FuzzEstimator { input: input.clone() });
 	let router = FuzzRouter {};
+	let conversion = FuzzCurrencyConversion {};
 
 	macro_rules! get_slice {
 		($len: expr) => {
@@ -613,6 +625,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
 		broadcast.clone(),
 		&router,
 		&router,
+		&conversion,
 		Arc::clone(&logger),
 		keys_manager.clone(),
 		keys_manager.clone(),

fuzz/src/invoice_request_deser.rs

@@ -16,6 +16,7 @@ use lightning::blinded_path::payment::{
 };
 use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
 use lightning::ln::inbound_payment::ExpandedKey;
+use lightning::offers::currency::NullCurrencyConversion;
 use lightning::offers::invoice::UnsignedBolt12Invoice;
 use lightning::offers::invoice_request::{InvoiceRequest, InvoiceRequestFields};
 use lightning::offers::offer::OfferId;
@@ -145,7 +146,7 @@ fn build_response<T: secp256k1::Signing + secp256k1::Verification>(
 	.unwrap();
 
 	let payment_hash = PaymentHash([42; 32]);
-	invoice_request.respond_with(vec![payment_path], payment_hash)?.build()
+	invoice_request.respond_with(&NullCurrencyConversion, vec![payment_path], payment_hash)?.build()
 }
 
 pub fn invoice_request_deser_test<Out: test_logger::Output>(data: &[u8], out: Out) {

lightning-background-processor/src/lib.rs

@@ -378,6 +378,9 @@ type DynMessageRouter = lightning::onion_message::messenger::DefaultMessageRoute
 	&'static (dyn EntropySource + Send + Sync),
 >;
 
+#[cfg(not(c_bindings))]
+type DynCurrencyConversion = lightning::offers::currency::NullCurrencyConversion;
+
 #[cfg(not(c_bindings))]
 type DynSignerProvider = dyn lightning::sign::SignerProvider<EcdsaSigner = lightning::sign::InMemorySigner>
 	+ Send
@@ -393,6 +396,7 @@ type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
 	&'static (dyn FeeEstimator + Send + Sync),
 	&'static DynRouter,
 	&'static DynMessageRouter,
+	&'static DynCurrencyConversion,
 	&'static (dyn Logger + Send + Sync),
 >;
 
@@ -1949,6 +1953,7 @@ mod tests {
 		IgnoringMessageHandler, MessageHandler, PeerManager, SocketDescriptor,
 	};
 	use lightning::ln::types::ChannelId;
+	use lightning::offers::currency::NullCurrencyConversion;
 	use lightning::onion_message::messenger::{DefaultMessageRouter, OnionMessenger};
 	use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 	use lightning::routing::router::{CandidateRouteHop, DefaultRouter, Path, RouteHop};
@@ -2044,6 +2049,7 @@ mod tests {
 				Arc<KeysManager>,
 			>,
 		>,
+		Arc<NullCurrencyConversion>,
 		Arc<test_utils::TestLogger>,
 	>;
 
@@ -2468,6 +2474,7 @@ mod tests {
 				Arc::clone(&network_graph),
 				Arc::clone(&keys_manager),
 			));
+			let conversion = Arc::new(NullCurrencyConversion);
 			let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Bitcoin));
 			let kv_store =
 				Arc::new(Persister::new(format!("{}_persister_{}", &persist_dir, i).into()));
@@ -2494,6 +2501,7 @@ mod tests {
 				Arc::clone(&tx_broadcaster),
 				Arc::clone(&router),
 				Arc::clone(&msg_router),
+				Arc::clone(&conversion),
 				Arc::clone(&logger),
 				Arc::clone(&keys_manager),
 				Arc::clone(&keys_manager),

lightning-block-sync/src/init.rs

@@ -53,6 +53,7 @@ where
 /// use lightning::chain::chaininterface::BroadcasterInterface;
 /// use lightning::chain::chaininterface::FeeEstimator;
 /// use lightning::ln::channelmanager::{ChannelManager, ChannelManagerReadArgs};
+/// use lightning::offers::currency::CurrencyConversion;
 /// use lightning::onion_message::messenger::MessageRouter;
 /// use lightning::routing::router::Router;
 /// use lightning::sign;
@@ -74,6 +75,7 @@ where
 /// 	F: FeeEstimator,
 /// 	R: Router,
 /// 	MR: MessageRouter,
+/// 	CC: CurrencyConversion,
 /// 	L: Logger,
 /// 	C: chain::Filter,
 /// 	P: chainmonitor::Persist<SP::EcdsaSigner>,
@@ -88,6 +90,7 @@ where
 /// 	fee_estimator: &F,
 /// 	router: &R,
 /// 	message_router: &MR,
+/// 	currency_conversion: &CC,
 /// 	logger: &L,
 /// 	persister: &P,
 /// ) {
@@ -108,11 +111,12 @@ where
 /// 			tx_broadcaster,
 /// 			router,
 /// 			message_router,
+/// 			currency_conversion,
 /// 			logger,
 /// 			config,
 /// 			vec![&mut monitor],
 /// 		);
-/// 		<(BlockLocator, ChannelManager<&ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P, &ES>, &T, &ES, &NS, &SP, &F, &R, &MR, &L>)>::read(
+/// 		<(BlockLocator, ChannelManager<&ChainMonitor<SP::EcdsaSigner, &C, &T, &F, &L, &P, &ES>, &T, &ES, &NS, &SP, &F, &R, &MR, &CC, &L>)>::read(
 /// 			&mut Cursor::new(&serialized_manager), read_args).unwrap()
 /// 	};
 ///

lightning/src/ln/async_payments_tests.rs

@@ -37,6 +37,7 @@ use crate::offers::async_receive_offer_cache::{
 	TEST_INVOICE_REFRESH_THRESHOLD, TEST_MAX_CACHED_OFFERS_TARGET, TEST_MAX_UPDATE_ATTEMPTS,
 	TEST_MIN_OFFER_PATHS_RELATIVE_EXPIRY_SECS, TEST_OFFER_REFRESH_THRESHOLD,
 };
+use crate::offers::currency::NullCurrencyConversion;
 use crate::offers::flow::{
 	TEST_DEFAULT_ASYNC_RECEIVE_OFFER_EXPIRY, TEST_OFFERS_MESSAGE_REQUEST_LIMIT,
 	TEST_TEMP_REPLY_PATH_RELATIVE_EXPIRY,
@@ -328,7 +329,11 @@ fn create_static_invoice<T: secp256k1::Signing + secp256k1::Verification>(
 	let (offer_builder, offer_nonce) = recipient
 		.node
 		.flow
-		.create_async_receive_offer_builder(entropy_source, blinded_paths_to_always_online_node)
+		.create_async_receive_offer_builder(
+			entropy_source,
+			&NullCurrencyConversion,
+			blinded_paths_to_always_online_node,
+		)
 		.unwrap();
 	let offer = offer_builder.build().unwrap();
 	let static_invoice =
@@ -702,7 +707,11 @@ fn static_invoice_unknown_required_features() {
 	let (offer_builder, nonce) = nodes[2]
 		.node
 		.flow
-		.create_async_receive_offer_builder(entropy_source, blinded_paths_to_always_online_node)
+		.create_async_receive_offer_builder(
+			entropy_source,
+			&NullCurrencyConversion,
+			blinded_paths_to_always_online_node,
+		)
 		.unwrap();
 	let offer = offer_builder.build().unwrap();
 	let static_invoice_unknown_req_features =
@@ -1772,7 +1781,11 @@ fn invalid_async_receive_with_retry<F1, F2>(
 	let (offer_builder, offer_nonce) = nodes[2]
 		.node
 		.flow
-		.create_async_receive_offer_builder(entropy_source, blinded_paths_to_always_online_node)
+		.create_async_receive_offer_builder(
+			entropy_source,
+			&NullCurrencyConversion,
+			blinded_paths_to_always_online_node,
+		)
 		.unwrap();
 	let offer = offer_builder.build().unwrap();
 	let amt_msat = 5000;