diff --git a/shared/descriptor.py b/shared/descriptor.py index 80e35b37..e1d140c9 100644 --- a/shared/descriptor.py +++ b/shared/descriptor.py @@ -228,22 +228,10 @@ class Descriptor: res.append(k.origin.psbt_derivation()) return res - @property - def is_wrapped(self): - return self.sh and self.is_segwit - - @property - def is_legacy(self): - return not (self.is_segwit or self.is_taproot) - @property def is_segwit(self): return (self.wsh and self.miniscript) or (self.wpkh and self.key) or self.taproot - @property - def is_pkh(self): - return self.key is not None and not self.taproot - @property def is_taproot(self): return self.taproot @@ -317,19 +305,6 @@ class Descriptor: assert self.key assert not self.miniscript - def scriptpubkey_type(self): - if self.is_taproot: - return "p2tr" - if self.sh: - return "p2sh" - if self.is_pkh: - if self.is_legacy: - return "p2pkh" - if self.is_segwit: - return "p2wpkh" - else: - return "p2wsh" - def derive(self, idx=None, change=False): if self.taproot: return type(self)(