Add missing gettransaction fields to v17

There are two undocumented fields in wallet v17 gettransaction. They are
documented in v20 onwards.

Add missing fields trusted and walletconflicts.

Author: jamillambert

types/src/model/wallet.rs

@@ -285,6 +285,8 @@ pub struct GetTransaction {
     pub fee: Option<SignedAmount>,
     /// The number of confirmations.
     pub confirmations: i64, // Docs do not indicate what negative value means?
+    /// Whether we consider the outputs of this unconfirmed transaction safe to spend.
+    pub trusted: Option<bool>,
     /// The block hash.
     pub block_hash: Option<BlockHash>,
     /// The index of the transaction in the block that includes it.
@@ -293,6 +295,8 @@ pub struct GetTransaction {
     pub block_time: Option<u32>,
     /// The transaction id.
     pub txid: Txid,
+    /// Confirmed transactions that have been detected by the wallet to conflict with this transaction.
+    pub wallet_conflicts: Vec<Txid>,
     /// The transaction time in seconds since epoch (1 Jan 1970 GMT).
     pub time: u32,
     /// The time received in seconds since epoch (1 Jan 1970 GMT).

types/src/v17/mining/into.rs

@@ -17,11 +17,6 @@ impl GetBlockTemplate {
         use GetBlockTemplateError as E;
 
         let version = block::Version::from_consensus(self.version);
-        let capabilities = self
-            .capabilities
-            .into_iter()
-            .map(|s| s.to_string())
-            .collect::<Vec<_>>();
         let version_bits_required =
             crate::to_u32(self.version_bits_required, "version_bits_required")?;
         let previous_block_hash =
@@ -44,7 +39,7 @@ impl GetBlockTemplate {
             version,
             rules: self.rules,
             version_bits_available: self.version_bits_available,
-            capabilities,
+            capabilities: self.capabilities,
             version_bits_required,
             previous_block_hash,
             transactions,

types/src/v17/wallet/error.rs

@@ -249,6 +249,8 @@ pub enum GetTransactionError {
     BlockHash(hex::HexToArrayError),
     /// Conversion of the `txid` field failed.
     Txid(hex::HexToArrayError),
+    /// Conversion of the `wallet_conflicts` field failed.
+    WalletConflicts(hex::HexToArrayError),
     /// Conversion of the transaction `hex` field failed.
     Tx(encode::FromHexError),
     /// Conversion of the `details` field failed.
@@ -265,6 +267,8 @@ impl fmt::Display for GetTransactionError {
             E::Fee(ref e) => write_err!(f, "conversion of the `fee` field failed"; e),
             E::BlockHash(ref e) => write_err!(f, "conversion of the `block_hash` field failed"; e),
             E::Txid(ref e) => write_err!(f, "conversion of the `txid` field failed"; e),
+            E::WalletConflicts(ref e) =>
+                write_err!(f, "conversion of the `wallet_conflicts` field failed"; e),
             E::Tx(ref e) => write_err!(f, "conversion of the `hex` field failed"; e),
             E::Details(ref e) => write_err!(f, "conversion of the `details` field failed"; e),
         }
@@ -282,6 +286,7 @@ impl std::error::Error for GetTransactionError {
             E::Fee(ref e) => Some(e),
             E::BlockHash(ref e) => Some(e),
             E::Txid(ref e) => Some(e),
+            E::WalletConflicts(ref e) => Some(e),
             E::Tx(ref e) => Some(e),
             E::Details(ref e) => Some(e),
         }

types/src/v17/wallet/into.rs

@@ -338,6 +338,11 @@ impl GetTransaction {
             self.block_index.map(|idx| crate::to_u32(idx, "block_index")).transpose()?;
 
         let txid = self.txid.parse::<Txid>().map_err(E::Txid)?;
+        let wallet_conflicts = self
+            .wallet_conflicts
+            .into_iter()
+            .map(|s| s.parse::<Txid>().map_err(E::WalletConflicts))
+            .collect::<Result<Vec<_>, _>>()?;
         let tx = encode::deserialize_hex::<Transaction>(&self.hex).map_err(E::Tx)?;
         let details = self
             .details
@@ -349,10 +354,12 @@ impl GetTransaction {
             amount,
             fee,
             confirmations: self.confirmations,
+            trusted: self.trusted,
             block_hash,
             block_index,
             block_time: self.block_time,
             txid,
+            wallet_conflicts,
             time: self.time,
             time_received: self.time_received,
             bip125_replaceable: self.bip125_replaceable.into_model(),

types/src/v17/wallet/mod.rs

@@ -413,6 +413,8 @@ pub struct GetTransaction {
     pub fee: Option<f64>,
     /// The number of confirmations.
     pub confirmations: i64,
+    /// Whether we consider the outputs of this unconfirmed transaction safe to spend.
+    pub trusted: Option<bool>,
     /// The block hash.
     #[serde(rename = "blockhash")]
     // The docs say this field should exist but integration test fail without `Option`.
@@ -426,6 +428,9 @@ pub struct GetTransaction {
     pub block_time: Option<u32>, // Docs are wrong, this is not documented as optional.
     /// The transaction id.
     pub txid: String,
+    /// Confirmed transactions that have been detected by the wallet to conflict with this transaction.
+    #[serde(rename = "walletconflicts")]
+    pub wallet_conflicts: Vec<String>,
     /// The transaction time in seconds since epoch (1 Jan 1970 GMT).
     pub time: u32,
     /// The time received in seconds since epoch (1 Jan 1970 GMT).