f Account for async'ified ChangeDestinationSource

Author: tnull

src/builder.rs

@@ -44,7 +44,7 @@ use lightning::routing::router::DefaultRouter;
 use lightning::routing::scoring::{
 	ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
 };
-use lightning::sign::EntropySource;
+use lightning::sign::{ChangeDestinationSourceSyncWrapper, EntropySource};
 
 use lightning::util::persist::{
 	read_channel_monitors, CHANNEL_MANAGER_PERSISTENCE_KEY,
@@ -1409,11 +1409,14 @@ fn build_with_store_internal(
 	let connection_manager =
 		Arc::new(ConnectionManager::new(Arc::clone(&peer_manager), Arc::clone(&logger)));
 
+	let change_destination_source =
+		Arc::new(ChangeDestinationSourceSyncWrapper::new(Arc::clone(&keys_manager)));
 	let output_sweeper = match io::utils::read_output_sweeper(
 		Arc::clone(&tx_broadcaster),
 		Arc::clone(&fee_estimator),
 		Arc::clone(&chain_source),
 		Arc::clone(&keys_manager),
+		Arc::clone(&change_destination_source),
 		Arc::clone(&kv_store),
 		Arc::clone(&logger),
 	) {
@@ -1426,7 +1429,7 @@ fn build_with_store_internal(
 					Arc::clone(&fee_estimator),
 					Some(Arc::clone(&chain_source)),
 					Arc::clone(&keys_manager),
-					Arc::clone(&keys_manager),
+					change_destination_source,
 					Arc::clone(&kv_store),
 					Arc::clone(&logger),
 				))

src/io/utils.rs

@@ -16,7 +16,7 @@ use crate::io::{
 use crate::logger::{log_error, LdkLogger, Logger};
 use crate::peer_store::PeerStore;
 use crate::sweep::DeprecatedSpendableOutputInfo;
-use crate::types::{Broadcaster, DynStore, KeysManager, Sweeper};
+use crate::types::{Broadcaster, ChangeDestinationSource, DynStore, KeysManager, Sweeper};
 use crate::wallet::ser::{ChangeSetDeserWrapper, ChangeSetSerWrapper};
 use crate::{Error, EventQueue, NodeMetrics, PaymentDetails};
 
@@ -235,7 +235,8 @@ where
 /// Read `OutputSweeper` state from the store.
 pub(crate) fn read_output_sweeper(
 	broadcaster: Arc<Broadcaster>, fee_estimator: Arc<OnchainFeeEstimator>,
-	chain_data_source: Arc<ChainSource>, keys_manager: Arc<KeysManager>, kv_store: Arc<DynStore>,
+	chain_data_source: Arc<ChainSource>, keys_manager: Arc<KeysManager>,
+	change_destination_source: Arc<ChangeDestinationSource>, kv_store: Arc<DynStore>,
 	logger: Arc<Logger>,
 ) -> Result<Sweeper, std::io::Error> {
 	let mut reader = Cursor::new(kv_store.read(
@@ -247,8 +248,8 @@ pub(crate) fn read_output_sweeper(
 		broadcaster,
 		fee_estimator,
 		Some(chain_data_source),
-		Arc::clone(&keys_manager),
 		keys_manager,
+		change_destination_source,
 		kv_store,
 		logger.clone(),
 	);

src/types.rs

@@ -22,6 +22,7 @@ use lightning::ln::types::ChannelId;
 use lightning::routing::gossip;
 use lightning::routing::router::DefaultRouter;
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
+use lightning::sign::ChangeDestinationSourceSyncWrapper;
 use lightning::sign::InMemorySigner;
 use lightning::util::persist::KVStore;
 use lightning::util::ser::{Readable, Writeable, Writer};
@@ -125,9 +126,11 @@ pub(crate) type MessageRouter = lightning::onion_message::messenger::DefaultMess
 	Arc<KeysManager>,
 >;
 
+pub(crate) type ChangeDestinationSource = ChangeDestinationSourceSyncWrapper<Arc<KeysManager>>;
+
 pub(crate) type Sweeper = OutputSweeper<
 	Arc<Broadcaster>,
-	Arc<KeysManager>,
+	Arc<ChangeDestinationSource>,
 	Arc<OnchainFeeEstimator>,
 	Arc<ChainSource>,
 	Arc<DynStore>,

src/wallet/mod.rs

@@ -25,8 +25,8 @@ use lightning::ln::inbound_payment::ExpandedKey;
 use lightning::ln::msgs::UnsignedGossipMessage;
 use lightning::ln::script::ShutdownScript;
 use lightning::sign::{
-	ChangeDestinationSource, EntropySource, InMemorySigner, KeysManager, NodeSigner, OutputSpender,
-	Recipient, SignerProvider, SpendableOutputDescriptor,
+	ChangeDestinationSourceSync, EntropySource, InMemorySigner, KeysManager, NodeSigner,
+	OutputSpender, Recipient, SignerProvider, SpendableOutputDescriptor,
 };
 
 use lightning::util::message_signing;
@@ -913,7 +913,7 @@ where
 	}
 }
 
-impl<B: Deref, E: Deref, L: Deref> ChangeDestinationSource for WalletKeysManager<B, E, L>
+impl<B: Deref, E: Deref, L: Deref> ChangeDestinationSourceSync for WalletKeysManager<B, E, L>
 where
 	B::Target: BroadcasterInterface,
 	E::Target: FeeEstimator,