Remove concrete types from types/src/vXY

integration_test/tests/hidden.rs

@@ -150,7 +150,7 @@ fn hidden__get_orphan_txs__modelled() {
     let json_v2: GetOrphanTxsVerboseTwo =
         node2.client.get_orphan_txs_verbosity_2().expect("getorphantxs 2");
 
-    let model_v0: mtype::GetOrphanTxs = json_v0.into_model();
+    let model_v0: mtype::GetOrphanTxs = json_v0.into_model().unwrap();
     let model_v1: mtype::GetOrphanTxsVerboseOne = json_v1.into_model().unwrap();
     let model_v2: mtype::GetOrphanTxsVerboseTwo = json_v2.into_model().unwrap();
 

types/src/v17/blockchain/into.rs

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: CC0-1.0
 
 use bitcoin::consensus::encode;
-use bitcoin::{block, hex, Block, BlockHash, CompactTarget, ScriptBuf, Txid, Weight, Work};
+use bitcoin::hex::FromHex;
+use bitcoin::{
+    block, hex, Amount, Block, BlockHash, CompactTarget, FeeRate, Network, ScriptBuf, TxMerkleNode,
+    TxOut, Txid, Weight, Work, Wtxid,
+};
 
 // TODO: Use explicit imports?
 use super::*;

types/src/v17/blockchain/mod.rs

@@ -9,8 +9,6 @@ mod into;
 
 use alloc::collections::BTreeMap;
 
-use bitcoin::hex::FromHex;
-use bitcoin::{Amount, FeeRate, Network, TxMerkleNode, TxOut, Wtxid};
 use serde::{Deserialize, Serialize};
 
 // TODO: Remove wildcard, use explicit types.

types/src/v19/wallet/into.rs

@@ -73,6 +73,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
 
         Ok(model::GetTransaction {
             amount,
@@ -97,7 +101,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: None, // v24 and later only.
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block: None, // v26 and later only.
             tx,
         })

types/src/v19/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::GetBalancesError;
@@ -104,7 +103,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
 }
 
 /// Result of the JSON-RPC method `getwalletinfo`.

types/src/v20/wallet/into.rs

@@ -198,6 +198,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
 
         Ok(model::GetTransaction {
             amount,
@@ -222,7 +226,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: None, // v24 and later only.
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block: None, // v26 and later only.
             tx,
         })

types/src/v20/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::{ListSinceBlockError, TransactionItemError};
@@ -221,7 +220,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
 }
 
 /// Transaction detail. Part of the `gettransaction`.

types/src/v23/wallet/into.rs

@@ -58,6 +58,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
 
         Ok(model::GetTransaction {
             amount,
@@ -82,7 +86,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: None, // v24 and later only.
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block: None, // v26 and later only.
             tx,
         })

types/src/v23/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::{GetTransactionError, ListSinceBlockError, TransactionItemError};
@@ -105,7 +104,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
 }
 
 /// Result of the JSON-RPC method `getwalletinfo`.

types/src/v24/wallet/into.rs

@@ -44,6 +44,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
 
         Ok(model::GetTransaction {
             amount,
@@ -68,7 +72,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: self.parent_descriptors,
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block: None, // v26 and later only.
             tx,
         })

types/src/v24/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::{
@@ -85,7 +84,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
 }
 
 /// Transaction detail. Part of the `gettransaction`.

types/src/v26/wallet/into.rs

@@ -73,6 +73,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
         let last_processed_block = self
             .last_processed_block
             .map(|l| l.into_model())
@@ -102,7 +106,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: self.parent_descriptors,
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block,
             tx,
         })

