From 434dcea88366907206023afc907e1c0da1186835 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Sun, 5 Nov 2023 23:33:27 +0300
Subject: [PATCH] Add JubmojiRequestI interface and update jubmojiVerifier
 function signature

---
 src/gateways/jubmojis/jubmoji.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gateways/jubmojis/jubmoji.ts b/src/gateways/jubmojis/jubmoji.ts
index f5ca6c6..e30a6a5 100644
--- a/src/gateways/jubmojis/jubmoji.ts
+++ b/src/gateways/jubmojis/jubmoji.ts
@@ -9,21 +9,30 @@ import snarkjs from 'snarkjs';
 import { EdwardsPoint, WeierstrassPoint } from './babyJubjub';
 import { computeTUFromR } from './ecdsa';
 import { computeMerkleRoot } from './inputGen';
-import { VerificationResult, VerifyArgs, ZKP, ZKPPublicSignals } from './jubmoji.types';
+import {
+  JubmojiRequestI,
+  VerificationResult,
+  VerifyArgs,
+  ZKP,
+  ZKPPublicSignals
+} from './jubmoji.types';
 import { hexToBigInt } from './utils';
 import vkey from './vkey';
 import { cardPubKeys } from './pubkeys';
 import { findAllJubmojiNullifiers } from '../../data/db';
 
-export async function jubmojiVerifier(serializedMembershipProof): Promise<VerificationResult> {
-  serializedMembershipProof = JSON.parse(serializedMembershipProof);
+export async function jubmojiVerifier(
+  serializedMembershipProof: JubmojiRequestI
+): Promise<VerificationResult> {
   console.log(serializedMembershipProof);
   const merkleRoot = await getMerkleRootFromCache(collectionPubKeys);
+  console.log(serializedMembershipProof.R);
+  console.log(typeof serializedMembershipProof.R);
   const R = EdwardsPoint.deserialize(serializedMembershipProof.R);
   const msgHash = hexToBigInt(serializedMembershipProof.msgHash);
   const zkp = serializedMembershipProof.zkp;
   return await verifyMembership({
-    proof: { R, msgHash, zkp: zkp },
+    proof: { R, msgHash, zkp },
     merkleRoot,
     sigNullifierRandomness: hexToBigInt(
       '6addd8ed78c6fb64157aa768c5a9477db536172929949dc22274e323ccb9'