Add getmempoolinfo v30 support

Redefine the type in v30 for the changes and remove TODO from table.

Update the export, into function and test feature gate.

Author: jamillambert

integration_test/tests/blockchain.rs

@@ -331,7 +331,6 @@ fn blockchain__get_mempool_entry__modelled() {
 }
 
 #[test]
-#[cfg(feature = "v29_and_below")]
 fn blockchain__get_mempool_info__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();

types/src/model/blockchain.rs

@@ -646,6 +646,10 @@ pub struct GetMempoolInfo {
     /// True if the mempool accepts RBF without replaceability signaling inspection. v24 and later
     /// only.
     pub full_rbf: Option<bool>,
+    /// True if the mempool accepts transactions with bare multisig outputs.
+    pub permit_bare_multisig: Option<bool>,
+    /// Maximum number of bytes that can be used by OP_RETURN outputs in the mempool.
+    pub max_data_carrier_size: Option<u64>,
 }
 
 /// Models the result of JSON-RPC method `getrawmempool` with verbose set to false.

types/src/v17/blockchain/into.rs

@@ -472,6 +472,8 @@ impl GetMempoolInfo {
             incremental_relay_fee: None,
             unbroadcast_count: None,
             full_rbf: None,
+            permit_bare_multisig: None,
+            max_data_carrier_size: None,
         })
     }
 }

types/src/v19/blockchain/into.rs

@@ -234,6 +234,8 @@ impl GetMempoolInfo {
             incremental_relay_fee: None,
             unbroadcast_count: None,
             full_rbf: None,
+            permit_bare_multisig: None,
+            max_data_carrier_size: None,
         })
     }
 }

types/src/v21/blockchain/into.rs

@@ -177,6 +177,8 @@ impl GetMempoolInfo {
             incremental_relay_fee: None,
             unbroadcast_count,
             full_rbf: None,
+            permit_bare_multisig: None,
+            max_data_carrier_size: None,
         })
     }
 }

types/src/v22/blockchain/into.rs

@@ -26,6 +26,8 @@ impl GetMempoolInfo {
             incremental_relay_fee: None,
             unbroadcast_count,
             full_rbf: None,
+            permit_bare_multisig: None,
+            max_data_carrier_size: None,
         })
     }
 }

types/src/v24/blockchain/into.rs

@@ -153,6 +153,8 @@ impl GetMempoolInfo {
             incremental_relay_fee,
             unbroadcast_count,
             full_rbf: Some(self.full_rbf),
+            permit_bare_multisig: None,
+            max_data_carrier_size: None,
         })
     }
 }

types/src/v30/blockchain/into.rs

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: CC0-1.0
+
+use super::{GetMempoolInfo, GetMempoolInfoError};
+use crate::model;
+
+impl GetMempoolInfo {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::GetMempoolInfo, GetMempoolInfoError> {
+        let size = crate::to_u32(self.size, "size")?;
+        let bytes = crate::to_u32(self.bytes, "bytes")?;
+        let usage = crate::to_u32(self.usage, "usage")?;
+        let max_mempool = crate::to_u32(self.max_mempool, "max_mempool")?;
+        let mempool_min_fee = crate::btc_per_kb(self.mempool_min_fee)?;
+        let min_relay_tx_fee = crate::btc_per_kb(self.min_relay_tx_fee)?;
+        let incremental_relay_fee = crate::btc_per_kb(self.incremental_relay_fee)?;
+        let unbroadcast_count = Some(crate::to_u32(self.unbroadcast_count, "unbroadcast_count")?);
+
+        Ok(model::GetMempoolInfo {
+            loaded: Some(self.loaded),
+            size,
+            bytes,
+            usage,
+            total_fee: Some(self.total_fee),
+            max_mempool,
+            mempool_min_fee,
+            min_relay_tx_fee,
+            incremental_relay_fee,
+            unbroadcast_count,
+            full_rbf: Some(self.full_rbf),
+            permit_bare_multisig: Some(self.permit_bare_multisig),
+            max_data_carrier_size: Some(self.max_data_carrier_size),
+        })
+    }
+}

types/src/v30/blockchain/mod.rs

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! The JSON-RPC API for Bitcoin Core `v30` - blockchain.
+//!
+//! Types for methods found under the `== Blockchain ==` section of the API docs.
+
+mod into;
+
+use serde::{Deserialize, Serialize};
+
+pub use super::GetMempoolInfoError;
+
+/// Result of JSON-RPC method `getmempoolinfo` with verbose set to `true`.
+///
+/// > getmempoolinfo
+/// >
+/// > Returns details on the active state of the TX memory pool.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
+pub struct GetMempoolInfo {
+    /// True if the initial load attempt of the persisted mempool finished.
+    pub loaded: bool,
+    /// Current tx count.
+    pub size: i64,
+    /// Sum of all virtual transaction sizes as defined in BIP 141.
+    ///
+    /// Differs from actual serialized size because witness data is discounted.
+    pub bytes: i64,
+    /// Total memory usage for the mempool.
+    pub usage: i64,
+    /// Total fees for the mempool in BTC, ignoring modified fees through prioritisetransaction.
+    pub total_fee: f64,
+    /// Maximum memory usage for the mempool.
+    #[serde(rename = "maxmempool")]
+    pub max_mempool: i64,
+    /// Minimum fee rate in BTC/kB for a transaction to be accepted.
+    ///
+    /// This is the maximum of `minrelaytxfee` and the minimum mempool fee.
+    #[serde(rename = "mempoolminfee")]
+    pub mempool_min_fee: f64,
+    /// Current minimum relay fee for transactions.
+    #[serde(rename = "minrelaytxfee")]
+    pub min_relay_tx_fee: f64,
+    /// Minimum fee rate increment for mempool limiting or replacement in BTC/kvB.
+    #[serde(rename = "incrementalrelayfee")]
+    pub incremental_relay_fee: f64,
+    /// Current number of transactions that haven't passed initial broadcast yet.
+    #[serde(rename = "unbroadcastcount")]
+    pub unbroadcast_count: i64,
+    /// True if the mempool accepts RBF without replaceability signaling inspection.
+    #[serde(rename = "fullrbf")]
+    pub full_rbf: bool,
+    /// True if the mempool accepts transactions with bare multisig outputs.
+    #[serde(rename = "permitbaremultisig")]
+    pub permit_bare_multisig: bool,
+    /// Maximum number of bytes that can be used by OP_RETURN outputs in the mempool.
+    #[serde(rename = "maxdatacarriersize")]
+    pub max_data_carrier_size: u64,
+}

types/src/v30/mod.rs

@@ -45,7 +45,7 @@
 //! | getmempoolancestors                | version + model |                                        |
 //! | getmempooldescendants              | version + model |                                        |
 //! | getmempoolentry                    | version + model |                                        |
-//! | getmempoolinfo                     | version + model | TODO                                   |
+//! | getmempoolinfo                     | version + model |                                        |
 //! | getrawmempool                      | version + model | Includes additional 'verbose' type     |
 //! | gettxout                           | version + model |                                        |
 //! | gettxoutproof                      | returns string  |                                        |
@@ -242,6 +242,10 @@
 //!
 //! </details>
 
+mod blockchain;
+
+#[doc(inline)]
+pub use self::{blockchain::GetMempoolInfo};
 #[doc(inline)]
 pub use crate::{
     v17::{
@@ -297,7 +301,7 @@ pub use crate::{
     },
     v24::{
         DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
-        GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
+        GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry,
         GetRawMempoolVerbose, GetTransactionDetail, GetTxSpendingPrevout,
         GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem, MempoolEntry,
         MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,