f Include into_model implementations

Author: tnull

json/src/model/mod.rs

@@ -34,7 +34,9 @@ pub use self::{
     },
     generating::{Generate, GenerateToAddress},
     network::{GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoNetwork},
-    raw_transactions::SendRawTransaction,
+    raw_transactions::{
+        SendRawTransaction, SubmitPackage, SubmitPackageTxResult, SubmitPackageTxResultFees,
+    },
     wallet::{
         CreateWallet, GetBalance, GetBalances, GetBalancesMine, GetBalancesWatchOnly,
         GetNewAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailCategory,

json/src/model/raw_transactions.rs

@@ -5,9 +5,60 @@
 //! These structs model the types returned by the JSON-RPC API but have concrete types
 //! and are not specific to a specific version of Bitcoin Core.
 
-use bitcoin::Txid;
+use std::collections::HashMap;
+
+use bitcoin::{Amount, FeeRate, Txid, Wtxid};
 use serde::{Deserialize, Serialize};
 
 /// Models the result of JSON-RPC method `sendrawtransaction`.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct SendRawTransaction(pub Txid);
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct SubmitPackage {
+    /// The transaction package result message. "success" indicates all transactions were accepted into or are already in the mempool.
+    pub package_msg: String,
+    /// Transaction results keyed by [`Wtxid`].
+    #[serde(rename = "tx-results")]
+    pub tx_results: HashMap<Wtxid, SubmitPackageTxResult>,
+    /// List of txids of replaced transactions.
+    #[serde(rename = "replaced-transactions")]
+    pub replaced_transactions: Vec<Txid>,
+}
+
+/// Models the per-transaction result included in the JSON-RPC method `submitpackage`.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct SubmitPackageTxResult {
+    /// The transaction id.
+    pub txid: Txid,
+    /// The [`Wtxid`] of a different transaction with the same [`Txid`] but different witness found in the mempool.
+    ///
+    /// If set, this means the submitted transaction was ignored.
+    #[serde(rename = "other-wtxid")]
+    pub other_wtxid: Option<Wtxid>,
+    /// Sigops-adjusted virtual transaction size.
+    pub vsize: Option<usize>,
+    /// Transaction fees.
+    pub fees: Option<SubmitPackageTxResultFees>,
+    /// The transaction error string, if it was rejected by the mempool
+    pub error: Option<String>,
+}
+
+/// Models the fees included in the per-transaction result of the JSON-RPC method `submitpackage`.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct SubmitPackageTxResultFees {
+    /// Transaction fee.
+    #[serde(rename = "base")]
+    pub base_fee: Amount,
+    /// The effective feerate.
+    ///
+    /// Will be `None` if the transaction was already in the mempool.
+    ///
+    /// For example, the package feerate and/or feerate with modified fees from the `prioritisetransaction` JSON-RPC method.
+    #[serde(rename = "effective-feerate")]
+    pub effective_feerate: Option<FeeRate>,
+    /// If [`Self::effective_feerate`] is provided, this holds the [`Wtxid`]s of the transactions
+    /// whose fees and vsizes are included in effective-feerate.
+    #[serde(rename = "effective-includes")]
+    pub effective_includes: Vec<Wtxid>,
+}

json/src/v28/raw_transactions.rs

@@ -9,7 +9,9 @@ use std::collections::HashMap;
 use bitcoin::{Amount, FeeRate, Txid, Wtxid};
 use serde::{Deserialize, Serialize};
 
-/// Models the result of JSON-RPC method `submitpackage`.
+use crate::model;
+
+/// Result of JSON-RPC method `submitpackage`.
 //submitpackage ["rawtx",...] ( maxfeerate maxburnamount )
 //
 //Submit a package of raw transactions (serialized, hex-encoded) to local node.
@@ -74,6 +76,17 @@ pub struct SubmitPackage {
     pub replaced_transactions: Vec<Txid>,
 }
 
+impl SubmitPackage {
+    /// Converts version specific type to a version in-specific, more strongly typed type.
+    pub fn into_model(self) -> model::SubmitPackage {
+        model::SubmitPackage {
+            package_msg: self.package_msg,
+            tx_results: self.tx_results.into_iter().map(|(k, v)| (k, v.into_model())).collect(),
+            replaced_transactions: self.replaced_transactions,
+        }
+    }
+}
+
 /// Models the per-transaction result included in the JSON-RPC method `submitpackage`.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct SubmitPackageTxResult {
@@ -92,6 +105,19 @@ pub struct SubmitPackageTxResult {
     pub error: Option<String>,
 }
 
+impl SubmitPackageTxResult {
+    /// Converts version specific type to a version in-specific, more strongly typed type.
+    pub fn into_model(self) -> model::SubmitPackageTxResult {
+        model::SubmitPackageTxResult {
+            txid: self.txid,
+            other_wtxid: self.other_wtxid,
+            vsize: self.vsize,
+            fees: self.fees.map(move |f| f.into_model()),
+            error: self.error,
+        }
+    }
+}
+
 /// Models the fees included in the per-transaction result of the JSON-RPC method `submitpackage`.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct SubmitPackageTxResultFees {
@@ -110,3 +136,14 @@ pub struct SubmitPackageTxResultFees {
     #[serde(rename = "effective-includes")]
     pub effective_includes: Vec<Wtxid>,
 }
+
+impl SubmitPackageTxResultFees {
+    /// Converts version specific type to a version in-specific, more strongly typed type.
+    pub fn into_model(self) -> model::SubmitPackageTxResultFees {
+        model::SubmitPackageTxResultFees {
+            base_fee: self.base_fee,
+            effective_feerate: self.effective_feerate,
+            effective_includes: self.effective_includes,
+        }
+    }
+}