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

orchard_commitments.py and orchard_group_hash.py: type fixes. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2021-05-06 15:54:33 +01:00 committed by therealyingtong
parent 929692ecdc
commit 29c40dc885
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
orchard_commitments.py
View File

@ -23,8 +23,9 @@ def rcv_trapdoor(randbytes):
# https://zips.z.cash/protocol/nu5.pdf#concretesinsemillacommit # https://zips.z.cash/protocol/nu5.pdf#concretesinsemillacommit
def sinsemilla_commit(r: Scalar, D, M): def sinsemilla_commit(r: Scalar, D, M):
assert isinstance(r, Scalar)
return sinsemilla_hash_to_point(D + b"-M", M).checked_incomplete_add( return sinsemilla_hash_to_point(D + b"-M", M).checked_incomplete_add(
r * group_hash(D + b"-r", "") group_hash(D + b"-r", b"") * r
) )
def sinsemilla_short_commit(r: Scalar, D, M): def sinsemilla_short_commit(r: Scalar, D, M):
@ -34,20 +35,20 @@ def sinsemilla_short_commit(r: Scalar, D, M):
def note_commit(rcm, g_d, pk_d, v, rho, psi): def note_commit(rcm, g_d, pk_d, v, rho, psi):
return sinsemilla_commit( return sinsemilla_commit(
rcm, rcm,
"z.cash: Orchard-NoteCommit", b"z.cash: Orchard-NoteCommit",
g_d + pk_d + i2lebsp(64, v) + i2lebsp(L_ORCHARD_BASE, rho) + i2lebsp(L_ORCHARD_BASE, psi) g_d + pk_d + i2lebsp(64, v) + i2lebsp(L_ORCHARD_BASE, rho.s) + i2lebsp(L_ORCHARD_BASE, psi.s)
) )
def rcm_trapdoor(randbytes): def rcm_trapdoor(randbytes):
return Scalar.random(randbytes) return Scalar.random(randbytes)
# https://zips.z.cash/protocol/nu5.pdf#concreteorchardnotecommit # https://zips.z.cash/protocol/nu5.pdf#concreteorchardnotecommit
def commit_ivk(rivk, ak, nk): def commit_ivk(rivk: Scalar, ak: Fp, nk: Fp):
return sinsemilla_short_commit( return Scalar(sinsemilla_short_commit(
rivk, rivk,
"z.cash: Orchard-CommitIvk", b"z.cash: Orchard-CommitIvk",
i2lebsp(L_ORCHARD_BASE, ak) + i2lebsp(L_ORCHARD_BASE, nk) i2lebsp(L_ORCHARD_BASE, ak.s) + i2lebsp(L_ORCHARD_BASE, nk.s)
) ).s)
def rivk_trapdoor(randbytes): def rivk_trapdoor(randbytes):
return Scalar.random(randbytes) return Scalar.random(randbytes)

4
orchard_group_hash.py
View File

@ -16,7 +16,9 @@ from tv_rand import Rand
def sxor(s1,s2): def sxor(s1,s2):
return bytes([a ^ b for a,b in zip(s1,s2)]) return bytes([a ^ b for a,b in zip(s1,s2)])
def expand_message_xmd(msg, dst, len_in_bytes): def expand_message_xmd(msg: bytes, dst: bytes, len_in_bytes: int):
assert isinstance(msg, bytes)
assert isinstance(dst, bytes)
assert len(dst) <= 255 assert len(dst) <= 255
b_in_bytes = 64 # hash function output size b_in_bytes = 64 # hash function output size