From ef32fbe1b985f8e86992ab0494e4fee3d6553b65 Mon Sep 17 00:00:00 2001 From: Artem Chystiakov Date: Mon, 18 May 2026 14:59:51 +0300 Subject: [PATCH] fix range check --- package-lock.json | 4 +- package.json | 2 +- src/core/templates/verifier_groth16.sol.ejs | 2 +- src/core/templates/verifier_plonk.sol.ejs | 2 +- test/CircuitZKit.test.ts | 71 +++++++++++++++++++++ 5 files changed, 76 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6b236c..abe7196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@solarity/zkit", - "version": "0.3.7", + "version": "0.3.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@solarity/zkit", - "version": "0.3.7", + "version": "0.3.8", "license": "MIT", "dependencies": { "@iden3/binfileutils": "0.0.12", diff --git a/package.json b/package.json index 176aa45..fec8446 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@solarity/zkit", - "version": "0.3.7", + "version": "0.3.8", "license": "MIT", "author": "Distributed Lab", "readme": "README.md", diff --git a/src/core/templates/verifier_groth16.sol.ejs b/src/core/templates/verifier_groth16.sol.ejs index 8f10542..1df370e 100644 --- a/src/core/templates/verifier_groth16.sol.ejs +++ b/src/core/templates/verifier_groth16.sol.ejs @@ -140,7 +140,7 @@ contract <%=verifier_id%> { <% } -%> /// @dev check pairings - if not(iszero(verified_)) { + if verified_ { verified_ := checkPairing(pointA_, pointB_, pointC_, publicSignals_, pointer_) } } diff --git a/src/core/templates/verifier_plonk.sol.ejs b/src/core/templates/verifier_plonk.sol.ejs index 342ba2e..198d4f7 100644 --- a/src/core/templates/verifier_plonk.sol.ejs +++ b/src/core/templates/verifier_plonk.sol.ejs @@ -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_) diff --git a/test/CircuitZKit.test.ts b/test/CircuitZKit.test.ts index db6b75e..e867b96 100644 --- a/test/CircuitZKit.test.ts +++ b/test/CircuitZKit.test.ts @@ -69,6 +69,8 @@ export interface ShortTestPlonkVerifierType { } describe("CircuitZKit", () => { + const SCALAR_FIELD_SIZE = 21888242871839275222246405745257275088548364400416034343698204186575808495617n; + function getArtifactsFullPath(circuitDirSourceName: string): string { return path.join(process.cwd(), "zkit", "artifacts", circuitDirSourceName); } @@ -310,6 +312,41 @@ describe("CircuitZKit", () => { .to.be.true; }); + it("should correctly create Solidity verifier and not verify invalid 'groth16' proof", async function () { + const circuitName = "Multiplier"; + const verifierDirPath = getVerifiersDirFullPath(); + const artifactsDirFullPath = getArtifactsFullPath(`${circuitName}.circom`); + + const multiplierCircuit = getCircuitZKit<"groth16">(circuitName, "groth16", { + circuitName, + circuitArtifactsPath: artifactsDirFullPath, + verifierDirPath, + }); + + const expectedVerifierFilePath = path.join(verifierDirPath, `${multiplierCircuit.getVerifierName()}.sol`); + + await multiplierCircuit.createVerifier("sol"); + expect(fs.existsSync(expectedVerifierFilePath)).to.be.true; + + await this.hre.run("compile", { quiet: true, force: true }); + + const proof = await multiplierCircuit.generateProof({ + a: 10, + b: 20, + }); + + proof.publicSignals[0] = (BigInt(proof.publicSignals[0]) + SCALAR_FIELD_SIZE).toString(); + + const data = await multiplierCircuit.generateCalldata(proof); + + const MultiplierVerifierFactory = await this.hre.ethers.getContractFactory("MultiplierGroth16Verifier"); + + const verifier = await MultiplierVerifierFactory.deploy(); + + expect(await verifier.verifyProof(data.proofPoints.a, data.proofPoints.b, data.proofPoints.c, data.publicSignals)) + .to.be.false; + }); + it("should correctly create Solidity verifier and verify 'plonk' proof", async function () { const circuitName = "Multiplier"; const verifierDirPath = getVerifiersDirFullPath(); @@ -344,6 +381,40 @@ describe("CircuitZKit", () => { expect(await verifier.verifyProof(data.proofPoints.proofData, data.publicSignals)).to.be.true; }); + it("should correctly create Solidity verifier and not verify invalid 'plonk' proof", async function () { + const circuitName = "Multiplier"; + const verifierDirPath = getVerifiersDirFullPath(); + const artifactsDirFullPath = getArtifactsFullPath(`${circuitName}.circom`); + + const multiplierCircuit = getCircuitZKit<"plonk">(circuitName, "plonk", { + circuitName, + circuitArtifactsPath: artifactsDirFullPath, + verifierDirPath, + }); + + const expectedVerifierFilePath = path.join(verifierDirPath, `${multiplierCircuit.getVerifierName()}.sol`); + + await multiplierCircuit.createVerifier("sol"); + expect(fs.existsSync(expectedVerifierFilePath)).to.be.true; + + await this.hre.run("compile", { quiet: true }); + + const proof = await multiplierCircuit.generateProof({ + a: 10, + b: 20, + }); + + proof.publicSignals[0] = (BigInt(proof.publicSignals[0]) + SCALAR_FIELD_SIZE).toString(); + + const data = await multiplierCircuit.generateCalldata(proof); + + const MultiplierVerifierFactory = await this.hre.ethers.getContractFactory("MultiplierPlonkVerifier"); + + const verifier = await MultiplierVerifierFactory.deploy(); + + expect(await verifier.verifyProof(data.proofPoints.proofData, data.publicSignals)).to.be.false; + }); + it("should correctly create Vyper verifier and verify 'groth16' proof", async function () { const circuitName = "Multiplier"; const verifierDirPath = getVerifiersDirFullPath();