pedersen2 adapted

circuits/pedersen.circom

@@ -128,6 +128,9 @@ template Segment(nWindows) {
     component adders[nWindows-1];
     for (i=0; i<nWindows; i++) {
         windows[i] = Window4();
+        for (j=0; j<4; j++) {
+            windows[i].in[j] <== in[4*i+j];
+        }
         if (i==0) {
             windows[i].base[0] <== e2m.out[0];
             windows[i].base[1] <== e2m.out[1];
@@ -153,9 +156,6 @@ template Segment(nWindows) {
             adders[i-1].in2[0] <== windows[i].out[0];
             adders[i-1].in2[1] <== windows[i].out[1];
         }
-        for (j=0; j<4; j++) {
-            windows[i].in[j] <== in[4*i+j];
-        }
     }
 
     component m2e = Montgomery2Edwards();

src/pedersenHash.js

@@ -31,18 +31,18 @@ function pedersenHash(msg) {
             let acc = bigInt.one;
             for (let b=0; ((b<windowSize-1)&&(o<bits.length)) ; b++) {
                 if (bits[o]) {
-                    acc = acc.add( bigInt.one.shl(b) );
+                    acc = acc.add( bigInt.one.shiftLeft(b) );
                 }
                 o++;
             }
             if (o<bits.length) {
                 if (bits[o]) {
-                    acc = acc.neg();
+                    acc = bigInt.zero.minus(acc);
                 }
                 o++;
             }
-            escalar = escalar.add(acc.mul(exp));
-            exp = exp.shl(windowSize+1);
+            escalar = escalar.add(acc.times(exp));
+            exp = exp.shiftLeft(windowSize+1);
         }
 
         if (escalar.lesser(bigInt.zero)) {

test/binsub.js

@@ -1,8 +1,5 @@
-const chai = require("chai");
 const path = require("path");
 
-const assert = chai.assert;
-
 const bigInt = require("big-integer");
 const tester = require("circom").tester;
 

test/pedersen2.js

@@ -1,11 +1,7 @@
-const chai = require("chai");
 const path = require("path");
-const snarkjs = require("snarkjs");
-const compiler = require("circom");
 
-const assert = chai.assert;
-
-const bigInt = snarkjs.bigInt;
+const bigInt = require("big-integer");
+const tester = require("circom").tester;
 
 const babyJub = require("../src/babyjub.js");
 const pedersen = require("../src/pedersenHash.js");
@@ -15,60 +11,39 @@ describe("Pedersen test", function() {
     let circuit;
     this.timeout(100000);
     before( async() => {
-        const cirDef = await compiler(path.join(__dirname, "circuits", "pedersen2_test.circom"));
-
-        circuit = new snarkjs.Circuit(cirDef);
 
-        console.log("NConstrains Pedersen2: " + circuit.nConstraints);
+        circuit = await tester(path.join(__dirname, "circuits", "pedersen2_test.circom"));
     });
     it("Should pedersen at zero", async () => {
 
-        let w, xout, yout;
-
-        w = circuit.calculateWitness({ in: 0});
+        let w;
 
-        xout = w[circuit.getSignalIdx("main.out[0]")];
-        yout = w[circuit.getSignalIdx("main.out[1]")];
+        w = await circuit.calculateWitness({ in: 0});
 
         const b = Buffer.alloc(32);
 
         const h = pedersen.hash(b);
         const hP = babyJub.unpackPoint(h);
 
-        /*
-        console.log(`[${xout.toString()}, ${yout.toString()}]`);
-        console.log(`[${hP[0].toString()}, ${hP[1].toString()}]`);
-        */
+        await circuit.assertOut(w, {out: hP});
 
-        assert(xout.equals(hP[0]));
-        assert(yout.equals(hP[1]));
     });
     it("Should pedersen with 253 ones", async () => {
 
-        let w, xout, yout;
+        let w;
 
-        const n = bigInt.one.shl(253).sub(bigInt.one);
-        console.log(n.toString(16));
+        const n = bigInt.one.shiftLeft(253).minus(bigInt.one);
 
-        w = circuit.calculateWitness({ in: n});
-
-        xout = w[circuit.getSignalIdx("main.out[0]")];
-        yout = w[circuit.getSignalIdx("main.out[1]")];
+        w = await circuit.calculateWitness({ in: n});
 
         const b = Buffer.alloc(32);
         for (let i=0; i<31; i++) b[i] = 0xFF;
         b[31] = 0x1F;
 
-
         const h = pedersen.hash(b);
         const hP = babyJub.unpackPoint(h);
 
-        /*
-        console.log(`[${xout.toString()}, ${yout.toString()}]`);
-        console.log(`[${hP[0].toString()}, ${hP[1].toString()}]`);
-        */
+        await circuit.assertOut(w, {out: hP});
 
-        assert(xout.equals(hP[0]));
-        assert(yout.equals(hP[1]));
     });
 });