From 77f1299d9bdc79c48211d3845c3b042e8481bd1b Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Sun, 9 May 2021 13:14:21 +0800
Subject: [PATCH] Add derive_nullifier() method

---
 orchard_key_components.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/orchard_key_components.py b/orchard_key_components.py
index 041a960..65e2650 100644
--- a/orchard_key_components.py
+++ b/orchard_key_components.py
@@ -3,8 +3,9 @@ import sys; assert sys.version_info[0] >= 3, "Python 3 required."
 
 from pyblake2 import blake2b, blake2s
 
-from orchard_generators import SPENDING_KEY_BASE, group_hash
+from orchard_generators import NULLIFIER_K_BASE, SPENDING_KEY_BASE, group_hash
 from orchard_pallas import Fp, Scalar, Point
+from orchard_poseidon_hash import poseidon_hash
 from orchard_merkle_tree import MERKLE_DEPTH
 from orchard_commitments import commit_ivk, note_commit
 from utils import leos2bsp, leos2ip, i2leosp
@@ -25,7 +26,7 @@ def to_base(buf):
 # PRFs and hashes
 #
 
-def prf_expand(sk, t):
+def prf_expand(sk: bytes, t: bytes):
     digest = blake2b(person=b'Zcash_ExpandSeed')
     digest.update(sk)
     digest.update(t)
@@ -37,6 +38,14 @@ def diversify_hash(d):
         P = group_hash(b'z.cash:Orchard-gd', b'')
     return P
 
+def prf_nf_orchard(nk, rho):
+    return poseidon_hash(nk, rho)
+
+def derive_nullifier(nk, rho: Fp, psi: Fp, cm):
+    scalar = to_base(prf_nf_orchard(nk, rho)) + psi  # addition mod p
+    point = NULLIFIER_K_BASE * to_scalar(scalar) + cm
+    return point.extract()
+
 #
 # Key components
 #
@@ -101,7 +110,7 @@ def main():
             note_v,
             note_rho,
             note_psi)
-        note_nf = b"0"*32 #note_nullifier(fvk.nk(), note_cm)
+        note_nf = derive_nullifier(fvk.nk, note_rho, note_psi, note_cm)
         test_vectors.append({
             'sk': sk.data,
             'ask': bytes(sk.ask),
@@ -115,7 +124,7 @@ def main():
             'note_v': note_v,
             'note_r': bytes(note_r),
             'note_cmx': bytes(note_cm.extract()),
-            'note_nf': note_nf,
+            'note_nf': bytes(note_nf),
         })
 
     render_tv(