X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-sample;a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=90552d915b5702ddc600910aed7506a75082080f;hp=58510ae736bd894cbfece045db24ef4ddd9ded31;hb=2dbe461743604d8ce8219e99ea337dd7b8b498df;hpb=678119951c5b3460d24da64d0f2d755ef4f198e6

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 58510ae..90552d9 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -60,6 +60,9 @@ impl BlockSource for &BitcoindClient {
 	}
 }
 
+/// The minimum feerate we are allowed to send, as specify by LDK.
+const MIN_FEERATE: u32 = 253;
+
 impl BitcoindClient {
 	pub async fn new(
 		host: String, port: u16, rpc_user: String, rpc_password: String,
@@ -67,9 +70,16 @@ impl BitcoindClient {
 		let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
 		let rpc_credentials =
 			base64::encode(format!("{}:{}", rpc_user.clone(), rpc_password.clone()));
-		let bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+		let mut bitcoind_rpc_client = RpcClient::new(&rpc_credentials, http_endpoint)?;
+		let _dummy = bitcoind_rpc_client
+			.call_method::<BlockchainInfo>("getblockchaininfo", &vec![])
+			.await
+			.map_err(|_| {
+				std::io::Error::new(std::io::ErrorKind::PermissionDenied,
+				"Failed to make initial call to bitcoind - please check your RPC user/password and access settings")
+			})?;
 		let mut fees: HashMap<Target, AtomicU32> = HashMap::new();
-		fees.insert(Target::Background, AtomicU32::new(253));
+		fees.insert(Target::Background, AtomicU32::new(MIN_FEERATE));
 		fees.insert(Target::Normal, AtomicU32::new(2000));
 		fees.insert(Target::HighPriority, AtomicU32::new(5000));
 		let client = Self {
@@ -104,12 +114,11 @@ impl BitcoindClient {
 						)
 						.await
 						.unwrap();
-					match resp.feerate {
-						Some(fee) => fee,
-						None => 253,
+					match resp.feerate_sat_per_kw {
+						Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
+						None => MIN_FEERATE,
 					}
 				};
-				// if background_estimate.
 
 				let normal_estimate = {
 					let mut rpc = rpc_client.lock().await;
@@ -122,8 +131,8 @@ impl BitcoindClient {
 						)
 						.await
 						.unwrap();
-					match resp.feerate {
-						Some(fee) => fee,
+					match resp.feerate_sat_per_kw {
+						Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 						None => 2000,
 					}
 				};
@@ -140,8 +149,8 @@ impl BitcoindClient {
 						.await
 						.unwrap();
 
-					match resp.feerate {
-						Some(fee) => fee,
+					match resp.feerate_sat_per_kw {
+						Some(feerate) => std::cmp::max(feerate, MIN_FEERATE),
 						None => 5000,
 					}
 				};
@@ -231,7 +240,21 @@ impl BroadcasterInterface for BitcoindClient {
 		let tx_serialized = serde_json::json!(encode::serialize_hex(tx));
 		tokio::spawn(async move {
 			let mut rpc = bitcoind_rpc_client.lock().await;
-			rpc.call_method::<RawTx>("sendrawtransaction", &vec![tx_serialized]).await.unwrap();
+			// This may error due to RL calling `broadcast_transaction` with the same transaction
+			// multiple times, but the error is safe to ignore.
+			match rpc.call_method::<RawTx>("sendrawtransaction", &vec![tx_serialized]).await {
+				Ok(_) => {}
+				Err(e) => {
+					let err_str = e.get_ref().unwrap().to_string();
+					if !err_str.contains("Transaction already in block chain")
+						&& !err_str.contains("Inputs missing or spent")
+						&& !err_str.contains("bad-txns-inputs-missingorspent")
+						&& !err_str.contains("non-BIP68-final")
+					{
+						panic!("{}", e);
+					}
+				}
+			}
 		});
 	}
 }