testmempoolaccept add maxfeerate param

mempool · Mar 24, 2024 · 946ea71 · 946ea71
1 parent 055ac9f
commit 946ea71
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/daemon.rs b/src/daemon.rs
@@ -602,8 +602,16 @@ impl Daemon {
             .chain_err(|| "failed to parse txid")
     }
 
-    pub fn test_mempool_accept(&self, txhex: Vec<String>) -> Result<Vec<MempoolAcceptResult>> {
-        let result = self.request("testmempoolaccept", json!([txhex]))?;
+    pub fn test_mempool_accept(
+        &self,
+        txhex: Vec<String>,
+        maxfeerate: Option<f32>,
+    ) -> Result<Vec<MempoolAcceptResult>> {
+        let params = match maxfeerate {
+            Some(rate) => json!([txhex, format!("{:.8}", rate)]),
+            None => json!([txhex]),
+        };
+        let result = self.request("testmempoolaccept", params)?;
         serde_json::from_value::<Vec<MempoolAcceptResult>>(result)
             .chain_err(|| "invalid testmempoolaccept reply")
     }

diff --git a/src/new_index/query.rs b/src/new_index/query.rs
@@ -87,8 +87,12 @@ impl Query {
         Ok(txid)
     }
 
-    pub fn test_mempool_accept(&self, txhex: Vec<String>) -> Result<Vec<MempoolAcceptResult>> {
-        self.daemon.test_mempool_accept(txhex)
+    pub fn test_mempool_accept(
+        &self,
+        txhex: Vec<String>,
+        maxfeerate: Option<f32>,
+    ) -> Result<Vec<MempoolAcceptResult>> {
+        self.daemon.test_mempool_accept(txhex, maxfeerate)
     }
 
     pub fn utxo(&self, scripthash: &[u8]) -> Result<Vec<Utxo>> {

diff --git a/src/rest.rs b/src/rest.rs
@@ -1207,9 +1207,16 @@ fn handle_request(
                 .split(',')
                 .map(|s| s.to_string())
                 .collect();
+            let maxfeerate = query_params
+                .get("maxfeerate")
+                .map(|s| {
+                    s.parse::<f32>()
+                        .map_err(|_| HttpError::from("Invalid maxfeerate".to_string()))
+                })
+                .transpose()?;
 
             let result = query
-                .test_mempool_accept(txhexes)
+                .test_mempool_accept(txhexes, maxfeerate)
                 .map_err(|err| HttpError::from(err.description().to_string()))?;
 
             json_response(result, TTL_SHORT)