psbt enhancements

Author: Sjors

hwilib/psbt.py

@@ -344,6 +344,22 @@ def deserialize(self, f: Readable) -> None:
                 for i in range(0, num_hashes):
                     leaf_hashes.add(vs.read(32))
                 self.tap_bip32_paths[xonly] = (leaf_hashes, KeyOriginInfo.deserialize(vs.read()))
+            elif key_type == PartiallySignedInput.PSBT_IN_TAP_INTERNAL_KEY:
+                if key in key_lookup:
+                    raise PSBTSerializationError("Duplicate key, input Taproot internal key already provided")
+                elif len(key) != 1:
+                    raise PSBTSerializationError("Input Taproot internal key key is more than one byte type")
+                self.tap_internal_key = deser_string(f)
+                if len(self.tap_internal_key) != 32:
+                    raise PSBTSerializationError("Input Taproot internal key is not 32 bytes")
+            elif key_type == PartiallySignedInput.PSBT_IN_TAP_MERKLE_ROOT:
+                if key in key_lookup:
+                    raise PSBTSerializationError("Duplicate key, input Taproot merkle root already provided")
+                elif len(key) != 1:
+                    raise PSBTSerializationError("Input Taproot merkle root key is more than one byte type")
+                self.tap_merkle_root = deser_string(f)
+                if len(self.tap_merkle_root) != 32:
+                    raise PSBTSerializationError("Input Taproot merkle root is not 32 bytes")
             elif key_type == PartiallySignedInput.PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS:
                 if key in key_lookup:
                     raise PSBTSerializationError("Duplicate key, input Musig2 participant pubkeys already provided")
@@ -1131,12 +1147,24 @@ def convert_to_v2(self) -> None:
         """
         Sets this PSBT to version 2
         """
+
+        if self.version == 0:
+            # make sure fields that PSBT version 0 fields are not present
+            self.setup_from_tx(self.tx)
+
         self._convert_version(2)
 
     def convert_to_v0(self) -> None:
         """
         Sets this PSBT to version 0
         """
+
+        if self.version == 2:
+            # strip PSBT version 2 fields
+            self.tx_version = None
+            self.fallback_locktime = None
+            self.tx_modifiable = None
+
         self._convert_version(0)
         self.tx = self.get_unsigned_tx()
         self.explicit_version = False