X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fbitcoind_client.rs;h=73ee635dec917c2d861994832ccb582e60215f01;hb=2bd0d81d407506d05901c3ac204fcbe3f8da34e9;hp=48d54f822e783bbb9dabfc0888d581c593f960df;hpb=b630ab9aecd9cae3ca264aaafb1af70ce81de0d7;p=ldk-sample diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs index 48d54f8..73ee635 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; @@ -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::("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 = 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, } }; @@ -153,19 +162,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; } }); @@ -191,14 +187,26 @@ impl BitcoindClient { let mut rpc = self.bitcoind_rpc_client.lock().await; let raw_tx_json = serde_json::json!(raw_tx.0); - rpc.call_method("fundrawtransaction", &[raw_tx_json]).await.unwrap() + let options = serde_json::json!({ + // LDK gives us feerates in satoshis per KW but Bitcoin Core here expects fees + // denominated in satoshis per vB. First we need to multiply by 4 to convert weight + // units to virtual bytes, then divide by 1000 to convert KvB to vB. + "fee_rate": self.get_est_sat_per_1000_weight(ConfirmationTarget::Normal) as f64 / 250.0, + // While users could "cancel" a channel open by RBF-bumping and paying back to + // themselves, we don't allow it here as its easy to have users accidentally RBF bump + // and pay to the channel funding address, which results in loss of funds. Real + // LDK-based applications should enable RBF bumping and RBF bump either to a local + // change address or to a new channel output negotiated with the same node. + "replaceable": false, + }); + rpc.call_method("fundrawtransaction", &[raw_tx_json, options]).await.unwrap() } pub async fn send_raw_transaction(&self, raw_tx: RawTx) { let mut rpc = self.bitcoind_rpc_client.lock().await; let raw_tx_json = serde_json::json!(raw_tx.0); - rpc.call_method::("sendrawtransaction", &[raw_tx_json]).await.unwrap(); + rpc.call_method::("sendrawtransaction", &[raw_tx_json]).await.unwrap(); } pub async fn sign_raw_transaction_with_wallet(&self, tx_hex: String) -> SignedTx { @@ -235,43 +243,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::( - // "estimatesmartfee", - // &vec![conf_target_json, estimate_mode_json], - // )) - // .unwrap() - // }), - // _ => runtime - // .block_on(rpc.call_method::( - // "estimatesmartfee", - // &vec![conf_target_json, estimate_mode_json], - // )) - // .unwrap(), - // }; - // if resp.errored { - // return default; - // } - // resp.feerate.unwrap() } } @@ -281,34 +252,22 @@ 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::("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::("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") + && !err_str.contains("insufficient fee, rejecting replacement ") + { + 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:: - // }); - // 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::("sendrawtransaction", &vec![tx_serialized]), - // ) - // .unwrap(); - // }); - // } - // _ => { - // runtime - // .block_on(rpc.call_method::("sendrawtransaction", &vec![tx_serialized])) - // .unwrap(); - // } - // } } }