fix

Author: jialinli98

ethereum/circuits/get_account/src/main.nr

@@ -2,5 +2,5 @@ use dep::ethereum::account::{AccountWithinBlock, get_account};
 use dep::ethereum::misc::types::Address;
 
 fn main(chain_id: pub Field, block_no: pub u64, address: pub Address) -> pub AccountWithinBlock {
-    get_account(chain_id, block_no, address)
+    get_account(chain_id as u32, block_no, address)
 }

ethereum/circuits/get_header/src/main.nr

@@ -1,5 +1,5 @@
 use dep::ethereum::header::{BlockHeaderPartial, get_header};
 
-fn main(chain_id: pub Field, block_no: pub u64) -> pub BlockHeaderPartial {
+fn main(chain_id: pub u32, block_no: pub u64) -> pub BlockHeaderPartial {
     get_header(chain_id, block_no)
 }

ethereum/circuits/get_log/src/main.nr

@@ -9,5 +9,5 @@ fn main(
     tx_idx: pub Field,
     log_idx: pub u32,
 ) -> pub LogWithinBlock<MAX_LOG_DATA_LEN> {
-    get_log::<MAX_LOG_DATA_LEN, MAX_LOGS_COUNT>(chain_id, block_number, tx_idx, log_idx)
+    get_log::<MAX_LOG_DATA_LEN, MAX_LOGS_COUNT>(chain_id as u32, block_number, tx_idx, log_idx)
 }

ethereum/circuits/get_receipt/src/main.nr

@@ -1,5 +1,5 @@
 use dep::ethereum::receipt::{get_receipt, TxReceiptWithinBlock};
 
 fn main(chain_id: pub Field, block_number: pub u64, tx_idx: pub Field) -> pub TxReceiptWithinBlock {
-    get_receipt(chain_id, block_number, tx_idx)
+    get_receipt(chain_id as u32, block_number, tx_idx)
 }

ethereum/circuits/get_storage/src/main.nr

@@ -9,5 +9,5 @@ fn main(
     address: pub Address,
     storage_key: pub Bytes32,
 ) -> pub StorageWithinBlock<1> {
-    get_account_with_storage(chain_id, block_number, address, storage_key)
+    get_account_with_storage(chain_id as u32, block_number, address, storage_key)
 }

ethereum/circuits/get_storage_recursive/src/main.nr

@@ -10,5 +10,5 @@ fn main(
     address: pub Address,
     storage_key: pub Bytes32,
 ) -> pub StorageWithinBlock<1> {
-    get_account_with_storage(chain_id, block_number, address, storage_key)
+    get_account_with_storage(chain_id as u32, block_number, address, storage_key)
 }

ethereum/circuits/get_transaction/src/main.nr

@@ -8,6 +8,6 @@ fn main(
     tx_idx: pub Field,
 ) -> pub TransactionWithinBlock<MAX_DATA_LEN_M> {
     let transaction_within_block: TransactionWithinBlock<MAX_DATA_LEN_M> =
-        get_transaction(chain_id, block_number, tx_idx);
+        get_transaction(chain_id as u32, block_number, tx_idx);
     transaction_within_block
 }

ethereum/circuits/lib/src/account.nr

@@ -13,8 +13,8 @@ pub(crate) global MAX_ACCOUNT_STATE_LEN: u32 = 110; // Values taken from account
 pub(crate) global MAX_ACCOUNT_LEAF_LEN: u32 = 148;
 
 pub struct AccountWithinBlock {
-    account: Account,
-    block_hash: Bytes32,
+    pub(crate) account: Account,
+    pub(crate) block_hash: Bytes32,
 }
 
 impl Eq for AccountWithinBlock {
@@ -27,7 +27,7 @@ type AccountWithStateProofM = (Account, ProofInput<MAX_PREFIXED_KEY_NIBBLE_LEN,
 
 type ProofInputSerialized<let LEN: u32> = [Field; LEN];
 
-pub fn get_account(chain_id: Field, block_no: u64, address: Address) -> AccountWithinBlock {
+pub fn get_account(chain_id: u32, block_no: u64, address: Address) -> AccountWithinBlock {
     let (account, state_proof) = get_account_unconstrained_M(chain_id, block_no, address);
     let header = get_header(chain_id, block_no);
     verify_account(address, account, state_proof, header.state_root);
@@ -36,13 +36,13 @@ pub fn get_account(chain_id: Field, block_no: u64, address: Address) -> AccountW
 
 #[oracle(get_account)]
 unconstrained fn get_account_oracle<let PROOF_INPUT_LEN: u32>(
-    _chain_id: Field,
+    _chain_id: u32,
     _block_no: u64,
     _address: [u8; 20],
 ) -> (Account, ProofInputSerialized<PROOF_INPUT_LEN>) {}
 
 unconstrained fn get_account_unconstrained_M(
-    chain_id: Field,
+    chain_id: u32,
     block_no: u64,
     address: Address,
 ) -> AccountWithStateProofM {

ethereum/circuits/lib/src/account_int_test.nr

@@ -18,8 +18,12 @@ use dep::std::test::OracleMock;
 
 #[test]
 fn test_get_account_success() {
-    let _ = OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp));
-    let _ = OracleMock::mock("get_account").returns((account, state_proof_input_serialized));
+    // Unsafe: test
+    let _ =
+        unsafe { OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp)) };
+    // Unsafe: test
+    let _ =
+        unsafe { OracleMock::mock("get_account").returns((account, state_proof_input_serialized)) };
 
     let account_within_block = get_account(ETHEREUM_MAINNET_ID, number, address);
 
@@ -33,10 +37,14 @@ fn test_get_account_success() {
 
 #[test(should_fail)]
 fn test_get_account_wrong_state_root() {
-    let _ = OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp));
-    let _ = OracleMock::mock("get_account").returns((
-        account_from_different_header, state_proof_input_from_different_header_serialized,
-    ));
-
+    // Unsafe: test
+    let _ =
+        unsafe { OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp)) };
+    // Unsafe: test
+    let _ = unsafe {
+        OracleMock::mock("get_account").returns((
+            account_from_different_header, state_proof_input_from_different_header_serialized,
+        ))
+    };
     let _ = get_account(ETHEREUM_MAINNET_ID, number, address_from_different_header);
 }

