vlayer utils

jialinli98 · jialinli98 · commit 5569b3e5f6a8 · 2025-12-12T13:39:16.000-08:00
diff --git a/ethereum/circuits/lib/src/account_with_storage.nr b/ethereum/circuits/lib/src/account_with_storage.nr
@@ -44,9 +44,9 @@ struct StateAndStorageProofInput {
 }
 
 pub struct StorageWithinBlock<let N: u32> {
-    pub(crate) block_hash: Bytes32,
-    pub(crate) account: Account,
-    pub(crate) values: [Bytes32; N],
+    pub block_hash: Bytes32,
+    pub account: Account,
+    pub values: [Bytes32; N],
 }
 
 type ProofInputSerialized<let LEN: u32> = [Field; LEN];
diff --git a/ethereum/circuits/lib/src/account_with_storage_recursive.nr b/ethereum/circuits/lib/src/account_with_storage_recursive.nr
@@ -5,9 +5,9 @@ use crate::serde::STORAGE_BLOCK_LEN;
 use dep::std::verify_proof_with_type;
 
 pub struct RecursiveProof {
-    key_hash: Field,
-    verification_key: [Field; 114],
-    proof: [Field; 93],
+    pub key_hash: Field,
+    pub verification_key: [Field; 114],
+    pub proof: [Field; 93],
 }
 
 global NUM_PUBLIC_INPUTS: u32 = 1 + 1 + ADDRESS_LENGTH + BYTES32_LENGTH + STORAGE_BLOCK_LEN; // chain_id + block_number + address + storage_key + public_return_inputs
diff --git a/ethereum/circuits/lib/src/fixtures.nr b/ethereum/circuits/lib/src/fixtures.nr
@@ -1,2 +1,2 @@
-pub(crate) mod mainnet;
-pub(crate) mod merkle_proofs;
+pub mod mainnet;
+pub mod merkle_proofs;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet.nr b/ethereum/circuits/lib/src/fixtures/mainnet.nr
@@ -1,5 +1,5 @@
 pub(crate) mod frontier;
 pub(crate) mod homestead;
 pub(crate) mod london;
-pub(crate) mod paris;
+pub mod paris;
 pub(crate) mod cancun;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris.nr
@@ -1,3 +1,3 @@
-pub(crate) mod usdc_circle;
+pub mod usdc_circle;
 pub(crate) mod usdc_uniswap;
 pub(crate) mod bored_ape_yacht_club;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/bored_ape_yacht_club.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/bored_ape_yacht_club.nr
@@ -1,2 +1,2 @@
-pub(crate) mod header;
-pub(crate) mod state_proof;
+pub mod header;
+pub mod state_proof;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle.nr
@@ -1,5 +1,5 @@
-pub(crate) mod header;
-pub(crate) mod account;
-pub(crate) mod state_proof;
-pub(crate) mod storage;
-pub(crate) mod storage_proof;
+pub mod header;
+pub mod account;
+pub mod state_proof;
+pub mod storage;
+pub mod storage_proof;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/account.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/account.nr
@@ -16,4 +16,4 @@ global code_hash: Bytes32 = [
     0x6b, 0x25, 0x33, 0x5c, 0xb1, 0x37, 0x16, 0xe0, 0xd1, 0xd3, 0x13, 0x83, 0xe6, 0xb4, 0x15, 0x05,
 ];
 
-pub(crate) global account: Account = Account { nonce, balance, storage_root, code_hash };
+pub global account: Account = Account { nonce, balance, storage_root, code_hash };
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/header.nr
@@ -1,19 +1,19 @@
 use crate::{header::BlockHeaderPartial, misc::types::Bytes32};
 
