fix accoute creation rw inside callop (#672)

* fix accoute creation rw inside callop

* add testcase

* fmt

---------

Co-authored-by: lightsing <[email protected]>

Author: lispc

Cargo.lock

@@ -684,6 +684,7 @@ impl<'a> CircuitInputStateRef<'a> {
                         value_prev: prev_keccak_code_hash,
                     },
                 )?;
+                // TODO: set code size to 0?
             }
         }
         if value.is_zero() {

bus-mapping/src/circuit_input_builder/input_state_ref.rs

@@ -76,6 +76,9 @@ impl Opcode for ReturnRevert {
                 state.call_context_read(&mut exec_step, call.call_id, field, value);
             }
 
+            // the 'nonce' field has already been set to 1 inside 'create' or 'begin_tx',
+            // so here account should not be empty.
+            // TODO: optimize this later.
             let account = state.sdb.get_account(&call.address).1.clone();
             let prev_code_hash = if account.is_empty() {
                 Word::zero()

bus-mapping/src/evm/opcodes/return_revert.rs

@@ -687,11 +687,11 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
         let callee_exists = is_precompile || !account_code_hash.is_zero();
         let caller_balance_sub_fee_pair = rws.next().account_balance_pair();
         if (!callee_exists && !tx.value.is_zero()) || tx.is_create {
-            rws.next();
+            rws.next(); // codehash read
             account_code_hash = rws.next().account_codehash_pair().1;
             #[cfg(feature = "scroll")]
             {
-                rws.next();
+                rws.next(); // keccak codehash read
                 let account_keccak_code_hash = rws.next().account_keccak_codehash_pair().1;
                 self.account_keccak_code_hash.assign(
                     region,

zkevm-circuits/src/evm_circuit/execution/begin_tx.rs

@@ -817,7 +817,11 @@ impl<F: Field> ExecutionGadget<F> for CallOpGadget<F> {
         let (caller_balance_pair, callee_balance_pair) =
             if is_call && is_precheck_ok && !value.is_zero() {
                 if !callee_exists {
-                    rw_offset += 1;
+                    rw_offset += 2; // codehash read and write
+                    #[cfg(feature = "scroll")]
+                    {
+                        rw_offset += 2; // keccak codehash read and write
+                    }
                 }
                 let caller_balance_pair =
                     block.rws[step.rw_indices[18 + rw_offset]].account_balance_pair();
@@ -1181,7 +1185,10 @@ mod test {
     };
 
     use itertools::Itertools;
-    use mock::{test_ctx::helpers::account_0_code_account_1_no_code, TestContext};
+    use mock::{
+        test_ctx::helpers::{account_0_code_account_1_no_code, tx_from_1_to_0},
+        TestContext,
+    };
 
     use rayon::prelude::{ParallelBridge, ParallelIterator};
     use std::default::Default;
@@ -1552,6 +1559,28 @@ mod test {
         );
     }
 
+    #[test]
+    fn call_non_exist_with_value() {
+        let callee_code = bytecode! {
+            .op_call(0xc350, 0xff, 0x13, 0x0, 0x0, 0x0, 0x0)
+        };
+
+        let ctx = TestContext::<2, 1>::new(
+            None,
+            account_0_code_account_1_no_code(callee_code),
+            tx_from_1_to_0,
+            |block, _tx| block.number(0xcafeu64),
+        )
+        .unwrap();
+
+        CircuitTestBuilder::new_from_test_ctx(ctx)
+            .params(CircuitsParams {
+                max_rws: 500,
+                ..Default::default()
+            })
+            .run();
+    }
+
     #[test]
     fn callop_error_depth() {
         let callee_code = bytecode! {

zkevm-circuits/src/evm_circuit/execution/callop.rs

@@ -640,17 +640,27 @@ impl<F: Field, const IS_CREATE2: bool, const S: ExecutionState> ExecutionGadget<
 
         if is_precheck_ok == 1 && !is_address_collision {
             /*
-            14 + rw_offset: read code_hash
-            15/16 + rw_offset: write code_hash inside transfer
-            17/18 + rw_offset: write keccak_code_hash inside transfer
+            rws:
+                ...
+                read code_hash // 14 + rw_offset
+                if creation needed:
+                    code_hash read // 15 + rw_offset
+                    code_hash write // 16 + rw_offset
+                    rw_offset += 2
+                    if feature = "scroll"
+                        keccak_code_hash read // 15 + rw_offset
+                        keecak_code_hash write // 16 + rw_offset
+                        rw_offset += 2
+                caller balance // 15 + rw_offset
+                callee balance // 16 + rw_offset
              */
-            rw_offset += 1;
+            rw_offset += 2;
             #[cfg(feature = "scroll")]
             {
                 rw_offset += 2; // Read Write empty Keccak code hash.
             }
             let [caller_balance_pair, callee_balance_pair] = if !value.is_zero() {
-                let account_balance_pair = [16, 17]
+                let account_balance_pair = [15, 16]
                     .map(|i| block.rws[step.rw_indices[i + rw_offset]].account_balance_pair());
                 rw_offset += 2;
                 account_balance_pair
@@ -696,7 +706,7 @@ impl<F: Field, const IS_CREATE2: bool, const S: ExecutionState> ExecutionGadget<
             Value::known(if is_precheck_ok == 0 || is_address_collision {
                 F::zero()
             } else {
-                block.rws[step.rw_indices[23 + rw_offset]]
+                block.rws[step.rw_indices[22 + rw_offset]]
                     .call_context_value()
                     .to_scalar()
                     .unwrap()

zkevm-circuits/src/evm_circuit/execution/create.rs

@@ -438,10 +438,9 @@ impl<F: Field> ExecutionGadget<F> for ReturnRevertGadget<F> {
 
         let is_contract_deployment = call.is_create && call.is_success && !length.is_zero();
         if !call.is_root {
-            let mut rw_counter_offset = 3;
+            let mut rw_counter_offset = 3; // stack read, stack read, call_context_read is_success
             if is_contract_deployment {
-                rw_counter_offset += 6 + copy_rwc_inc;
-                //rw_counter_offset += 6 + length.as_u64();
+                rw_counter_offset += 6 + copy_rwc_inc; // 4 call_context_read + 2 codehash rw
                 #[cfg(feature = "scroll")]
                 {
                     rw_counter_offset += 3; // keccak code hash rw, code size