From 1af40f179086ee4a3e57bf0842bbaa5efe6b1b4a Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Thu, 18 Jan 2024 09:54:21 +0100
Subject: [PATCH] Read proof from file in test

---
 contracts/Proofs.sol |  2 +-
 test/Proofs.test.js  |  6 ++---
 test/proof.js        | 54 ++++++++++++++++++++++++--------------------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/contracts/Proofs.sol b/contracts/Proofs.sol
index 704d821..76948a3 100644
--- a/contracts/Proofs.sol
+++ b/contracts/Proofs.sol
@@ -128,7 +128,7 @@ abstract contract Proofs is Periods {
     //  - the dataset root (which dataset we prove)
     //  - and the slot index (which slot out of that dataset we prove)
     uint256[3] memory pubSignals;
-    pubSignals[0] = 7410779170;
+    pubSignals[0] = 7538754537;
     pubSignals[
       1
     ] = 16074246370508166450132968585287196391860062495017081813239200574579640171677;
diff --git a/test/Proofs.test.js b/test/Proofs.test.js
index c8ab806..9c718b5 100644
--- a/test/Proofs.test.js
+++ b/test/Proofs.test.js
@@ -160,7 +160,7 @@ describe("Proofs", function () {
   })
 
   describe("when proofs are required", function () {
-    const proof = loadProof("testing")
+    const proof = loadProof("local")
 
     beforeEach(async function () {
       await proofs.setSlotState(slotId, SlotState.Filled)
@@ -206,9 +206,7 @@ describe("Proofs", function () {
     it("fails proof submission when proof is incorrect", async function () {
       let invalid = new Uint8Array(proof)
       invalid[42] = 42
-      await expect(proofs.submitProof(slotId, invalid)).to.be.revertedWith(
-        "Invalid proof"
-      )
+      await expect(proofs.submitProof(slotId, invalid)).to.be.reverted
     })
 
     it("emits an event when proof was submitted", async function () {
diff --git a/test/proof.js b/test/proof.js
index 6c61e4a..fc71ba1 100644
--- a/test/proof.js
+++ b/test/proof.js
@@ -1,36 +1,40 @@
 const fs = require("fs")
 const ethers = require("ethers")
-const { arrayify } = ethers.utils
+const { arrayify, concat } = ethers.utils
+const { BigNumber } = ethers
 
-const BASE_PATH = __dirname + "/../contracts/verifiers"
-const PROOF_FILE_NAME = "proof.json"
-const PUBLIC_FILE_NAME = "public.json"
+const BASE_PATH = __dirname + "/../verifier/networks"
+const PROOF_FILE_NAME = "example-proof/proof.json"
+
+function decimalToBytes(decimal) {
+  return arrayify(BigNumber.from(decimal).toHexString())
+}
+
+function G1ToBytes(point) {
+  return concat([
+    decimalToBytes(point[0]),
+    decimalToBytes(point[1])
+  ])
+}
+
+function G2ToBytes(point) {
+  return concat([
+    decimalToBytes(point[0][1]),
+    decimalToBytes(point[0][0]),
+    decimalToBytes(point[1][1]),
+    decimalToBytes(point[1][0])
+  ])
+}
 
-// TODO: Some error handling, when file don't exists or don't have expected format?
 function loadProof(name) {
   const proof = JSON.parse(
     fs.readFileSync(`${BASE_PATH}/${name}/${PROOF_FILE_NAME}`)
   )
-  const publicSignals = JSON.parse(
-    fs.readFileSync(`${BASE_PATH}/${name}/${PUBLIC_FILE_NAME}`)
-  )
-
-  // TODO: We need to do some input processing from the given files, that I did not have time to look into
-  //    instead I hardcoded the values. Look into https://github.com/iden3/snarkjs#26-simulate-a-verification-call
-  //    how to obtain it.
-
-  //return [proof.pi_a, proof.pi_b, proof.pi_c, public]
-  return arrayify(
-    "0x" +
-      "1bcdb9a3c52070f56e8d49b29239f0528817f99745157ce4d03faefddfff6acc" +
-      "2496ab7dd8f0596c21653105e4af7e48eb5395ea45e0c876d7db4dd31b4df23e" +
-      "002ef03c350ccfbf234bfde498378709edea3a506383d492b58c4c35ffecc508" +
-      "174d475745707d35989001e9216201bdb828130b0e78dbf772c4795fa845b5eb" +
-      "1f04519f202fac14311c65d827f65f787dbe01985044278292723b9ee77ce5ee" +
-      "1c42f4d640e94c28401392031e74426ae68145f4f520cd576ca5e5b9af97c0bb" +
-      "1db1e61b32db677f3927ec117569e068f62747986e4ac7f54db8f2acd17e4abc" +
-      "20a59e1daca2ab80199c5bca2c5a7d6de6348bd795a0dd999752cc462d851128"
-  )
+  return concat([
+    G1ToBytes(proof['pi_a']),
+    G2ToBytes(proof['pi_b']),
+    G1ToBytes(proof['pi_c'])
+  ])
 }
 
 module.exports = { loadProof }