Merge pull request #61 from zcash-hackworks/57-zip244-changes

Update test vectors for ZIP 244 changes
This commit is contained in:
str4d 2022-01-07 11:57:54 +00:00 committed by GitHub
commit 6ee8ff7f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 114 additions and 53 deletions

View File

@ -27,11 +27,17 @@ def tv_value_json(value, bitcoin_flavoured):
if isinstance(value, Some): if isinstance(value, Some):
value = value.thing value = value.thing
if type(value) == bytes: def bitcoinify(value):
if bitcoin_flavoured and len(value) == 32: if type(value) == bytes:
value = value[::-1] if bitcoin_flavoured and len(value) == 32:
value = hexlify(value).decode() value = value[::-1]
return value value = hexlify(value).decode()
return value
if type(value) == list:
return [bitcoinify(v) for v in value]
else:
return bitcoinify(value)
def tv_json(filename, parts, vectors, bitcoin_flavoured): def tv_json(filename, parts, vectors, bitcoin_flavoured):
if type(vectors) == type({}): if type(vectors) == type({}):
@ -148,11 +154,22 @@ def tv_part_rust(name, value, config, indent=3):
name, name,
)) ))
for item in value: for item in value:
if type(item) == bytes: if 'Vec<u8>' in config['rust_type']:
print('''%svec![
%s%s
%s],''' % (
' ' * (indent + 1),
' ' * (indent + 1),
chunk(hexlify(item)),
' ' * (indent + 1),
))
elif type(item) == bytes:
print('''%s[%s],''' % ( print('''%s[%s],''' % (
' ' * (indent + 1), ' ' * (indent + 1),
chunk(hexlify(item)), chunk(hexlify(item)),
)) ))
elif type(item) == int:
print('%s%d,' % (' ' * (indent + 1), item))
elif type(item) == list: elif type(item) == list:
print('''%s[''' % ( print('''%s[''' % (
' ' * (indent + 1) ' ' * (indent + 1)

View File

@ -221,38 +221,55 @@ def auth_digest(tx):
# Signatures # Signatures
class TransparentInput(object): class TransparentInput(object):
def __init__(self, tx, rand): def __init__(self, nIn, rand):
self.nIn = nIn
self.scriptCode = Script(rand) self.scriptCode = Script(rand)
self.nIn = rand.u8() % len(tx.vin)
self.amount = rand.u64() % (MAX_MONEY + 1) self.amount = rand.u64() % (MAX_MONEY + 1)
def signature_digest(tx, nHashType, txin): def signature_digest(tx, t_inputs, nHashType, txin):
digest = blake2b( digest = blake2b(
digest_size=32, digest_size=32,
person=b'ZcashTxHash_' + struct.pack('<I', tx.nConsensusBranchId), person=b'ZcashTxHash_' + struct.pack('<I', tx.nConsensusBranchId),
) )
digest.update(header_digest(tx)) digest.update(header_digest(tx))
digest.update(transparent_sig_digest(tx, nHashType, txin)) digest.update(transparent_sig_digest(tx, t_inputs, nHashType, txin))
digest.update(sapling_digest(tx)) digest.update(sapling_digest(tx))
digest.update(orchard_digest(tx)) digest.update(orchard_digest(tx))
return digest.digest() return digest.digest()
def transparent_sig_digest(tx, nHashType, txin): def transparent_sig_digest(tx, t_inputs, nHashType, txin):
# Sapling Spend or Orchard Action
if txin is None:
return transparent_digest(tx)
digest = blake2b(digest_size=32, person=b'ZTxIdTranspaHash') digest = blake2b(digest_size=32, person=b'ZTxIdTranspaHash')
digest.update(prevouts_sig_digest(tx, nHashType)) if len(tx.vin) + len(tx.vout) > 0:
digest.update(sequence_sig_digest(tx, nHashType)) digest.update(hash_type(tx, nHashType, txin))
digest.update(outputs_sig_digest(tx, nHashType, txin)) digest.update(prevouts_sig_digest(tx, nHashType))
digest.update(txin_sig_digest(tx, txin)) digest.update(amounts_sig_digest(t_inputs, nHashType))
digest.update(script_codes_sig_digest(t_inputs, nHashType))
digest.update(sequence_sig_digest(tx, nHashType))
digest.update(outputs_sig_digest(tx, nHashType, txin))
digest.update(txin_sig_digest(tx, txin))
return digest.digest() return digest.digest()
def hash_type(tx, nHashType, txin):
if txin is None:
# Sapling Spend or Orchard Action
assert nHashType == SIGHASH_ALL
else:
# Transparent input
assert nHashType in [
SIGHASH_ALL,
SIGHASH_NONE,
SIGHASH_SINGLE,
SIGHASH_ALL | SIGHASH_ANYONECANPAY,
SIGHASH_NONE | SIGHASH_ANYONECANPAY,
SIGHASH_SINGLE | SIGHASH_ANYONECANPAY,
]
assert (nHashType & 0x1f) != SIGHASH_SINGLE or 0 <= txin.nIn and txin.nIn < len(tx.vout)
return struct.pack('B', nHashType)
def prevouts_sig_digest(tx, nHashType): def prevouts_sig_digest(tx, nHashType):
# If the SIGHASH_ANYONECANPAY flag is not set: # If the SIGHASH_ANYONECANPAY flag is not set:
if not (nHashType & SIGHASH_ANYONECANPAY): if not (nHashType & SIGHASH_ANYONECANPAY):
@ -260,14 +277,29 @@ def prevouts_sig_digest(tx, nHashType):
else: else:
return blake2b(digest_size=32, person=b'ZTxIdPrevoutHash').digest() return blake2b(digest_size=32, person=b'ZTxIdPrevoutHash').digest()
def amounts_sig_digest(t_inputs, nHashType):
# If the SIGHASH_ANYONECANPAY flag is not set:
if not (nHashType & SIGHASH_ANYONECANPAY):
digest = blake2b(digest_size=32, person=b'ZTxTrAmountsHash')
for x in t_inputs:
digest.update(struct.pack('<Q', x.amount))
return digest.digest()
else:
return blake2b(digest_size=32, person=b'ZTxTrAmountsHash').digest()
def script_codes_sig_digest(t_inputs, nHashType):
# If the SIGHASH_ANYONECANPAY flag is not set:
if not (nHashType & SIGHASH_ANYONECANPAY):
digest = blake2b(digest_size=32, person=b'ZTxTrScriptsHash')
for x in t_inputs:
digest.update(bytes(x.scriptCode))
return digest.digest()
else:
return blake2b(digest_size=32, person=b'ZTxTrScriptsHash').digest()
def sequence_sig_digest(tx, nHashType): def sequence_sig_digest(tx, nHashType):
# if the SIGHASH_ANYONECANPAY flag is not set, and the sighash type is neither # if the SIGHASH_ANYONECANPAY flag is not set:
# SIGHASH_SINGLE nor SIGHASH_NONE: if not (nHashType & SIGHASH_ANYONECANPAY):
if (
(not (nHashType & SIGHASH_ANYONECANPAY)) and \
(nHashType & 0x1f) != SIGHASH_SINGLE and \
(nHashType & 0x1f) != SIGHASH_NONE
):
return getHashSequence(tx, b'ZTxIdSequencHash') return getHashSequence(tx, b'ZTxIdSequencHash')
else: else:
return blake2b(digest_size=32, person=b'ZTxIdSequencHash').digest() return blake2b(digest_size=32, person=b'ZTxIdSequencHash').digest()
@ -290,10 +322,11 @@ def outputs_sig_digest(tx, nHashType, txin):
def txin_sig_digest(tx, txin): def txin_sig_digest(tx, txin):
digest = blake2b(digest_size=32, person=b'Zcash___TxInHash') digest = blake2b(digest_size=32, person=b'Zcash___TxInHash')
digest.update(bytes(tx.vin[txin.nIn].prevout)) if txin is not None:
digest.update(bytes(txin.scriptCode)) digest.update(bytes(tx.vin[txin.nIn].prevout))
digest.update(struct.pack('<Q', txin.amount)) digest.update(struct.pack('<Q', txin.amount))
digest.update(struct.pack('<I', tx.vin[txin.nIn].nSequence)) digest.update(bytes(txin.scriptCode))
digest.update(struct.pack('<I', tx.vin[txin.nIn].nSequence))
return digest.digest() return digest.digest()
@ -317,37 +350,47 @@ def main():
txid = txid_digest(tx) txid = txid_digest(tx)
auth = auth_digest(tx) auth = auth_digest(tx)
# Generate amounts and scriptCodes for each transparent input.
t_inputs = [TransparentInput(nIn, rand) for nIn in range(len(tx.vin))]
# If there are any transparent inputs, derive a corresponding transparent sighash. # If there are any transparent inputs, derive a corresponding transparent sighash.
if len(tx.vin) > 0: if len(t_inputs) > 0:
txin = TransparentInput(tx, rand) txin = rand.a(t_inputs)
else: else:
txin = None txin = None
sighash_all = signature_digest(tx, SIGHASH_ALL, txin) sighash_shielded = signature_digest(tx, t_inputs, SIGHASH_ALL, None)
other_sighashes = None if txin is None else [ other_sighashes = {
signature_digest(tx, nHashType, txin) nHashType: None if txin is None else signature_digest(tx, t_inputs, nHashType, txin)
for nHashType in [ for nHashType in ([
SIGHASH_ALL,
SIGHASH_NONE, SIGHASH_NONE,
SIGHASH_SINGLE, SIGHASH_SINGLE,
SIGHASH_ALL | SIGHASH_ANYONECANPAY, SIGHASH_ALL | SIGHASH_ANYONECANPAY,
SIGHASH_NONE | SIGHASH_ANYONECANPAY, SIGHASH_NONE | SIGHASH_ANYONECANPAY,
SIGHASH_SINGLE | SIGHASH_ANYONECANPAY, SIGHASH_SINGLE | SIGHASH_ANYONECANPAY,
] ] if txin is None or txin.nIn < len(tx.vout) else [
] SIGHASH_ALL,
SIGHASH_NONE,
SIGHASH_ALL | SIGHASH_ANYONECANPAY,
SIGHASH_NONE | SIGHASH_ANYONECANPAY,
])
}
test_vectors.append({ test_vectors.append({
'tx': bytes(tx), 'tx': bytes(tx),
'txid': txid, 'txid': txid,
'auth_digest': auth, 'auth_digest': auth,
'amounts': [x.amount for x in t_inputs],
'script_codes': [x.scriptCode.raw() for x in t_inputs],
'transparent_input': None if txin is None else txin.nIn, 'transparent_input': None if txin is None else txin.nIn,
'script_code': None if txin is None else txin.scriptCode.raw(), 'sighash_shielded': sighash_shielded,
'amount': None if txin is None else txin.amount, 'sighash_all': other_sighashes.get(SIGHASH_ALL),
'sighash_all': sighash_all, 'sighash_none': other_sighashes.get(SIGHASH_NONE),
'sighash_none': None if txin is None else other_sighashes[0], 'sighash_single': other_sighashes.get(SIGHASH_SINGLE),
'sighash_single': None if txin is None else other_sighashes[1], 'sighash_all_anyone': other_sighashes.get(SIGHASH_ALL | SIGHASH_ANYONECANPAY),
'sighash_all_anyone': None if txin is None else other_sighashes[2], 'sighash_none_anyone': other_sighashes.get(SIGHASH_NONE | SIGHASH_ANYONECANPAY),
'sighash_none_anyone': None if txin is None else other_sighashes[3], 'sighash_single_anyone': other_sighashes.get(SIGHASH_SINGLE | SIGHASH_ANYONECANPAY),
'sighash_single_anyone': None if txin is None else other_sighashes[4],
}) })
render_tv( render_tv(
@ -357,19 +400,20 @@ def main():
('tx', {'rust_type': 'Vec<u8>', 'bitcoin_flavoured': False}), ('tx', {'rust_type': 'Vec<u8>', 'bitcoin_flavoured': False}),
('txid', '[u8; 32]'), ('txid', '[u8; 32]'),
('auth_digest', '[u8; 32]'), ('auth_digest', '[u8; 32]'),
('amounts', '[i64; %d]' % len(t_inputs)),
('script_codes', {
'rust_type': '[Vec<u8>; %d]' % len(t_inputs),
'bitcoin_flavoured': False,
}),
('transparent_input', { ('transparent_input', {
'rust_type': 'Option<u32>', 'rust_type': 'Option<u32>',
'rust_fmt': lambda x: None if x is None else Some(x), 'rust_fmt': lambda x: None if x is None else Some(x),
}), }),
('script_code', { ('sighash_shielded', '[u8; 32]'),
'rust_type': 'Option<Vec<u8>>', ('sighash_all', {
'rust_type': 'Option<[u8; 32]>',
'rust_fmt': lambda x: None if x is None else Some(x), 'rust_fmt': lambda x: None if x is None else Some(x),
}), }),
('amount', {
'rust_type': 'Option<i64>',
'rust_fmt': lambda x: None if x is None else Some(x),
}),
('sighash_all', '[u8; 32]'),
('sighash_none', { ('sighash_none', {
'rust_type': 'Option<[u8; 32]>', 'rust_type': 'Option<[u8; 32]>',
'rust_fmt': lambda x: None if x is None else Some(x), 'rust_fmt': lambda x: None if x is None else Some(x),