tornado-packages/snarkjs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix plonk circuits with less than 4 constraints

Browse Source
This commit is contained in:
Jordi Baylina 2021-06-06 17:27:41 +02:00
parent 5d23fd3998
commit b474a52106
No known key found for this signature in database
GPG Key ID: 7480C80C1BE43112
6 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/cli.cjs
View File

@ -6047,7 +6047,8 @@ async function plonkSetup(r1csName, ptauName, zkeyName, logger) {
return -1; return -1;
} }
const cirPower = log2(plonkConstraints.length -1) +1; let cirPower = log2(plonkConstraints.length -1) +1;
if (cirPower < 3) cirPower = 3; // As the t polinomal is n+5 whe need at least a power of 4
const domainSize = 2 ** cirPower; const domainSize = 2 ** cirPower;
if (logger) logger.info("Plonk constraints: " + plonkConstraints.length); if (logger) logger.info("Plonk constraints: " + plonkConstraints.length);
@ -6718,18 +6719,23 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
} }
*/ */
if (logger) logger.debug("phse3: Reading QM4");
const QM4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QM4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QL4");
const QL4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QL4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QR4");
const QR4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QR4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QO4");
const QO4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QO4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QC4");
const QC4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QC4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r);
@ -6769,6 +6775,8 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
let w = Fr.one; let w = Fr.one;
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
if ((i%4096 == 0)&&(logger)) logger.debug(`calculating t ${i}/${zkey.domainSize*4}`);
const a = A4.slice(i*n8r, i*n8r+n8r); const a = A4.slice(i*n8r, i*n8r+n8r);
const b = B4.slice(i*n8r, i*n8r+n8r); const b = B4.slice(i*n8r, i*n8r+n8r);
const c = C4.slice(i*n8r, i*n8r+n8r); const c = C4.slice(i*n8r, i*n8r+n8r);
@ -6868,8 +6876,10 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
w = Fr.mul(w, Fr.w[zkey.power+2]); w = Fr.mul(w, Fr.w[zkey.power+2]);
} }
if (logger) logger.debug("ifft T");
let t = await Fr.ifft(T); let t = await Fr.ifft(T);
if (logger) logger.debug("dividing T/Z");
for (let i=0; i<zkey.domainSize; i++) { for (let i=0; i<zkey.domainSize; i++) {
t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r); t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r);
} }
@ -6887,6 +6897,7 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
} }
} }
if (logger) logger.debug("ifft Tz");
const tz = await Fr.ifft(Tz); const tz = await Fr.ifft(Tz);
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
const a = tz.slice(i*n8r, (i+1)*n8r); const a = tz.slice(i*n8r, (i+1)*n8r);

13
build/main.cjs
View File

@ -6004,7 +6004,8 @@ async function plonkSetup(r1csName, ptauName, zkeyName, logger) {
return -1; return -1;
} }
const cirPower = log2(plonkConstraints.length -1) +1; let cirPower = log2(plonkConstraints.length -1) +1;
if (cirPower < 3) cirPower = 3; // As the t polinomal is n+5 whe need at least a power of 4
const domainSize = 2 ** cirPower; const domainSize = 2 ** cirPower;
if (logger) logger.info("Plonk constraints: " + plonkConstraints.length); if (logger) logger.info("Plonk constraints: " + plonkConstraints.length);
@ -6675,18 +6676,23 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
} }
*/ */
if (logger) logger.debug("phse3: Reading QM4");
const QM4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QM4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QL4");
const QL4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QL4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QR4");
const QR4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QR4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QO4");
const QO4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QO4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QC4");
const QC4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r); const QC4 = new ffjavascript.BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r);
@ -6726,6 +6732,8 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
let w = Fr.one; let w = Fr.one;
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
if ((i%4096 == 0)&&(logger)) logger.debug(`calculating t ${i}/${zkey.domainSize*4}`);
const a = A4.slice(i*n8r, i*n8r+n8r); const a = A4.slice(i*n8r, i*n8r+n8r);
const b = B4.slice(i*n8r, i*n8r+n8r); const b = B4.slice(i*n8r, i*n8r+n8r);
const c = C4.slice(i*n8r, i*n8r+n8r); const c = C4.slice(i*n8r, i*n8r+n8r);
@ -6825,8 +6833,10 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
w = Fr.mul(w, Fr.w[zkey.power+2]); w = Fr.mul(w, Fr.w[zkey.power+2]);
} }
if (logger) logger.debug("ifft T");
let t = await Fr.ifft(T); let t = await Fr.ifft(T);
if (logger) logger.debug("dividing T/Z");
for (let i=0; i<zkey.domainSize; i++) { for (let i=0; i<zkey.domainSize; i++) {
t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r); t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r);
} }
@ -6844,6 +6854,7 @@ async function plonk16Prove(zkeyFileName, witnessFileName, logger) {
} }
} }
if (logger) logger.debug("ifft Tz");
const tz = await Fr.ifft(Tz); const tz = await Fr.ifft(Tz);
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
const a = tz.slice(i*n8r, (i+1)*n8r); const a = tz.slice(i*n8r, (i+1)*n8r);

