f Switch to rustls, retry failed request once

Author: tnull

Cargo.toml

@@ -41,7 +41,8 @@ lightning-transaction-sync = { version = "0.0.114", features = ["esplora-async"]
 #lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
 #lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async"] }
 
-bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "key-value-db", "reqwest-default-tls"]}
+bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "key-value-db"]}
+reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
 bitcoin = "0.29.2"
 
 rand = "0.8.5"

src/wallet.rs

@@ -26,6 +26,7 @@ use bitcoin::{Script, Transaction, TxOut};
 
 use std::collections::HashMap;
 use std::sync::{Arc, Condvar, Mutex, RwLock};
+use std::time::Duration;
 
 pub struct Wallet<D>
 where
@@ -79,12 +80,34 @@ where
 		}
 
 		let sync_options = SyncOptions { progress: None };
-		let res = match self.inner.lock().unwrap().sync(&self.blockchain, sync_options).await {
+		let wallet_lock = self.inner.lock().unwrap();
+		let res = match wallet_lock.sync(&self.blockchain, sync_options).await {
 			Ok(()) => Ok(()),
-			Err(e) => {
-				log_error!(self.logger, "Wallet sync error: {}", e);
-				Err(From::from(e))
-			}
+			Err(e) => match e {
+				bdk::Error::Esplora(ref be) => match **be {
+					bdk::blockchain::esplora::EsploraError::Reqwest(_) => {
+						tokio::time::sleep(Duration::from_secs(1)).await;
+						log_error!(
+							self.logger,
+							"Sync failed due to HTTP connection error, retrying: {}",
+							e
+						);
+						let sync_options = SyncOptions { progress: None };
+						wallet_lock
+							.sync(&self.blockchain, sync_options)
+							.await
+							.map_err(|e| From::from(e))
+					}
+					_ => {
+						log_error!(self.logger, "Sync failed due to Esplora error: {}", e);
+						Err(From::from(e))
+					}
+				},
+				_ => {
+					log_error!(self.logger, "Wallet sync error: {}", e);
+					Err(From::from(e))
+				}
+			},
 		};
 
 		drop(guard);