fix precompile revert

Author: lispc

Cargo.lock

@@ -2,6 +2,7 @@ use crate::{
     circuit_input_builder::{CircuitInputStateRef, ExecStep},
     error::ExecError,
     evm::Opcode,
+    operation::CallContextField,
     Error,
 };
 use eth_types::{evm_types::OpcodeId, GethExecStep};
@@ -33,7 +34,7 @@ impl Opcode for PrecompileFailed {
         state.call_expand_memory(args_offset, args_length, ret_offset, ret_length)?;
 
         let call = state.parse_call(geth_step)?;
-        state.push_call(call);
+        state.push_call(call.clone());
         state.handle_return(&mut exec_step, geth_steps, false)?;
 
         for i in 0..stack_input_num {
@@ -51,6 +52,14 @@ impl Opcode for PrecompileFailed {
             (0_u64).into(),
         )?;
 
+        for (field, value) in [
+            (CallContextField::LastCalleeId, call.call_id.into()),
+            (CallContextField::LastCalleeReturnDataOffset, 0.into()),
+            (CallContextField::LastCalleeReturnDataLength, 0.into()),
+        ] {
+            state.call_context_write(&mut exec_step, call.caller_id, field, value);
+        }
+
         Ok(vec![exec_step])
     }
 }

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

@@ -9,6 +9,7 @@ use crate::{
             CachedRegion, Cell, Word,
         },
     },
+    table::CallContextFieldTag,
     util::Expr,
     witness::{Block, Call, ExecStep, Transaction},
 };
@@ -46,6 +47,9 @@ impl<F: Field> ExecutionGadget<F> for ErrorPrecompileFailedGadget<F> {
         let is_staticcall =
             IsZeroGadget::construct(cb, opcode.expr() - OpcodeId::STATICCALL.expr());
 
+        // Use rw_counter of the step which triggers next call as its call_id.
+        let callee_call_id = cb.curr.state.rw_counter.clone();
+
         let gas = cb.query_word_rlc();
         let callee_address = cb.query_word_rlc();
         let value = cb.query_word_rlc();
@@ -67,6 +71,14 @@ impl<F: Field> ExecutionGadget<F> for ErrorPrecompileFailedGadget<F> {
         cb.stack_pop(rd_length.expr());
         cb.stack_push(0.expr());
 
+        for (field_tag, value) in [
+            (CallContextFieldTag::LastCalleeId, callee_call_id.expr()),
+            (CallContextFieldTag::LastCalleeReturnDataOffset, 0.expr()),
+            (CallContextFieldTag::LastCalleeReturnDataLength, 0.expr()),
+        ] {
+            cb.call_context_lookup(true.expr(), None, field_tag, value);
+        }
+
         let cd_address = MemoryAddressGadget::construct(cb, cd_offset, cd_length);
         let rd_address = MemoryAddressGadget::construct(cb, rd_offset, rd_length);