update noir version (to fix bug with ecdsa verify)

DmitriiKJ · DmitriiKJ · commit 40934e471fd4 · 2025-11-11T12:13:57.000+01:00
diff --git a/circuits/app/proof_of_reserve/coins/Nargo.toml b/circuits/app/proof_of_reserve/coins/Nargo.toml
@@ -3,7 +3,7 @@ name = "coins"
 type = "bin"
 
 [dependencies]
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
-ripemd160 = { tag = "v0.0.3", git = "https://github.com/distributed-lab/noir-ripemd160" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
+ripemd160 = { tag = "v0.0.4", git = "https://github.com/distributed-lab/noir-ripemd160" }
 utils = { path = "../../../crates/utils" }
 crypto = { path = "../../../crates/crypto" }
diff --git a/circuits/app/proof_of_reserve/coins/Prover.toml b/circuits/app/proof_of_reserve/coins/Prover.toml
@@ -2,23 +2,23 @@ const_message_hash = [49, 95, 91, 219, 118, 208, 120, 196, 59, 138, 192, 6, 78,
 
 [[coins_database]]
 script_pub_key = [118, 169, 20, 121, 176, 0, 136, 118, 38, 178, 148, 169, 20, 80, 26, 76, 210, 38, 181, 139, 35, 89, 131, 136, 172]
-amount = 2627669
+amount = 5077231
 
 [[coins_database]]
 script_pub_key = [118, 169, 20, 121, 176, 0, 136, 118, 38, 178, 148, 169, 20, 80, 26, 76, 210, 38, 181, 139, 35, 89, 131, 136, 172]
-amount = 3111962
+amount = 9905716
 
 [[coins_database]]
 script_pub_key = [118, 169, 20, 121, 176, 0, 136, 118, 38, 178, 148, 169, 20, 80, 26, 76, 210, 38, 181, 139, 35, 89, 131, 136, 172]
-amount = 3060838
+amount = 2493733
 
 [[coins_database]]
 script_pub_key = [118, 169, 20, 121, 176, 0, 136, 118, 38, 178, 148, 169, 20, 80, 26, 76, 210, 38, 181, 139, 35, 89, 131, 136, 172]
-amount = 9993668
+amount = 6735336
 
 [[coins_database]]
-script_pub_key = [118, 169, 20, 121, 176, 0, 136, 118, 38, 178, 148, 169, 20, 80, 26, 76, 210, 38, 181, 139, 35, 89, 131, 136, 172]
-amount = 7353970
+script_pub_key = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+amount = 0
 
 [[own_utxos]]
 witness = [48, 69, 2, 33, 0, 176, 13, 195, 19, 255, 73, 45, 45, 108, 64, 66, 69, 250, 68, 134, 160, 179, 250, 237, 127, 30, 197, 101, 2, 107, 209, 142, 13, 184, 235, 138, 56, 2, 32, 120, 103, 36, 158, 33, 198, 151, 26, 30, 56, 250, 37, 73, 202, 33, 166, 26, 253, 114, 192, 163, 252, 223, 56, 48, 150, 15, 48, 27, 224, 6, 63, 0]
@@ -37,5 +37,5 @@ witness = [48, 69, 2, 33, 0, 176, 13, 195, 19, 255, 73, 45, 45, 108, 64, 66, 69,
 pub_key = [3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96, 72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
 [[own_utxos]]
-witness = [48, 69, 2, 33, 0, 176, 13, 195, 19, 255, 73, 45, 45, 108, 64, 66, 69, 250, 68, 134, 160, 179, 250, 237, 127, 30, 197, 101, 2, 107, 209, 142, 13, 184, 235, 138, 56, 2, 32, 120, 103, 36, 158, 33, 198, 151, 26, 30, 56, 250, 37, 73, 202, 33, 166, 26, 253, 114, 192, 163, 252, 223, 56, 48, 150, 15, 48, 27, 224, 6, 63, 0]
-pub_key = [3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96, 72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+witness = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+pub_key = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
diff --git a/circuits/app/proof_of_reserve/utxos_tree/Nargo.toml b/circuits/app/proof_of_reserve/utxos_tree/Nargo.toml
@@ -3,4 +3,5 @@ name = "utxos_tree"
 type = "bin"
 
 [dependencies]
-utils = { path = "../../../crates/utils" }
+utils = { path = "../../../crates/utils" }
+bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20251104", directory = "barretenberg/noir/bb_proof_verification" }
diff --git a/circuits/app/proof_of_reserve/utxos_tree/Prover.toml b/circuits/app/proof_of_reserve/utxos_tree/Prover.toml
diff --git a/circuits/app/proof_of_reserve/utxos_tree/src/constants.nr b/circuits/app/proof_of_reserve/utxos_tree/src/constants.nr
@@ -1,9 +1,6 @@
 pub global MAX_MERKLE_TREE_LEVELS: u32 = 3;
 pub global MAX_NODES_AMOUNT: u32 = 1;
 
-pub global HONK_VK_SIZE: u32 = 128;
-pub global HONK_PROOF_SIZE: u32 = 456;
-pub global HONK_IDENTIFIER: u32 = 1;
 pub global PUBLIC_INPUTS_SIZE: u32 = 65;
 
 pub global SHA256_HASH_SIZE: u32 = 32;
diff --git a/circuits/app/proof_of_reserve/utxos_tree/src/main.nr b/circuits/app/proof_of_reserve/utxos_tree/src/main.nr
@@ -3,31 +3,29 @@
 
 mod constants;
 
-use constants::{
-    HONK_IDENTIFIER, HONK_PROOF_SIZE, HONK_VK_SIZE, MAX_MERKLE_TREE_LEVELS, MAX_NODES_AMOUNT,
-    PUBLIC_INPUTS_SIZE, SHA256_HASH_SIZE,
-};
+use bb_proof_verification::{UltraHonkVerificationKey, UltraHonkZKProof, verify_ultrahonkzk_proof};
+use constants::{MAX_MERKLE_TREE_LEVELS, MAX_NODES_AMOUNT, PUBLIC_INPUTS_SIZE, SHA256_HASH_SIZE};
 use utils::merkle_root::merkle_root;
 
 struct NodeProof {
-    proof: [Field; HONK_PROOF_SIZE],
+    proof: UltraHonkZKProof,
     public_inputs: [Field; PUBLIC_INPUTS_SIZE],
 }
 
 fn main(
-    verification_key: [Field; HONK_VK_SIZE],
+    verification_key: UltraHonkVerificationKey,
+    key_hash: Field,
     node_proofs: [NodeProof; MAX_NODES_AMOUNT],
 ) -> pub ([u8; SHA256_HASH_SIZE], u64) {
     let mut nodes = [[0; SHA256_HASH_SIZE]; MAX_NODES_AMOUNT];
     let mut owned_amount = 0;
 
     for i in 0..MAX_NODES_AMOUNT {
-        std::verify_proof_with_type(
+        verify_ultrahonkzk_proof(
             verification_key,
             node_proofs[i].proof,
             node_proofs[i].public_inputs,
-            0x0,
-            HONK_IDENTIFIER,
+            key_hash,
         );
         for j in 0..SHA256_HASH_SIZE {
             nodes[i][j] = node_proofs[i].public_inputs[j + SHA256_HASH_SIZE] as u8;
diff --git a/circuits/crates/blocks/Nargo.toml b/circuits/crates/blocks/Nargo.toml
@@ -4,6 +4,6 @@ type = "lib"
 authors = ["Distributed Lab"]
 
 [dependencies]
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
-bignum = { tag = "v0.7.1", git = "https://github.com/noir-lang/noir-bignum" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
+bignum = { tag = "v0.8.0", git = "https://github.com/noir-lang/noir-bignum" }
 convert = { path = "../utils" }
diff --git a/circuits/crates/bvm/Nargo.toml b/circuits/crates/bvm/Nargo.toml
@@ -6,8 +6,8 @@ authors = ["Distributed Lab"]
 [dependencies]
 utils = { path = "../utils" }
 sign = { path = "../sign" }
-ripemd160 = { tag = "v0.0.3", git = "https://github.com/distributed-lab/noir-ripemd160" }
-sha1 = { tag = "v0.1.0", git = "https://github.com/zac-williamson/sha1" }
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
+ripemd160 = { tag = "v0.0.4", git = "https://github.com/distributed-lab/noir-ripemd160" }
+sha1 = { tag = "v0.11", git = "https://github.com/zac-williamson/sha1" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
 crypto = { path = "../../crates/crypto" }
-bignum = { tag = "v0.7.1", git = "https://github.com/noir-lang/noir-bignum" }
+bignum = { tag = "v0.8.0", git = "https://github.com/noir-lang/noir-bignum" }
diff --git a/circuits/crates/bvm/src/stack.nr b/circuits/crates/bvm/src/stack.nr
@@ -593,14 +593,14 @@ impl<let MAX_STACK_ELEMENT_SIZE: u32, let MAX_STACK_SIZE: u32, let CURRENT_TRANS
     // todo: replace bit shifts with more efficient operations
     pub fn op_checklocktimeverify(&mut self) {
         let elem = self.data[self.stack_size - 1];
-        let num = vec_to_i32(elem);
+        let num = vec_to_u32(elem);
         let ltime_offset = self.cur_transaction.lock_time.offset;
         let sequence_offset = self.cur_transaction.inputs[self.input_to_sign].sequence.offset;
         let mut locktime = 0;
         let mut sequence = 0;
         for i in 0..4 {
-            locktime += self.cur_transaction.data[ltime_offset + i] as i32 << (i * 8) as u8;
-            sequence += self.cur_transaction.data[sequence_offset + i] as i32 << (i * 8) as u8;
+            locktime += self.cur_transaction.data[ltime_offset + i] as u32 << (i * 8) as u32;
+            sequence += self.cur_transaction.data[sequence_offset + i] as u32 << (i * 8) as u32;
         }
 
         if (num < 0)
@@ -615,14 +615,14 @@ impl<let MAX_STACK_ELEMENT_SIZE: u32, let MAX_STACK_SIZE: u32, let CURRENT_TRANS
     // todo: replace bit shifts with more efficiency operations
     pub fn op_checksequenceverify(&mut self) {
         let elem = self.data[self.stack_size - 1];
-        let num = vec_to_i32(elem);
+        let num = vec_to_u32(elem);
         let version_offset = self.cur_transaction.version.offset;
         let sequence_offset = self.cur_transaction.inputs[self.input_to_sign].sequence.offset;
         let mut version = 0;
         let mut sequence = 0;
         for i in 0..4 {
-            version += self.cur_transaction.data[version_offset + i] as i32 << (i * 8) as u8;
-            sequence += self.cur_transaction.data[sequence_offset + i] as i32 << (i * 8) as u8;
+            version += self.cur_transaction.data[version_offset + i] as u32 << (i * 8) as u32;
+            sequence += self.cur_transaction.data[sequence_offset + i] as u32 << (i * 8) as u32;
         }
 
         let types_are_equal = ((sequence >> 22) & 1) == ((num >> 22) & 1);
@@ -1183,7 +1183,7 @@ impl<let MAX_STACK_ELEMENT_SIZE: u32, let MAX_STACK_SIZE: u32, let CURRENT_TRANS
                 let mut message_hash = [0; 32];
 
                 let (pub_x, pub_y) = keys[N - 1 - i];
-                let (signature, hash_type, _) = sigs[sig_now];
+                let (signature, hash_type, _) = sigs[sig_now as u32];
 
                 if hash_type == SIGHASH_ALL {
                     message_hash = self.get_sighash_all_message_hash::<SCRIPT_CODE_LEN>(address);
diff --git a/circuits/crates/crypto/Nargo.toml b/circuits/crates/crypto/Nargo.toml
@@ -4,9 +4,9 @@ type = "lib"
 authors = ["Distributed Lab"]
 
 [dependencies]
-bignum = { tag = "v0.7.1", git = "https://github.com/noir-lang/noir-bignum" }
-bignum2 = {tag = "v0.7.3-2", git = "https://github.com/zkpassport/noir-bignum"}
+bignum = { tag = "v0.8.0", git = "https://github.com/noir-lang/noir-bignum" }
+bignum2 = {tag = "v0.8.0-2", git = "https://github.com/zkpassport/noir-bignum"}
 utils = { path = "../utils" }
-noir_ecdsa = { tag = "v0.2.7", git = "https://github.com/zkpassport/noir-ecdsa" }
-bigcurve = {tag = "v0.9.0-1", git = "https://github.com/zkpassport/noir_bigcurve"}
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
+noir_ecdsa = { tag = "v0.2.9", git = "https://github.com/zkpassport/noir-ecdsa" }
+bigcurve = {tag = "v0.11.0-1", git = "https://github.com/zkpassport/noir_bigcurve"}
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
diff --git a/circuits/crates/script/Nargo.toml b/circuits/crates/script/Nargo.toml
@@ -4,8 +4,8 @@ type = "lib"
 authors = ["Distributed Lab"]
 
 [dependencies]
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
-ripemd160 = { tag = "v0.0.3", git = "https://github.com/distributed-lab/noir-ripemd160" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
+ripemd160 = { tag = "v0.0.4", git = "https://github.com/distributed-lab/noir-ripemd160" }
 utils = { path = "../utils" }
 bvm = { path = "../bvm" }
 sign = { path = "../sign" }
diff --git a/circuits/crates/sign/Nargo.toml b/circuits/crates/sign/Nargo.toml
@@ -5,6 +5,7 @@ authors = ["Distributed Lab"]
 
 [dependencies]
 utils = { path = "../utils" }
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
-bignum = { tag = "v0.7.1", git = "https://github.com/noir-lang/noir-bignum" }
-crypto = { path = "../../crates/crypto" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
+bignum = { tag = "v0.8.0", git = "https://github.com/noir-lang/noir-bignum" }
+crypto = { path = "../../crates/crypto" }
+poseidon = { tag = "v0.1.1", git = "https://github.com/noir-lang/poseidon" }
diff --git a/circuits/crates/sign/src/compact_size.nr b/circuits/crates/sign/src/compact_size.nr
@@ -6,11 +6,11 @@ pub fn compact_size_to_u32<let N: u32>(data: [u8; N], position: PositionField) -
         result = data[position.offset] as u32;
     } else if position.size == 3 {
         for i in 1..3 {
-            result += data[position.offset + i] as u32 << (8 * (i - 1) as u8);
+            result += data[position.offset + i] as u32 << (8 * (i - 1));
         }
     } else if position.size == 5 {
         for i in 1..5 {
-            result += data[position.offset + i] as u32 << (8 * (i - 1) as u8);
+            result += data[position.offset + i] as u32 << (8 * (i - 1) as u32);
         }
     } else if position.size == 9 {
         assert(false, "Compact size type FF is not supported");
diff --git a/circuits/crates/sign/src/segwit.nr b/circuits/crates/sign/src/segwit.nr
@@ -1,5 +1,4 @@
-use crate::legacy::Transaction;
-use super::sig_types::{SIGHASH_ALL, SIGHASH_ANYONECANPAY, SIGHASH_NONE, SIGHASH_SINGLE};
+use super::transaction::Transaction;
 use utils::convert::{bytes_to_hex, hex_to_bytes};
 
 fn prepare_preimage_hash_for_sighash_all<let TRANSACTION_SIZE: u32, let INPUT_COUNT: u32, let INPUT_COUNT_LEN: u32, let INPUT_SIZE: u32, let OUTPUT_COUNT: u32, let OUTPUT_COUNT_LEN: u32, let OUTPUT_SIZE: u32, let MAX_WITNESS_STACK_SIZE: u32, let WITNESS_SIZE: u32, let SCRIPT_CODE_SIZE: u32>(
diff --git a/circuits/crates/sign/src/transaction.nr b/circuits/crates/sign/src/transaction.nr
@@ -1,9 +1,9 @@
+use poseidon::poseidon2::Poseidon2Hasher;
 use std::collections::map::HashMap;
 use std::hash::BuildHasherDefault;
-use std::hash::poseidon2::Poseidon2Hasher;
 
 use crate::compact_size;
-use utils::convert::{bytes_to_hex, hex_to_bytes, reverse_bytes};
+use utils::convert::{bytes_to_hex, hex_to_bytes};
 
 pub struct PositionField {
     pub offset: u32,
@@ -162,8 +162,8 @@ impl<let TRANSACTION_SIZE: u32, let INPUT_COUNT: u32, let INPUT_COUNT_LEN: u32,
                 cur_pos += stack_size.size;
 
                 let stack_size_u32 = compact_size::compact_size_to_u32(data, stack_size);
-                let mut items: HashMap<u32, WitnessItem, 100, BuildHasherDefault<Poseidon2Hasher>> =
-                    HashMap::default();
+                let mut items: HashMap<u32, WitnessItem, 100, BuildHasherDefault<Poseidon2Hasher>>
+                     = HashMap::default();
 
                 assert(stack_size_u32 <= MAX_WITNESS_STACK_SIZE);
                 for j in 0..MAX_WITNESS_STACK_SIZE {
diff --git a/circuits/crates/utils/Nargo.toml b/circuits/crates/utils/Nargo.toml
@@ -4,5 +4,5 @@ type = "lib"
 authors = ["Distributed Lab"]
 
 [dependencies]
-bignum = { tag = "v0.7.1", git = "https://github.com/noir-lang/noir-bignum" }
-sha256 = { tag = "v0.1.0", git = "https://github.com/noir-lang/sha256" }
+bignum = { tag = "v0.8.0", git = "https://github.com/noir-lang/noir-bignum" }
+sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
diff --git a/circuits/crates/utils/src/convert.nr b/circuits/crates/utils/src/convert.nr
@@ -100,7 +100,7 @@ pub fn vec_to_i32<let MAX_STACK_ELEMENT_SIZE: u32>(
     le_bytes_to_i32(result)
 }
 
-pub fn i32_to_vec<let N: u32, let MAX_STACK_ELEMENT_SIZE: u32>(
+pub fn i32_to_vec<let MAX_STACK_ELEMENT_SIZE: u32>(
     number: i32,
 ) -> BoundedVec<u8, MAX_STACK_ELEMENT_SIZE> {
     let bytes = i32_to_le_bytes(number);
@@ -147,7 +147,7 @@ pub fn le_bytes_to_u32(bytes: [u8; 4]) -> u32 {
     result
 }
 
-pub fn u32_to_vec<let N: u32, let MAX_STACK_ELEMENT_SIZE: u32>(
+pub fn u32_to_vec<let MAX_STACK_ELEMENT_SIZE: u32>(
     number: u32,
 ) -> BoundedVec<u8, MAX_STACK_ELEMENT_SIZE> {
     let bytes = u32_to_le_bytes(number);
diff --git a/circuits/crates/utils/src/encode.nr b/circuits/crates/utils/src/encode.nr
@@ -22,7 +22,7 @@ pub fn encode_base58<let LEN: u32>(ripemd: [u8; 20]) -> str<LEN> {
     for i in 0..LEN {
         quotient = divided.udiv(divider);
         remainder = divided - quotient.mul(divider);
-        res[LEN - i - 1] = base58[remainder.get_limb(0)];
+        res[LEN - i - 1] = base58[remainder.get_limb(0) as u32];
 
         divided = quotient;
     }
@@ -73,7 +73,7 @@ pub fn encode_bech32m(value: [u8; 32]) -> str<62> {
     }
 
     for i in 0..58 {
-        res[i] = bech32m[res[i]];
+        res[i] = bech32m[res[i] as u32];
     }
 
     "bc1p".as_bytes().as_slice().append(res).as_array().as_str_unchecked()
@@ -99,7 +99,7 @@ fn bits_5_to_num(value: [u1]) -> u8 {
     let mut res = 0;
 
     for i in 0..5 {
-        res += (value[i] as u8 << (4 - i));
+        res += (value[i] as u8 << (4 - i) as u8);
     }
 
     res
diff --git a/utxo_indexer/proof_of_reserve/src/main.rs b/utxo_indexer/proof_of_reserve/src/main.rs
