fix(callop): fix LastCalleeId, and other fixes

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

@@ -176,6 +176,7 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
         let is_precompile = code_address
             .map(|ref addr| is_precompiled(addr))
             .unwrap_or(false);
+        // CALLCODE does not need to do real transfer
         // Transfer value only when all these conditions met:
         // - The opcode is CALL
         // - The precheck passed
@@ -185,7 +186,7 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
                 &mut exec_step,
                 call.caller_address,
                 call.address,
-                callee_exists || is_precompile,
+                callee_exists,
                 false,
                 call.value,
             )?;
@@ -229,7 +230,6 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
         match (is_precheck_ok, is_precompile, is_empty_code_hash) {
             // 1. Call to precompiled.
             (true, true, _) => {
-                assert!(call.is_success, "call to precompile should not fail");
                 let caller_ctx = state.caller_ctx_mut()?;
                 let code_address = code_address.unwrap();
                 let (result, contract_gas_cost) = execute_precompiled(
@@ -282,7 +282,7 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
             // 2. Call to account with empty code.
             (true, _, true) => {
                 for (field, value) in [
-                    (CallContextField::LastCalleeId, 0.into()),
+                    (CallContextField::LastCalleeId, call.call_id.into()),
                     (CallContextField::LastCalleeReturnDataOffset, 0.into()),
                     (CallContextField::LastCalleeReturnDataLength, 0.into()),
                 ] {
@@ -356,7 +356,7 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
             // 4. insufficient balance or error depth cases.
             (false, _, _) => {
                 for (field, value) in [
-                    (CallContextField::LastCalleeId, 0.into()),
+                    (CallContextField::LastCalleeId, call.call_id.into()),
                     (CallContextField::LastCalleeReturnDataOffset, 0.into()),
                     (CallContextField::LastCalleeReturnDataLength, 0.into()),
                 ] {

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

@@ -145,7 +145,7 @@ impl<F: Field> ExecutionGadget<F> for CallOpGadget<F> {
             );
         });
 
-        cb.condition(call_gadget.has_value.clone(), |cb| {
+        cb.condition(is_call.expr() * call_gadget.has_value.clone(), |cb| {
             cb.require_zero(
                 "CALL with value must not be in static call stack",
                 is_static.expr(),
@@ -180,20 +180,17 @@ impl<F: Field> ExecutionGadget<F> for CallOpGadget<F> {
         // skip the transfer (this is necessary for non-existing accounts, which
         // will not be crated when value is 0 and so the callee balance lookup
         // would be invalid).
-        let transfer = cb.condition(
-            is_call.expr() * not::expr(is_insufficient_balance.expr()),
-            |cb| {
-                TransferGadget::construct(
-                    cb,
-                    caller_address.to_word(),
-                    callee_address.to_word(),
-                    not::expr(call_gadget.callee_not_exists.expr()),
-                    0.expr(),
-                    call_gadget.value.clone(),
-                    &mut callee_reversion_info,
-                )
-            },
-        );
+        let transfer = cb.condition(is_call.expr() * is_precheck_ok.expr(), |cb| {
+            TransferGadget::construct(
+                cb,
+                caller_address.to_word(),
+                callee_address.to_word(),
+                not::expr(call_gadget.callee_not_exists.expr()),
+                0.expr(),
+                call_gadget.value.clone(),
+                &mut callee_reversion_info,
+            )
+        });
 
         // For CALLCODE opcode, verify caller balance is greater than or equal to stack
         // `value` in successful case. that is `is_insufficient_balance` is false.
@@ -231,12 +228,18 @@ impl<F: Field> ExecutionGadget<F> for CallOpGadget<F> {
         let stack_pointer_delta =
             select::expr(is_call.expr() + is_callcode.expr(), 6.expr(), 5.expr());
         let memory_expansion = call_gadget.memory_expansion.clone();
+
+        // handle calls to accounts with no code.
         cb.condition(
             and::expr(&[no_callee_code.expr(), is_precheck_ok.expr()]),
             |cb| {
                 // Save caller's call state
-                for field_tag in [
+                cb.call_context_lookup_write(
+                    None,
                     CallContextFieldTag::LastCalleeId,
+                    Word::from_lo_unchecked(callee_call_id.expr()),
+                );
+                for field_tag in [
                     CallContextFieldTag::LastCalleeReturnDataOffset,
                     CallContextFieldTag::LastCalleeReturnDataLength,
                 ] {
@@ -276,11 +279,15 @@ impl<F: Field> ExecutionGadget<F> for CallOpGadget<F> {
             },
         );
 
-        // handle is_insufficient_balance step transition
+        // handle is_insufficient_balance or !is_depth_ok step transition
         cb.condition(not::expr(is_precheck_ok.expr()), |cb| {
             // Save caller's call state
-            for field_tag in [
+            cb.call_context_lookup_write(
+                None,
                 CallContextFieldTag::LastCalleeId,
+                Word::from_lo_unchecked(callee_call_id.expr()),
+            );
+            for field_tag in [
                 CallContextFieldTag::LastCalleeReturnDataOffset,
                 CallContextFieldTag::LastCalleeReturnDataLength,
             ] {