0.5.31

README.md

@@ -1,12 +1,15 @@
 # Circom
 
-Circom is a language designed to write arithmetic circuits that can be used in zero knowledge proofs.
+Circom is a language designed to write arithmetic circuits that can be used in zero-knowledge proofs.
 
 In particular, it is designed to work in [zksnarks JavaScript library](https://github.com/iden3/zksnark).
 
-
 ## Usage
 
+### Circom Docs
+
+You can read the details of circom in [the documentation webpage](https://docs.circom.io/).
+
 ### Tutorial
 
 A good starting point [is this tutorial](https://github.com/iden3/circom/blob/master/TUTORIAL.md)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.5.28",
+  "version": "0.5.31",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.5.28",
+  "version": "0.5.31",
   "description": "Language to generate logic circuits",
   "main": "index.js",
   "directories": {

ports/c/builder.js

@@ -661,11 +661,6 @@ class BuilderC {
 
     async _buildCircuitVar(fdData) {
 
-        const pP = fdData.pos;
-
-        const strBuff = new TextEncoder("utf-8").encode(this.header.P.toString());
-        await fdData.write(strBuff);
-
         const buff = new Uint8Array(72);
         const buffV = new DataView(buff.buffer);
 
@@ -673,7 +668,7 @@ class BuilderC {
         utils.setUint64(buffV, 8, this.pComponents, true);
         utils.setUint64(buffV, 16, this.pMapIsInput, true);
         utils.setUint64(buffV, 24, this.pConstants, true);
-        utils.setUint64(buffV, 32, pP, true);
+        utils.setUint64(buffV, 32, this.pPriemStr, true);
         utils.setUint64(buffV, 40, this.pCets, true);
 
         buffV.setUint32(48, this.header.NSignals, true);
@@ -688,6 +683,16 @@ class BuilderC {
         await fdData.write(buff);
     }
 
+    async _buildPrimeStr(fdData) {
+        this.pPriemStr = fdData.pos;
+        const strBuff = new TextEncoder("utf-8").encode(this.header.P.toString());
+        await fdData.write(strBuff);
+
+        const zB = new Uint8Array(1);
+        zB[0] =0;
+        await fdData.write(zB);
+    }
+
 
     async build(fdCode, fdData) {
         const encoder = new TextEncoder("utf-8");
@@ -696,6 +701,7 @@ class BuilderC {
 
         const code=new BigArray();
         this._buildHeader(code);
+        await this._buildPrimeStr(fdData);
         await this._buildSizes(fdData);
         await this._buildConstants(fdData);
         await this._buildHashMaps(fdData);

ports/wasm/build_runtime.js

@@ -473,7 +473,7 @@ module.exports = function buildRuntime(module, builder) {
         );
 
         f.addCode(
-            c.if(   // If ( mapIsInput[s >> 5] & 1 << (s & 0x1f) )
+            c.if(   // If ( mapIsInput[s >> 5] & (1 << (s & 0x1f)) )
                 c.i32_and(
                     c.i32_load(
                         c.i32_add(

src/compiler.js

@@ -183,28 +183,36 @@ function classifySignals(ctx) {
 
     function priorize(t1, t2) {
         if ((t1 == ERROR) || (t2==ERROR)) return ERROR;
-        if (t1 == ctx.stINTERNAL) {
-            return t2;
-        } else if (t2==ctx.stINTERNAL) {
-            return t1;
-        }
         if ((t1 == ctx.stONE) || (t2 == ctx.stONE)) return ctx.stONE;
         if ((t1 == ctx.stOUTPUT) || (t2 == ctx.stOUTPUT)) return ctx.stOUTPUT;
+        if ((t1 == ctx.stPUBINPUT) || (t2 == ctx.stPUBINPUT)) return ctx.stPUBINPUT;
+        if ((t1 == ctx.stPRVINPUT) || (t2 == ctx.stPRVINPUT)) return ctx.stPRVINPUT;
+        if ((t1 == ctx.stINTERNAL) || (t2 == ctx.stINTERNAL)) return ctx.stINTERNAL;
         if ((t1 == ctx.stCONSTANT) || (t2 == ctx.stCONSTANT)) return ctx.stCONSTANT;
         if ((t1 == ctx.stDISCARDED) || (t2 == ctx.stDISCARDED)) return ctx.stDISCARDED;
         if (t1!=t2) return ERROR;
         return t1;
     }
 
+    for (let i=0; i<ctx.constraints.length; i++) {
+        if ((ctx.verbose)&&(i%100000 == 0)) console.log(`marking as internal: ${i}/${ctx.constraints.length}`);
+
+        const c = ctx.constraints[i];
+        for (let s in c.a.coefs) ctx.signals[s].c = ctx.stINTERNAL;
+        for (let s in c.b.coefs) ctx.signals[s].c = ctx.stINTERNAL;
+        for (let s in c.c.coefs) ctx.signals[s].c = ctx.stINTERNAL;
+    }
+
+
     // First classify the signals
     for (let s=0; s<ctx.signals.length; s++) {
         if ((ctx.verbose)&&(s%100000 == 0)) console.log(`classify signals: ${s}/${ctx.signals.length}`);
         const signal = ctx.signals[s];
-        let tAll = ctx.stINTERNAL;
+        let tAll = ctx.stDISCARDED;
         let lSignal = signal;
         let end = false;
         while (!end) {
-            let t = lSignal.c || ctx.stINTERNAL;
+            let t = lSignal.c || ctx.stDISCARDED;
             if (s == 0) {
                 t = ctx.stONE;
             } else if (lSignal.o & ctx.MAIN) {

src/r1csfile.js

@@ -8,7 +8,7 @@ module.exports.buildR1cs = buildR1cs;
 
 async function buildR1cs(ctx, fileName) {
 
-    const fd = await fastFile.createOverride(fileName, 1<<22, 1<<24);
+    const fd = await fastFile.createOverride(fileName, 1<<24, 1<<22);
 
     const buffBigInt = new Uint8Array(ctx.F.n8);