f

Author: jbesraa

Cargo.toml

@@ -75,7 +75,7 @@ libc = "0.2"
 uniffi = { version = "0.27.3", features = ["build"], optional = true }
 serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
 serde_json = { version = "1.0.128", default-features = false, features = ["std"] }
-payjoin = { version = "0.16.0", default-features = false, features = ["send", "v2"] }
+payjoin = { version = "0.21.0", default-features = false, features = ["send", "v2"] }
 
 vss-client = "0.3"
 prost = { version = "0.11.6", default-features = false}
@@ -90,7 +90,7 @@ electrum-client = { version = "0.21.0", default-features = true }
 bitcoincore-rpc = { version = "0.19.0", default-features = false }
 proptest = "1.0.0"
 regex = "1.5.6"
-payjoin = { version = "0.16.0", default-features = false, features = ["send", "v2", "receive"] }
+payjoin = { version = "0.21.0", default-features = false, features = ["send", "v2", "receive"] }
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls", "blocking"] }
 
 [target.'cfg(not(no_download))'.dev-dependencies]

src/builder.rs

@@ -1234,7 +1234,6 @@ fn build_with_store_internal(
 
 	let payjoin_handler = payjoin_config.map(|pj_config| {
 		Arc::new(PayjoinHandler::new(
-			Arc::clone(&tx_sync),
 			Arc::clone(&event_queue),
 			Arc::clone(&logger),
 			pj_config.payjoin_relay.clone(),
@@ -1243,14 +1242,6 @@ fn build_with_store_internal(
 		))
 	});
 
-	let is_listening = Arc::new(AtomicBool::new(false));
-	let latest_wallet_sync_timestamp = Arc::new(RwLock::new(None));
-	let latest_onchain_wallet_sync_timestamp = Arc::new(RwLock::new(None));
-	let latest_fee_rate_cache_update_timestamp = Arc::new(RwLock::new(None));
-	let latest_rgs_snapshot_timestamp = Arc::new(RwLock::new(None));
-	let latest_node_announcement_broadcast_timestamp = Arc::new(RwLock::new(None));
-	let latest_channel_monitor_archival_height = Arc::new(RwLock::new(None));
-
 	Ok(Node {
 		runtime,
 		stop_sender,

src/event.rs

@@ -332,7 +332,7 @@ impl_writeable_tlv_based_enum!(Event,
 		(0, amount_sats, required),
 		(2, txid, required),
 		(4, reason, required),
-	};
+	}
 );
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -361,8 +361,7 @@ pub enum PayjoinPaymentFailureReason {
 impl_writeable_tlv_based_enum!(PayjoinPaymentFailureReason,
 	(0, Timeout) => {},
 	(1, RequestSendingFailed) => {},
-	(2, ResponseProcessingFailed) => {};
->>>>>>> 1136aa4 (Implement `PayjoinPayment` ..)
+	(2, ResponseProcessingFailed) => {}
 );
 
 pub struct EventQueue<L: Deref>

src/lib.rs

@@ -258,68 +258,6 @@ impl Node {
 				.continuously_sync_wallets(stop_sync_receiver, sync_cman, sync_cmon, sync_sweeper)
 				.await;
 		});
-		let sync_logger = Arc::clone(&self.logger);
-		let sync_payjoin = &self.payjoin_handler.as_ref();
-		let sync_payjoin = sync_payjoin.map(Arc::clone);
-		let sync_wallet_timestamp = Arc::clone(&self.latest_wallet_sync_timestamp);
-		let sync_monitor_archival_height = Arc::clone(&self.latest_channel_monitor_archival_height);
-		let mut stop_sync = self.stop_sender.subscribe();
-		let wallet_sync_interval_secs =
-			self.config.wallet_sync_interval_secs.max(WALLET_SYNC_INTERVAL_MINIMUM_SECS);
-		runtime.spawn(async move {
-			let mut wallet_sync_interval =
-				tokio::time::interval(Duration::from_secs(wallet_sync_interval_secs));
-			wallet_sync_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
-			loop {
-				tokio::select! {
-					_ = stop_sync.changed() => {
-						log_trace!(
-							sync_logger,
-							"Stopping background syncing Lightning wallet.",
-						);
-						return;
-					}
-					_ = wallet_sync_interval.tick() => {
-						let mut confirmables = vec![
-							&*sync_cman as &(dyn Confirm + Sync + Send),
-							&*sync_cmon as &(dyn Confirm + Sync + Send),
-							&*sync_sweeper as &(dyn Confirm + Sync + Send),
-						];
-						if let Some(sync_payjoin) = sync_payjoin.as_ref() {
-							confirmables.push(sync_payjoin.as_ref() as &(dyn Confirm + Sync + Send));
-						}
-						let now = Instant::now();
-						let timeout_fut = tokio::time::timeout(Duration::from_secs(LDK_WALLET_SYNC_TIMEOUT_SECS), tx_sync.sync(confirmables));
-						match timeout_fut.await {
-							Ok(res) => match res {
-								Ok(()) => {
-									log_trace!(
-										sync_logger,
-										"Background sync of Lightning wallet finished in {}ms.",
-										now.elapsed().as_millis()
-										);
-									let unix_time_secs_opt =
-										SystemTime::now().duration_since(UNIX_EPOCH).ok().map(|d| d.as_secs());
-									*sync_wallet_timestamp.write().unwrap() = unix_time_secs_opt;
-
-									periodically_archive_fully_resolved_monitors(
-										Arc::clone(&archive_cman),
-										Arc::clone(&archive_cmon),
-										Arc::clone(&sync_monitor_archival_height)
-									);
-								}
-								Err(e) => {
-									log_error!(sync_logger, "Background sync of Lightning wallet failed: {}", e)
-								}
-							}
-							Err(e) => {
-								log_error!(sync_logger, "Background sync of Lightning wallet timed out: {}", e)
-							}
-						}
-					}
-				}
-			}
-		});
 
 		if self.gossip_source.is_rgs() {
 			let gossip_source = Arc::clone(&self.gossip_source);
@@ -1320,21 +1258,6 @@ impl Node {
 		let sync_cman = Arc::clone(&self.channel_manager);
 		let sync_cmon = Arc::clone(&self.chain_monitor);
 		let sync_sweeper = Arc::clone(&self.output_sweeper);
-		let sync_logger = Arc::clone(&self.logger);
-		let sync_payjoin = &self.payjoin_handler.as_ref();
-		let mut confirmables = vec![
-			&*sync_cman as &(dyn Confirm + Sync + Send),
-			&*sync_cmon as &(dyn Confirm + Sync + Send),
-			&*sync_sweeper as &(dyn Confirm + Sync + Send),
-		];
-		if let Some(sync_payjoin) = sync_payjoin {
-			confirmables.push(sync_payjoin.as_ref() as &(dyn Confirm + Sync + Send));
-		}
-		let sync_wallet_timestamp = Arc::clone(&self.latest_wallet_sync_timestamp);
-		let sync_fee_rate_update_timestamp =
-			Arc::clone(&self.latest_fee_rate_cache_update_timestamp);
-		let sync_onchain_wallet_timestamp = Arc::clone(&self.latest_onchain_wallet_sync_timestamp);
-		let sync_monitor_archival_height = Arc::clone(&self.latest_channel_monitor_archival_height);
 
 		tokio::task::block_in_place(move || {
 			tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap().block_on(