Merge branch 'main' into relayer_quick_fixes

metacraft-labs · Jun 29, 2023 · 91a7101 · 91a7101
2 parents c259d28 + 6c8d8d3
commit 91a7101
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/beacon-light-client/circom/circuits/is_valid_merkle_branch_out.circom b/beacon-light-client/circom/circuits/is_valid_merkle_branch_out.circom
@@ -2,7 +2,10 @@ pragma circom 2.1.5;
 
 include "hash_two.circom";
 include "../../../node_modules/circomlib/circuits/comparators.circom";
+include "../../../node_modules/circomlib/circuits/bitify.circom";
+
 include "utils/arrays.circom";
+include "utils/numerical.circom";
 
 template IsValidMerkleBranchOut(N) {
   signal input branch[N][256];
@@ -14,12 +17,14 @@ template IsValidMerkleBranchOut(N) {
 
   component hashers[N];
   component isZero[N];
-
+  component idx2Bits;  
+  idx2Bits = Num2Bits(N+1);
+  idx2Bits.in <== index;
   for(var i = 0; i < N; i++) {
     hashers[i] = HashTwo();
     isZero[i] = IsZero();
 
-    isZero[i].in <-- (index \ (2**i)) % 2;
+    isZero[i].in <== idx2Bits.out[i];
 
     var current[256];
 

diff --git a/beacon-light-client/circom/test/pow/data/case05/input.json b/beacon-light-client/circom/test/pow/data/case05/input.json
@@ -0,0 +1,4 @@
+{
+    "base": "10",
+    "power": "0"
+}
diff --git a/beacon-light-client/circom/test/pow/data/case05/output.json b/beacon-light-client/circom/test/pow/data/case05/output.json
@@ -0,0 +1,3 @@
+{
+    "out": "1"
+}