zcash-hackworks
/
zcash-test-vectors
mirror of https://github.com/zcash-hackworks/zcash-test-vectors.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change the order of arguments to the bip_0032.Extended{Secret,Public}Key constructors 

to be (chaincode, sk), for consistency with the orchard.key_components.ExtendedSpendingKey
constructor and with the serialization order.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2022-02-12 21:42:32 +00:00
parent 2e99fdefc7
commit 3872f29af5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zcash_test_vectors/transparent/bip_0032.py
View File

@ -16,11 +16,12 @@ from ..utils import i2beosp
class ExtendedSecretKey: class ExtendedSecretKey:
def __init__(self, sk, chaincode): def __init__(self, chaincode, sk):
assert isinstance(sk, PrivateKey)
assert len(chaincode) == 32 assert len(chaincode) == 32
self.sk = sk assert isinstance(sk, PrivateKey)
self.chaincode = chaincode self.chaincode = chaincode
self.sk = sk
@classmethod @classmethod
def master(cls, S): def master(cls, S):
@ -28,7 +29,7 @@ class ExtendedSecretKey:
I_L = I[:32] I_L = I[:32]
I_R = I[32:] I_R = I[32:]
sk = PrivateKey(I_L, True) sk = PrivateKey(I_L, True)
return cls(sk, I_R) return cls(I_R, sk)
def __bytes__(self): def __bytes__(self):
# The extra zero byte is specified in # The extra zero byte is specified in
@ -36,7 +37,7 @@ class ExtendedSecretKey:
return self.chaincode + b'\x00' + self.sk.private_key return self.chaincode + b'\x00' + self.sk.private_key
def public_key(self): def public_key(self):
return ExtendedPublicKey(self.sk.pubkey, self.chaincode) return ExtendedPublicKey(self.chaincode, self.sk.pubkey)
def child(self, i): def child(self, i):
assert 0 <= i and i <= 0xFFFFFFFF assert 0 <= i and i <= 0xFFFFFFFF
@ -49,7 +50,7 @@ class ExtendedSecretKey:
I_L = I[:32] I_L = I[:32]
I_R = I[32:] I_R = I[32:]
sk_i = PrivateKey(self.sk.tweak_add(I_L), True) sk_i = PrivateKey(self.sk.tweak_add(I_L), True)
child_i = self.__class__(sk_i, I_R) child_i = self.__class__(I_R, sk_i)
if i < 0x80000000: if i < 0x80000000:
assert bytes(self.public_key().child(i)) == bytes(child_i.public_key()) assert bytes(self.public_key().child(i)) == bytes(child_i.public_key())
@ -58,12 +59,12 @@ class ExtendedSecretKey:
class ExtendedPublicKey: class ExtendedPublicKey:
def __init__(self, pk, chaincode): def __init__(self, chaincode, pk):
assert isinstance(pk, PublicKey)
assert len(chaincode) == 32 assert len(chaincode) == 32
assert isinstance(pk, PublicKey)
self.pk = pk
self.chaincode = chaincode self.chaincode = chaincode
self.pk = pk
def pubkey_bytes(self): def pubkey_bytes(self):
pk_bytes = self.pk.serialize(compressed=True) pk_bytes = self.pk.serialize(compressed=True)
@ -87,7 +88,7 @@ class ExtendedPublicKey:
I_L = I[:32] I_L = I[:32]
I_R = I[32:] I_R = I[32:]
pk_i = self.pk.tweak_add(I_L) pk_i = self.pk.tweak_add(I_L)
return self.__class__(pk_i, I_R) return self.__class__(I_R, pk_i)
def derive_ovks(self): def derive_ovks(self):
return derive_ovks(self.chaincode, self.pk.serialize(compressed=True)) return derive_ovks(self.chaincode, self.pk.serialize(compressed=True))