Use ScriptPubKey model in GetDescriptorActivity

A new model with strongly typed fields for ScriptPubKey has been added.

Update GetDescriptorActivity model to use it.

Add the required error variants and into_model function.

Author: jamillambert

types/src/model/blockchain.rs

@@ -15,7 +15,7 @@ use bitcoin::{
 };
 use serde::{Deserialize, Serialize};
 
-use crate::ScriptPubkey;
+use super::ScriptPubkey;
 
 /// Models the result of JSON-RPC method `dumptxoutset`.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]

types/src/v29/blockchain/error.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::HexToBytesError;
 use bitcoin::{address, amount, hex, network};
 
 use crate::error::write_err;
-use crate::NumericError;
+use crate::{NumericError, ScriptPubkeyError};
 
 /// Error when converting a `GetBlockVerboseOne` type into the model type.
 #[derive(Debug)]
@@ -295,6 +295,10 @@ pub enum GetDescriptorActivityError {
     /// We wrap the inner error to provide context. This might not be strictly necessary
     /// if the inner errors are distinct enough, but can be helpful.
     ActivityEntry(Box<GetDescriptorActivityError>), // Use Box to avoid recursive type size issues
+    /// Conversion of the `prevout_spk` field failed.
+    PrevoutSpk(ScriptPubkeyError),
+    /// Conversion of the `output_spk` field failed.
+    OutputSpk(ScriptPubkeyError),
 }
 
 impl fmt::Display for GetDescriptorActivityError {
@@ -308,6 +312,8 @@ impl fmt::Display for GetDescriptorActivityError {
             Script(ref e) => write_err!(f, "conversion of the script `hex` field failed"; e),
             Address(ref e) => write_err!(f, "conversion of the `address` field failed"; e),
             ActivityEntry(ref e) => write_err!(f, "conversion of an activity entry failed"; e),
+            PrevoutSpk(ref e) => write_err!(f, "conversion of the `prevout_spk` field failed"; e),
+            OutputSpk(ref e) => write_err!(f, "conversion of the `output_spk` field failed"; e),
         }
     }
 }
@@ -324,6 +330,8 @@ impl std::error::Error for GetDescriptorActivityError {
             Script(ref e) => Some(e),
             Address(ref e) => Some(e),
             ActivityEntry(ref e) => Some(&**e), // Deref the Box to get the inner error
+            PrevoutSpk(ref e) => Some(e),
+            OutputSpk(ref e) => Some(e),
         }
     }
 }

types/src/v29/blockchain/into.rs

@@ -225,6 +225,7 @@ impl GetDescriptorActivity {
                             spend.height.map(|h| crate::to_u32(h, "height")).transpose()?;
                         let spend_txid = Txid::from_str(&spend.spend_txid).map_err(E::Hash)?;
                         let prevout_txid = Txid::from_str(&spend.prevout_txid).map_err(E::Hash)?;
+                        let prevout_spk = spend.prevout_spk.into_model().map_err(E::PrevoutSpk)?;
 
                         Ok(model::ActivityEntry::Spend(model::SpendActivity {
                             amount,
@@ -234,7 +235,7 @@ impl GetDescriptorActivity {
                             spend_vout: spend.spend_vout,
                             prevout_txid,
                             prevout_vout: spend.prevout_vout,
-                            prevout_spk: spend.prevout_spk,
+                            prevout_spk,
                         }))
                     }
                     ActivityEntry::Receive(receive) => {
@@ -247,14 +248,15 @@ impl GetDescriptorActivity {
                         let height =
                             receive.height.map(|h| crate::to_u32(h, "height")).transpose()?; // Uses From<NumericError>
                         let txid = Txid::from_str(&receive.txid).map_err(E::Hash)?;
+                        let output_spk = receive.output_spk.into_model().map_err(E::OutputSpk)?;
 
                         Ok(model::ActivityEntry::Receive(model::ReceiveActivity {
                             amount,
                             block_hash,
                             height,
                             txid,
                             vout: receive.vout,
-                            output_spk: receive.output_spk,
+                            output_spk,
                         }))
                     }
                 }