Don't fail if bitcoind fee estimation is disabled (#1060)

romanz · Jul 13, 2024 · 1b0bb23 · 1b0bb23
1 parent 785eca6
commit 1b0bb23
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/daemon.rs b/src/daemon.rs
@@ -148,11 +148,15 @@ impl Daemon {
     }
 
     pub(crate) fn estimate_fee(&self, nblocks: u16) -> Result<Option<Amount>> {
-        Ok(self
-            .rpc
-            .estimate_smart_fee(nblocks, None)
-            .context("failed to estimate fee")?
-            .fee_rate)
+        let res = self.rpc.estimate_smart_fee(nblocks, None);
+        if let Err(bitcoincore_rpc::Error::JsonRpc(jsonrpc::Error::Rpc(RpcError {
+            code: -32603,
+            ..
+        }))) = res
+        {
+            return Ok(None); // don't fail when fee estimation is disabled (e.g. with `-blocksonly=1`)
+        }
+        Ok(res.context("failed to estimate fee")?.fee_rate)
     }
 
     pub(crate) fn get_relay_fee(&self) -> Result<Amount> {