ethereum/circuits/lib/src/account_with_storage.nr

@@ -45,9 +45,9 @@ struct StateAndStorageProofInput {
 }
 
 pub struct StorageWithinBlock<let N: u32> {
-    pub block_hash: Bytes32,
-    account: Account,
-    values: [Bytes32; N],
+    pub(crate) block_hash: Bytes32,
+    pub(crate) account: Account,
+    pub(crate) values: [Bytes32; N],
 }
 
 type ProofInputSerialized<let LEN: u32> = [Field; LEN];
@@ -101,7 +101,7 @@ fn get_storage_value(
 }
 
 pub fn get_account_with_storage(
-    chain_id: Field,
+    chain_id: u32,
     block_number: u64,
     address: Address,
     storage_key: Bytes32,
@@ -125,14 +125,14 @@ pub fn get_account_with_storage(
 
 #[oracle(get_proof)]
 unconstrained fn get_proof_oracle<let STATE_PROOF_INPUT_LEN: u32, let STORAGE_PROOF_INPUT: u32>(
-    _chain_id: Field,
+    _chain_id: u32,
     _block_no: u64,
     _address: Address,
     _storage_key: Bytes32,
     ) -> (Account, ProofInputSerialized<STATE_PROOF_INPUT_LEN>, ProofInputSerialized<STORAGE_PROOF_INPUT>) {}
 
 unconstrained fn get_proof_unconstrained(
-    chain_id: Field,
+    chain_id: u32,
     block_no: u64,
     address: Address,
     storage_key: Bytes32,