arnaucube/circomlib
1
0
Fork 0
mirror of https://github.com/arnaucube/circomlib.git synced 2026-02-06 18:56:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

PR #19 https://github.com/iden3/circomlib/pull/19

Browse Source 
Merge branch 'master' of https://github.com/iden3/circomlib
This commit is contained in:
arnaucube
2019-09-05 18:02:28 +02:00
parent e9b5da742a f9e0484663
commit de34085109
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
circuits/escalarmulany.circom
View File

@@ -19,6 +19,7 @@
include "montgomery.circom"; include "montgomery.circom";
include "babyjub.circom"; include "babyjub.circom";
include "comparators.circom";
template Multiplexor2() { template Multiplexor2() {
signal input sel; signal input sel;
@@ -138,6 +139,8 @@ template EscalarMulAny(n) {
component doublers[nsegments-1]; component doublers[nsegments-1];
component m2e[nsegments-1]; component m2e[nsegments-1];
component adders[nsegments-1]; component adders[nsegments-1];
component zeropoint = IsZero();
zeropoint.in <== p[0];
var s; var s;
var i; var i;
@@ -154,8 +157,9 @@ template EscalarMulAny(n) {
} }
if (s==0) { if (s==0) {
p[0] ==> segments[s].p[0]; // force G8 point if input point is zero
p[1] ==> segments[s].p[1]; segments[s].p[0] <== p[0] + (5299619240641551281634865583518297030282874472190772894086521144482721001553 - p[0])*zeropoint.out;
segments[s].p[1] <== p[1] + (16950150798460657717958625567821834550301663161624707787222815936182638968203 - p[1])*zeropoint.out;
} else { } else {
doublers[s-1] = MontgomeryDouble(); doublers[s-1] = MontgomeryDouble();
m2e[s-1] = Montgomery2Edwards(); m2e[s-1] = Montgomery2Edwards();
@@ -183,10 +187,10 @@ template EscalarMulAny(n) {
} }
if (nsegments == 1) { if (nsegments == 1) {
segments[0].out[0] ==> out[0]; segments[0].out[0]*(1-zeropoint.out) ==> out[0];
segments[0].out[1] ==> out[1]; segments[0].out[1]+(1-segments[0].out[1])*zeropoint.out ==> out[1];
} else { } else {
adders[nsegments-2].xout ==> out[0]; adders[nsegments-2].xout*(1-zeropoint.out) ==> out[0];
adders[nsegments-2].yout ==> out[1]; adders[nsegments-2].yout+(1-adders[nsegments-2].yout)*zeropoint.out ==> out[1];
} }
} }

2
circuits/escalarmulfix.circom
View File

@@ -246,7 +246,7 @@ template EscalarMulFix(n, BASE) {
var s; var s;
var i; var i;
var nseg; var nseg;
var nWindows var nWindows;
for (s=0; s<nsegments; s++) { for (s=0; s<nsegments; s++) {

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "circomlib", "name": "circomlib",
"version": "0.0.14", "version": "0.0.15",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "circomlib", "name": "circomlib",
"version": "0.0.14", "version": "0.0.15",
"description": "Basic circuits library for Circom", "description": "Basic circuits library for Circom",
"main": "index.js", "main": "index.js",
"directories": { "directories": {
@@ -26,7 +26,7 @@
"dependencies": { "dependencies": {
"blake-hash": "^1.1.0", "blake-hash": "^1.1.0",
"blake2b": "^2.1.3", "blake2b": "^2.1.3",
"snarkjs": "^0.1.18", "snarkjs": "^0.1.19",
"typedarray-to-buffer": "^3.1.5", "typedarray-to-buffer": "^3.1.5",
"web3": "^1.0.0-beta.55" "web3": "^1.0.0-beta.55"
}, },