fix

Author: jialinli98

ethereum/circuits/lib/src/account.nr

@@ -28,7 +28,9 @@ type AccountWithStateProofM = (Account, ProofInput<MAX_PREFIXED_KEY_NIBBLE_LEN,
 type ProofInputSerialized<let LEN: u32> = [Field; LEN];
 
 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);
+    // Safety: verification done separately
+    let (account, state_proof) =
+        unsafe { 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);
     AccountWithinBlock { account, block_hash: header.hash }

ethereum/circuits/lib/src/account_int_test.nr

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

ethereum/circuits/lib/src/account_with_storage.nr

@@ -108,8 +108,9 @@ pub fn get_account_with_storage(
 ) -> StorageWithinBlock<1> {
     let BlockHeaderPartial { number: _, hash, state_root, transactions_root: _, receipts_root: _ }
          = get_header(chain_id, block_number);
+    // Safety: veirfication done separately
     let StateAndStorageProofInput { account, state_proof_input, storage_proof_input } =
-        get_proof_unconstrained(chain_id, block_number, address, storage_key);
+        unsafe { get_proof_unconstrained(chain_id, block_number, address, storage_key) };
 
     verify_account(address, account, state_proof_input, state_root);
     verify_storage_values([storage_proof_input], account.storage_root);

ethereum/circuits/lib/src/account_with_storage_int_test.nr

@@ -25,10 +25,10 @@ use dep::std::test::OracleMock;
 
 #[test]
 fn test_get_account_with_storage_success() {
-    // Unsafe: test
+    // Safety: test
     let _ =
         unsafe { OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp)) };
-    // Unsafe: test
+    // Safety: test
     let _ = unsafe {
         OracleMock::mock("get_proof").returns((
             account, state_proof_input_serialized, proofs_serialized[0],
@@ -50,13 +50,13 @@ fn test_get_account_with_storage_success() {
 
 #[test(should_fail_with = "Invalid node hash")]
 fn test_get_account_with_storage_invalid_state_root() {
-    // Unsafe: test
+    // Safety: test
     let _ = unsafe {
         OracleMock::mock("get_header").returns((
             crypto_punks_block_header_partial, crypto_punks_block_header_rlp,
         ))
     };
-    // Unsafe: test
+    // Safety: test
     let _ = unsafe {
         OracleMock::mock("get_proof").returns((
             account, state_proof_input_serialized, proofs_serialized[0],
@@ -78,7 +78,7 @@ fn test_get_account_with_storage_invalid_storage_root() {
             crypto_punks_block_header_partial, crypto_punks_block_header_rlp,
         ))
     };
-    // Unsafe: test
+    // Safety: test
     let _ = unsafe {
         OracleMock::mock("get_proof").returns((
             crypto_punks_account, crypto_punks_state_proof_input_serialized, proofs_serialized[0],
@@ -95,10 +95,10 @@ fn test_get_account_with_storage_invalid_storage_root() {
 
 #[test(should_fail_with = "Storage key does not match the argument")]
 fn test_get_account_with_storage_storage_key_does_not_match_the_argument() {
-    // Unsafe: test
+    // Safety: test
     let _ =
         unsafe { OracleMock::mock("get_header").returns((block_header_partial, block_header_rlp)) };
-    // Unsafe: test
+    // Safety: test
     let _ = unsafe {
         OracleMock::mock("get_proof").returns((
             account, state_proof_input_serialized, proofs_serialized[0],

ethereum/circuits/lib/src/account_with_storage_recursive.nr

@@ -1,7 +1,8 @@
 use crate::account_with_storage::StorageWithinBlock;
 use crate::misc::{fragment::Fragment, types::{Address, ADDRESS_LENGTH, Bytes32, BYTES32_LENGTH}};
+use crate::serde::Serde;
 use crate::serde::STORAGE_BLOCK_LEN;
-use dep::std::verify_proof;
+use dep::std::verify_proof_with_type;
 
 pub struct RecursiveProof {
     key_hash: Field,
@@ -17,12 +18,14 @@ pub fn get_account_with_storage_recursive(
     address: Address,
     storage_key: Bytes32,
 ) -> StorageWithinBlock<1> {
-    let (storage_within_block, RecursiveProof { key_hash, verification_key, proof }) = get_account_with_storage_recursive_unconstrained(
-        chain_id,
-        block_number,
-        address,
-        storage_key,
-    );
+    let (storage_within_block, RecursiveProof { key_hash, verification_key, proof }) = unsafe {
+        get_account_with_storage_recursive_unconstrained(
+            chain_id,
+            block_number,
+            address,
+            storage_key,
+        )
+    };
 
     let mut public_inputs: Fragment<NUM_PUBLIC_INPUTS, Field> = Fragment::empty();
     public_inputs.push_back(chain_id as Field);
@@ -31,11 +34,12 @@ pub fn get_account_with_storage_recursive(
     public_inputs.extend_back(storage_key.serialize());
     public_inputs.extend_back(storage_within_block.serialize());
 
-    verify_proof(
+    verify_proof_with_type(
         verification_key,
         proof,
         public_inputs.to_array::<NUM_PUBLIC_INPUTS>(),
         key_hash,
+        1, // TODO: Need to confirm it's meant to non zk honk proof
     );
 
     storage_within_block

ethereum/circuits/lib/src/fixtures/mainnet/cancun/access_list.nr

@@ -1 +1 @@
-mod header;
+pub(crate) mod header;

ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/receipt.nr

@@ -2,7 +2,7 @@ use crate::misc::fragment::Fragment;
 use crate::receipt::{ForeignCallTxReceiptPartial, TxReceiptPartial};
 use crate::receipt::TxType;
 
-global tx_type: TxType = 2;
+pub(crate) global tx_type: TxType = 2;
 global receipt_rlp: [u8; 999] = [
     0xf9, 0x01, 0xa7, 0x01, 0x83, 0x80, 0x9b, 0x29, 0xb9, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,