fixes

jialinli98 · jialinli98 · commit 63a76e74d95e · 2025-12-12T15:57:49.000-08:00
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 mod london;
 pub mod paris;
 pub(crate) mod cancun;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks.nr b/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks.nr
@@ -1,3 +1,3 @@
-pub(crate) mod header;
-pub(crate) mod account;
-pub(crate) mod state_proof;
+pub mod header;
+pub mod account;
+pub mod state_proof;
diff --git a/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks/account.nr b/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks/account.nr
@@ -26,4 +26,4 @@ pub(crate) global code_hash: Bytes32 = [
     0xe4, 0x16, 0x7f, 0x0b, 0x74, 0xea, 0x23, 0x05, 0x66, 0xdd, 0xec, 0xe7, 0xae, 0x9d, 0x6f, 0x0b,
 ];
 
-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/london/crypto_punks/header.nr b/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks/header.nr
@@ -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/london/crypto_punks/state_proof.nr b/ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks/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/vlayer/ethereum/circuits/lib/src/lib.nr b/vlayer/ethereum/circuits/lib/src/lib.nr
@@ -1,8 +1,8 @@
-pub(crate) mod token;
+pub mod token;
 mod token_int_test;
 pub(crate) mod slot;
 mod slot_test;
-pub(crate) mod token_list;
+pub mod token_list;
 pub(crate) mod chain_id;
-pub(crate) mod nft;
-pub(crate) mod nft_list;
+pub mod nft;
+pub mod nft_list;
diff --git a/vlayer/ethereum/circuits/lib/src/nft.nr b/vlayer/ethereum/circuits/lib/src/nft.nr
@@ -13,7 +13,7 @@ pub struct ERC721Token {
     pub chain_id: u32,
 }
 
-trait ERC721 {
+pub trait ERC721 {
     fn get_owner(self, token_id: Bytes32, block_number: u64) -> Address;
 }
 
diff --git a/vlayer/ethereum/circuits/lib/src/nft_list.nr b/vlayer/ethereum/circuits/lib/src/nft_list.nr
@@ -1,4 +1,4 @@
-mod mainnet {
+pub mod mainnet {
     use crate::chain_id;
     use crate::nft::ERC721Token;
     use crate::slot::{dynamic_array_with_precalculated_slot, mapping, struct_slot};
diff --git a/vlayer/ethereum/circuits/lib/src/token_list.nr b/vlayer/ethereum/circuits/lib/src/token_list.nr
@@ -1,9 +1,9 @@
-mod mainnet {
+pub mod mainnet {
     use crate::chain_id;
     use crate::token::ERC20Token;
     use dep::ethereum::uint256::U256;
 
-    global USDC: ERC20Token = ERC20Token {
+    pub global USDC: ERC20Token = ERC20Token {
         address: [
             0xa0, 0xb8, 0x69, 0x91, 0xc6, 0x21, 0x8b, 0x36, 0xc1, 0xd1, 0x9d, 0x4a, 0x2e, 0x9e,
             0xb0, 0xce, 0x36, 0x06, 0xeb, 0x48,
diff --git a/vlayer/examples/circuits/is_ape_owner/src/main.nr b/vlayer/examples/circuits/is_ape_owner/src/main.nr
@@ -1,6 +1,5 @@
-use dep::ethereum::misc::bytes32::field_to_bytes32;
 use dep::ethereum::misc::types::Address;
-use dep::std::field::bytes32_to_field;
+use dep::token::nft::ERC721;
 use dep::token::nft_list::mainnet::BORED_APE_YACHT_CLUB;
 
 mod main_test;
diff --git a/vlayer/examples/circuits/is_ape_owner/src/main_test.nr b/vlayer/examples/circuits/is_ape_owner/src/main_test.nr
@@ -14,20 +14,26 @@ mod is_ape_owner_main {
     };
     use dep::std::test::OracleMock;
 
-    global BORED_APE_OWNER_WALLER_ADDRESS = [
+    global BORED_APE_OWNER_WALLER_ADDRESS: Address = [
         0x13, 0x70, 0x24, 0xfc, 0xa6, 0xcd, 0x54, 0x2e, 0x95, 0x97, 0xd5, 0xa5, 0x51, 0xeb, 0xb1,
         0xbd, 0x12, 0xdc, 0xc7, 0x03,
     ];
-    global BLOCK_NUMBER = 19_000_000;
+    global BLOCK_NUMBER: u64 = 19_000_000;
 
     #[test]
     fn success() {
-        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_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 token_id = [
             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,
@@ -38,12 +44,18 @@ mod is_ape_owner_main {
 
     #[test(should_fail_with = "Owner is not the same as the wallet address")]
     fn invalid_wallet() {
-        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_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 token_id = [
             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/vlayer/examples/circuits/is_crypto_punk_owner/src/main.nr b/vlayer/examples/circuits/is_crypto_punk_owner/src/main.nr
@@ -1,6 +1,6 @@
 use dep::ethereum::misc::bytes32::field_to_bytes32;
 use dep::ethereum::misc::types::Address;
-use dep::std::field::bytes32_to_field;
+use dep::token::nft::ERC721;
 use dep::token::nft_list::mainnet::CRYPTO_PUNK;
 
 mod main_test;
diff --git a/vlayer/examples/circuits/is_crypto_punk_owner/src/main_test.nr b/vlayer/examples/circuits/is_crypto_punk_owner/src/main_test.nr
@@ -10,36 +10,46 @@ mod is_crypto_punk_owner_main {
             state_proof::proof_input_serialized as state_proof_input_serialized,
             storage_proof::proofs_serialized,
         },
-        misc::arrays::alter_array,
+        misc::{arrays::alter_array, types::Address},
     };
     use dep::std::test::OracleMock;
 
-    global CRYPTO_PUNK_OWNER_WALLER_ADDRESS = [
+    global CRYPTO_PUNK_OWNER_WALLER_ADDRESS: Address = [
         0xc3, 0x52, 0xb5, 0x34, 0xe8, 0xb9, 0x87, 0xe0, 0x36, 0xa9, 0x35, 0x39, 0xfd, 0x68, 0x97,
         0xf5, 0x34, 0x88, 0xe5, 0x6a,
     ];
-    global BLOCK_NUMBER = 14_194_126;
+    global BLOCK_NUMBER: u64 = 14_194_126;
 
     #[test]
     fn success() {
-        let _ = OracleMock::mock("get_header").returns((
-            london_block_header_partial, london_block_header_rlp,
-        ));
-        let _ = OracleMock::mock("get_proof").returns((
-            account, state_proof_input_serialized, proofs_serialized[0],
-        ));
+        // Safety: test
+        let _ = unsafe {
+            OracleMock::mock("get_header").returns((
+                london_block_header_partial, london_block_header_rlp,
+            ))
+        };
+        // Safety: test
+        let _ = unsafe {
+            OracleMock::mock("get_proof").returns((
+                account, state_proof_input_serialized, proofs_serialized[0],
+            ))
+        };
         let token_id = 9;
         main(CRYPTO_PUNK_OWNER_WALLER_ADDRESS, token_id, BLOCK_NUMBER);
     }
 
     #[test(should_fail_with = "Owner is not the same as the wallet address")]
     fn invalid_wallet() {
-        let _ = OracleMock::mock("get_header").returns((
-            london_block_header_partial, london_block_header_rlp,
-        ));
-        let _ = OracleMock::mock("get_proof").returns((
-            account, state_proof_input_serialized, proofs_serialized[0],
-        ));
+        let _ = unsafe {
+            OracleMock::mock("get_header").returns((
+                london_block_header_partial, london_block_header_rlp,
+            ))
+        };
+        let _ = unsafe {
+            OracleMock::mock("get_proof").returns((
+                account, state_proof_input_serialized, proofs_serialized[0],
+            ))
+        };
 
         let token_id = 9;
         main(
diff --git a/vlayer/examples/circuits/is_dao_worthy/src/main.nr b/vlayer/examples/circuits/is_dao_worthy/src/main.nr
@@ -1,4 +1,5 @@
 use dep::ethereum::misc::types::Address;
+use dep::token::token::ERC20;
 use dep::token::token_list::mainnet::USDC;
 
 mod main_test;
diff --git a/vlayer/examples/circuits/is_dao_worthy/src/main_test.nr b/vlayer/examples/circuits/is_dao_worthy/src/main_test.nr
@@ -13,12 +13,18 @@ mod is_dao_worthy_main {
 
     #[test]
     fn success_greater_then() {
-        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_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 block_number = 19_000_000;
         let circle_address = [
diff --git a/vlayer/examples/circuits/is_dao_worthy_recursive/src/main.nr b/vlayer/examples/circuits/is_dao_worthy_recursive/src/main.nr
@@ -1,4 +1,5 @@
 use dep::ethereum::misc::types::Address;
+use dep::token::token::ERC20;
 use dep::token::token_list::mainnet::USDC;
 
 mod main_test;
diff --git a/vlayer/examples/circuits/is_dao_worthy_recursive/src/main_test.nr b/vlayer/examples/circuits/is_dao_worthy_recursive/src/main_test.nr
@@ -14,22 +14,30 @@ mod is_dao_worthy_main {
         storage_proof::proofs_serialized,
     };
     use dep::std::test::OracleMock;
+    use ethereum::serde::Serde;
 
     #[test]
     fn success_greater_then() {
         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 block_number = 19_000_000;
         let circle_address = [

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ pub struct ERC721Token {`
`13`	`13`	`pub chain_id: u32,`
`14`	`14`	`}`
`15`	`15`
`16`		`-trait ERC721 {`
	`16`	`+pub trait ERC721 {`
`17`	`17`	`fn get_owner(self, token_id: Bytes32, block_number: u64) -> Address;`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-mod mainnet {`
	`1`	`+pub mod mainnet {`
`2`	`2`	`use crate::chain_id;`
`3`	`3`	`use crate::nft::ERC721Token;`
`4`	`4`	`use crate::slot::{dynamic_array_with_precalculated_slot, mapping, struct_slot};`