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

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 90552d9..61e67c2 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -187,7 +187,19 @@ 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) {
@@ -250,6 +262,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);
 					}