From 70ccff9bd9137b3a0e77b5f5661c22b4d6cbbf08 Mon Sep 17 00:00:00 2001
From: ying tong <yingtong@z.cash>
Date: Fri, 28 May 2021 23:28:01 +0800
Subject: [PATCH] Store v as integer instead of Scalar in NotePlaintext

Co-authored-by: str4d <jack@z.cash>
---
 orchard_note_encryption.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/orchard_note_encryption.py b/orchard_note_encryption.py
index b4b932d..2b65946 100644
--- a/orchard_note_encryption.py
+++ b/orchard_note_encryption.py
@@ -126,14 +126,14 @@ class TransmittedNoteCipherText(object):
         assert(leadbyte == 2)
         np = OrchardNotePlaintext(
             p_enc[1:12],   # d
-            Scalar.from_bytes(p_enc[12:20]),  # v
+            struct.unpack('<Q', p_enc[12:20]),  # v
             p_enc[20:52],  # rseed
             p_enc[52:564], # memo
         )
 
         g_d = diversify_hash(np.d)
         pk_d = OrchardKeyAgreement.derive_public(ivk, g_d)
-        note = OrchardNote(np.d, pk_d, np.v.s, rho, np.rseed)
+        note = OrchardNote(np.d, pk_d, np.v, rho, np.rseed)
 
         esk = OrchardKeyAgreement.esk(np.rseed, rho)
         if OrchardKeyAgreement.derive_public(esk, g_d) != epk:
@@ -174,14 +174,14 @@ class TransmittedNoteCipherText(object):
         assert(leadbyte == 2)
         np = OrchardNotePlaintext(
             p_enc[1:12],   # d
-            Scalar.from_bytes(p_enc[12:20]),  # v
+            struct.unpack('<Q', p_enc[12:20]),  # v
             p_enc[20:52],  # rseed
             p_enc[52:564], # memo
         )
         if OrchardKeyAgreement.esk(np.rseed, rho) != esk:
             return None
         g_d = diversify_hash(np.d)
-        note = OrchardNote(np.d, pk_d, np.v.s, rho, np.rseed)
+        note = OrchardNote(np.d, pk_d, np.v, rho, np.rseed)
 
         cm = note.note_commitment()
         if cm is None: