From 2cab572c6620bacdb9a087533fd96c16ada8bdcb Mon Sep 17 00:00:00 2001
From: Jordi Baylina <jordi@baylina.cat>
Date: Thu, 6 Dec 2018 12:13:27 +0100
Subject: [PATCH] Before merging in a single lib

---
 circuit/aliascheck.circom            |  14 --
 circuit/compconstant.circom          |  56 ------
 circuit/eddsa.circom                 |   4 +-
 circuit/pedersen.circom              | 246 +++++++++++++++++++++++----
 circuit/pedersen2.circom             | 236 -------------------------
 circuit/pedersen_old.circom          |  48 ++++++
 circuit/pointbits.circom             |   4 +-
 circuit/sign.circom                  |   2 +-
 test/circuits/aliascheck_test.circom |   2 +-
 test/circuits/pedersen2_test.circom  |   2 +-
 test/circuits/pedersen_test.circom   |   2 +-
 test/sign.js                         |   2 +-
 12 files changed, 274 insertions(+), 344 deletions(-)
 delete mode 100644 circuit/aliascheck.circom
 delete mode 100644 circuit/compconstant.circom
 delete mode 100644 circuit/pedersen2.circom
 create mode 100644 circuit/pedersen_old.circom

diff --git a/circuit/aliascheck.circom b/circuit/aliascheck.circom
deleted file mode 100644
index e911424..0000000
--- a/circuit/aliascheck.circom
+++ /dev/null
@@ -1,14 +0,0 @@
-
-include "compconstant.circom";
-
-
-template AliasCheck() {
-
-    signal input in[254];
-
-    component  compConstant = CompConstant(-1);
-
-    for (var i=0; i<254; i++) in[i] ==> compConstant.in[i];
-
-    compConstant.out === 0;
-}
diff --git a/circuit/compconstant.circom b/circuit/compconstant.circom
deleted file mode 100644
index 7c66300..0000000
--- a/circuit/compconstant.circom
+++ /dev/null
@@ -1,56 +0,0 @@
-
-include "../node_modules/circom/circuits/bitify.circom";
-
-// Returns 1 if in (in binary) > ct
-
-template CompConstant(ct) {
-    signal input in[254];
-    signal output out;
-
-    signal parts[127];
-    signal sout;
-
-    var clsb;
-    var cmsb;
-    var slsb;
-    var smsb;
-
-    var sum=0;
-
-    var b = (1 << 128) -1;
-    var a = 1;
-    var e = 1;
-    var i;
-
-    for (i=0;i<127; i++) {
-        clsb = (ct >> (i*2)) & 1;
-        cmsb = (ct >> (i*2+1)) & 1;
-        slsb = in[i*2];
-        smsb = in[i*2+1];
-
-
-        if ((cmsb==0)&(clsb==0)) {
-            parts[i] <== -b*smsb*slsb + b*smsb + b*slsb;
-        } else if ((cmsb==0)&(clsb==1)) {
-            parts[i] <== a*smsb*slsb - a*slsb + b*smsb - a*smsb + a;
-        } else if ((cmsb==1)&(clsb==0)) {
-            parts[i] <== b*smsb*slsb - a*smsb + a;
-        } else {
-            parts[i] <== -a*smsb*slsb + a;
-        }
-
-        sum = sum + parts[i];
-
-        b = b -e;
-        a = a +e;
-        e = e*2;
-    }
-
-    sout <== sum;
-
-    component num2bits = Num2Bits(135);
-
-    num2bits.in <== sout;
-
-    out <== num2bits.out[127];
-}
diff --git a/circuit/eddsa.circom b/circuit/eddsa.circom
index c1ac925..fe1be4a 100644
--- a/circuit/eddsa.circom
+++ b/circuit/eddsa.circom
@@ -1,6 +1,6 @@
-include "compconstant.circom";
+include "../node_modules/circom/circuits/compconstant.circom";
 include "pointbits.circom";
-include "pedersen2.circom";
+include "pedersen.circom";
 include "escalarmulany.circom";
 include "escalarmulfix.circom";
 
diff --git a/circuit/pedersen.circom b/circuit/pedersen.circom
index f01e667..2b07153 100644
--- a/circuit/pedersen.circom
+++ b/circuit/pedersen.circom
@@ -1,48 +1,236 @@
+include "montgomery.circom";
+include "mux3.circom";
+include "babyjub.circom";
 
