Fix output for Orchard note encryption test vectors
The test vectors were being generated correctly, but the output was still Sapling-specific (rather than including Orchard components).
This commit is contained in:
parent
23f3d09f03
commit
3179b97362
|
@ -252,17 +252,18 @@ def main():
|
||||||
assert(memo_using_ivk == memo)
|
assert(memo_using_ivk == memo)
|
||||||
|
|
||||||
test_vectors.append({
|
test_vectors.append({
|
||||||
|
'incoming_viewing_key': receiver_fvk.dk + bytes(ivk),
|
||||||
'ovk': sender_ovk,
|
'ovk': sender_ovk,
|
||||||
'ivk': bytes(ivk),
|
|
||||||
'default_d': d,
|
'default_d': d,
|
||||||
'default_pk_d': bytes(pk_d),
|
'default_pk_d': bytes(pk_d),
|
||||||
'v': np.v,
|
'v': np.v,
|
||||||
'rcm': bytes(note.rcm),
|
'rseed': note.rseed,
|
||||||
'memo': np.memo,
|
'memo': np.memo,
|
||||||
'cv': bytes(cv),
|
'cv_net': bytes(cv),
|
||||||
|
'rho': bytes(rho),
|
||||||
'cmx': bytes(cm.extract()),
|
'cmx': bytes(cm.extract()),
|
||||||
'esk': bytes(ne.esk),
|
'esk': bytes(ne.esk),
|
||||||
'epk': bytes(transmitted_note_ciphertext.epk),
|
'ephemeral_key': bytes(transmitted_note_ciphertext.epk),
|
||||||
'shared_secret': bytes(ne.shared_secret),
|
'shared_secret': bytes(ne.shared_secret),
|
||||||
'k_enc': ne.k_enc,
|
'k_enc': ne.k_enc,
|
||||||
'p_enc': ne.p_enc,
|
'p_enc': ne.p_enc,
|
||||||
|
@ -276,17 +277,18 @@ def main():
|
||||||
args,
|
args,
|
||||||
'orchard_note_encryption',
|
'orchard_note_encryption',
|
||||||
(
|
(
|
||||||
|
('incoming_viewing_key', '[u8; 64]'),
|
||||||
('ovk', '[u8; 32]'),
|
('ovk', '[u8; 32]'),
|
||||||
('ivk', '[u8; 32]'),
|
|
||||||
('default_d', '[u8; 11]'),
|
('default_d', '[u8; 11]'),
|
||||||
('default_pk_d', '[u8; 32]'),
|
('default_pk_d', '[u8; 32]'),
|
||||||
('v', 'u64'),
|
('v', 'u64'),
|
||||||
('rcm', '[u8; 32]'),
|
('rseed', '[u8; 32]'),
|
||||||
('memo', '[u8; 512]'),
|
('memo', '[u8; 512]'),
|
||||||
('cv', '[u8; 32]'),
|
('cv_net', '[u8; 32]'),
|
||||||
|
('rho', '[u8; 32]'),
|
||||||
('cmx', '[u8; 32]'),
|
('cmx', '[u8; 32]'),
|
||||||
('esk', '[u8; 32]'),
|
('esk', '[u8; 32]'),
|
||||||
('epk', '[u8; 32]'),
|
('ephemeral_key', '[u8; 32]'),
|
||||||
('shared_secret', '[u8; 32]'),
|
('shared_secret', '[u8; 32]'),
|
||||||
('k_enc', '[u8; 32]'),
|
('k_enc', '[u8; 32]'),
|
||||||
('p_enc', '[u8; 564]'),
|
('p_enc', '[u8; 564]'),
|
||||||
|
|
Loading…
Reference in New Issue