X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=0b37ac34823e9c44dc62135141170c9cc375714b;hb=5c4d2912e04af1d115c64cca32317e548e3c45a7;hp=fd21b5974040efc0afc42380fcd94df705c0e92d;hpb=5acf6fb775b9fdbf617b64060004d5a9895e56df;p=ldk-sample

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index fd21b59..0b37ac3 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -3,7 +3,7 @@ use base64;
 use bitcoin::blockdata::block::Block;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
-use bitcoin::hash_types::BlockHash;
+use bitcoin::hash_types::{BlockHash, Txid};
 use bitcoin::util::address::Address;
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning_block_sync::http::HttpEndpoint;
@@ -24,6 +24,7 @@ pub struct BitcoindClient {
 	rpc_user: String,
 	rpc_password: String,
 	fees: Arc<HashMap<Target, AtomicU32>>,
+	handle: tokio::runtime::Handle,
 }
 
 #[derive(Clone, Eq, Hash, PartialEq)]
@@ -66,6 +67,7 @@ const MIN_FEERATE: u32 = 253;
 impl BitcoindClient {
 	pub async fn new(
 		host: String, port: u16, rpc_user: String, rpc_password: String,
+		handle: tokio::runtime::Handle,
 	) -> std::io::Result<Self> {
 		let http_endpoint = HttpEndpoint::for_host(host.clone()).with_port(port);
 		let rpc_credentials =
@@ -89,19 +91,21 @@ impl BitcoindClient {
 			rpc_user,
 			rpc_password,
 			fees: Arc::new(fees),
+			handle: handle.clone(),
 		};
 		BitcoindClient::poll_for_fee_estimates(
 			client.fees.clone(),
 			client.bitcoind_rpc_client.clone(),
-		)
-		.await;
+			handle,
+		);
 		Ok(client)
 	}
 
-	async fn poll_for_fee_estimates(
+	fn poll_for_fee_estimates(
 		fees: Arc<HashMap<Target, AtomicU32>>, rpc_client: Arc<Mutex<RpcClient>>,
+		handle: tokio::runtime::Handle,
 	) {
-		tokio::spawn(async move {
+		handle.spawn(async move {
 			loop {
 				let background_estimate = {
 					let mut rpc = rpc_client.lock().await;
@@ -206,7 +210,7 @@ impl BitcoindClient {
 		let mut rpc = self.bitcoind_rpc_client.lock().await;
 
 		let raw_tx_json = serde_json::json!(raw_tx.0);
-		rpc.call_method::<RawTx>("sendrawtransaction", &[raw_tx_json]).await.unwrap();
+		rpc.call_method::<Txid>("sendrawtransaction", &[raw_tx_json]).await.unwrap();
 	}
 
 	pub async fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx {
@@ -250,11 +254,11 @@ impl BroadcasterInterface for BitcoindClient {
 	fn broadcast_transaction(&self, tx: &Transaction) {
 		let bitcoind_rpc_client = self.bitcoind_rpc_client.clone();
 		let tx_serialized = serde_json::json!(encode::serialize_hex(tx));
-		tokio::spawn(async move {
+		self.handle.spawn(async move {
 			let mut rpc = bitcoind_rpc_client.lock().await;
 			// 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 {
+			match rpc.call_method::<Txid>("sendrawtransaction", &vec![tx_serialized]).await {
 				Ok(_) => {}
 				Err(e) => {
 					let err_str = e.get_ref().unwrap().to_string();
@@ -262,6 +266,7 @@ impl BroadcasterInterface for BitcoindClient {
 						&& !err_str.contains("Inputs missing or spent")
 						&& !err_str.contains("bad-txns-inputs-missingorspent")
 						&& !err_str.contains("non-BIP68-final")
+						&& !err_str.contains("insufficient fee, rejecting replacement ")
 					{
 						panic!("{}", e);
 					}