Add missing listunspent field in v18

There is a missing return field `desc` in v18

Add the field to ListUnspentItem in v18. Update v17 and v18 into
functions.

Type redefined in v18 already,
no change in reexports needed.

Author: jamillambert

types/src/model/wallet.rs

@@ -610,6 +610,8 @@ pub struct ListUnspentItem {
     pub spendable: bool,
     /// Whether we know how to spend this output, ignoring the lack of keys.
     pub solvable: bool,
+    /// A descriptor for spending this output (only when solvable)
+    pub descriptor: Option<String>,
     /// Whether this output is considered safe to spend. Unconfirmed transactions from outside keys
     /// and unconfirmed replacement transactions are considered unsafe and are not eligible for
     /// spending by fundrawtransaction and sendtoaddress.

types/src/v17/wallet/into.rs

@@ -668,6 +668,7 @@ impl ListUnspentItem {
             redeem_script,
             spendable: self.spendable,
             solvable: self.solvable,
+            descriptor: None,
             safe: self.safe,
         })
     }

types/src/v18/wallet/into.rs

@@ -72,7 +72,6 @@ impl ListUnspentItem {
             .redeem_script
             .map(|hex| ScriptBuf::from_hex(&hex).map_err(E::RedeemScript))
             .transpose()?;
-
         Ok(model::ListUnspentItem {
             txid,
             vout,
@@ -84,6 +83,7 @@ impl ListUnspentItem {
             redeem_script,
             spendable: self.spendable,
             solvable: self.solvable,
+            descriptor: self.descriptor,
             safe: self.safe,
         })
     }

types/src/v18/wallet/mod.rs

@@ -76,6 +76,9 @@ pub struct ListUnspentItem {
     pub spendable: bool,
     /// Whether we know how to spend this output, ignoring the lack of keys.
     pub solvable: bool,
+    /// A descriptor for spending this output (only when solvable)
+    #[serde(rename = "desc")]
+    pub descriptor: Option<String>,
     /// Whether this output is considered safe to spend. Unconfirmed transactions from outside keys
     /// and unconfirmed replacement transactions are considered unsafe and are not eligible for
     /// spending by fundrawtransaction and sendtoaddress.