AaronFiore/electrum
1
0
Fork 0
Code Activity

descriptor.py: don't allow ypub/zpub inside descriptors

Browse Source
This commit is contained in:
SomberNight
2023-02-26 11:40:42 +00:00
parent 001ca775a9
commit d2f75b7da5
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/bip32.py
View File

@@ -124,7 +124,13 @@ class BIP32Node(NamedTuple):
child_number: bytes = b'\x00'*4 child_number: bytes = b'\x00'*4
@classmethod @classmethod
def from_xkey(cls, xkey: str, *, net=None) -> 'BIP32Node': def from_xkey(
cls,
xkey: str,
*,
net=None,
allow_custom_headers: bool = True, # to also accept ypub/zpub
) -> 'BIP32Node':
if net is None: if net is None:
net = constants.net net = constants.net
xkey = DecodeBase58Check(xkey) xkey = DecodeBase58Check(xkey)
@@ -145,6 +151,8 @@ class BIP32Node(NamedTuple):
else: else:
raise InvalidMasterKeyVersionBytes(f'Invalid extended key format: {hex(header)}') raise InvalidMasterKeyVersionBytes(f'Invalid extended key format: {hex(header)}')
xtype = headers_inv[header] xtype = headers_inv[header]
if not allow_custom_headers and xtype != "standard":
raise ValueError(f"only standard xpub/xprv allowed. found custom xtype={xtype}")
if is_private: if is_private:
eckey = ecc.ECPrivkey(xkey[13 + 33:]) eckey = ecc.ECPrivkey(xkey[13 + 33:])
else: else:

4
electrum/descriptor.py
View File

@@ -121,8 +121,8 @@ class PubkeyProvider(object):
unhexlify(self.pubkey) unhexlify(self.pubkey)
# Is hex, normal pubkey # Is hex, normal pubkey
except Exception: except Exception:
# Not hex, maybe xpub # Not hex, maybe xpub (but don't allow ypub/zpub)
self.extkey = BIP32Node.from_xkey(pubkey) self.extkey = BIP32Node.from_xkey(pubkey, allow_custom_headers=False)
@classmethod @classmethod
def parse(cls, s: str) -> 'PubkeyProvider': def parse(cls, s: str) -> 'PubkeyProvider':

22
electrum/tests/test_bitcoin.py
View File

@@ -815,6 +815,28 @@ class Test_xprv_xpub(ElectrumTestCase):
self.assertFalse(is_xprv('xprv1nval1d')) self.assertFalse(is_xprv('xprv1nval1d'))
self.assertFalse(is_xprv('xprv661MyMwAqRbcFWohJWt7PHsFEJfZAvw9ZxwQoDa4SoMgsDDM1T7WK3u9E4edkC4ugRnZ8E4xDZRpk8Rnts3Nbt97dPwT52WRONGBADWRONG')) self.assertFalse(is_xprv('xprv661MyMwAqRbcFWohJWt7PHsFEJfZAvw9ZxwQoDa4SoMgsDDM1T7WK3u9E4edkC4ugRnZ8E4xDZRpk8Rnts3Nbt97dPwT52WRONGBADWRONG'))
def test_bip32_from_xkey(self):
bip32node1 = BIP32Node.from_xkey("xpub6H1LXWLaKsWFhvm6RVpEL9P4KfRZSW7abD2ttkWP3SSQvnyA8FSVqNTEcYFgJS2UaFcxupHiYkro49S8yGasTvXEYBVPamhGW6cFJodrTHy")
self.assertEqual(
BIP32Node(
xtype='standard',
eckey=ecc.ECPubkey(bytes.fromhex("022a471424da5e657499d1ff51cb43c47481a03b1e77f951fe64cec9f5a48f7011")),
chaincode=bytes.fromhex("c783e67b921d2beb8f6b389cc646d7263b4145701dadd2161548a8b078e65e9e"),
depth=5,
fingerprint=bytes.fromhex("d880d7d8"),
child_number=bytes.fromhex("3b9aca00"),
),
bip32node1)
with self.assertRaises(ValueError):
BIP32Node.from_xkey(
"zpub6jftahH18ngZyLeqfLBFAm7YaWFVttE9pku5pNMX2qPzTjoq1FVgZMmhjecyB2nqFb31gHE9vNvbaggU6vvWpNZbXEWLLUjYjFqG95LNyT8",
allow_custom_headers=False)
bip32node2 = BIP32Node.from_xkey(
"zpub6jftahH18ngZyLeqfLBFAm7YaWFVttE9pku5pNMX2qPzTjoq1FVgZMmhjecyB2nqFb31gHE9vNvbaggU6vvWpNZbXEWLLUjYjFqG95LNyT8",
allow_custom_headers=True)
self.assertEqual(bytes.fromhex("03f18e53f3386a5f9a9d2c369ad3b84b429eb397b4bc69ce600f2d833b54ba32f4"),
bip32node2.eckey.get_public_key_bytes(compressed=True))
def test_is_bip32_derivation(self): def test_is_bip32_derivation(self):
self.assertTrue(is_bip32_derivation("m/0'/1")) self.assertTrue(is_bip32_derivation("m/0'/1"))
self.assertTrue(is_bip32_derivation("m/0'/0'")) self.assertTrue(is_bip32_derivation("m/0'/0'"))