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

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index ca4a181..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,
@@ -76,7 +79,7 @@ impl BitcoindClient {
 				"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 {
@@ -111,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;
@@ -129,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,
 					}
 				};
@@ -147,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,
 					}
 				};
@@ -246,6 +248,7 @@ impl BroadcasterInterface for BitcoindClient {
 					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);