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

Rename scriptCode -> scriptPubKey

This commit is contained in:
Kris Nuttycombe 2022-01-12 18:10:18 -07:00
parent 1ce0af7cd3
commit 0a6297335f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zip_0244.py
View File

@ -223,7 +223,7 @@ def auth_digest(tx):
class TransparentInput(object): class TransparentInput(object):
def __init__(self, nIn, rand): def __init__(self, nIn, rand):
self.nIn = nIn self.nIn = nIn
self.scriptCode = Script(rand) self.scriptPubKey = Script(rand)
self.amount = rand.u64() % (MAX_MONEY + 1) self.amount = rand.u64() % (MAX_MONEY + 1)
def signature_digest(tx, t_inputs, nHashType, txin): def signature_digest(tx, t_inputs, nHashType, txin):
@ -246,7 +246,7 @@ def transparent_sig_digest(tx, t_inputs, nHashType, txin):
digest.update(hash_type(tx, nHashType, txin)) digest.update(hash_type(tx, nHashType, txin))
digest.update(prevouts_sig_digest(tx, nHashType)) digest.update(prevouts_sig_digest(tx, nHashType))
digest.update(amounts_sig_digest(t_inputs, nHashType)) digest.update(amounts_sig_digest(t_inputs, nHashType))
digest.update(script_codes_sig_digest(t_inputs, nHashType)) digest.update(scriptpubkeys_sig_digest(t_inputs, nHashType))
digest.update(sequence_sig_digest(tx, nHashType)) digest.update(sequence_sig_digest(tx, nHashType))
digest.update(outputs_sig_digest(tx, nHashType, txin)) digest.update(outputs_sig_digest(tx, nHashType, txin))
digest.update(txin_sig_digest(tx, txin)) digest.update(txin_sig_digest(tx, txin))
@ -287,12 +287,12 @@ def amounts_sig_digest(t_inputs, nHashType):
else: else:
return blake2b(digest_size=32, person=b'ZTxTrAmountsHash').digest() return blake2b(digest_size=32, person=b'ZTxTrAmountsHash').digest()
def script_codes_sig_digest(t_inputs, nHashType): def scriptpubkeys_sig_digest(t_inputs, 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):
digest = blake2b(digest_size=32, person=b'ZTxTrScriptsHash') digest = blake2b(digest_size=32, person=b'ZTxTrScriptsHash')
for x in t_inputs: for x in t_inputs:
digest.update(bytes(x.scriptCode)) digest.update(bytes(x.scriptPubKey))
return digest.digest() return digest.digest()
else: else:
return blake2b(digest_size=32, person=b'ZTxTrScriptsHash').digest() return blake2b(digest_size=32, person=b'ZTxTrScriptsHash').digest()
@ -325,7 +325,7 @@ def txin_sig_digest(tx, txin):
if txin is not None: if txin is not None:
digest.update(bytes(tx.vin[txin.nIn].prevout)) digest.update(bytes(tx.vin[txin.nIn].prevout))
digest.update(struct.pack('<Q', txin.amount)) digest.update(struct.pack('<Q', txin.amount))
digest.update(bytes(txin.scriptCode)) digest.update(bytes(txin.scriptPubKey))
digest.update(struct.pack('<I', tx.vin[txin.nIn].nSequence)) digest.update(struct.pack('<I', tx.vin[txin.nIn].nSequence))
return digest.digest() return digest.digest()
@ -382,7 +382,7 @@ def main():
'txid': txid, 'txid': txid,
'auth_digest': auth, 'auth_digest': auth,
'amounts': [x.amount for x in t_inputs], 'amounts': [x.amount for x in t_inputs],
'script_codes': [x.scriptCode.raw() for x in t_inputs], 'script_pubkeys': [x.scriptPubKey.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,
'sighash_shielded': sighash_shielded, 'sighash_shielded': sighash_shielded,
'sighash_all': other_sighashes.get(SIGHASH_ALL), 'sighash_all': other_sighashes.get(SIGHASH_ALL),
@ -401,7 +401,7 @@ def main():
('txid', '[u8; 32]'), ('txid', '[u8; 32]'),
('auth_digest', '[u8; 32]'), ('auth_digest', '[u8; 32]'),
('amounts', '[i64; %d]' % len(t_inputs)), ('amounts', '[i64; %d]' % len(t_inputs)),
('script_codes', { ('script_pubkeys', {
'rust_type': '[Vec<u8>; %d]' % len(t_inputs), 'rust_type': '[Vec<u8>; %d]' % len(t_inputs),
'bitcoin_flavoured': False, 'bitcoin_flavoured': False,
}), }),