fixes

jialinli98 · jialinli98 · commit 63dee8ec327a · 2025-12-09T16:44:06.000-08:00
diff --git a/ethereum/circuits/lib/src/account_with_storage_recursive.nr b/ethereum/circuits/lib/src/account_with_storage_recursive.nr
@@ -18,6 +18,7 @@ pub fn get_account_with_storage_recursive(
     address: Address,
     storage_key: Bytes32,
 ) -> StorageWithinBlock<1> {
+    // Safety: veirfication done separately
     let (storage_within_block, RecursiveProof { key_hash, verification_key, proof }) = unsafe {
         get_account_with_storage_recursive_unconstrained(
             chain_id,
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/cancun/access_list/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/cancun/access_list/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/header.nr
@@ -69,4 +69,5 @@ pub(crate) global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number: NUMBER, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/log.nr b/ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/log.nr
@@ -89,7 +89,7 @@ global topics_storage: [Bytes32; 4] = [
         0x00, 0x00,
     ],
 ];
-global topics: BoundedVec<Bytes32, 4> = BoundedVec::from_array(topics_storage);
+global topics: BoundedVec<Bytes32, 4> = BoundedVec::from_parts(topics_storage, 3);
 global data_storage: Bytes32 = [
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x33, 0xf8, 0xff,
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/cancun/small_block/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/cancun/small_block/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/cancun/small_block/log.nr b/ethereum/circuits/lib/src/fixtures/mainnet/cancun/small_block/log.nr
@@ -95,7 +95,7 @@ global data_storage: Bytes32 = [
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x44, 0x12, 0x7f, 0xb4, 0x3f, 0xa1, 0x00, 0x00,
 ];
 
-global topics: BoundedVec<Bytes32, 4> = BoundedVec::from_array(topics_storage);
+global topics: BoundedVec<Bytes32, 4> = BoundedVec::from_parts(topics_storage, 3);
 global data: BoundedVec<u8, 32> = BoundedVec::from_array(data_storage);
 
 pub(crate) global log: Log<32> = Log {
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/frontier/first/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/frontier/first/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/frontier/zero/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/frontier/zero/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/homestead/fork/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/homestead/fork/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/london/vitalik_balance/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/london/vitalik_balance/header.nr
@@ -69,4 +69,5 @@ global encoded_data: [u8; 708] = [
 
 pub(crate) global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> = BoundedVec::from_array(encoded_data);
+pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+    BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/misc/bytes.nr b/ethereum/circuits/lib/src/misc/bytes.nr
@@ -100,7 +100,7 @@ pub(crate) fn byte_value<let N: u32>(in_value: [u8; N]) -> BoundedVec<u8, N> {
 
     let value = left_byte_shift(in_value, N - value_length);
 
-    BoundedVec::from_array(value)
+    BoundedVec::from_parts(value, value_length)
 }
 
 pub fn add_bigint<let N: u32>(left: [u8; N], right: [u8; N]) -> [u8; N] {
diff --git a/ethereum/circuits/lib/src/verifiers/header.nr b/ethereum/circuits/lib/src/verifiers/header.nr
@@ -1,7 +1,6 @@
 use dep::keccak256::keccak256;
 
 use crate::chain::{ETHEREUM_MAINNET_ID, ETHEREUM_SEPOLIA_ID};
-use crate::HASH_LEN;
 use crate::header::{BlockHeaderPartial, BlockHeaderRlp};
 use crate::misc::{arrays::sub_array_equals, fragment::Fragment};
 use crate::rlp::decode::decode_list;
@@ -51,7 +50,6 @@ pub fn verify_header(
         expected_header_fields_count == header_rlp_list.len(),
         "number of header RLP fields does not match",
     );
-
     header_rlp_list.get(BLOCK_NUM_INDEX).assert_eq_u64(
         "Block number",
         block_header_rlp,
diff --git a/vlayer/ethereum/circuits/lib/src/nft.nr b/vlayer/ethereum/circuits/lib/src/nft.nr
@@ -7,7 +7,7 @@ use dep::ethereum::{
     uint256::U256,
 };
 
-struct ERC721Token {
+pub struct ERC721Token {
     address: Address,
     token_id_to_slot: fn(Bytes32) -> U256,
     chain_id: Field,
