Add missing fields to getmempoolinfo

v21, v22 and v24 had missing return fields.

Redefine the type and into functions with the missing fields.

Update model and other into functions.

Author: jamillambert

types/src/model/blockchain.rs

@@ -454,6 +454,9 @@ pub struct GetMempoolInfo {
     pub bytes: u32,
     /// Total memory usage for the mempool.
     pub usage: u32,
+    /// Total fees for the mempool in BTC, ignoring modified fees through prioritisetransaction. v23
+    /// and later only.
+    pub total_fee: Option<f64>,
     /// Maximum memory usage for the mempool.
     pub max_mempool: u32,
     /// Minimum fee rate in BTC/kB for a transaction to be accepted.
@@ -462,6 +465,13 @@ pub struct GetMempoolInfo {
     pub mempool_min_fee: Option<FeeRate>,
     /// Current minimum relay fee for transactions.
     pub min_relay_tx_fee: Option<FeeRate>,
+    /// Minimum fee rate increment for mempool limiting or replacement in BTC/kvB. v24 and later only.
+    pub incremental_relay_fee: Option<FeeRate>,
+    ///  Current number of transactions that haven't passed initial broadcast yet. v21 and later only.
+    pub unbroadcast_count: Option<u32>,
+    /// True if the mempool accepts RBF without replaceability signaling inspection. v24 and later
+    /// only.
+    pub full_rbf: Option<bool>,
 }
 
 /// Models the result of JSON-RPC method `getrawmempool` with verbose set to false.

types/src/v17/blockchain/into.rs

@@ -463,9 +463,13 @@ impl GetMempoolInfo {
             size,
             bytes,
             usage,
+            total_fee: None,
             max_mempool,
             mempool_min_fee,
             min_relay_tx_fee,
+            incremental_relay_fee: None,
+            unbroadcast_count: None,
+            full_rbf: None,
         })
     }
 }

types/src/v19/blockchain/into.rs

@@ -226,9 +226,13 @@ impl GetMempoolInfo {
             size,
             bytes,
             usage,
+            total_fee: None,
             max_mempool,
             mempool_min_fee,
             min_relay_tx_fee,
+            incremental_relay_fee: None,
+            unbroadcast_count: None,
+            full_rbf: None,
         })
     }
 }

types/src/v21/blockchain/into.rs

@@ -5,7 +5,8 @@ use alloc::collections::BTreeMap;
 use bitcoin::{BlockHash, Network, Txid, Work, Wtxid};
 
 use super::{
-    GetBlockchainInfo, GetBlockchainInfoError, GetMempoolEntry, MempoolEntry, MempoolEntryError,
+    GetBlockchainInfo, GetBlockchainInfoError, GetMempoolEntry, GetMempoolInfo,
+    GetMempoolInfoError, MempoolEntry, MempoolEntryError,
 };
 use crate::model;
 
@@ -104,3 +105,30 @@ impl MempoolEntry {
         })
     }
 }
+
+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 unbroadcast_count = Some(crate::to_u32(self.unbroadcast_count, "unbroadcast_count")?);
+
+        Ok(model::GetMempoolInfo {
+            loaded: Some(self.loaded),
+            size,
+            bytes,
+            usage,
+            total_fee: None,
+            max_mempool,
+            mempool_min_fee,
+            min_relay_tx_fee,
+            incremental_relay_fee: None,
+            unbroadcast_count,
+            full_rbf: None,
+        })
+    }
+}

types/src/v21/blockchain/mod.rs

@@ -11,8 +11,8 @@ use alloc::collections::BTreeMap;
 use serde::{Deserialize, Serialize};
 
 pub use super::{
-    Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBlockchainInfoError, MempoolEntryError,
-    MempoolEntryFees,
+    Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBlockchainInfoError, GetMempoolInfoError,
+    MempoolEntryError, MempoolEntryFees,
 };
 
 /// Result of JSON-RPC method `getblockchaininfo`.
@@ -173,3 +173,36 @@ pub struct MempoolEntry {
     /// any peers)
     pub unbroadcast: bool,
 }
+
+/// 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)]
+pub struct GetMempoolInfo {
+    /// True if the mempool is fully loaded. v0.19 and later only.
+    pub loaded: bool,
+    /// Current transaction 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,
+    /// 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,
+    /// Current number of transactions that haven't passed initial broadcast yet. v21 and later only.
+    #[serde(rename = "unbroadcastcount")]
+    pub unbroadcast_count: i64,
+}

types/src/v21/mod.rs

@@ -237,7 +237,10 @@ mod wallet;
 
 #[doc(inline)]
 pub use self::{
-    blockchain::{Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, Softfork, SoftforkType},
+    blockchain::{
+        Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, Softfork,
+        SoftforkType,
+    },
     wallet::UnloadWallet,
 };
 #[doc(inline)]
@@ -286,7 +289,7 @@ pub use crate::{
         GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError,
         GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors,
         GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-        GetMempoolInfo, GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
+        GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
         MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
     },
     v20::{Banned, CreateMultisig, ListBanned, Logging},

types/src/v22/blockchain/into.rs

@@ -0,0 +1,31 @@
+// 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 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: None,
+            unbroadcast_count,
+            full_rbf: None,
+        })
+    }
+}

types/src/v22/blockchain/mod.rs

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! The JSON-RPC API for Bitcoin Core `v22` - 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)]
+pub struct GetMempoolInfo {
+    /// True if the mempool is fully loaded. v0.19 and later only.
+    pub loaded: bool,
+    /// Current transaction 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. v23
+    /// and later only.
+    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,
+    /// Current number of transactions that haven't passed initial broadcast yet. v21 and later only.
+    #[serde(rename = "unbroadcastcount")]
+    pub unbroadcast_count: i64,
+}

types/src/v22/mod.rs

@@ -243,11 +243,13 @@
 //! </details>
 
 // JSON-RPC types by API section.
+mod blockchain;
 mod control;
 mod network;
 
 #[doc(inline)]
 pub use self::{
+    blockchain::GetMempoolInfo,
     control::Logging,
     network::{Banned, ListBanned},
 };
@@ -297,12 +299,13 @@ pub use crate::{
         GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError,
         GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors,
         GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-        GetMempoolInfo, GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
+        GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
         MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
     },
     v20::CreateMultisig,
     v21::{
-        Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, Softfork, SoftforkType, UnloadWallet,
+        Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, Softfork, SoftforkType,
+        UnloadWallet,
     },
     ScriptPubkey,
 };

types/src/v23/mod.rs

@@ -294,10 +294,10 @@ pub use crate::{
         GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError,
         GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors,
         GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-        GetMempoolInfo, GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
+        GetNetworkInfo, GetPeerInfo, GetRpcInfo, MapMempoolEntryError,
         MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
         Softfork, SoftforkType,
     },
     v21::UnloadWallet,
-    v22::{Banned, ListBanned, Logging, ScriptPubkey},
+    v22::{Banned, GetMempoolInfo, ListBanned, Logging, ScriptPubkey},
 };