Merge branch 'scroll-dev-1115' of github.com:scroll-tech/zkevm-circuits into scroll-dev-1115

Author: lispc

bus-mapping/src/evm/opcodes.rs

@@ -255,14 +255,14 @@ fn fn_gen_associated_ops(opcode_id: &OpcodeId) -> FnGenAssociatedOps {
     }
 }
 
-fn fn_gen_error_state_associated_ops(error: &ExecError) -> FnGenAssociatedOps {
+fn fn_gen_error_state_associated_ops(error: &ExecError) -> Option<FnGenAssociatedOps> {
     match error {
-        ExecError::InvalidJump => ErrorInvalidJump::gen_associated_ops,
-        ExecError::OutOfGas(OogError::Call) => OOGCall::gen_associated_ops,
+        ExecError::InvalidJump => Some(ErrorInvalidJump::gen_associated_ops),
+        ExecError::OutOfGas(OogError::Call) => Some(OOGCall::gen_associated_ops),
         // more future errors place here
         _ => {
-            warn!("Using dummy gen_associated_ops for error state {:?}", error);
-            Dummy::gen_associated_ops
+            warn!("TODO: error state {:?} not implemented", error);
+            None
         }
     }
 }
@@ -327,16 +327,22 @@ pub fn gen_associated_ops(
         if exec_step.oog_or_stack_error() && !geth_step.op.is_call_or_create() {
             state.gen_restore_context_ops(&mut exec_step, geth_steps)?;
         } else {
+            let fn_gen_error_associated_ops = fn_gen_error_state_associated_ops(&exec_error);
+            // if fn_gen_error_associated_ops handles the target error, return the handled
+            // result
+            if let Some(fn_gen_error_ops) = fn_gen_error_associated_ops {
+                return fn_gen_error_ops(state, geth_steps);
+            }
+
+            // here for some errors which fn_gen_error_associated_ops don't handle now,
+            // continue to use dummy handling until all errors implemented in
+            // fn_gen_error_associated_ops
             if geth_step.op.is_call_or_create() && !exec_step.oog_or_stack_error() {
                 let call = state.parse_call(geth_step)?;
                 // Switch to callee's call context
                 state.push_call(call);
-            } else {
-                let fn_gen_error_associated_ops = fn_gen_error_state_associated_ops(&exec_error);
-                return fn_gen_error_associated_ops(state, geth_steps);
             }
         }
-
         state.handle_return(geth_step)?;
         return Ok(vec![exec_step]);
     }

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

@@ -49,7 +49,7 @@ impl<F: Field> ExecutionGadget<F> for MemoryGadget<F> {
         let is_mstore8 = IsEqualGadget::construct(cb, opcode.expr(), OpcodeId::MSTORE8.expr());
         // This is an MSTORE/MSTORE8
         let is_store = not::expr(is_mload.expr());
-        // This in an MSTORE/MLOAD
+        // This is an MSTORE/MLOAD
         let is_not_mstore8 = not::expr(is_mstore8.expr());
 
         // Calculate the next memory size and the gas cost for this memory