Add segwit_version to DescriptorType

Author: LLFourn

src/descriptor/mod.rs

@@ -261,14 +261,15 @@ pub enum DescriptorType {
 }
 
 impl DescriptorType {
-    /// Whether this is a segwit descriptor.
+    /// Returns the segwit version implied by the descriptor type.
     ///
-    /// Returns true whether it is "native" segwit or "wrapped" p2sh segwit
-    pub fn is_segwit(&self) -> bool {
+    /// This will return `Some(0)` whether it is "native" segwitv0 or "wrapped" p2sh segwit.
+    pub fn segwit_version(&self) -> Option<u8> {
         use self::DescriptorType::*;
         match self {
-            Wpkh | ShWpkh | Wsh | ShWsh | ShWshSortedMulti | WshSortedMulti | Tr => true,
-            Bare | Sh | Pkh | ShSortedMulti => false,
+            Tr => Some(1),
+            Wpkh | ShWpkh | Wsh | ShWsh | ShWshSortedMulti | WshSortedMulti => Some(0),
+            Bare | Sh | Pkh | ShSortedMulti => None,
         }
     }
 }

src/psbt/mod.rs

@@ -730,14 +730,14 @@ impl PsbtExt for Psbt {
         let expected_spk = {
             match (&input.witness_utxo, &input.non_witness_utxo) {
                 (Some(witness_utxo), None) => {
-                    if desc_type.is_segwit() {
+                    if desc_type.segwit_version().is_some() {
                         witness_utxo.script_pubkey.clone()
                     } else {
                         return Err(UtxoUpdateError::UtxoCheck);
                     }
                 }
                 (None, Some(non_witness_utxo)) => {
-                    if desc_type.is_segwit() {
+                    if desc_type.segwit_version().is_some() {
                         return Err(UtxoUpdateError::UtxoCheck);
                     }