feat: Add estimate_smart_fee_with_mode call

m4ycon · m4ycon · commit 5ef6ba130fd5 · 2026-03-13T12:12:13.000-03:00
diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs
@@ -321,3 +321,15 @@ impl Serialize for ImportMultiTimestamp {
         }
     }
 }
+
+/// Arg for the `estimatesmartfee` method.
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum FeeEstimateMode {
+    /// Use default settings based on other criteria
+    Unset,
+    /// Force estimatesmartfee to use non-conservative estimates
+    Economical,
+    /// Force estimatesmartfee to use conservative estimates
+    Conservative,
+}
diff --git a/client/src/client_sync/v17/util.rs b/client/src/client_sync/v17/util.rs
@@ -33,6 +33,14 @@ macro_rules! impl_client_v17__estimate_smart_fee {
             pub fn estimate_smart_fee(&self, blocks: u32) -> Result<EstimateSmartFee> {
                 self.call("estimatesmartfee", &[blocks.into()])
             }
+
+            pub fn estimate_smart_fee_with_mode(
+                &self,
+                blocks: u32,
+                mode: FeeEstimateMode,
+            ) -> Result<EstimateSmartFee> {
+                self.call("estimatesmartfee", &[blocks.into(), into_json(mode)?])
+            }
         }
     };
 }
diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs
@@ -24,7 +24,7 @@ use crate::types::v18::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,
+        TemplateRules, WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
 };
 
diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs
@@ -20,7 +20,7 @@ use crate::types::v19::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,
+        TemplateRules, WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
 };
 
diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs
@@ -20,7 +20,7 @@ use crate::types::v20::*;
 pub use crate::client_sync::{
     v17::{
         AddressType, AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
 };
 
diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs
@@ -24,7 +24,7 @@ use crate::types::v21::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,
+        TemplateRules, WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
 };
 
diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs
@@ -21,7 +21,7 @@ use crate::types::v22::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,
+        TemplateRules, WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
 };
diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs
@@ -21,7 +21,7 @@ use crate::types::v23::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
 };
diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs
@@ -20,7 +20,7 @@ use crate::types::v24::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs
@@ -20,7 +20,7 @@ use crate::types::v25::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs
@@ -23,7 +23,7 @@ use crate::types::v26::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs
@@ -19,7 +19,7 @@ use crate::types::v27::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs
@@ -20,7 +20,7 @@ use crate::types::v28::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput,
+        WalletCreateFundedPsbtInput, FeeEstimateMode,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs
@@ -21,7 +21,10 @@ use crate::types::v29::*;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
 pub use crate::client_sync::{
-    v17::{AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput,},
+    v17::{
+      AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput,
+      FeeEstimateMode,
+    },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
 };
diff --git a/client/src/client_sync/v30/mod.rs b/client/src/client_sync/v30/mod.rs
@@ -18,7 +18,10 @@ use crate::types::v30::*;
 
 #[rustfmt::skip]                // Keep public re-exports separate.
 pub use crate::client_sync::{
-    v17::{AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput,},
+    v17::{
+      AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, WalletCreateFundedPsbtInput,
+      FeeEstimateMode,
+    },
     v21::ImportDescriptorsRequest,
     v23::AddressType,
     v29::{TemplateRequest, TemplateRules}
diff --git a/integration_test/tests/util.rs b/integration_test/tests/util.rs
@@ -7,8 +7,8 @@
 
 use bitcoin::{address, amount, sign_message, PrivateKey, PublicKey};
 use integration_test::{Node, NodeExt as _, Wallet};
-use node::mtype;
 use node::vtype::*;
+use node::{mtype, FeeEstimateMode};
 
 #[test]
 fn util__create_multisig__modelled() {
@@ -73,6 +73,21 @@ fn util__estimate_smart_fee__modelled() {
     model.unwrap();
 }
 
+#[test]
+fn util__estimate_smart_fee_with_mode__modelled() {
+    let node = Node::with_wallet(Wallet::Default, &[]);
+    node.fund_wallet();
+
+    const MODES: [FeeEstimateMode; 3] =
+        [FeeEstimateMode::Unset, FeeEstimateMode::Economical, FeeEstimateMode::Conservative];
+    for mode in MODES {
+        let json: EstimateSmartFee =
+            node.client.estimate_smart_fee_with_mode(6, mode).expect("estimatesmartfee");
+        let model: Result<mtype::EstimateSmartFee, amount::ParseAmountError> = json.into_model();
+        model.unwrap();
+    }
+}
+
 #[test]
 #[cfg(not(feature = "v17"))]
 fn util__get_descriptor_info() {

Original file line number	Diff line number	Diff line change
`@@ -321,3 +321,15 @@ impl Serialize for ImportMultiTimestamp {`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`	`}`
	`324`	`+`
	`325`	+/// Arg for the `estimatesmartfee` method.
	`326`	`+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]`
	`327`	`+#[serde(rename_all = "UPPERCASE")]`
	`328`	`+pub enum FeeEstimateMode {`
	`329`	`+ /// Use default settings based on other criteria`
	`330`	`+ Unset,`
	`331`	`+ /// Force estimatesmartfee to use non-conservative estimates`
	`332`	`+ Economical,`
	`333`	`+ /// Force estimatesmartfee to use conservative estimates`
	`334`	`+ Conservative,`
	`335`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,14 @@ macro_rules! impl_client_v17__estimate_smart_fee {`
`33`	`33`	`pub fn estimate_smart_fee(&self, blocks: u32) -> Result<EstimateSmartFee> {`
`34`	`34`	`self.call("estimatesmartfee", &[blocks.into()])`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ pub fn estimate_smart_fee_with_mode(`
	`38`	`+ &self,`
	`39`	`+ blocks: u32,`
	`40`	`+ mode: FeeEstimateMode,`
	`41`	`+ ) -> Result<EstimateSmartFee> {`
	`42`	`+ self.call("estimatesmartfee", &[blocks.into(), into_json(mode)?])`
	`43`	`+ }`
`36`	`44`	`}`
`37`	`45`	`};`
`38`	`46`	`}`