X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=ca4a18134423a17f21636fab53cc8d534e749af0;hb=198a8397557b7a0df16504c46f685f0e1a0d69d6;hp=48d54f822e783bbb9dabfc0888d581c593f960df;hpb=b630ab9aecd9cae3ca264aaafb1af70ce81de0d7;p=ldk-sample

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 48d54f8..ca4a181 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -67,7 +67,14 @@ 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::Normal, AtomicU32::new(2000));
@@ -153,19 +160,6 @@ impl BitcoindClient {
 				fees.get(&Target::HighPriority)
 					.unwrap()
 					.store(high_prio_estimate, Ordering::Release);
-				// match fees.get(Target::Background) {
-				//     Some(fee) => fee.store(background_estimate, Ordering::Release),
-				//     None =>
-				// }
-				// if let Some(fee) = background_estimate.feerate {
-				//     fees.get("background").unwrap().store(fee, Ordering::Release);
-				// }
-				// if let Some(fee) = normal_estimate.feerate {
-				//     fees.get("normal").unwrap().store(fee, Ordering::Release);
-				// }
-				// if let Some(fee) = high_prio_estimate.feerate {
-				//     fees.get("high_prio").unwrap().store(fee, Ordering::Release);
-				// }
 				tokio::time::sleep(Duration::from_secs(60)).await;
 			}
 		});
@@ -235,43 +229,6 @@ impl FeeEstimator for BitcoindClient {
 				self.fees.get(&Target::HighPriority).unwrap().load(Ordering::Acquire)
 			}
 		}
-		// self.fees.g
-		// 253
-		// match confirmation_target {
-		//     ConfirmationTarget::Background =>
-		// }
-		// let mut rpc = self.bitcoind_rpc_client.lock().unwrap();
-
-		// let (conf_target, estimate_mode, default) = match confirmation_target {
-		// 	ConfirmationTarget::Background => (144, "ECONOMICAL", 253),
-		// 	ConfirmationTarget::Normal => (18, "ECONOMICAL", 20000),
-		// 	ConfirmationTarget::HighPriority => (6, "CONSERVATIVE", 50000),
-		// };
-
-		// // This function may be called from a tokio runtime, or not. So we need to check before
-		// // making the call to avoid the error "cannot run a tokio runtime from within a tokio runtime".
-		// let conf_target_json = serde_json::json!(conf_target);
-		// let estimate_mode_json = serde_json::json!(estimate_mode);
-		// let resp = match Handle::try_current() {
-		// 	Ok(_) => tokio::task::block_in_place(|| {
-		// 		runtime
-		// 			.block_on(rpc.call_method::<FeeResponse>(
-		// 				"estimatesmartfee",
-		// 				&vec![conf_target_json, estimate_mode_json],
-		// 			))
-		// 			.unwrap()
-		// 	}),
-		// 	_ => runtime
-		// 		.block_on(rpc.call_method::<FeeResponse>(
-		// 			"estimatesmartfee",
-		// 			&vec![conf_target_json, estimate_mode_json],
-		// 		))
-		// 		.unwrap(),
-		// };
-		// if resp.errored {
-		// 	return default;
-		// }
-		// resp.feerate.unwrap()
 	}
 }
 
@@ -281,34 +238,20 @@ 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("non-BIP68-final")
+					{
+						panic!("{}", e);
+					}
+				}
+			}
 		});
-		// let bitcoind_rpc_client = self.bitcoind_rpc_client.clone();
-		// tokio::spawn(async move {
-		//     let rpc = bitcoind_rpc_client.lock().await;
-		//     rpc.call_method::<R>
-		// });
-		// let mut rpc = self.bitcoind_rpc_client.lock().unwrap();
-		// let runtime = self.runtime.lock().unwrap();
-
-		// let tx_serialized = serde_json::json!(encode::serialize_hex(tx));
-		// // This function may be called from a tokio runtime, or not. So we need to check before
-		// // making the call to avoid the error "cannot run a tokio runtime from within a tokio runtime".
-		// match Handle::try_current() {
-		// 	Ok(_) => {
-		// 		tokio::task::block_in_place(|| {
-		// 			runtime
-		// 				.block_on(
-		// 					rpc.call_method::<RawTx>("sendrawtransaction", &vec![tx_serialized]),
-		// 				)
-		// 				.unwrap();
-		// 		});
-		// 	}
-		// 	_ => {
-		// 		runtime
-		// 			.block_on(rpc.call_method::<RawTx>("sendrawtransaction", &vec![tx_serialized]))
-		// 			.unwrap();
-		// 	}
-		// }
 	}
 }