Circuits update circom 2.1.5

beacon-light-client/circom/circuits/aggregate_bitmask.circom

@@ -1,10 +1,9 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../vendor/circom-pairing/circuits/curve.circom";
 
-template AggregateKeysBitmask(N) {
+template AggregateKeysBitmask(N,K) {
   var J = 2;
-  var K = 7;
   signal input points[N][J][K];
   signal input bitmask[N];
 

beacon-light-client/circom/circuits/bitmask_contains_only_bools.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../node_modules/circomlib/circuits/comparators.circom";
 

beacon-light-client/circom/circuits/compress.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../vendor/circom-pairing/circuits/bigint.circom";
 
@@ -10,12 +10,7 @@ template Compress() {
   // CURVE.P / 2
   var prime[7] = [35888059530597717, 36027359614205881, 18556878317960535, 21977360498475850, 26290126778424359, 29735955799434292, 914940731273212];
 
-  component lessThan = BigLessThan(55, 7);
-
-  for(var i = 0; i < 7; i++) {
-    lessThan.b[i] <== point[1][i];
-    lessThan.a[i] <== prime[i];
-  }
+  signal lessThan <== BigLessThan(55, 7)(prime, point[1]);
 
   component num2Bits[7];
 
@@ -30,5 +25,5 @@ template Compress() {
 
   bits[0] <== 1;
   bits[1] <== 0;
-  bits[2] <== lessThan.out;
+  bits[2] <== lessThan;
 }

beacon-light-client/circom/circuits/compute_domain.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "hash_two.circom";
 
@@ -9,25 +9,22 @@ template ComputeDomain() {
   signal input GENESIS_VALIDATORS_ROOT[256];
   signal input DOMAIN_SYNC_COMMITTEE[32];
 
-  component hashTwo = HashTwo();
+  signal concated_fork_version[256];
 
   for(var i = 0; i < 32; i++) {
-    hashTwo.in[0][i] <== fork_version[i];
+    concated_fork_version[i] <== fork_version[i];
   }
-
   for(var i = 32; i < 256; i++) {
-    hashTwo.in[0][i] <== 0;
+    concated_fork_version[i] <== 0;
   }
 
-  for(var i = 0; i < 256; i++) {
-    hashTwo.in[1][i] <== GENESIS_VALIDATORS_ROOT[i];
-  }
+  signal hashTwo[256] <== HashTwo()([concated_fork_version,GENESIS_VALIDATORS_ROOT]);
 
   for(var i = 0; i < 32; i++) {
     domain[i] <== DOMAIN_SYNC_COMMITTEE[i];
   }
 
   for(var i = 32; i < 256; i++) {
-    domain[i] <== hashTwo.out[i - 32];
+    domain[i] <== hashTwo[i - 32];
   }
 }

beacon-light-client/circom/circuits/compute_signing_root.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "compute_domain.circom";
 
@@ -10,18 +10,7 @@ template ComputeSigningRoot() {
 
   signal output signing_root[256];
 
-  component hashTwo = HashTwo();
+  signal hashTwo[256] <== HashTwo()([headerHash,domain]);
 
-  for(var i = 0; i < 256; i++) {
-    hashTwo.in[0][i] <== headerHash[i];
-  }
-
-  for(var i = 0; i < 256; i++) {
-    hashTwo.in[1][i] <== domain[i];
-  }
-
-
-  for(var i = 0; i < 256; i++) {
-    signing_root[i] <== hashTwo.out[i];
-  }
+  signing_root <== hashTwo;
 }

beacon-light-client/circom/circuits/expand_message.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../node_modules/circomlib/circuits/sha256/sha256.circom";
 include "../../../node_modules/circomlib/circuits/bitify.circom";
@@ -31,12 +31,7 @@ template ExpandMessage() {
     b_0Sha.in[i] <== BIG_SIG_DST[i - 792];
   }
 
-
-  var b_0[256];
-
-  for(var i = 0; i < 256; i++) {
-    b_0[i] = b_0Sha.out[i];
-  }
+  var b_0[256] = b_0Sha.out;
 
   component prevSha256[8];
 

beacon-light-client/circom/circuits/hash_aggregated_key.circom

@@ -0,0 +1,24 @@
+pragma circom 2.1.5;
+
+include "../../../node_modules/circomlib/circuits/sha256/sha256.circom";
+
+template hashAggregatedKey(){
+  signal input aggregatedKey[384];
+  signal output out[256];
+
+  component hash = Sha256(512);
+
+  for(var i = 0; i < 384; i++) {
+    hash.in[i] <== aggregatedKey[i];
+  }
+
+  for(var i = 384; i < 512; i++) {
+    hash.in[i] <== 0;
+  }
+
+  for(var i = 0; i < 256; i++) {
+  out[i] <== hash.out[i];
+  }
+
+
+}

beacon-light-client/circom/circuits/hash_to_field.circom

@@ -1,26 +1,21 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "expand_message.circom";
 include "../../../vendor/circom-pairing/circuits/bigint.circom";
 
-template HashToField() {
-  var K = 7;
+template HashToField(K) {
   signal input in[256];
   signal output out[2][2][K];
 
-  component expand_message = ExpandMessage();
-
-  for(var i = 0; i < 256; i++) {
-    expand_message.in[i] <== in[i];
-  }
+  signal expand_message[2048] <== ExpandMessage()(in);
 
   component bigInts[2][2][10];
 
   for(var i = 0; i < 2; i++) {
     for(var j = 0; j < 2; j++) {
       bigInts[i][j][9] = Bits2Num(55);
       for(var i1=0; i1 < 17; i1++) {
-        bigInts[i][j][9].in[16 - i1] <== expand_message.out[i * 1024 + j * 512 + i1];
+        bigInts[i][j][9].in[16 - i1] <== expand_message[i * 1024 + j * 512 + i1];
       }
 
       for(var i1 = 17; i1 < 55; i1++) {
@@ -30,7 +25,7 @@ template HashToField() {
       for(var k = 8; k >= 0; k--) {
         bigInts[i][j][k] = Bits2Num(55);
         for(var i1 = 0; i1 < 55; i1++) {
-          bigInts[i][j][k].in[54 - i1] <== expand_message.out[i * 1024 + j * 512 + (8-k) * 55 + i1 + 17];
+          bigInts[i][j][k].in[54 - i1] <== expand_message[i * 1024 + j * 512 + (8-k) * 55 + i1 + 17];
         }
       }
     }
@@ -52,17 +47,14 @@ template HashToField() {
         bigMod[i][j].a[k] <== 0;
       }
 
-      for(var k = 0; k < 7; k++) {
-        bigMod[i][j].b[k] <== p[k];
-      }
+      bigMod[i][j].b <== p;
+
     }
   }
 
   for(var i = 0; i < 2; i++) {
     for(var j = 0; j < 2; j++) {
-      for(var k = 0; k < 7; k++) {
-        out[i][j][k] <== bigMod[i][j].mod[k];
-      }
+      out[i][j] <== bigMod[i][j].mod;
     }
   }
 }

beacon-light-client/circom/circuits/hash_tree_root.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../node_modules/circomlib/circuits/sha256/sha256.circom";
 include "hash_two.circom";
@@ -15,24 +15,18 @@ template HashTreeRoot(N) {
   }
 
   for(var i = 0; i < N / 2; i++) {
-    for(var j = 0; j < 256; j++) {
-      hashers[i].in[0][j] <== leaves[i * 2][j];
-      hashers[i].in[1][j] <== leaves[i * 2 + 1][j];
-    }
+    hashers[i].in[0] <== leaves[i * 2];
+    hashers[i].in[1] <== leaves[i * 2 + 1];
   }
 
   var k = 0;
 
   for(var i = N / 2; i < N - 1; i++) {
-    for(var j = 0; j < 256; j++) {
-      hashers[i].in[0][j] <== hashers[k * 2].out[j];
-      hashers[i].in[1][j] <== hashers[k * 2 + 1].out[j];
-    }
+    hashers[i].in[0] <== hashers[k * 2].out;
+    hashers[i].in[1] <== hashers[k * 2 + 1].out;
 
     k++;
   }
 
-  for(var i = 0; i < 256; i++) {
-    out[i] <== hashers[N - 2].out[i];
-  }
+  out <== hashers[N - 2].out;
 }

beacon-light-client/circom/circuits/hash_tree_root_beacon_header.circom

@@ -1,4 +1,4 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "hash_two.circom";
 include "hash_tree_root.circom";
@@ -12,35 +12,16 @@ template HashTreeRootBeaconHeader() {
 
   signal output out[256];
 
-  component hashTreeRoot = HashTreeRoot(8);
+  signal zerosArr[3][256];
 
-  for(var i = 0; i < 256; i++) {
-    hashTreeRoot.leaves[0][i] <== slot[i];
-  }
-
-  for(var i = 0; i < 256; i++) {
-    hashTreeRoot.leaves[1][i] <== proposer_index[i];
-  }
-
-  for(var i = 0; i < 256; i++) {
-    hashTreeRoot.leaves[2][i] <== parent_root[i];
-  }
-
-  for(var i = 0; i < 256; i++) {
-    hashTreeRoot.leaves[3][i] <== state_root[i];
-  }
-
-  for(var i = 0; i < 256; i++) {
-    hashTreeRoot.leaves[4][i] <== body_root[i];
-  }
-
-  for(var i = 5; i < 8; i++) {
+  for(var i = 0; i < 3; i++) {
     for(var j = 0; j < 256; j++) {
-      hashTreeRoot.leaves[i][j] <== 0;
+      zerosArr[i][j] <== 0;
     }
   }
 
-  for(var i = 0; i < 256; i++) {
-    out[i] <== hashTreeRoot.out[i];
-  }
+  signal hashTreeRoot[256] <== HashTreeRoot(8)([slot, proposer_index,
+  parent_root, state_root, body_root, zerosArr[0], zerosArr[1], zerosArr[2]]);
+
+  out <== hashTreeRoot;
 }

beacon-light-client/circom/circuits/hash_two.circom

@@ -1,24 +1,23 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
-include "hash_two.circom";
 include "../../../node_modules/circomlib/circuits/sha256/sha256.circom";
 
 template HashTwo() {
   signal input in[2][256];
 
   signal output out[256];
 
-  component sha256 = Sha256(512);
+  signal concateneted[512];
 
   for(var i = 0; i < 256; i++) {
-    sha256.in[i] <== in[0][i];
+    concateneted[i] <== in[0][i];
   }
 
   for(var i = 256; i < 512; i++) {
-    sha256.in[i] <== in[1][i - 256];
+    concateneted[i] <== in[1][i - 256];
   }
 
-  for(var i = 0; i < 256; i++) {
-    out[i] <== sha256.out[i];
-  }
+  signal sha256[256] <== Sha256(512)(concateneted);
+
+  out <== sha256;
 }

beacon-light-client/circom/circuits/is_first.circom

@@ -1,25 +1,19 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../node_modules/circomlib/circuits/comparators.circom";
+// include "../../../node_modules/circomlib/circuits/gates.circom";
 
 template IsFirst() {
   signal input firstHash[2];
   signal input secondHash[2];
 
   signal output out;
 
-  component isEqual1 = IsEqual();
-  isEqual1.in[0] <== firstHash[0];
-  isEqual1.in[1] <== secondHash[0];
+  signal isEqual1 <== IsEqual()([firstHash[0],secondHash[0]]);
 
-  component isEqual2 = IsEqual();
-  isEqual2.in[0] <== firstHash[1];
-  isEqual2.in[1] <== secondHash[1];
+  signal isEqual2 <== IsEqual()([firstHash[1],secondHash[1]]);
 
-  component and = AND();
+  signal and <== AND()(isEqual1,isEqual2);
 
-  and.a <== isEqual1.out;
-  and.b <== isEqual2.out;
-
-  out <== and.out;
+  out <== and;
 }

beacon-light-client/circom/circuits/is_supermajority.circom

@@ -1,22 +1,17 @@
-pragma circom 2.0.3;
+pragma circom 2.1.5;
 
 include "../../../node_modules/circomlib/circuits/comparators.circom";
 
 template IsSuperMajority(N) {
   signal input bitmask[N];
 
-  signal output out;
-
   var sum = 0;
-  component lessThan[N];
   //count the number of 1s in the bitmask
   for(var i = 0; i < N; i++) {
     sum += bitmask[i];
   }
   // check if 1s are more then 2/3 of the bitmask
-  component greaterThan = GreaterEqThan(252);
-  greaterThan.in[0] <== sum * 3;
-  greaterThan.in[1] <== 2 * N;
+  signal greaterThan <== GreaterEqThan(252)([sum * 3, 2 * N]);
 
-  greaterThan.out === 1;
+  greaterThan === 1;
 }

beacon-light-client/circom/circuits/is_valid_merkle_branch.circom

@@ -14,3 +14,4 @@ template IsValidMerkleBranch(N) {
 
   isValidBalanceBranchOut === 1;
 }
+