f Reuse the same esplora-client again

Author: tnull

Cargo.toml

@@ -92,11 +92,6 @@ rand = "0.8.5"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 tokio = { version = "1.37", default-features = false, features = [ "rt-multi-thread", "time", "sync", "macros" ] }
 esplora-client = { version = "0.12", default-features = false, features = ["tokio", "async-https-rustls"] }
-
-# FIXME: This was  introduced to decouple the `bdk_esplora` and
-# `lightning-transaction-sync` APIs. We should drop it as part of the upgrade
-# to LDK 0.2.
-esplora-client_0_11 = { package = "esplora-client", version = "0.11", default-features = false, features = ["tokio", "async-https-rustls"] }
 electrum-client = { version = "0.23.1", default-features = true }
 libc = "0.2"
 uniffi = { version = "0.28.3", features = ["build"], optional = true }

src/chain/esplora.rs

@@ -58,19 +58,6 @@ impl EsploraChainSource {
 		tx_broadcaster: Arc<Broadcaster>, kv_store: Arc<DynStore>, config: Arc<Config>,
 		logger: Arc<Logger>, node_metrics: Arc<RwLock<NodeMetrics>>,
 	) -> Self {
-		// FIXME / TODO: We introduced this to make `bdk_esplora` work separately without updating
-		// `lightning-transaction-sync`. We should revert this as part of of the upgrade to LDK 0.2.
-		let mut client_builder_0_11 = esplora_client_0_11::Builder::new(&server_url);
-		client_builder_0_11 = client_builder_0_11.timeout(DEFAULT_ESPLORA_CLIENT_TIMEOUT_SECS);
-
-		for (header_name, header_value) in &headers {
-			client_builder_0_11 = client_builder_0_11.header(header_name, header_value);
-		}
-
-		let esplora_client_0_11 = client_builder_0_11.build_async().unwrap();
-		let tx_sync =
-			Arc::new(EsploraSyncClient::from_client(esplora_client_0_11, Arc::clone(&logger)));
-
 		let mut client_builder = esplora_client::Builder::new(&server_url);
 		client_builder = client_builder.timeout(DEFAULT_ESPLORA_CLIENT_TIMEOUT_SECS);
 
@@ -79,6 +66,8 @@ impl EsploraChainSource {
 		}
 
 		let esplora_client = client_builder.build_async().unwrap();
+		let tx_sync =
+			Arc::new(EsploraSyncClient::from_client(esplora_client.clone(), Arc::clone(&logger)));
 
 		let onchain_wallet_sync_status = Mutex::new(WalletSyncStatus::Completed);
 		let lightning_wallet_sync_status = Mutex::new(WalletSyncStatus::Completed);