types/src/v26/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::{
@@ -130,7 +129,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
     /// Hash and height of the block this information was generated on.
     #[serde(rename = "lastprocessedblock")]
     pub last_processed_block: Option<LastProcessedBlock>,

types/src/v28/blockchain/into.rs

@@ -1,10 +1,56 @@
 // SPDX-License-Identifier: CC0-1.0
 
-use bitcoin::{Amount, BlockHash, ScriptBuf, Txid};
+use alloc::collections::BTreeMap;
 
-use super::{ScanTxOutSetError, ScanTxOutSetStart, ScanTxOutSetUnspent};
+use bitcoin::{Amount, BlockHash, Network, ScriptBuf, Txid, Work};
+
+use super::{
+    GetBlockchainInfo, GetBlockchainInfoError, ScanTxOutSetError, ScanTxOutSetStart,
+    ScanTxOutSetUnspent,
+};
 use crate::model;
 
+impl GetBlockchainInfo {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::GetBlockchainInfo, GetBlockchainInfoError> {
+        use GetBlockchainInfoError as E;
+
+        let chain = Network::from_core_arg(&self.chain).map_err(E::Chain)?;
+        let best_block_hash =
+            self.best_block_hash.parse::<BlockHash>().map_err(E::BestBlockHash)?;
+        let time = Some(crate::to_u32(self.time, "time")?);
+        let chain_work = Work::from_unprefixed_hex(&self.chain_work).map_err(E::ChainWork)?;
+        let prune_height =
+            self.prune_height.map(|h| crate::to_u32(h, "prune_height")).transpose()?;
+        let prune_target_size =
+            self.prune_target_size.map(|h| crate::to_u32(h, "prune_target_size")).transpose()?;
+        let softforks = BTreeMap::new(); // TODO: Handle softforks stuff.
+
+        Ok(model::GetBlockchainInfo {
+            chain,
+            blocks: crate::to_u32(self.blocks, "blocks")?,
+            headers: crate::to_u32(self.headers, "headers")?,
+            best_block_hash,
+            bits: None,
+            target: None,
+            difficulty: self.difficulty,
+            time,
+            median_time: crate::to_u32(self.median_time, "median_time")?,
+            verification_progress: self.verification_progress,
+            initial_block_download: self.initial_block_download,
+            chain_work,
+            size_on_disk: self.size_on_disk,
+            pruned: self.pruned,
+            prune_height,
+            automatic_pruning: self.automatic_pruning,
+            prune_target_size,
+            softforks,
+            signet_challenge: None,
+            warnings: self.warnings,
+        })
+    }
+}
+
 impl ScanTxOutSetStart {
     /// Converts version specific type to a version nonspecific, more strongly typed type.
     pub fn into_model(self) -> Result<model::ScanTxOutSetStart, ScanTxOutSetError> {

types/src/v28/blockchain/mod.rs

@@ -8,11 +8,9 @@ mod into;
 
 use alloc::collections::BTreeMap;
 
-use bitcoin::{BlockHash, Network, Work};
 use serde::{Deserialize, Serialize};
 
 use super::{GetBlockchainInfoError, ScanTxOutSetError, Softfork};
-use crate::model;
 
 /// Result of JSON-RPC method `getblockchaininfo`.
 ///
@@ -65,47 +63,6 @@ pub struct GetBlockchainInfo {
     pub warnings: Vec<String>,
 }
 
-impl GetBlockchainInfo {
-    /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> Result<model::GetBlockchainInfo, GetBlockchainInfoError> {
-        use GetBlockchainInfoError as E;
-
-        let chain = Network::from_core_arg(&self.chain).map_err(E::Chain)?;
-        let best_block_hash =
-            self.best_block_hash.parse::<BlockHash>().map_err(E::BestBlockHash)?;
-        let time = Some(crate::to_u32(self.time, "time")?);
-        let chain_work = Work::from_unprefixed_hex(&self.chain_work).map_err(E::ChainWork)?;
-        let prune_height =
-            self.prune_height.map(|h| crate::to_u32(h, "prune_height")).transpose()?;
-        let prune_target_size =
-            self.prune_target_size.map(|h| crate::to_u32(h, "prune_target_size")).transpose()?;
-        let softforks = BTreeMap::new(); // TODO: Handle softforks stuff.
-
-        Ok(model::GetBlockchainInfo {
-            chain,
-            blocks: crate::to_u32(self.blocks, "blocks")?,
-            headers: crate::to_u32(self.headers, "headers")?,
-            best_block_hash,
-            bits: None,
-            target: None,
-            difficulty: self.difficulty,
-            time,
-            median_time: crate::to_u32(self.median_time, "median_time")?,
-            verification_progress: self.verification_progress,
-            initial_block_download: self.initial_block_download,
-            chain_work,
-            size_on_disk: self.size_on_disk,
-            pruned: self.pruned,
-            prune_height,
-            automatic_pruning: self.automatic_pruning,
-            prune_target_size,
-            softforks,
-            signet_challenge: None,
-            warnings: self.warnings,
-        })
-    }
-}
-
 /// Result of JSON-RPC method `scantxoutset`.
 ///
 /// > scantxoutset "action" ( [scanobjects,...] )

types/src/v28/wallet/into.rs

@@ -215,6 +215,10 @@ impl GetTransaction {
             .into_iter()
             .map(|d| d.into_model().map_err(E::Details))
             .collect::<Result<Vec<_>, _>>()?;
+        let decoded = self
+            .decoded
+            .map(|tx| encode::deserialize_hex::<Transaction>(&tx).map_err(E::Tx))
+            .transpose()?;
         let last_processed_block = self
             .last_processed_block
             .map(|l| l.into_model())
@@ -244,7 +248,7 @@ impl GetTransaction {
             bip125_replaceable: self.bip125_replaceable.into_model(),
             parent_descriptors: self.parent_descriptors,
             details,
-            decoded: self.decoded,
+            decoded,
             last_processed_block,
             tx,
         })

types/src/v28/wallet/mod.rs

@@ -7,7 +7,6 @@
 mod error;
 mod into;
 
-use bitcoin::Transaction;
 use serde::{Deserialize, Serialize};
 
 pub use self::error::{GetHdKeysError, ListSinceBlockError, TransactionItemError};
@@ -270,7 +269,7 @@ pub struct GetTransaction {
     /// Raw data for transaction.
     pub hex: String,
     /// The decoded transaction (only present when `verbose` is passed).
-    pub decoded: Option<Transaction>,
+    pub decoded: Option<String>,
     /// Hash and height of the block this information was generated on.
     #[serde(rename = "lastprocessedblock")]
     pub last_processed_block: Option<LastProcessedBlock>,

types/src/v29/blockchain/into.rs

@@ -6,8 +6,8 @@ use core::str::FromStr;
 use bitcoin::consensus::encode;
 use bitcoin::hashes::hex::FromHex;
 use bitcoin::{
-    absolute, block, hex, transaction, Amount, BlockHash, CompactTarget, ScriptBuf, Target,
-    Transaction, Txid, Weight, Work,
+    absolute, block, hex, transaction, Amount, BlockHash, CompactTarget, Network, ScriptBuf,
+    Target, Transaction, TxMerkleNode, Txid, Weight, Work,
 };
 
 // TODO: Use explicit imports?

types/src/v29/blockchain/mod.rs

@@ -8,8 +8,6 @@ use serde::{Deserialize, Serialize};
 mod error;
 mod into;
 
-use bitcoin::{Network, TxMerkleNode};
-
 pub use self::error::{
     GetBlockHeaderError, GetBlockHeaderVerboseError, GetBlockVerboseOneError,
     GetBlockVerboseThreeError, GetBlockVerboseTwoError, GetBlockchainInfoError,