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;