-include "escalarmul.circom";
+template Window4() {
+    signal input in[4];
+    signal input base[2];
+    signal output out[2];
+    signal output out8[2];   // Returns 8*Base (To be linked)
+
+    component mux = MultiMux3(2);
+
+    mux.s[0] <== in[0];
+    mux.s[1] <== in[1];
+    mux.s[2] <== in[2];
+
+    component dbl2 = MontgomeryDouble();
+    component adr3 = MontgomeryAdd();
+    component adr4 = MontgomeryAdd();
+    component adr5 = MontgomeryAdd();
+    component adr6 = MontgomeryAdd();
+    component adr7 = MontgomeryAdd();
+    component adr8 = MontgomeryAdd();
+
+// in[0]  -> 1*BASE
+
+    mux.c[0][0] <== base[0];
+    mux.c[1][0] <== base[1];
+
+// in[1] -> 2*BASE
+    dbl2.in[0] <== base[0];
+    dbl2.in[1] <== base[1];
+    mux.c[0][1] <== dbl2.out[0];
+    mux.c[1][1] <== dbl2.out[1];
+
+// in[2] -> 3*BASE
+    adr3.in1[0] <== base[0];
+    adr3.in1[1] <== base[1];
+    adr3.in2[0] <== dbl2.out[0];
+    adr3.in2[1] <== dbl2.out[1];
+    mux.c[0][2] <== adr3.out[0];
+    mux.c[1][2] <== adr3.out[1];
+
+// in[3] -> 4*BASE
+    adr4.in1[0] <== base[0];
+    adr4.in1[1] <== base[1];
+    adr4.in2[0] <== adr3.out[0];
+    adr4.in2[1] <== adr3.out[1];
+    mux.c[0][3] <== adr4.out[0];
+    mux.c[1][3] <== adr4.out[1];
+
+// in[4] -> 5*BASE
+    adr5.in1[0] <== base[0];
+    adr5.in1[1] <== base[1];
+    adr5.in2[0] <== adr4.out[0];
+    adr5.in2[1] <== adr4.out[1];
+    mux.c[0][4] <== adr5.out[0];
+    mux.c[1][4] <== adr5.out[1];
+
+// in[5] -> 6*BASE
+    adr6.in1[0] <== base[0];
+    adr6.in1[1] <== base[1];
+    adr6.in2[0] <== adr5.out[0];
+    adr6.in2[1] <== adr5.out[1];
+    mux.c[0][5] <== adr6.out[0];
+    mux.c[1][5] <== adr6.out[1];
+
+// in[6] -> 7*BASE
+    adr7.in1[0] <== base[0];
+    adr7.in1[1] <== base[1];
+    adr7.in2[0] <== adr6.out[0];
+    adr7.in2[1] <== adr6.out[1];
+    mux.c[0][6] <== adr7.out[0];
+    mux.c[1][6] <== adr7.out[1];
+
+// in[7] -> 8*BASE
+    adr8.in1[0] <== base[0];
+    adr8.in1[1] <== base[1];
+    adr8.in2[0] <== adr7.out[0];
+    adr8.in2[1] <== adr7.out[1];
+    mux.c[0][7] <== adr8.out[0];
+    mux.c[1][7] <== adr8.out[1];
+
+    out8[0] <== adr8.out[0];
+    out8[1] <== adr8.out[1];
+
+    out[0] <== mux.out[0];
+    out[1] <== - mux.out[1]*2*in[3] + mux.out[1];  // Negate y if in[3] is one
+}
+
+
+template Segment(nWindows) {
+    signal input in[nWindows*4];
+    signal input base[2];
+    signal output out[2];
+
+    var i;
+    var j;
+
+    // Convert the base to montgomery
+
+    component e2m = Edwards2Montgomery();
+    e2m.in[0] <== base[0];
+    e2m.in[1] <== base[1];
+
+    component windows[nWindows];
+    component doublers1[nWindows-1];
+    component doublers2[nWindows-1];
+    component adders[nWindows-1];
+    for (i=0; i<nWindows; i++) {
+        windows[i] = Window4();
+        if (i==0) {
+            windows[i].base[0] <== e2m.out[0];
+            windows[i].base[1] <== e2m.out[1];
+        } else {
+            doublers1[i-1] = MontgomeryDouble();
+            doublers2[i-1] = MontgomeryDouble();
+            doublers1[i-1].in[0] <== windows[i-1].out8[0];
+            doublers1[i-1].in[1] <== windows[i-1].out8[1];
+            doublers2[i-1].in[0] <== doublers1[i-1].out[0];
+            doublers2[i-1].in[1] <== doublers1[i-1].out[1];
+
+            windows[i].base[0] <== doublers2[i-1].out[0];
+            windows[i].base[1] <== doublers2[i-1].out[1];
+
+            adders[i-1] = MontgomeryAdd();
+            if (i==1) {
+                adders[i-1].in1[0] <== windows[0].out[0];
+                adders[i-1].in1[1] <== windows[0].out[1];
+            } else {
+                adders[i-1].in1[0] <== adders[i-2].out[0];
+                adders[i-1].in1[1] <== adders[i-2].out[1];
+            }
+            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();
+
+    if (nWindows > 1) {
+        m2e.in[0] <== adders[nWindows-2].out[0];
+        m2e.in[1] <== adders[nWindows-2].out[1];
+    } else {
+        m2e.in[0] <== windows[0].out[0];
+        m2e.in[1] <== windows[0].out[1];
+    }
+
+    out[0] <== m2e.out[0];
+    out[1] <== m2e.out[1];
+}
 
 template Pedersen(n) {
     signal input in[n];
     signal output out[2];
 
-    var nexps = ((n-1) \ 250) + 1;
-    var nlastbits = n - (nexps-1)*250;
+    var BASE = [
+        [7889815880984390413826091016397158135734961432619494935997950708325418623781,8846020814737052626835496416415322522216827521798085437978304928900248828704],
+        [12932435660254426850246080929365951045207624124386035886549006330955720993567,15876660444082442781217588393435527739441124986236154572507597829115005542086],
+        [2482397177297734131621151094340467680859038448217226675361423673093734165962,10039279516804305991696249700635360957313934801940294703211894781106216299926],
+        [17157815998940296936592098789990444736073034804807810484873853349962905015352,6488208869655503622669430389521947006738035600928015942696596112432120303604],
+        [264004460746169389447419243214191481604172623204375600962322511417379874376,2415858116338771134001541482988382151008857516531390792628421155957250972277],
+        [4135925743285698117252356077971179769271452015650275231796007492648697405139,10188226868678337759614729372197905253307539893323271103976079007344248400845],
+        [1774758779250924961062140611815304699163957993414252473010092444201412186500,4347026286058522695608532575722049241297833321096891696953943795644684841805],
+        [7879866447646097585900946926276218605564915618236971624614091698429769712458,2093592432852088858177276030443845730480437238346603396739626046140688969347],
+        [8298560996095230984182228319122592575131718101813938808256495049817179791777,1767915891871602626938298102360238720016341966012238026281701463959008338852],
+        [10415885340847357003805466620366840573458521568359796855704531856219635265921,3432650026491357206165099540731361444311747596326968441647905394914712226413]
+    ]
 
-    component escalarMuls[nexps];
+    var nSegments = ((n-1)\200)+1;
 
-    var PBASE = [
-                    [ 6842263847932328569390632736104801120816056295876316310227967232893658007436,
-                     10520112236148895828506510766039255961372323270202387671483666293012156799229],
-                    [ 7512553369533424708326990019377586455744651641787163924108944444109352325495,
-                       242060483180498555826438209654403949979206323274480625257315595534333598496],
-                    [  480315709862415282411588615813248553518720286084247594626493599605932342246,
-                     15016559215090999873142530067666085992648246670781771102893391410239675444873],
-                    [ 8311398801616893527636419786153024398643144699386228070202625261657263599049,
-                     11125962584728296601438821974884453267303385157860713577195820780853779600315],
-                    [ 1924118814882677827825936037840538695314492559747259292440881566152665343441,
-                     17232376423406964731689089286495480735310130852288107159412732879983310795144]
-                ];
+    component segments[nSegments];
 
     var i;
     var j;
-    var nexpbits;
-    for (i=0; i<nexps; i++) {
-        nexpbits = (i == nexps-1) ? nlastbits : 250;
-        escalarMuls[i] = EscalarMul(nexpbits, PBASE[i]);
-
-        for (j=0; j<nexpbits; j++) {
-            escalarMuls[i].in[j] <== in[250*i + j];
+    var nBits;
+    var nWindows;
+    for (i=0; i<nSegments; i++) {
+        nBits = (i == (nSegments-1)) ? n - (nSegments-1)*200 : 200;
+        nWindows = ((nBits - 1)\4)+1;
+        segments[i] = Segment(nWindows);
+        segments[i].base[0] <== BASE[i][0];
+        segments[i].base[1] <== BASE[i][1];
+        for (j = 0; j<nBits; j++) {
+            segments[i].in[j] <== in[i*200+j];
+        }
+        // Fill padding bits
+        for (j = nBits; j < nWindows*4; j++) {
+            segments[i].in[j] <== 0;
         }
+    }
+
+    component adders[nSegments-1];
 
+    for (i=0; i<nSegments-1; i++) {
+        adders[i] = BabyAdd();
         if (i==0) {
-            escalarMuls[i].inp[0] <== 0;
-            escalarMuls[i].inp[1] <== 1;
+            adders[i].x1 <== segments[0].out[0];
+            adders[i].y1 <== segments[0].out[1];
+            adders[i].x2 <== segments[1].out[0];
+            adders[i].y2 <== segments[1].out[1];
         } else {
-            escalarMuls[i].inp[0] <== escalarMuls[i-1].out[0];
-            escalarMuls[i].inp[1] <== escalarMuls[i-1].out[1];
+            adders[i].x1 <== adders[i-1].xout;
+            adders[i].y1 <== adders[i-1].yout;
+            adders[i].x2 <== segments[i+1].out[0];
+            adders[i].y2 <== segments[i+1].out[1];
         }
     }
 
-    escalarMuls[nexps-1].out[0] ==> out[0];
-    escalarMuls[nexps-1].out[1] ==> out[1];
+/*
+    coponent packPoint = PackPoint();
+
+    if (nSegments>1) {
+        packPoint.in[0] <== adders[nSegments-2].xout;
+        packPoint.in[1] <== adders[nSegments-2].yout;
+    } else {
+        packPoint.in[0] <== segments[0].out[0];
+        packPoint.in[1] <== segments[0].out[1];
+    }
+
+    out[0] <== packPoint.out[0];
+    out[1] <== packPoint.out[1];
+*/
+
+    if (nSegments>1) {
+        out[0] <== adders[nSegments-2].xout;
+        out[1] <== adders[nSegments-2].yout;
+    } else {
+        out[0] <== segments[0].out[0];
+        out[1] <== segments[0].out[1];
+    }
 }
+
diff --git a/circuit/pedersen2.circom b/circuit/pedersen2.circom
deleted file mode 100644
index 2b07153..0000000
--- a/circuit/pedersen2.circom
+++ /dev/null
@@ -1,236 +0,0 @@
-include "montgomery.circom";
-include "mux3.circom";
-include "babyjub.circom";
-
-template Window4() {
-    signal input in[4];
-    signal input base[2];
-    signal output out[2];
-    signal output out8[2];   // Returns 8*Base (To be linked)
-
-    component mux = MultiMux3(2);
-
-    mux.s[0] <== in[0];
-    mux.s[1] <== in[1];
-    mux.s[2] <== in[2];
-
-    component dbl2 = MontgomeryDouble();
-    component adr3 = MontgomeryAdd();
-    component adr4 = MontgomeryAdd();
-    component adr5 = MontgomeryAdd();
-    component adr6 = MontgomeryAdd();
-    component adr7 = MontgomeryAdd();
-    component adr8 = MontgomeryAdd();
-
-// in[0]  -> 1*BASE
-
-    mux.c[0][0] <== base[0];
-    mux.c[1][0] <== base[1];
-
-// in[1] -> 2*BASE
-    dbl2.in[0] <== base[0];
-    dbl2.in[1] <== base[1];
-    mux.c[0][1] <== dbl2.out[0];
-    mux.c[1][1] <== dbl2.out[1];
-
-// in[2] -> 3*BASE
-    adr3.in1[0] <== base[0];
-    adr3.in1[1] <== base[1];
-    adr3.in2[0] <== dbl2.out[0];
-    adr3.in2[1] <== dbl2.out[1];
-    mux.c[0][2] <== adr3.out[0];
-    mux.c[1][2] <== adr3.out[1];
-
-// in[3] -> 4*BASE
-    adr4.in1[0] <== base[0];
-    adr4.in1[1] <== base[1];
-    adr4.in2[0] <== adr3.out[0];
-    adr4.in2[1] <== adr3.out[1];
-    mux.c[0][3] <== adr4.out[0];
-    mux.c[1][3] <== adr4.out[1];
-
-// in[4] -> 5*BASE
-    adr5.in1[0] <== base[0];
-    adr5.in1[1] <== base[1];
-    adr5.in2[0] <== adr4.out[0];
-    adr5.in2[1] <== adr4.out[1];
-    mux.c[0][4] <== adr5.out[0];
-    mux.c[1][4] <== adr5.out[1];
-
-// in[5] -> 6*BASE
-    adr6.in1[0] <== base[0];
-    adr6.in1[1] <== base[1];
-    adr6.in2[0] <== adr5.out[0];
-    adr6.in2[1] <== adr5.out[1];
-    mux.c[0][5] <== adr6.out[0];
-    mux.c[1][5] <== adr6.out[1];
-
-// in[6] -> 7*BASE
-    adr7.in1[0] <== base[0];
-    adr7.in1[1] <== base[1];
-    adr7.in2[0] <== adr6.out[0];
-    adr7.in2[1] <== adr6.out[1];
-    mux.c[0][6] <== adr7.out[0];
-    mux.c[1][6] <== adr7.out[1];
-
-// in[7] -> 8*BASE
-    adr8.in1[0] <== base[0];
-    adr8.in1[1] <== base[1];
-    adr8.in2[0] <== adr7.out[0];
-    adr8.in2[1] <== adr7.out[1];
-    mux.c[0][7] <== adr8.out[0];
-    mux.c[1][7] <== adr8.out[1];
-
-    out8[0] <== adr8.out[0];
-    out8[1] <== adr8.out[1];
-
-    out[0] <== mux.out[0];
-    out[1] <== - mux.out[1]*2*in[3] + mux.out[1];  // Negate y if in[3] is one
-}
-
-
-template Segment(nWindows) {
-    signal input in[nWindows*4];
-    signal input base[2];
-    signal output out[2];
-
-    var i;
-    var j;
-
-    // Convert the base to montgomery
-
-    component e2m = Edwards2Montgomery();
-    e2m.in[0] <== base[0];
-    e2m.in[1] <== base[1];
-
-    component windows[nWindows];
-    component doublers1[nWindows-1];
-    component doublers2[nWindows-1];
-    component adders[nWindows-1];
-    for (i=0; i<nWindows; i++) {
-        windows[i] = Window4();
-        if (i==0) {
-            windows[i].base[0] <== e2m.out[0];
-            windows[i].base[1] <== e2m.out[1];
-        } else {
-            doublers1[i-1] = MontgomeryDouble();
-            doublers2[i-1] = MontgomeryDouble();
-            doublers1[i-1].in[0] <== windows[i-1].out8[0];
-            doublers1[i-1].in[1] <== windows[i-1].out8[1];
-            doublers2[i-1].in[0] <== doublers1[i-1].out[0];
-            doublers2[i-1].in[1] <== doublers1[i-1].out[1];
-
-            windows[i].base[0] <== doublers2[i-1].out[0];
-            windows[i].base[1] <== doublers2[i-1].out[1];
-
-            adders[i-1] = MontgomeryAdd();
-            if (i==1) {
-                adders[i-1].in1[0] <== windows[0].out[0];
-                adders[i-1].in1[1] <== windows[0].out[1];
-            } else {
-                adders[i-1].in1[0] <== adders[i-2].out[0];
-                adders[i-1].in1[1] <== adders[i-2].out[1];
-            }
-            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();
-
-    if (nWindows > 1) {
-        m2e.in[0] <== adders[nWindows-2].out[0];
-        m2e.in[1] <== adders[nWindows-2].out[1];
-    } else {
-        m2e.in[0] <== windows[0].out[0];
-        m2e.in[1] <== windows[0].out[1];
-    }
-
-    out[0] <== m2e.out[0];
-    out[1] <== m2e.out[1];
-}
-
-template Pedersen(n) {
-    signal input in[n];
-    signal output out[2];
-
-    var BASE = [
-        [7889815880984390413826091016397158135734961432619494935997950708325418623781,8846020814737052626835496416415322522216827521798085437978304928900248828704],
-        [12932435660254426850246080929365951045207624124386035886549006330955720993567,15876660444082442781217588393435527739441124986236154572507597829115005542086],
-        [2482397177297734131621151094340467680859038448217226675361423673093734165962,10039279516804305991696249700635360957313934801940294703211894781106216299926],
-        [17157815998940296936592098789990444736073034804807810484873853349962905015352,6488208869655503622669430389521947006738035600928015942696596112432120303604],
-        [264004460746169389447419243214191481604172623204375600962322511417379874376,2415858116338771134001541482988382151008857516531390792628421155957250972277],
-        [4135925743285698117252356077971179769271452015650275231796007492648697405139,10188226868678337759614729372197905253307539893323271103976079007344248400845],
-        [1774758779250924961062140611815304699163957993414252473010092444201412186500,4347026286058522695608532575722049241297833321096891696953943795644684841805],
-        [7879866447646097585900946926276218605564915618236971624614091698429769712458,2093592432852088858177276030443845730480437238346603396739626046140688969347],
-        [8298560996095230984182228319122592575131718101813938808256495049817179791777,1767915891871602626938298102360238720016341966012238026281701463959008338852],
-        [10415885340847357003805466620366840573458521568359796855704531856219635265921,3432650026491357206165099540731361444311747596326968441647905394914712226413]
-    ]
-
-    var nSegments = ((n-1)\200)+1;
-
-    component segments[nSegments];
-
-    var i;
-    var j;
-    var nBits;
-    var nWindows;
-    for (i=0; i<nSegments; i++) {
-        nBits = (i == (nSegments-1)) ? n - (nSegments-1)*200 : 200;
-        nWindows = ((nBits - 1)\4)+1;
-        segments[i] = Segment(nWindows);
-        segments[i].base[0] <== BASE[i][0];
-        segments[i].base[1] <== BASE[i][1];
-        for (j = 0; j<nBits; j++) {
-            segments[i].in[j] <== in[i*200+j];
-        }
-        // Fill padding bits
-        for (j = nBits; j < nWindows*4; j++) {
-            segments[i].in[j] <== 0;
-        }
-    }
-
-    component adders[nSegments-1];
-
-    for (i=0; i<nSegments-1; i++) {
-        adders[i] = BabyAdd();
-        if (i==0) {
-            adders[i].x1 <== segments[0].out[0];
-            adders[i].y1 <== segments[0].out[1];
-            adders[i].x2 <== segments[1].out[0];
-            adders[i].y2 <== segments[1].out[1];
-        } else {
-            adders[i].x1 <== adders[i-1].xout;
-            adders[i].y1 <== adders[i-1].yout;
-            adders[i].x2 <== segments[i+1].out[0];
-            adders[i].y2 <== segments[i+1].out[1];
-        }
-    }
-
-/*
-    coponent packPoint = PackPoint();
-
-    if (nSegments>1) {
-        packPoint.in[0] <== adders[nSegments-2].xout;
-        packPoint.in[1] <== adders[nSegments-2].yout;
-    } else {
-        packPoint.in[0] <== segments[0].out[0];
-        packPoint.in[1] <== segments[0].out[1];
-    }
-
-    out[0] <== packPoint.out[0];
-    out[1] <== packPoint.out[1];
-*/
-
-    if (nSegments>1) {
-        out[0] <== adders[nSegments-2].xout;
-        out[1] <== adders[nSegments-2].yout;
-    } else {
-        out[0] <== segments[0].out[0];
-        out[1] <== segments[0].out[1];
-    }
-}
-
diff --git a/circuit/pedersen_old.circom b/circuit/pedersen_old.circom
new file mode 100644
index 0000000..f01e667
--- /dev/null
+++ b/circuit/pedersen_old.circom
@@ -0,0 +1,48 @@
+
+include "escalarmul.circom";
+
+template Pedersen(n) {
+    signal input in[n];
+    signal output out[2];
+
+    var nexps = ((n-1) \ 250) + 1;
+    var nlastbits = n - (nexps-1)*250;
+
+    component escalarMuls[nexps];
+
+    var PBASE = [
+                    [ 6842263847932328569390632736104801120816056295876316310227967232893658007436,
+                     10520112236148895828506510766039255961372323270202387671483666293012156799229],
+                    [ 7512553369533424708326990019377586455744651641787163924108944444109352325495,
+                       242060483180498555826438209654403949979206323274480625257315595534333598496],
+                    [  480315709862415282411588615813248553518720286084247594626493599605932342246,
+                     15016559215090999873142530067666085992648246670781771102893391410239675444873],
+                    [ 8311398801616893527636419786153024398643144699386228070202625261657263599049,
+                     11125962584728296601438821974884453267303385157860713577195820780853779600315],
+                    [ 1924118814882677827825936037840538695314492559747259292440881566152665343441,
+                     17232376423406964731689089286495480735310130852288107159412732879983310795144]
+                ];
+
+    var i;
+    var j;
+    var nexpbits;
+    for (i=0; i<nexps; i++) {
+        nexpbits = (i == nexps-1) ? nlastbits : 250;
+        escalarMuls[i] = EscalarMul(nexpbits, PBASE[i]);
+
+        for (j=0; j<nexpbits; j++) {
+            escalarMuls[i].in[j] <== in[250*i + j];
+        }
+
+        if (i==0) {
+            escalarMuls[i].inp[0] <== 0;
+            escalarMuls[i].inp[1] <== 1;
+        } else {
+            escalarMuls[i].inp[0] <== escalarMuls[i-1].out[0];
+            escalarMuls[i].inp[1] <== escalarMuls[i-1].out[1];
+        }
+    }
+
+    escalarMuls[nexps-1].out[0] ==> out[0];
+    escalarMuls[nexps-1].out[1] ==> out[1];
+}
diff --git a/circuit/pointbits.circom b/circuit/pointbits.circom
index 11808c9..aeed287 100644
--- a/circuit/pointbits.circom
+++ b/circuit/pointbits.circom
@@ -1,6 +1,6 @@
 include "../node_modules/circom/circuits/bitify.circom";
-include "aliascheck.circom";
-include "compconstant.circom";
+include "../node_modules/circom/circuits/aliascheck.circom";
+include "../node_modules/circom/circuits/compconstant.circom";
 include "babyjub.circom";
 
 
diff --git a/circuit/sign.circom b/circuit/sign.circom
index 34d8fae..bc894ed 100644
--- a/circuit/sign.circom
+++ b/circuit/sign.circom
@@ -1,4 +1,4 @@
-include "compconstant.circom";
+include "../node_modules/circom/circuits/compconstant.circom";
 
 template Sign() {
     signal input in[254];
diff --git a/test/circuits/aliascheck_test.circom b/test/circuits/aliascheck_test.circom
index 25bdae2..de8fac2 100644
--- a/test/circuits/aliascheck_test.circom
+++ b/test/circuits/aliascheck_test.circom
@@ -1,3 +1,3 @@
-include "../../circuit/aliascheck.circom";
+include "../../node_modules/circom/circuits/aliascheck.circom";
 
 component main = AliasCheck()
diff --git a/test/circuits/pedersen2_test.circom b/test/circuits/pedersen2_test.circom
index b3206c9..4397bff 100644
--- a/test/circuits/pedersen2_test.circom
+++ b/test/circuits/pedersen2_test.circom
@@ -1,4 +1,4 @@
-include "../../circuit/pedersen2.circom";
+include "../../circuit/pedersen.circom";
 include "../../node_modules/circom/circuits/bitify.circom";
 
 
diff --git a/test/circuits/pedersen_test.circom b/test/circuits/pedersen_test.circom
index e8e6f8d..639cb4d 100644
--- a/test/circuits/pedersen_test.circom
+++ b/test/circuits/pedersen_test.circom
@@ -1,4 +1,4 @@
-include "../../circuit/pedersen.circom";
+include "../../circuit/pedersen_old.circom";
 include "../../node_modules/circom/circuits/bitify.circom";
 
 
diff --git a/test/sign.js b/test/sign.js
index 62c52ce..81efe80 100644
--- a/test/sign.js
+++ b/test/sign.js
@@ -25,7 +25,7 @@ function getBits(v, n) {
 
 const q = bigInt("21888242871839275222246405745257275088548364400416034343698204186575808495617");
 
-describe("Aliascheck test", () => {
+describe("Sign test", () => {
     let circuit;
     before( async() => {
         const cirDef = await compiler(path.join(__dirname, "circuits", "sign_test.circom"));