npm - @solarity/zkit - Versions diffs - 0.3.7-rc.2 → 0.3.8 - Mend

@solarity/zkit 0.3.7-rc.2 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/README.md +9 -3
package/dist/core/templates/verifier_groth16.sol.ejs +35 -47
package/dist/core/templates/verifier_plonk.sol.ejs +1 -1
package/dist/utils/index.d.ts +1 -12
package/dist/utils/index.d.ts.map +1 -1
package/dist/utils/index.js +1 -52
package/dist/utils/index.js.map +1 -1
package/dist/utils/protocol-utils.d.ts +13 -0
package/dist/utils/protocol-utils.d.ts.map +1 -0
package/dist/utils/protocol-utils.js +66 -0
package/dist/utils/protocol-utils.js.map +1 -0
package/package.json +5 -5
package/src/core/templates/verifier_groth16.sol.ejs +35 -47
package/src/core/templates/verifier_plonk.sol.ejs +1 -1
package/src/utils/index.ts +1 -32
package/src/utils/protocol-utils.ts +31 -0

package/README.md CHANGED Viewed

@@ -1,5 +1,6 @@
 [![npm](https://img.shields.io/npm/v/@solarity/zkit.svg)](https://www.npmjs.com/package/@solarity/zkit)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Tests](https://github.com/dl-solarity/zkit/actions/workflows/tests.yml/badge.svg)](https://github.com/dl-solarity/zkit/actions/workflows/tests.yml)
 # ZKit - Circom Zero Knowledge Kit
@@ -9,6 +10,7 @@
 - Leverage `groth16` and `plonk` proving systems.
 - Render optimized Solidity | Vyper verifiers.
 - Build and work with ZK witnesses.
+- Substitute witness signals for advanced circuits testing.
 ## Installation
@@ -62,18 +64,22 @@ await circuit.createVerifier("sol");
 await circuit.createVerifier("sol", "_suffix_");
 ```
-- **`async calculateWitness(inputs) -> bigint[]`**
+- **`async calculateWitness(inputs, witnessOverrides?) -> bigint[]`**
 Calculates a witness in the `tmp` directory and returns its json representation.
+An optional `witnessOverrides` parameter can be provided to replace specific signal values in the generated witness file.
 ```typescript
 /// witness = [1n, 200n, 20n, 10n]
 const witness = await circuit.calculateWitness({ a: 10, b: 20 });
+/// witness = [1n, 200n, 35n, 10n]
+const witness = await circuit.calculateWitness({ a: 10, b: 20 }, { "main.a": 35 });
 ```
-- **`async generateProof(inputs) -> proof`**
+- **`async generateProof(inputs, witnessOverrides?) -> proof`**
-Generates a proof for the given inputs.
+Generates a proof for the given `inputs` and `witnessOverrides`.
 ```typescript
 /// { proof: { pi_a, pi_b, pi_c, protocol, curve }, publicSignals: [6] }

package/dist/core/templates/verifier_groth16.sol.ejs CHANGED Viewed

@@ -48,9 +48,8 @@ contract <%=verifier_id%> {
         <%=IC[i][1]%>;
     <% } -%>
-    /// @dev memory pointer sizes
-    uint16 public constant P_PUBLIC_SIGNALS_ACCUMULATOR_SIZE = 128;
-    uint16 public constant P_TOTAL_SIZE = 896;
+    /// @dev memory pointer size
+    uint256 public constant P_TOTAL_SIZE = 768;
     function verifyProof(
         uint256[2] memory pointA_,
@@ -63,30 +62,23 @@ contract <%=verifier_id%> {
                 res_ := lt(signal_, SCALAR_FIELD_SIZE)
             }
-            function g1MulAdd(pR_, x_, y_, s_) -> res_ {
-                let pointer_ := mload(64) // free pointer
+            function g1MulAdd(pointer_, x_, y_, s_) -> res_ {
+                mstore(add(pointer_, 64), x_)
+                mstore(add(pointer_, 96), y_)
+                mstore(add(pointer_, 128), s_)
-                mstore(pointer_, x_)
-                mstore(add(pointer_, 32), y_)
-                mstore(add(pointer_, 64), s_)
-                res_ := staticcall(6000, 7, pointer_, 96, pointer_, 64) // ecMul
+                res_ := staticcall(6000, 7, add(pointer_, 64), 96, add(pointer_, 64), 64) // ecMul
                 res_ := and(res_, gt(returndatasize(), 0)) // check that multiplication succeeded
                 if iszero(res_) {
                     leave
                 }
-                mstore(add(pointer_, 64), mload(pR_))
-                mstore(add(pointer_, 96), mload(add(pR_, 32)))
-                res_ := staticcall(150, 6, pointer_, 128, pR_, 64) // ecAdd
+                res_ := staticcall(150, 6, pointer_, 128, pointer_, 64) // ecAdd
                 res_ := and(res_, gt(returndatasize(), 0)) // check that addition succeeded
             }
             function checkPairing(pA_, pB_, pC_, pubSignals_, pointer_) -> res_ {
-                let pPairing_ := add(pointer_, P_PUBLIC_SIGNALS_ACCUMULATOR_SIZE)
                 mstore(pointer_, IC0_X)
                 mstore(add(pointer_, 32), IC0_Y)
@@ -96,51 +88,47 @@ contract <%=verifier_id%> {
                 }
                 <% } -%>
+                /// @dev gamma2
+                mstore(add(pointer_, 64), GAMMA_X1)
+                mstore(add(pointer_, 96), GAMMA_X2)
+                mstore(add(pointer_, 128), GAMMA_Y1)
+                mstore(add(pointer_, 160), GAMMA_Y2)
                 /// @dev -A
-                mstore(pPairing_, mload(pA_))
+                mstore(add(pointer_, 192), mload(pA_))
                 mstore(
-                    add(pPairing_, 32),
+                    add(pointer_, 224),
                     mod(sub(BASE_FIELD_SIZE, mload(add(pA_, 32))), BASE_FIELD_SIZE)
                 )
                 /// @dev B
-                mstore(add(pPairing_, 64), mload(mload(pB_)))
-                mstore(add(pPairing_, 96), mload(add(mload(pB_), 32)))
-                mstore(add(pPairing_, 128), mload(mload(add(pB_, 32))))
-                mstore(add(pPairing_, 160), mload(add(mload(add(pB_, 32)), 32)))
+                mstore(add(pointer_, 256), mload(mload(pB_)))
+                mstore(add(pointer_, 288), mload(add(mload(pB_), 32)))
+                mstore(add(pointer_, 320), mload(mload(add(pB_, 32))))
+                mstore(add(pointer_, 352), mload(add(mload(add(pB_, 32)), 32)))
                 /// @dev alpha1
-                mstore(add(pPairing_, 192), ALPHA_X)
-                mstore(add(pPairing_, 224), ALPHA_Y)
+                mstore(add(pointer_, 384), ALPHA_X)
+                mstore(add(pointer_, 416), ALPHA_Y)
                 /// @dev beta2
-                mstore(add(pPairing_, 256), BETA_X1)
-                mstore(add(pPairing_, 288), BETA_X2)
-                mstore(add(pPairing_, 320), BETA_Y1)
-                mstore(add(pPairing_, 352), BETA_Y2)
-                /// @dev public signals
-                mstore(add(pPairing_, 384), mload(pointer_))
-                mstore(add(pPairing_, 416), mload(add(pointer_, 32)))
-                /// @dev gamma2
-                mstore(add(pPairing_, 448), GAMMA_X1)
-                mstore(add(pPairing_, 480), GAMMA_X2)
-                mstore(add(pPairing_, 512), GAMMA_Y1)
-                mstore(add(pPairing_, 544), GAMMA_Y2)
+                mstore(add(pointer_, 448), BETA_X1)
+                mstore(add(pointer_, 480), BETA_X2)
+                mstore(add(pointer_, 512), BETA_Y1)
+                mstore(add(pointer_, 544), BETA_Y2)
                 /// @dev C
-                mstore(add(pPairing_, 576), mload(pC_))
-                mstore(add(pPairing_, 608), mload(add(pC_, 32)))
+                mstore(add(pointer_, 576), mload(pC_))
+                mstore(add(pointer_, 608), mload(add(pC_, 32)))
                 /// @dev delta2
-                mstore(add(pPairing_, 640), DELTA_X1)
-                mstore(add(pPairing_, 672), DELTA_X2)
-                mstore(add(pPairing_, 704), DELTA_Y1)
-                mstore(add(pPairing_, 736), DELTA_Y2)
+                mstore(add(pointer_, 640), DELTA_X1)
+                mstore(add(pointer_, 672), DELTA_X2)
+                mstore(add(pointer_, 704), DELTA_Y1)
+                mstore(add(pointer_, 736), DELTA_Y2)
-                res_ := staticcall(181000, 8, pPairing_, 768, pPairing_, 32) // ecPairing
-                res_ := and(res_, mload(pPairing_)) // check that pairing succeeded
+                res_ := staticcall(181000, 8, pointer_, 768, pointer_, 32) // ecPairing
+                res_ := and(res_, mload(pointer_)) // check that pairing succeeded
             }
             let pointer_ := mload(64) // free pointer
@@ -152,7 +140,7 @@ contract <%=verifier_id%> {
             <% } -%>
             /// @dev check pairings
-            if not(iszero(verified_)) {
+            if verified_ {
                 verified_ := checkPairing(pointA_, pointB_, pointC_, publicSignals_, pointer_)
             }
         }

package/dist/core/templates/verifier_plonk.sol.ejs CHANGED Viewed

@@ -761,7 +761,7 @@ contract <%=verifier_id%> {
             verified_ := checkInput(proofArr_)
             /// @dev check pairings
-            if not(iszero(verified_)) {
+            if verified_ {
                 calculateChallenges(pointer_, proofArr_, publicSignals_)
                 calculateLagrange(pointer_)
                 calculatePI(pointer_, publicSignals_)

package/dist/utils/index.d.ts CHANGED Viewed

@@ -1,14 +1,3 @@
-/**
- * Terminates the BN128 curve instance used by SnarkJS.
- */
-export declare function terminateCurve(): Promise<void>;
-/**
- * Returns the path to the temporary directory used by ZKit.
- *
- * Creates the directory if it does not exist.
- *
- * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
- */
-export declare function getTmpDir(): string;
 export * from "./witness-utils";
+export * from "./protocol-utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"~~AAQA;;GAEG;AACH~~,~~wBAAsB,~~cAAc,~~kBAEnC;AAED;;;;;;GAMG;AACH~~,~~wBAAgB,SAAS,IAAI,MAAM,CAQlC~~;~~AAED~~,cAAc,~~iBAAiB~~,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}

package/dist/utils/index.js CHANGED Viewed

@@ -10,61 +10,10 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminateCurve = terminateCurve;
-exports.getTmpDir = getTmpDir;
-const os_1 = __importDefault(require("os"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const constants_1 = require("../constants");
-const snarkjs = __importStar(require("snarkjs"));
-/**
- * Terminates the BN128 curve instance used by SnarkJS.
- */
-async function terminateCurve() {
-    await (await snarkjs.curves.getCurveFromName(constants_1.BN128_CURVE_NAME)).terminate();
-}
-/**
- * Returns the path to the temporary directory used by ZKit.
- *
- * Creates the directory if it does not exist.
- *
- * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
- */
-function getTmpDir() {
-    const tmpDir = path_1.default.join(os_1.default.tmpdir(), ".zkit");
-    if (!fs_1.default.existsSync(tmpDir)) {
-        fs_1.default.mkdirSync(tmpDir, { recursive: true });
-    }
-    return tmpDir;
-}
 __exportStar(require("./witness-utils"), exports);
+__exportStar(require("./protocol-utils"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA~~,~~wCAEC~~;~~AASD~~,8BAQC;AA9BD,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AAExB,4CAAgD;AAEhD,iDAAmC;AAEnC;;GAEG;AACI,KAAK,UAAU,cAAc;IAClC,MAAM,CAAC,MAAO,OAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AACvF,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,SAAS;IACvB,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAE/C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,YAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,kDAAgC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,mDAAiC"}

package/dist/utils/protocol-utils.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+/**
+ * Terminates the BN128 curve instance used by SnarkJS.
+ */
+export declare function terminateCurve(): Promise<void>;
+/**
+ * Returns the path to the temporary directory used by ZKit.
+ *
+ * Creates the directory if it does not exist.
+ *
+ * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
+ */
+export declare function getTmpDir(): string;
+//# sourceMappingURL=protocol-utils.d.ts.map

package/dist/utils/protocol-utils.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"protocol-utils.d.ts","sourceRoot":"","sources":["../../src/utils/protocol-utils.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,wBAAsB,cAAc,kBAEnC;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAQlC"}

package/dist/utils/protocol-utils.js ADDED Viewed

@@ -0,0 +1,66 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.terminateCurve = terminateCurve;
+exports.getTmpDir = getTmpDir;
+const os_1 = __importDefault(require("os"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const snarkjs = __importStar(require("snarkjs"));
+const constants_1 = require("../constants");
+/**
+ * Terminates the BN128 curve instance used by SnarkJS.
+ */
+async function terminateCurve() {
+    await (await snarkjs.curves.getCurveFromName(constants_1.BN128_CURVE_NAME)).terminate();
+}
+/**
+ * Returns the path to the temporary directory used by ZKit.
+ *
+ * Creates the directory if it does not exist.
+ *
+ * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
+ */
+function getTmpDir() {
+    const tmpDir = path_1.default.join(os_1.default.tmpdir(), ".zkit");
+    if (!fs_1.default.existsSync(tmpDir)) {
+        fs_1.default.mkdirSync(tmpDir, { recursive: true });
+    }
+    return tmpDir;
+}
+//# sourceMappingURL=protocol-utils.js.map

package/dist/utils/protocol-utils.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"protocol-utils.js","sourceRoot":"","sources":["../../src/utils/protocol-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wCAEC;AASD,8BAQC;AA9BD,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AAExB,iDAAmC;AAEnC,4CAAgD;AAEhD;;GAEG;AACI,KAAK,UAAU,cAAc;IAClC,MAAM,CAAC,MAAO,OAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AACvF,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,SAAS;IACvB,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAE/C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,YAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@solarity/zkit",
-  "version": "0.3.7-rc.2",
+  "version": "0.3.8",
   "license": "MIT",
   "author": "Distributed Lab",
   "readme": "README.md",
@@ -39,10 +39,12 @@
   },
   "dependencies": {
     "ejs": "3.1.10",
-    "snarkjs": "0.7.5"
+    "snarkjs": "0.7.5",
+    "@iden3/binfileutils": "0.0.12",
+    "ffjavascript": "0.3.1",
+    "readline": "1.3.0"
   },
   "devDependencies": {
-    "@iden3/binfileutils": "^0.0.12",
     "@nomicfoundation/hardhat-ethers": "3.0.5",
     "@nomiclabs/hardhat-vyper": "^3.0.7",
     "@solarity/solidity-lib": "3.0.0-rc.3",
@@ -54,13 +56,11 @@
     "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "ethers": "^6.11.1",
-    "ffjavascript": "^0.3.1",
     "hardhat": "2.22.7",
     "husky": "^9.0.11",
     "mocha": "^10.3.0",
     "nyc": "^15.1.0",
     "prettier": "^3.2.5",
-    "readline": "^1.3.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   }

package/src/core/templates/verifier_groth16.sol.ejs CHANGED Viewed

@@ -48,9 +48,8 @@ contract <%=verifier_id%> {
         <%=IC[i][1]%>;
     <% } -%>
-    /// @dev memory pointer sizes
-    uint16 public constant P_PUBLIC_SIGNALS_ACCUMULATOR_SIZE = 128;
-    uint16 public constant P_TOTAL_SIZE = 896;
+    /// @dev memory pointer size
+    uint256 public constant P_TOTAL_SIZE = 768;
     function verifyProof(
         uint256[2] memory pointA_,
@@ -63,30 +62,23 @@ contract <%=verifier_id%> {
                 res_ := lt(signal_, SCALAR_FIELD_SIZE)
             }
-            function g1MulAdd(pR_, x_, y_, s_) -> res_ {
-                let pointer_ := mload(64) // free pointer
+            function g1MulAdd(pointer_, x_, y_, s_) -> res_ {
+                mstore(add(pointer_, 64), x_)
+                mstore(add(pointer_, 96), y_)
+                mstore(add(pointer_, 128), s_)
-                mstore(pointer_, x_)
-                mstore(add(pointer_, 32), y_)
-                mstore(add(pointer_, 64), s_)
-                res_ := staticcall(6000, 7, pointer_, 96, pointer_, 64) // ecMul
+                res_ := staticcall(6000, 7, add(pointer_, 64), 96, add(pointer_, 64), 64) // ecMul
                 res_ := and(res_, gt(returndatasize(), 0)) // check that multiplication succeeded
                 if iszero(res_) {
                     leave
                 }
-                mstore(add(pointer_, 64), mload(pR_))
-                mstore(add(pointer_, 96), mload(add(pR_, 32)))
-                res_ := staticcall(150, 6, pointer_, 128, pR_, 64) // ecAdd
+                res_ := staticcall(150, 6, pointer_, 128, pointer_, 64) // ecAdd
                 res_ := and(res_, gt(returndatasize(), 0)) // check that addition succeeded
             }
             function checkPairing(pA_, pB_, pC_, pubSignals_, pointer_) -> res_ {
-                let pPairing_ := add(pointer_, P_PUBLIC_SIGNALS_ACCUMULATOR_SIZE)
                 mstore(pointer_, IC0_X)
                 mstore(add(pointer_, 32), IC0_Y)
@@ -96,51 +88,47 @@ contract <%=verifier_id%> {
                 }
                 <% } -%>
+                /// @dev gamma2
+                mstore(add(pointer_, 64), GAMMA_X1)
+                mstore(add(pointer_, 96), GAMMA_X2)
+                mstore(add(pointer_, 128), GAMMA_Y1)
+                mstore(add(pointer_, 160), GAMMA_Y2)
                 /// @dev -A
-                mstore(pPairing_, mload(pA_))
+                mstore(add(pointer_, 192), mload(pA_))
                 mstore(
-                    add(pPairing_, 32),
+                    add(pointer_, 224),
                     mod(sub(BASE_FIELD_SIZE, mload(add(pA_, 32))), BASE_FIELD_SIZE)
                 )
                 /// @dev B
-                mstore(add(pPairing_, 64), mload(mload(pB_)))
-                mstore(add(pPairing_, 96), mload(add(mload(pB_), 32)))
-                mstore(add(pPairing_, 128), mload(mload(add(pB_, 32))))
-                mstore(add(pPairing_, 160), mload(add(mload(add(pB_, 32)), 32)))
+                mstore(add(pointer_, 256), mload(mload(pB_)))
+                mstore(add(pointer_, 288), mload(add(mload(pB_), 32)))
+                mstore(add(pointer_, 320), mload(mload(add(pB_, 32))))
+                mstore(add(pointer_, 352), mload(add(mload(add(pB_, 32)), 32)))
                 /// @dev alpha1
-                mstore(add(pPairing_, 192), ALPHA_X)
-                mstore(add(pPairing_, 224), ALPHA_Y)
+                mstore(add(pointer_, 384), ALPHA_X)
+                mstore(add(pointer_, 416), ALPHA_Y)
                 /// @dev beta2
-                mstore(add(pPairing_, 256), BETA_X1)
-                mstore(add(pPairing_, 288), BETA_X2)
-                mstore(add(pPairing_, 320), BETA_Y1)
-                mstore(add(pPairing_, 352), BETA_Y2)
-                /// @dev public signals
-                mstore(add(pPairing_, 384), mload(pointer_))
-                mstore(add(pPairing_, 416), mload(add(pointer_, 32)))
-                /// @dev gamma2
-                mstore(add(pPairing_, 448), GAMMA_X1)
-                mstore(add(pPairing_, 480), GAMMA_X2)
-                mstore(add(pPairing_, 512), GAMMA_Y1)
-                mstore(add(pPairing_, 544), GAMMA_Y2)
+                mstore(add(pointer_, 448), BETA_X1)
+                mstore(add(pointer_, 480), BETA_X2)
+                mstore(add(pointer_, 512), BETA_Y1)
+                mstore(add(pointer_, 544), BETA_Y2)
                 /// @dev C
-                mstore(add(pPairing_, 576), mload(pC_))
-                mstore(add(pPairing_, 608), mload(add(pC_, 32)))
+                mstore(add(pointer_, 576), mload(pC_))
+                mstore(add(pointer_, 608), mload(add(pC_, 32)))
                 /// @dev delta2
-                mstore(add(pPairing_, 640), DELTA_X1)
-                mstore(add(pPairing_, 672), DELTA_X2)
-                mstore(add(pPairing_, 704), DELTA_Y1)
-                mstore(add(pPairing_, 736), DELTA_Y2)
+                mstore(add(pointer_, 640), DELTA_X1)
+                mstore(add(pointer_, 672), DELTA_X2)
+                mstore(add(pointer_, 704), DELTA_Y1)
+                mstore(add(pointer_, 736), DELTA_Y2)
-                res_ := staticcall(181000, 8, pPairing_, 768, pPairing_, 32) // ecPairing
-                res_ := and(res_, mload(pPairing_)) // check that pairing succeeded
+                res_ := staticcall(181000, 8, pointer_, 768, pointer_, 32) // ecPairing
+                res_ := and(res_, mload(pointer_)) // check that pairing succeeded
             }
             let pointer_ := mload(64) // free pointer
@@ -152,7 +140,7 @@ contract <%=verifier_id%> {
             <% } -%>
             /// @dev check pairings
-            if not(iszero(verified_)) {
+            if verified_ {
                 verified_ := checkPairing(pointA_, pointB_, pointC_, publicSignals_, pointer_)
             }
         }

package/src/core/templates/verifier_plonk.sol.ejs CHANGED Viewed

@@ -761,7 +761,7 @@ contract <%=verifier_id%> {
             verified_ := checkInput(proofArr_)
             /// @dev check pairings
-            if not(iszero(verified_)) {
+            if verified_ {
                 calculateChallenges(pointer_, proofArr_, publicSignals_)
                 calculateLagrange(pointer_)
                 calculatePI(pointer_, publicSignals_)

package/src/utils/index.ts CHANGED Viewed

@@ -1,33 +1,2 @@
-import os from "os";
-import fs from "fs";
-import path from "path";
-import { BN128_CURVE_NAME } from "../constants";
-import * as snarkjs from "snarkjs";
-/**
- * Terminates the BN128 curve instance used by SnarkJS.
- */
-export async function terminateCurve() {
-  await (await (snarkjs as any).curves.getCurveFromName(BN128_CURVE_NAME)).terminate();
-}
-/**
- * Returns the path to the temporary directory used by ZKit.
- *
- * Creates the directory if it does not exist.
- *
- * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
- */
-export function getTmpDir(): string {
-  const tmpDir = path.join(os.tmpdir(), ".zkit");
-  if (!fs.existsSync(tmpDir)) {
-    fs.mkdirSync(tmpDir, { recursive: true });
-  }
-  return tmpDir;
-}
 export * from "./witness-utils";
+export * from "./protocol-utils";

package/src/utils/protocol-utils.ts ADDED Viewed

@@ -0,0 +1,31 @@
+import os from "os";
+import fs from "fs";
+import path from "path";
+import * as snarkjs from "snarkjs";
+import { BN128_CURVE_NAME } from "../constants";
+/**
+ * Terminates the BN128 curve instance used by SnarkJS.
+ */
+export async function terminateCurve() {
+  await (await (snarkjs as any).curves.getCurveFromName(BN128_CURVE_NAME)).terminate();
+}
+/**
+ * Returns the path to the temporary directory used by ZKit.
+ *
+ * Creates the directory if it does not exist.
+ *
+ * @returns {string} The path to the temporary `.zkit` directory inside the OS temp folder.
+ */
+export function getTmpDir(): string {
+  const tmpDir = path.join(os.tmpdir(), ".zkit");
+  if (!fs.existsSync(tmpDir)) {
+    fs.mkdirSync(tmpDir, { recursive: true });
+  }
+  return tmpDir;
+}