Add missing getmempoolentry field in v18

There is a missing return field `bip125-replaceable` in v18.

Redefinte the type in v18 with the new field and add it to the
redefinition in v19.
Update the v17 and v19 into functions. Type redefined in v19, therefore
no further reexport changes needed.

Author: jamillambert

types/src/model/blockchain.rs

@@ -414,6 +414,8 @@ pub struct MempoolEntry {
     pub depends: Vec<Txid>,
     /// Unconfirmed transactions spending outputs from this transaction (child transaction id).
     pub spent_by: Vec<Txid>,
+    /// Whether this transaction could be replaced due to BIP125 (replace-by-fee)
+    pub bip125_replaceable: Option<bool>,
 }
 
 /// (No docs in Core v0.17.)

types/src/v17/blockchain/into.rs

@@ -425,6 +425,7 @@ impl MempoolEntry {
             fees,
             depends,
             spent_by,
+            bip125_replaceable: None,
         })
     }
 }

types/src/v18/blockchain/into.rs

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: CC0-1.0
+
+use bitcoin::{Txid, Wtxid};
+
+use super::{GetMempoolEntry, MempoolEntry, MempoolEntryError};
+use crate::model;
+
+impl GetMempoolEntry {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::GetMempoolEntry, MempoolEntryError> {
+        Ok(model::GetMempoolEntry(self.0.into_model()?))
+    }
+}
+
+impl MempoolEntry {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::MempoolEntry, MempoolEntryError> {
+        use MempoolEntryError as E;
+
+        let size = Some(crate::to_u32(self.size, "size")?);
+        let weight = None;
+        let time = crate::to_u32(self.time, "time")?;
+        let height = crate::to_u32(self.height, "height")?;
+        let descendant_count = crate::to_u32(self.descendant_count, "descendant_count")?;
+        let descendant_size = crate::to_u32(self.descendant_size, "descendant_size")?;
+        let ancestor_count = crate::to_u32(self.ancestor_count, "ancestor_count")?;
+        let ancestor_size = crate::to_u32(self.ancestor_size, "ancestor_size")?;
+        let wtxid = self.wtxid.parse::<Wtxid>().map_err(E::Wtxid)?;
+        let fees = self.fees.into_model().map_err(E::Fees)?;
+        let depends = self
+            .depends
+            .iter()
+            .map(|txid| txid.parse::<Txid>())
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(E::Depends)?;
+        let spent_by = self
+            .spent_by
+            .iter()
+            .map(|txid| txid.parse::<Txid>())
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(E::SpentBy)?;
+
+        Ok(model::MempoolEntry {
+            size,
+            weight,
+            time,
+            height,
+            descendant_count,
+            descendant_size,
+            ancestor_count,
+            ancestor_size,
+            wtxid,
+            fees,
+            depends,
+            spent_by,
+            bip125_replaceable: Some(self.bip125_replaceable),
+        })
+    }
+}

