merge dev branch into main

.github/actions/mobile-setup/action.yml

@@ -52,5 +52,6 @@ runs:
       run: |
         cd ${{ inputs.app_path }}
         corepack enable
+        yarn set version 4.6.0
         yarn install
         yarn install-app:deploy

.github/actions/yarn-install/action.yml

@@ -15,7 +15,8 @@ runs:
       shell: bash
       run: |
         corepack enable
-        corepack prepare [email protected] --activate
+        corepack prepare [email protected] --activate
+        yarn set version 4.6.0
 
     - name: Setup Node.js
       uses: actions/setup-node@v4

.github/workflows/artifacts.yml

@@ -40,7 +40,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          npm i -g yarn && cd circuits && yarn
+          corepack enable
+          yarn set version 4.6.0
+          cd circuits && yarn
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
@@ -58,8 +60,8 @@ jobs:
       - name: Build cpp circuits
         run: |
           chmod +x circuits/scripts/build/build_cpp.sh && \
-          ./circuits/scripts/build/build_cpp.sh register && 
-          ./circuits/scripts/build/build_cpp.sh disclose && 
+          ./circuits/scripts/build/build_cpp.sh register &&
+          ./circuits/scripts/build/build_cpp.sh disclose &&
           ./circuits/scripts/build/build_cpp.sh dsc
 
       - name: Upload Artifact

circuits/circuits/utils/crypto/hasher/shaBytes/shaBytesDynamic.circom

@@ -3,6 +3,8 @@ pragma circom 2.1.9;
 include "./dynamic/sha1Bytes.circom";
 include "./dynamic/sha224Bytes.circom";
 include "@openpassport/zk-email-circuits/lib/sha.circom";
+include "@openpassport/zk-email-circuits/utils/array.circom";
+include "circomlib/circuits/bitify.circom";
 include "./dynamic/sha384Bytes.circom";
 include "./dynamic/sha512Bytes.circom";
 
@@ -19,6 +21,10 @@ template ShaBytesDynamic(hashLen, max_num_bytes) {
 
     signal output hash_bits[hashLen];
 
+    // Assert `in_len_padded_bytes` fits in `ceil(log2(max_num_bytes * 8))`
+    component rangeCheck = Num2Bits(log2Ceil(max_num_bytes * 8));
+    rangeCheck.in <== in_len_padded_bytes;
+
     if (hashLen == 512) {
         hash_bits <== Sha512Bytes(max_num_bytes)(in_padded, in_len_padded_bytes);
     }
@@ -28,11 +34,11 @@ template ShaBytesDynamic(hashLen, max_num_bytes) {
     if (hashLen == 256) {
         hash_bits <== Sha256Bytes(max_num_bytes)(in_padded, in_len_padded_bytes);
     }
-    if (hashLen == 224) { 
+    if (hashLen == 224) {
         hash_bits <== Sha224Bytes(max_num_bytes)(in_padded, in_len_padded_bytes);
     }
     if (hashLen == 160) {
         hash_bits <== Sha1Bytes(max_num_bytes)(in_padded, in_len_padded_bytes);
     }
 
-}
+}

package.json

@@ -6,7 +6,6 @@
     "circuits",
     "contracts",
     "sdk/*",
-    "sdk/tests/*",
     "prover/tests"
   ],
   "scripts": {