Change package name & git url to self-host as part of tornado packages

fix: Add workaround for SES that reject arrow strings

build/cli.cjs

@@ -289,6 +289,7 @@ async function clProcessor(commands) {
     for (let i=0; i<commands.length; i++) {
         const cmd = commands[i];
         const m = calculateMatch(commands[i], cl);
+        let res;
         if (m) {
             if ((argv.h) || (argv.help)) {
                 helpCmd(cmd);
@@ -297,16 +298,16 @@ async function clProcessor(commands) {
             if (areParamsValid(cmd.cmd, m)) {
                 if (cmd.options) {
                     const options = getOptions(cmd.options);
-                    await cmd.action(m, options);
+                    res = await cmd.action(m, options);
                 } else {
-                    await cmd.action(m, {});
+                    res = await cmd.action(m, {});
                 }
             } else {
                 if (m.length>0) console.log("Invalid number of parameters");
                 helpCmd(cmd);
                 return 99;
             }
-            return;
+            return res;
         }
     }
     if (cl.length>0) console.log("Invalid command");
@@ -5862,7 +5863,7 @@ async function wtnsCalculate$1(input, wasmFileName, wtnsFileName, options) {
 
     const wc = await circom_runtime.WitnessCalculatorBuilder(wasm);
     if (wc.circom_version() == 1) {
-        const w = await wc.calculateBinWitness(input);
+        const w = await wc.calculateBinWitness(input, true);
 
         const fdWtns = await binFileUtils__namespace.createBinFile(wtnsFileName, "wtns", 2, 2);
 
@@ -7790,13 +7791,15 @@ async function wtnsDebug$1(input, wasmFileName, wtnsFileName, symName, options,
     if (options.set) {
         if (!sym) sym = await loadSymbols(symName);
         wcOps.logSetSignal= function(labelIdx, value) {
-            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <-- " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <" + "-- " + value.toString());
         };
     }
     if (options.get) {
         if (!sym) sym = await loadSymbols(symName);
         wcOps.logGetSignal= function(varIdx, value) {
-            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --> " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --" + "> " + value.toString());
         };
     }
     if (options.trigger) {

build/main.cjs

@@ -1129,7 +1129,7 @@ async function wtnsCalculate(input, wasmFileName, wtnsFileName, options) {
 
     const wc = await circom_runtime.WitnessCalculatorBuilder(wasm);
     if (wc.circom_version() == 1) {
-        const w = await wc.calculateBinWitness(input);
+        const w = await wc.calculateBinWitness(input, true);
 
         const fdWtns = await binFileUtils__namespace.createBinFile(wtnsFileName, "wtns", 2, 2);
 
@@ -3871,13 +3871,15 @@ async function wtnsDebug(input, wasmFileName, wtnsFileName, symName, options, lo
     if (options.set) {
         if (!sym) sym = await loadSymbols(symName);
         wcOps.logSetSignal= function(labelIdx, value) {
-            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <-- " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <" + "-- " + value.toString());
         };
     }
     if (options.get) {
         if (!sym) sym = await loadSymbols(symName);
         wcOps.logGetSignal= function(varIdx, value) {
-            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --> " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --" + "> " + value.toString());
         };
     }
     if (options.trigger) {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "snarkjs",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "snarkjs",
-      "version": "0.4.14",
+      "version": "0.4.15",
       "license": "GPL-3.0",
       "dependencies": {
         "@iden3/binfileutils": "0.0.10",

package.json

@@ -1,65 +1,65 @@
 {
-  "name": "snarkjs",
-  "type": "module",
-  "version": "0.4.14",
-  "description": "zkSNARKs implementation in JavaScript",
-  "main": "./build/main.cjs",
-  "module": "./main.js",
-  "exports": {
-    "import": "./main.js",
-    "require": "./build/main.cjs"
-  },
-  "scripts": {
-    "test": "mocha",
-    "build": "rollup -c config/rollup.cjs.config.js",
-    "buildcli": "rollup -c config/rollup.cli.config.js",
-    "buildiife": "BROWSER=true rollup -c config/rollup.iife.config.js",
-    "buildiifemin": "BROWSER=true rollup -c config/rollup.iife_min.config.js"
-  },
-  "bin": {
-    "snarkjs": "build/cli.cjs"
-  },
-  "directories": {
-    "templates": "templates"
-  },
-  "keywords": [
-    "zksnark",
-    "zcash",
-    "ethereum",
-    "zero",
-    "knowlage",
-    "cryptography",
-    "circuit"
-  ],
-  "author": "Jordi Baylina",
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iden3/snarkjs.git"
-  },
-  "dependencies": {
-    "@iden3/binfileutils": "0.0.10",
-    "blake2b-wasm": "^2.4.0",
-    "circom_runtime": "0.1.17",
-    "ejs": "^3.1.6",
-    "fastfile": "0.0.19",
-    "ffjavascript": "0.2.48",
-    "js-sha3": "^0.8.0",
-    "logplease": "^1.2.15",
-    "r1csfile": "0.0.35",
-    "readline": "^1.3.0"
-  },
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^11.1.0",
-    "@rollup/plugin-replace": "^2.3.4",
-    "@rollup/plugin-virtual": "^2.0.3",
-    "chai": "^4.2.0",
-    "eslint": "^8.7.0",
-    "mocha": "^9.1.4",
-    "rollup": "^2.36.2",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-visualizer": "^4.2.0"
-  }
+    "name": "@tornado/snarkjs",
+    "type": "module",
+    "version": "0.4.15",
+    "description": "zkSNARKs implementation in JavaScript",
+    "main": "./build/main.cjs",
+    "module": "./main.js",
+    "exports": {
+        "import": "./main.js",
+        "require": "./build/main.cjs"
+    },
+    "scripts": {
+        "test": "mocha",
+        "build": "rollup -c config/rollup.cjs.config.js",
+        "buildcli": "rollup -c config/rollup.cli.config.js",
+        "buildiife": "BROWSER=true rollup -c config/rollup.iife.config.js",
+        "buildiifemin": "BROWSER=true rollup -c config/rollup.iife_min.config.js"
+    },
+    "bin": {
+        "snarkjs": "build/cli.cjs"
+    },
+    "directories": {
+        "templates": "templates"
+    },
+    "keywords": [
+        "zksnark",
+        "zcash",
+        "ethereum",
+        "zero",
+        "knowlage",
+        "cryptography",
+        "circuit"
+    ],
+    "author": "Jordi Baylina",
+    "license": "GPL-3.0",
+    "repository": {
+        "type": "git",
+        "url": "https://git.tornado.ws/tornado-packages/snarkjs"
+    },
+    "dependencies": {
+        "@iden3/binfileutils": "0.0.10",
+        "blake2b-wasm": "^2.4.0",
+        "circom_runtime": "0.1.17",
+        "ejs": "^3.1.6",
+        "fastfile": "0.0.19",
+        "ffjavascript": "0.2.48",
+        "js-sha3": "^0.8.0",
+        "logplease": "^1.2.15",
+        "r1csfile": "0.0.35",
+        "readline": "^1.3.0"
+    },
+    "devDependencies": {
+        "@rollup/plugin-commonjs": "^17.0.0",
+        "@rollup/plugin-json": "^4.1.0",
+        "@rollup/plugin-node-resolve": "^11.1.0",
+        "@rollup/plugin-replace": "^2.3.4",
+        "@rollup/plugin-virtual": "^2.0.3",
+        "chai": "^4.2.0",
+        "eslint": "^8.7.0",
+        "mocha": "^9.1.4",
+        "rollup": "^2.36.2",
+        "rollup-plugin-terser": "^7.0.2",
+        "rollup-plugin-visualizer": "^4.2.0"
+    }
 }

src/clprocessor.js

@@ -58,6 +58,7 @@ export default async function clProcessor(commands) {
     for (let i=0; i<commands.length; i++) {
         const cmd = commands[i];
         const m = calculateMatch(commands[i], cl);
+        let res;
         if (m) {
             if ((argv.h) || (argv.help)) {
                 helpCmd(cmd);
@@ -66,16 +67,16 @@ export default async function clProcessor(commands) {
             if (areParamsValid(cmd.cmd, m)) {
                 if (cmd.options) {
                     const options = getOptions(cmd.options);
-                    await cmd.action(m, options);
+                    res = await cmd.action(m, options);
                 } else {
-                    await cmd.action(m, {});
+                    res = await cmd.action(m, {});
                 }
             } else {
                 if (m.length>0) console.log("Invalid number of parameters");
                 helpCmd(cmd);
                 return 99;
             }
-            return;
+            return res;
         }
     }
     if (cl.length>0) console.log("Invalid command");

src/wtns_calculate.js

@@ -30,7 +30,7 @@ export default async function wtnsCalculate(input, wasmFileName, wtnsFileName, o
 
     const wc = await WitnessCalculatorBuilder(wasm);
     if (wc.circom_version() == 1) {
-        const w = await wc.calculateBinWitness(input);
+        const w = await wc.calculateBinWitness(input, true);
 
         const fdWtns = await binFileUtils.createBinFile(wtnsFileName, "wtns", 2, 2);
 

src/wtns_debug.js

@@ -37,13 +37,15 @@ export default async function wtnsDebug(input, wasmFileName, wtnsFileName, symNa
     if (options.set) {
         if (!sym) sym = await loadSyms(symName);
         wcOps.logSetSignal= function(labelIdx, value) {
-            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <-- " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("SET " + sym.labelIdx2Name[labelIdx] + " <" + "-- " + value.toString());
         };
     }
     if (options.get) {
         if (!sym) sym = await loadSyms(symName);
         wcOps.logGetSignal= function(varIdx, value) {
-            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --> " + value.toString());
+            // The line below splits the arrow log into 2 strings to avoid some Secure ECMAScript issues
+            if (logger) logger.info("GET " + sym.labelIdx2Name[varIdx] + " --" + "> " + value.toString());
         };
     }
     if (options.trigger) {

templates/verifier_groth16.sol.ejs

@@ -1,250 +1,169 @@
-//
-// Copyright 2017 Christian Reitwiessner
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// 2019 OKIMS
-//      ported to solidity 0.6
-//      fixed linter warnings
-//      added requiere error messages
-//
-//
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.6.11;
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.7.0;
+
 library Pairing {
+    uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
+
     struct G1Point {
-        uint X;
-        uint Y;
+        uint256 X;
+        uint256 Y;
     }
+
     // Encoding of field elements is: X[0] * z + X[1]
     struct G2Point {
-        uint[2] X;
-        uint[2] Y;
+        uint256[2] X;
+        uint256[2] Y;
     }
-    /// @return the generator of G1
-    function P1() internal pure returns (G1Point memory) {
-        return G1Point(1, 2);
-    }
-    /// @return the generator of G2
-    function P2() internal pure returns (G2Point memory) {
-        // Original code point
-        return G2Point(
-            [11559732032986387107991004021392285783925812861821192530917403151452391805634,
-             10857046999023057135944570762232829481370756359578518086990519993285655852781],
-            [4082367875863433681332203403145435568316851327593401208105741076214120093531,
-             8495653923123431417604973247489272438418190587263600148770280649306958101930]
-        );
 
-/*
-        // Changed by Jordi point
-        return G2Point(
-            [10857046999023057135944570762232829481370756359578518086990519993285655852781,
-             11559732032986387107991004021392285783925812861821192530917403151452391805634],
-            [8495653923123431417604973247489272438418190587263600148770280649306958101930,
-             4082367875863433681332203403145435568316851327593401208105741076214120093531]
-        );
-*/
-    }
-    /// @return r the negation of p, i.e. p.addition(p.negate()) should be zero.
-    function negate(G1Point memory p) internal pure returns (G1Point memory r) {
+    /*
+     * @return The negation of p, i.e. p.plus(p.negate()) should be zero
+     */
+    function negate(G1Point memory p) internal pure returns (G1Point memory) {
         // The prime q in the base field F_q for G1
-        uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
-        if (p.X == 0 && p.Y == 0)
+        if (p.X == 0 && p.Y == 0) {
             return G1Point(0, 0);
-        return G1Point(p.X, q - (p.Y % q));
+        } else {
+            return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q));
+        }
     }
-    /// @return r the sum of two points of G1
-    function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) {
-        uint[4] memory input;
-        input[0] = p1.X;
-        input[1] = p1.Y;
-        input[2] = p2.X;
-        input[3] = p2.Y;
+
+    /*
+     * @return r the sum of two points of G1
+     */
+    function plus(
+        G1Point memory p1,
+        G1Point memory p2
+    ) internal view returns (G1Point memory r) {
+        uint256[4] memory input = [
+            p1.X, p1.Y,
+            p2.X, p2.Y
+        ];
         bool success;
+
         // solium-disable-next-line security/no-inline-assembly
         assembly {
             success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60)
             // Use "invalid" to make gas estimation work
             switch success case 0 { invalid() }
         }
-        require(success,"pairing-add-failed");
+
+        require(success, "pairing-add-failed");
     }
-    /// @return r the product of a point on G1 and a scalar, i.e.
-    /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p.
-    function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) {
-        uint[3] memory input;
-        input[0] = p.X;
-        input[1] = p.Y;
-        input[2] = s;
+
+    /*
+     * @return r the product of a point on G1 and a scalar, i.e.
+     *         p == p.scalarMul(1) and p.plus(p) == p.scalarMul(2) for all
+     *         points p.
+     */
+    function scalarMul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) {
+        uint256[3] memory input = [p.X, p.Y, s];
         bool success;
+
         // solium-disable-next-line security/no-inline-assembly
         assembly {
             success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60)
             // Use "invalid" to make gas estimation work
             switch success case 0 { invalid() }
         }
-        require (success,"pairing-mul-failed");
+
+        require(success, "pairing-mul-failed");
     }
-    /// @return the result of computing the pairing check
-    /// e(p1[0], p2[0]) *  .... * e(p1[n], p2[n]) == 1
-    /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
-    /// return true.
-    function pairing(G1Point[] memory p1, G2Point[] memory p2) internal view returns (bool) {
-        require(p1.length == p2.length,"pairing-lengths-failed");
-        uint elements = p1.length;
-        uint inputSize = elements * 6;
-        uint[] memory input = new uint[](inputSize);
-        for (uint i = 0; i < elements; i++)
-        {
-            input[i * 6 + 0] = p1[i].X;
-            input[i * 6 + 1] = p1[i].Y;
-            input[i * 6 + 2] = p2[i].X[0];
-            input[i * 6 + 3] = p2[i].X[1];
-            input[i * 6 + 4] = p2[i].Y[0];
-            input[i * 6 + 5] = p2[i].Y[1];
-        }
-        uint[1] memory out;
+
+    /* @return The result of computing the pairing check
+     *         e(p1[0], p2[0]) *  .... * e(p1[n], p2[n]) == 1
+     *         For example,
+     *         pairing([P1(), P1().negate()], [P2(), P2()]) should return true.
+     */
+    function pairing(
+        G1Point memory a1,
+        G2Point memory a2,
+        G1Point memory b1,
+        G2Point memory b2,
+        G1Point memory c1,
+        G2Point memory c2,
+        G1Point memory d1,
+        G2Point memory d2
+    ) internal view returns (bool) {
+        uint256[24] memory input = [
+            a1.X, a1.Y, a2.X[0], a2.X[1], a2.Y[0], a2.Y[1],
+            b1.X, b1.Y, b2.X[0], b2.X[1], b2.Y[0], b2.Y[1],
+            c1.X, c1.Y, c2.X[0], c2.X[1], c2.Y[0], c2.Y[1],
+            d1.X, d1.Y, d2.X[0], d2.X[1], d2.Y[0], d2.Y[1]
+        ];
+        uint256[1] memory out;
         bool success;
+
         // solium-disable-next-line security/no-inline-assembly
         assembly {
-            success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20)
+            success := staticcall(sub(gas(), 2000), 8, input, mul(24, 0x20), out, 0x20)
             // Use "invalid" to make gas estimation work
             switch success case 0 { invalid() }
         }
-        require(success,"pairing-opcode-failed");
+
+        require(success, "pairing-opcode-failed");
         return out[0] != 0;
     }
-    /// Convenience method for a pairing check for two pairs.
-    function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](2);
-        G2Point[] memory p2 = new G2Point[](2);
-        p1[0] = a1;
-        p1[1] = b1;
-        p2[0] = a2;
-        p2[1] = b2;
-        return pairing(p1, p2);
-    }
-    /// Convenience method for a pairing check for three pairs.
-    function pairingProd3(
-            G1Point memory a1, G2Point memory a2,
-            G1Point memory b1, G2Point memory b2,
-            G1Point memory c1, G2Point memory c2
-    ) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](3);
-        G2Point[] memory p2 = new G2Point[](3);
-        p1[0] = a1;
-        p1[1] = b1;
-        p1[2] = c1;
-        p2[0] = a2;
-        p2[1] = b2;
-        p2[2] = c2;
-        return pairing(p1, p2);
-    }
-    /// Convenience method for a pairing check for four pairs.
-    function pairingProd4(
-            G1Point memory a1, G2Point memory a2,
-            G1Point memory b1, G2Point memory b2,
-            G1Point memory c1, G2Point memory c2,
-            G1Point memory d1, G2Point memory d2
-    ) internal view returns (bool) {
-        G1Point[] memory p1 = new G1Point[](4);
-        G2Point[] memory p2 = new G2Point[](4);
-        p1[0] = a1;
-        p1[1] = b1;
-        p1[2] = c1;
-        p1[3] = d1;
-        p2[0] = a2;
-        p2[1] = b2;
-        p2[2] = c2;
-        p2[3] = d2;
-        return pairing(p1, p2);
-    }
 }
+
 contract Verifier {
+    uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
+    uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
     using Pairing for *;
+
     struct VerifyingKey {
         Pairing.G1Point alfa1;
         Pairing.G2Point beta2;
         Pairing.G2Point gamma2;
         Pairing.G2Point delta2;
-        Pairing.G1Point[] IC;
+        Pairing.G1Point[<%=IC.length%>] IC;
     }
-    struct Proof {
-        Pairing.G1Point A;
-        Pairing.G2Point B;
-        Pairing.G1Point C;
-    }
-    function verifyingKey() internal pure returns (VerifyingKey memory vk) {
-        vk.alfa1 = Pairing.G1Point(
-            <%=vk_alpha_1[0]%>,
-            <%=vk_alpha_1[1]%>
-        );
 
-        vk.beta2 = Pairing.G2Point(
-            [<%=vk_beta_2[0][1]%>,
-             <%=vk_beta_2[0][0]%>],
-            [<%=vk_beta_2[1][1]%>,
-             <%=vk_beta_2[1][0]%>]
-        );
-        vk.gamma2 = Pairing.G2Point(
-            [<%=vk_gamma_2[0][1]%>,
-             <%=vk_gamma_2[0][0]%>],
-            [<%=vk_gamma_2[1][1]%>,
-             <%=vk_gamma_2[1][0]%>]
-        );
-        vk.delta2 = Pairing.G2Point(
-            [<%=vk_delta_2[0][1]%>,
-             <%=vk_delta_2[0][0]%>],
-            [<%=vk_delta_2[1][1]%>,
-             <%=vk_delta_2[1][0]%>]
-        );
-        vk.IC = new Pairing.G1Point[](<%=IC.length%>);
-        <% for (let i=0; i<IC.length; i++) { %>
-        vk.IC[<%=i%>] = Pairing.G1Point( 
-            <%=IC[i][0]%>,
-            <%=IC[i][1]%>
-        );                                      
-        <% } %>
+    function verifyingKey() internal pure returns (VerifyingKey memory vk) {
+          vk.alfa1 = Pairing.G1Point(<%=vk_alpha_1[0]%>, <%=vk_alpha_1[1]%>);
+          vk.beta2 = Pairing.G2Point([<%=vk_beta_2[0][1]%>, <%=vk_beta_2[0][0]%>], [<%=vk_beta_2[1][1]%>, <%=vk_beta_2[1][0]%>]);
+          vk.gamma2 = Pairing.G2Point([<%=vk_gamma_2[0][1]%>, <%=vk_gamma_2[0][0]%>], [<%=vk_gamma_2[1][1]%>, <%=vk_gamma_2[1][0]%>]);
+          vk.delta2 = Pairing.G2Point([<%=vk_delta_2[0][1]%>, <%=vk_delta_2[0][0]%>], [<%=vk_delta_2[1][1]%>, <%=vk_delta_2[1][0]%>]);
+          <% for (let i=0; i<IC.length; i++) { %>
+          vk.IC[<%=i%>] = Pairing.G1Point(<%=IC[i][0]%>, <%=IC[i][1]%>);<% } %>
     }
-    function verify(uint[] memory input, Proof memory proof) internal view returns (uint) {
-        uint256 snark_scalar_field = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
-        VerifyingKey memory vk = verifyingKey();
-        require(input.length + 1 == vk.IC.length,"verifier-bad-input");
-        // Compute the linear combination vk_x
-        Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0);
-        for (uint i = 0; i < input.length; i++) {
-            require(input[i] < snark_scalar_field,"verifier-gte-snark-scalar-field");
-            vk_x = Pairing.addition(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i]));
-        }
-        vk_x = Pairing.addition(vk_x, vk.IC[0]);
-        if (!Pairing.pairingProd4(
-            Pairing.negate(proof.A), proof.B,
-            vk.alfa1, vk.beta2,
-            vk_x, vk.gamma2,
-            proof.C, vk.delta2
-        )) return 1;
-        return 0;
-    }
-    /// @return r  bool true if proof is valid
+
+    /*
+     * @returns Whether the proof is valid given the hardcoded verifying key
+     *          above and the public inputs
+     */
     function verifyProof(
-            uint[2] memory a,
-            uint[2][2] memory b,
-            uint[2] memory c,
-            uint[<%=IC.length-1%>] memory input
-        ) public view returns (bool r) {
-        Proof memory proof;
-        proof.A = Pairing.G1Point(a[0], a[1]);
-        proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]);
-        proof.C = Pairing.G1Point(c[0], c[1]);
-        uint[] memory inputValues = new uint[](input.length);
-        for(uint i = 0; i < input.length; i++){
-            inputValues[i] = input[i];
+        bytes memory proof,
+        uint256[<%=IC.length-1%>] memory input
+    ) public view returns (bool) {
+        uint256[8] memory p = abi.decode(proof, (uint256[8]));
+        for (uint8 i = 0; i < p.length; i++) {
+            // Make sure that each element in the proof is less than the prime q
+            require(p[i] < PRIME_Q, "verifier-proof-element-gte-prime-q");
         }
-        if (verify(inputValues, proof) == 0) {
-            return true;
-        } else {
-            return false;
+        Pairing.G1Point memory proofA = Pairing.G1Point(p[0], p[1]);
+        Pairing.G2Point memory proofB = Pairing.G2Point([p[2], p[3]], [p[4], p[5]]);
+        Pairing.G1Point memory proofC = Pairing.G1Point(p[6], p[7]);
+
+        VerifyingKey memory vk = verifyingKey();
+        // Compute the linear combination vkX
+        Pairing.G1Point memory vkX = vk.IC[0];
+        for (uint256 i = 0; i < input.length; i++) {
+            // Make sure that every input is less than the snark scalar field
+            require(input[i] < SNARK_SCALAR_FIELD, "verifier-input-gte-snark-scalar-field");
+            vkX = Pairing.plus(vkX, Pairing.scalarMul(vk.IC[i + 1], input[i]));
         }
+
+        return Pairing.pairing(
+            Pairing.negate(proofA),
+            proofB,
+            vk.alfa1,
+            vk.beta2,
+            vkX,
+            vk.gamma2,
+            proofC,
+            vk.delta2
+        );
     }
 }
+