-pub(crate) global number: u64 = 19000000;
-pub(crate) global hash: Bytes32 = [
+pub global number: u64 = 19000000;
+pub global hash: Bytes32 = [
     0xcf, 0x38, 0x40, 0x12, 0xb9, 0x1b, 0x08, 0x12, 0x30, 0xcd, 0xf1, 0x7a, 0x3f, 0x7d, 0xd3, 0x70,
     0xd8, 0xe6, 0x70, 0x56, 0x05, 0x8a, 0xf6, 0xb2, 0x72, 0xb3, 0xd5, 0x4a, 0xa2, 0x71, 0x4f, 0xac,
 ];
-pub(crate) global state_root: Bytes32 = [
+pub global state_root: Bytes32 = [
     0x1a, 0xd7, 0xb8, 0x0a, 0xf0, 0xc2, 0x8b, 0xc1, 0x48, 0x95, 0x13, 0x34, 0x6d, 0x27, 0x06, 0x88,
     0x5b, 0xe9, 0x0a, 0xbb, 0x07, 0xf2, 0x3c, 0xa2, 0x8e, 0x50, 0x48, 0x2a, 0xdb, 0x39, 0x2d, 0x61,
 ];
-pub(crate) global transactions_root: Bytes32 = [
+pub global transactions_root: Bytes32 = [
     0x41, 0x0d, 0x8e, 0xfe, 0x97, 0x36, 0x13, 0xf9, 0x46, 0x3b, 0xb2, 0x5a, 0x0c, 0x71, 0xcc, 0xb5,
     0x2b, 0x26, 0x48, 0x42, 0xf4, 0x87, 0x45, 0x10, 0xd7, 0x0d, 0xd7, 0x48, 0xfb, 0xbe, 0xb0, 0xb6,
 ];
-pub(crate) global receipts_root: Bytes32 = [
+pub global receipts_root: Bytes32 = [
     0x44, 0xdb, 0xbb, 0xb9, 0x2e, 0x05, 0x3e, 0xc5, 0x03, 0x06, 0x57, 0xcf, 0x7e, 0x85, 0x40, 0x62,
     0x60, 0x2a, 0x7d, 0xba, 0xd7, 0x89, 0x0f, 0xb4, 0x3c, 0x01, 0x00, 0x9d, 0x1d, 0x39, 0xfa, 0xf5,
 ];
@@ -67,7 +67,7 @@ global encoded_data: [u8; 708] = [
     0x00, 0x00, 0x00, 0x00,
 ];
 
-pub(crate) global block_header_partial: BlockHeaderPartial =
+pub global block_header_partial: BlockHeaderPartial =
     BlockHeaderPartial { number, hash, state_root, transactions_root, receipts_root };
-pub(crate) global block_header_rlp: BoundedVec<u8, 708> =
+pub global block_header_rlp: BoundedVec<u8, 708> =
     BoundedVec::from_parts(encoded_data, encoded_length);
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/state_proof.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/state_proof.nr
@@ -438,4 +438,4 @@ pub(crate) global proof_input: ProofInput<66, 110, 10, 148> = ProofInput {
     },
 };
 
-pub(crate) global proof_input_serialized: [Field; 5645] = proof_input.serialize();
+pub global proof_input_serialized: [Field; 5645] = proof_input.serialize();
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/storage.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/storage.nr
@@ -3,7 +3,7 @@ pub(crate) global keys: [[u8; 32]; 1] = [[
     0x50, 0x70, 0xdd, 0xe6, 0xc5, 0x2c, 0x68, 0x7c, 0x6d, 0x0d, 0x92, 0xfb, 0x85, 0x32, 0xb3, 0x05,
 ]];
 
-pub(crate) global values: [[u8; 32]; 1] = [[
+pub global values: [[u8; 32]; 1] = [[
     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, 0x72, 0x61, 0x31, 0xeb, 0x27, 0x10,
 ]];
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/storage_proof.nr b/ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle/storage_proof.nr
@@ -292,7 +292,7 @@ pub(crate) global proofs: [ProofInput<66, 32, 6, 69>; 1] = [
     },
 ];
 
-pub(crate) global proofs_serialized: [[Field; 3360]; 1] = proofs
+pub global proofs_serialized: [[Field; 3360]; 1] = proofs
     .map(
         |
     proof: ProofInput<MAX_PREFIXED_KEY_NIBBLE_LEN, MAX_STORAGE_VALUE_LEN, MAX_STORAGE_DEPTH_NO_LEAF_M, MAX_STORAGE_LEAF_LEN>| {
diff --git a/ethereum/circuits/lib/src/lib.nr b/ethereum/circuits/lib/src/lib.nr
@@ -4,7 +4,7 @@ pub mod header;
 mod header_int_test;
 pub mod account_with_storage;
 mod account_with_storage_int_test;
-pub(crate) mod account_with_storage_recursive;
+pub mod account_with_storage_recursive;
 mod account_with_storage_recursive_int_test;
 pub mod receipt;
 mod receipt_int_test;
@@ -16,12 +16,12 @@ mod transaction_test;
 mod transaction_int_test;
 pub mod misc;
 mod chain;
-pub(crate) mod serde;
+pub mod serde;
 mod serde_test;
-pub(crate) mod uint256;
+pub mod uint256;
 mod uint256_test;
 
-pub(crate) mod fixtures;
+pub mod fixtures;
 pub(crate) mod verifiers;
 pub(crate) mod merkle_patricia_proofs;
 pub(crate) mod rlp;
diff --git a/ethereum/circuits/lib/src/misc.nr b/ethereum/circuits/lib/src/misc.nr
@@ -1,4 +1,4 @@
-pub(crate) mod arrays;
+pub mod arrays;
 mod arrays_test;
 pub(crate) mod bounded_vecs;
 mod bounded_vecs_test;
diff --git a/ethereum/circuits/lib/src/misc/bytes32.nr b/ethereum/circuits/lib/src/misc/bytes32.nr
@@ -1,6 +1,6 @@
 use crate::misc::types::Bytes32;
 
-pub(crate) global MAX_FIELD_VALUE: Field =
+pub global MAX_FIELD_VALUE: Field =
     0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000;
 
 pub fn address_to_bytes32(address: [u8; 20]) -> Bytes32 {
diff --git a/ethereum/circuits/lib/src/misc/bytes32_test.nr b/ethereum/circuits/lib/src/misc/bytes32_test.nr
@@ -1,7 +1,6 @@
-global MAX_FIELD_VALUE: Field = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000;
 mod field_to_bytes32 {
     use crate::misc::bytes32::field_to_bytes32;
-    use crate::misc::bytes32_test::MAX_FIELD_VALUE;
+    use crate::misc::bytes32::MAX_FIELD_VALUE;
 
     #[test]
     fn zero() {
diff --git a/ethereum/circuits/lib/src/serde.nr b/ethereum/circuits/lib/src/serde.nr
@@ -17,7 +17,7 @@ use crate::receipt::{
 };
 use crate::uint256::U256;
 
-pub(crate) trait Serde<let LEN: u32> {
+pub trait Serde<let LEN: u32> {
     fn serialize(self) -> [Field; LEN];
     fn deserialize(data: [Field; LEN]) -> Self;
 }
diff --git a/ethereum/circuits/lib/src/uint256.nr b/ethereum/circuits/lib/src/uint256.nr
@@ -5,25 +5,25 @@ use dep::std::ops::Add;
 
 global uint128_overflow_value: Field = 340282366920938463463374607431768211456; // 2^128
 
-pub(crate) struct U256 {
+pub struct U256 {
     pub(crate) high: u128,
     pub(crate) low: u128,
 }
 
 impl U256 {
-    pub(crate) fn new(high: u128, low: u128) -> Self {
+    pub fn new(high: u128, low: u128) -> Self {
         Self { high, low }
     }
 
-    pub(crate) fn zero() -> Self {
+    pub fn zero() -> Self {
         Self { high: 0, low: 0 }
     }
 
-    pub(crate) fn one() -> Self {
+    pub fn one() -> Self {
         Self { high: 0, low: 1 }
     }
 
-    pub(crate) fn from_field(field: Field) -> Self {
+    pub fn from_field(field: Field) -> Self {
         U256::from(field_to_bytes32(field))
     }
 }
diff --git a/ethereum/circuits/lib/src/verifiers.nr b/ethereum/circuits/lib/src/verifiers.nr
@@ -1,4 +1,4 @@
-pub(crate) mod account;
+pub mod account;
 mod account_test;
 pub(crate) mod header;
 mod header_test;
diff --git a/vlayer/ethereum/circuits/lib/src/chain_id.nr b/vlayer/ethereum/circuits/lib/src/chain_id.nr
@@ -1,14 +1,14 @@
-global MAINNET = 1;
-global ROPSTEN = 3;
-global RINKEBY = 4;
-global GOERLI = 5;
-global OPTIMISM = 10;
-global KOVAN = 42;
-global BNB = 56;
-global POLYGON = 137;
-global BASE = 8453;
-global ARBITRUM = 42161;
-global CELO = 42220;
-global AVALANCHE = 43114;
-global MUMBAI = 80001;
-global SEPOLIA = 11155111;
+global MAINNET: u32 = 1;
+//global ROPSTEN: u32 = 3;
+//global RINKEBY: u32 = 4;
+//global GOERLI: u32 = 5;
+//global OPTIMISM: u32 = 10;
+//global KOVAN: u32 = 42;
+//global BNB: u32 = 56;
+//global POLYGON: u32 = 137;
+//global BASE: u32 = 8453;
+//global ARBITRUM: u32 = 42161;
+//global CELO: u32 = 42220;
+//global AVALANCHE: u32 = 43114;
+//global MUMBAI: u32 = 80001;
+global SEPOLIA: u32 = 11155111;
diff --git a/vlayer/ethereum/circuits/lib/src/lib.nr b/vlayer/ethereum/circuits/lib/src/lib.nr
@@ -5,4 +5,4 @@ mod slot_test;
 pub(crate) mod token_list;
 pub(crate) mod chain_id;
 pub(crate) mod nft;
-mod nft_list;
+pub(crate) mod nft_list;
diff --git a/vlayer/ethereum/circuits/lib/src/nft.nr b/vlayer/ethereum/circuits/lib/src/nft.nr
@@ -8,9 +8,9 @@ use dep::ethereum::{
 };
 
 pub struct ERC721Token {
-    address: Address,
-    token_id_to_slot: fn(Bytes32) -> U256,
-    chain_id: Field,
+    pub address: Address,
+    pub token_id_to_slot: fn(Bytes32) -> U256,
+    pub chain_id: u32,
 }
 
 trait ERC721 {
diff --git a/vlayer/ethereum/circuits/lib/src/nft_list.nr b/vlayer/ethereum/circuits/lib/src/nft_list.nr
@@ -2,7 +2,7 @@ mod mainnet {
     use crate::chain_id;
     use crate::nft::ERC721Token;
     use crate::slot::{dynamic_array_with_precalculated_slot, mapping, struct_slot};
-    use dep::ethereum::{misc::{bytes32::field_to_bytes32, types::Bytes32}, uint256::U256};
+    use dep::ethereum::uint256::U256;
     use dep::std::field::bytes32_to_field;
 
     pub fn BORED_APE_YACHT_CLUB() -> ERC721Token {
diff --git a/vlayer/ethereum/circuits/lib/src/slot.nr b/vlayer/ethereum/circuits/lib/src/slot.nr
@@ -2,7 +2,7 @@ use dep::ethereum::misc::types::Bytes32;
 use dep::ethereum::uint256::U256;
 use dep::keccak256::keccak256;
 
-global STORAGE_KEY_HASH_INPUT_LENGTH = 64;
+global STORAGE_KEY_HASH_INPUT_LENGTH: u32 = 64;
 
 pub(crate) fn mapping(slot: U256, key: Bytes32) -> U256 {
     let mut vector: BoundedVec<u8, STORAGE_KEY_HASH_INPUT_LENGTH> = BoundedVec::new();
diff --git a/vlayer/ethereum/circuits/lib/src/slot_test.nr b/vlayer/ethereum/circuits/lib/src/slot_test.nr
@@ -60,7 +60,7 @@ mod mapping {
 
 mod dynamic_array {
     use crate::slot::dynamic_array;
-    use dep::ethereum::misc::{bytes32::field_to_bytes32, bytes32_test::MAX_FIELD_VALUE};
+    use dep::ethereum::misc::bytes32::MAX_FIELD_VALUE;
     use dep::ethereum::uint256::U256;
 
     #[test]
@@ -94,7 +94,7 @@ mod dynamic_array {
 
 mod dynamic_array_with_precalculated_slot {
     use crate::slot::dynamic_array_with_precalculated_slot;
-    use dep::ethereum::misc::{bytes32::field_to_bytes32, bytes32_test::MAX_FIELD_VALUE};
+    use dep::ethereum::misc::bytes32::MAX_FIELD_VALUE;
     use dep::ethereum::uint256::U256;
 
     #[test]
diff --git a/vlayer/ethereum/circuits/lib/src/token.nr b/vlayer/ethereum/circuits/lib/src/token.nr
@@ -7,13 +7,13 @@ use dep::ethereum::{
 use dep::ethereum::uint256::U256;
 use dep::std::field::bytes32_to_field;
 
-global TOKEN_BALANCE_INDEX = 0;
+global TOKEN_BALANCE_INDEX: u32 = 0;
 
-struct ERC20Token {
-    address: Address,
-    balances_slot: U256,
-    allowances_slot: U256,
-    chain_id: Field,
+pub struct ERC20Token {
+    pub address: Address,
+    pub balances_slot: U256,
+    pub allowances_slot: U256,
+    pub chain_id: u32,
 }
 
 impl ERC20Token {
@@ -22,7 +22,7 @@ impl ERC20Token {
     }
 }
 
-trait ERC20 {
+pub trait ERC20 {
     fn get_balance(self, wallet_address: Address, block_number: u64, recursive: bool) -> u128;
 }
 
diff --git a/vlayer/ethereum/circuits/lib/src/token_int_test.nr b/vlayer/ethereum/circuits/lib/src/token_int_test.nr
@@ -1,19 +1,20 @@
 mod test_ERC20Token {
     use crate::chain_id::MAINNET;
+    use crate::token::ERC20;
     use crate::token::ERC20Token;
     use dep::ethereum::account_with_storage::StorageWithinBlock;
     use dep::ethereum::account_with_storage_recursive::RecursiveProof;
     use dep::ethereum::fixtures::mainnet::paris::usdc_circle::{
         account::account,
         header::{
             block_header_partial as paris_block_header_partial,
-            block_header_rlp as paris_block_header_rlp, hash, number, receipts_root, state_root,
-            transactions_root,
+            block_header_rlp as paris_block_header_rlp, hash,
         },
         state_proof::proof_input_serialized as state_proof_input_serialized,
         storage::values,
         storage_proof::proofs_serialized,
     };
+    use dep::ethereum::serde::Serde;
     use dep::ethereum::uint256::U256;
     use dep::std::test::OracleMock;
 
@@ -22,16 +23,22 @@ mod test_ERC20Token {
         let result = StorageWithinBlock { block_hash: hash, account, values };
         let recursive_proof =
             RecursiveProof { key_hash: 1, verification_key: [0; 114], proof: [0; 93] };
-
-        let _ = OracleMock::mock("get_storage_recursive").returns((
-            result.serialize(), recursive_proof,
-        ));
-        let _ = OracleMock::mock("get_header").returns((
-            paris_block_header_partial, paris_block_header_rlp,
-        ));
-        let _ = OracleMock::mock("get_proof").returns((
-            account, state_proof_input_serialized, proofs_serialized[0],
-        ));
+        // Safety: test
+        let _ = unsafe {
+            OracleMock::mock("get_storage_recursive").returns((result.serialize(), recursive_proof))
+        };
+        // Safety: test
+        let _ = unsafe {
+            OracleMock::mock("get_header").returns((
+                paris_block_header_partial, paris_block_header_rlp,
+            ))
+        };
+        // Safety: test
+        let _ = unsafe {
+            OracleMock::mock("get_proof").returns((
+                account, state_proof_input_serialized, proofs_serialized[0],
+            ))
+        };
 
         let usdc_token = ERC20Token {
             address: [
@@ -49,7 +56,7 @@ mod test_ERC20Token {
         ];
         let block_number = 19000000;
         let balance = usdc_token.get_balance(circle_address, block_number, false);
-        let expected_usdc_balnce_of_circle = U128::from_integer(125761774888720);
+        let expected_usdc_balnce_of_circle = 125761774888720;
         assert_eq(expected_usdc_balnce_of_circle, balance);
     }
 }
diff --git a/vlayer/ethereum/circuits/lib/src/token_list.nr b/vlayer/ethereum/circuits/lib/src/token_list.nr

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ struct StateAndStorageProofInput {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`pub struct StorageWithinBlock<let N: u32> {`
`47`		`- pub(crate) block_hash: Bytes32,`
`48`		`- pub(crate) account: Account,`
`49`		`- pub(crate) values: [Bytes32; N],`
	`47`	`+ pub block_hash: Bytes32,`
	`48`	`+ pub account: Account,`
	`49`	`+ pub values: [Bytes32; N],`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`type ProofInputSerialized<let LEN: u32> = [Field; LEN];`