15
build/snarkjs.js
View File

File diff suppressed because one or more lines are too long

2
build/snarkjs.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/plonk_prove.js
View File

@ -327,18 +327,23 @@ export default async function plonk16Prove(zkeyFileName, witnessFileName, logger
} }
*/ */
if (logger) logger.debug("phse3: Reading QM4");
const QM4 = new BigBuffer(zkey.domainSize*4*n8r); const QM4 = new BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QM4, 0 , zkey.domainSize*n8r*4, sectionsZKey[7][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QL4");
const QL4 = new BigBuffer(zkey.domainSize*4*n8r); const QL4 = new BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QL4, 0 , zkey.domainSize*n8r*4, sectionsZKey[8][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QR4");
const QR4 = new BigBuffer(zkey.domainSize*4*n8r); const QR4 = new BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QR4, 0 , zkey.domainSize*n8r*4, sectionsZKey[9][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QO4");
const QO4 = new BigBuffer(zkey.domainSize*4*n8r); const QO4 = new BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QO4, 0 , zkey.domainSize*n8r*4, sectionsZKey[10][0].p + zkey.domainSize*n8r);
if (logger) logger.debug("phse3: Reading QC4");
const QC4 = new BigBuffer(zkey.domainSize*4*n8r); const QC4 = new BigBuffer(zkey.domainSize*4*n8r);
await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r); await fdZKey.readToBuffer(QC4, 0 , zkey.domainSize*n8r*4, sectionsZKey[11][0].p + zkey.domainSize*n8r);
@ -378,6 +383,8 @@ export default async function plonk16Prove(zkeyFileName, witnessFileName, logger
let w = Fr.one; let w = Fr.one;
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
if ((i%4096 == 0)&&(logger)) logger.debug(`calculating t ${i}/${zkey.domainSize*4}`);
const a = A4.slice(i*n8r, i*n8r+n8r); const a = A4.slice(i*n8r, i*n8r+n8r);
const b = B4.slice(i*n8r, i*n8r+n8r); const b = B4.slice(i*n8r, i*n8r+n8r);
const c = C4.slice(i*n8r, i*n8r+n8r); const c = C4.slice(i*n8r, i*n8r+n8r);
@ -477,8 +484,10 @@ export default async function plonk16Prove(zkeyFileName, witnessFileName, logger
w = Fr.mul(w, Fr.w[zkey.power+2]); w = Fr.mul(w, Fr.w[zkey.power+2]);
} }
if (logger) logger.debug("ifft T");
let t = await Fr.ifft(T); let t = await Fr.ifft(T);
if (logger) logger.debug("dividing T/Z");
for (let i=0; i<zkey.domainSize; i++) { for (let i=0; i<zkey.domainSize; i++) {
t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r); t.set(Fr.neg(t.slice(i*n8r, i*n8r+n8r)), i*n8r);
} }
@ -496,6 +505,7 @@ export default async function plonk16Prove(zkeyFileName, witnessFileName, logger
} }
} }
if (logger) logger.debug("ifft Tz");
const tz = await Fr.ifft(Tz); const tz = await Fr.ifft(Tz);
for (let i=0; i<zkey.domainSize*4; i++) { for (let i=0; i<zkey.domainSize*4; i++) {
const a = tz.slice(i*n8r, (i+1)*n8r); const a = tz.slice(i*n8r, (i+1)*n8r);

3
src/plonk_setup.js
View File

@ -69,7 +69,8 @@ export default async function plonkSetup(r1csName, ptauName, zkeyName, logger) {
return -1; return -1;
} }
const cirPower = log2(plonkConstraints.length -1) +1; let cirPower = log2(plonkConstraints.length -1) +1;
if (cirPower < 3) cirPower = 3; // As the t polinomal is n+5 whe need at least a power of 4
const domainSize = 2 ** cirPower; const domainSize = 2 ** cirPower;
if (logger) logger.info("Plonk constraints: " + plonkConstraints.length); if (logger) logger.info("Plonk constraints: " + plonkConstraints.length);