types/src/v18/blockchain/mod.rs

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! The JSON-RPC API for Bitcoin Core `v0.18` - blockchain.
+//!
+//! Types for methods found under the `== Blockchain ==` section of the API docs.
+
+mod into;
+
+use serde::{Deserialize, Serialize};
+
+use super::{MempoolEntryError, MempoolEntryFees};
+
+/// Result of JSON-RPC method `getmempoolentry`.
+///
+/// > getmempoolentry txid
+/// >
+/// > Returns mempool data for given transaction
+/// >
+/// > Arguments:
+/// > 1. "txid"                 (string, required) The transaction id (must be in mempool)
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct GetMempoolEntry(pub MempoolEntry);
+
+/// A relative (ancestor or descendant) transaction of a transaction in the mempool.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct MempoolEntry {
+    /// Virtual transaction size as defined in BIP 141.
+    ///
+    /// This is different from actual serialized size for witness transactions as witness data is discounted.
+    pub size: i64,
+    /// DEPRECATED: Transaction fee in BTC.
+    pub fee: f64,
+    /// DEPRECATED: Transaction fee with fee deltas used for mining priority.
+    #[serde(rename = "modifiedfee")]
+    pub modified_fee: f64,
+    /// Local time transaction entered pool in seconds since 1 Jan 1970 GMT.
+    pub time: i64,
+    /// Block height when transaction entered pool.
+    pub height: i64,
+    /// Number of in-mempool descendant transactions (including this one).
+    #[serde(rename = "descendantcount")]
+    pub descendant_count: i64,
+    /// Virtual transaction size of in-mempool descendants (including this one).
+    #[serde(rename = "descendantsize")]
+    pub descendant_size: i64,
+    /// DEPRECATED: Modified fees (see above) of in-mempool descendants (including this one).
+    #[serde(rename = "descendantfees")]
+    pub descendant_fees: f64,
+    /// Number of in-mempool ancestor transactions (including this one).
+    #[serde(rename = "ancestorcount")]
+    pub ancestor_count: i64,
+    /// Virtual transaction size of in-mempool ancestors (including this one).
+    #[serde(rename = "ancestorsize")]
+    pub ancestor_size: i64,
+    /// DEPRECATED: Modified fees (see above) of in-mempool ancestors (including this one).
+    #[serde(rename = "ancestorfees")]
+    pub ancestor_fees: f64,
+    /// Hash of serialized transaction, including witness data.
+    pub wtxid: String,
+    /// (No docs in Core v0.17.)
+    pub fees: MempoolEntryFees,
+    /// Unconfirmed transactions used as inputs for this transaction (parent transaction id).
+    pub depends: Vec<String>,
+    /// Unconfirmed transactions spending outputs from this transaction (child transaction id).
+    #[serde(rename = "spentby")]
+    pub spent_by: Vec<String>,
+    /// Whether this transaction could be replaced due to BIP125 (replace-by-fee)
+    #[serde(rename = "bip125-replaceable")]
+    pub bip125_replaceable: bool,
+}

types/src/v18/mod.rs

@@ -223,6 +223,7 @@
 //! </details>
 
 // JSON-RPC types by API section.
+mod blockchain;
 mod control;
 mod network;
 mod raw_transactions;
@@ -231,6 +232,7 @@ mod wallet;
 
 #[doc(inline)]
 pub use self::{
+    blockchain::{GetMempoolEntry, MempoolEntry},
     control::{ActiveCommand, GetRpcInfo},
     network::{GetNodeAddresses, NodeAddress},
     raw_transactions::{
@@ -260,7 +262,7 @@ pub use crate::v17::{
     GetBlockchainInfo, GetBlockchainInfoError, GetChainTips, GetChainTxStats, GetChainTxStatsError,
     GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolAncestors,
     GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
-    GetMempoolEntry, GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
+    GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
     GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
     GetNewAddress, GetPeerInfo, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose,
     GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
@@ -273,7 +275,7 @@ pub use crate::v17::{
     ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError,
     ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError,
     ListWallets, LoadWallet, Locked, Logging, MapMempoolEntryError, MempoolAcceptance,
-    MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
+    MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
     PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction, RawTransactionError,
     RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction,
     SendToAddress, SetNetworkActive, SignFail, SignFailError, SignMessage, SignMessageWithPrivKey,

types/src/v19/blockchain/into.rs

@@ -160,6 +160,7 @@ impl MempoolEntry {
             fees,
             depends,
             spent_by,
+            bip125_replaceable: Some(self.bip125_replaceable),
         })
     }
 }

types/src/v19/blockchain/mod.rs

@@ -232,6 +232,9 @@ pub struct MempoolEntry {
     /// Unconfirmed transactions spending outputs from this transaction (child transaction id).
     #[serde(rename = "spentby")]
     pub spent_by: Vec<String>,
+    /// Whether this transaction could be replaced due to BIP125 (replace-by-fee)
+    #[serde(rename = "bip125-replaceable")]
+    pub bip125_replaceable: bool,
 }
 
 /// (No docs in Core v0.19.)