fix: PR adjustments

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

@@ -176,10 +176,6 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGMemoryCopyGadget<F> {
             (false, U256::zero())
         };
 
-        if !is_extcodecopy {
-            rws.offset_reset();
-        };
-
         let dst_offset = rws.next().stack_value();
         let src_offset = rws.next().stack_value();
         let copy_size = rws.next().stack_value();

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

@@ -183,16 +183,10 @@ impl<F: Field> ExecutionGadget<F> for ReturnDataCopyGadget<F> {
 
         self.data_offset.assign_u256(region, offset, data_offset)?;
 
-        let [last_callee_id, return_data_offset, return_data_size] = [
-            (3, CallContextFieldTag::LastCalleeId),
-            (4, CallContextFieldTag::LastCalleeReturnDataOffset),
-            (5, CallContextFieldTag::LastCalleeReturnDataLength),
-        ]
-        .map(|(_, tag)| {
-            let rw = rws.next();
-            assert_eq!(rw.field_tag(), Some(tag as u64));
-            rw.call_context_value()
-        });
+        let last_callee_id = rws.next().call_context_value();
+        let return_data_offset = rws.next().call_context_value();
+        let return_data_size = rws.next().call_context_value();
+
         self.last_callee_id.assign(
             region,
             offset,

zkevm-circuits/src/evm_circuit/util.rs

@@ -469,14 +469,6 @@ impl<'a> StepRws<'a> {
     pub(crate) fn offset_add(&mut self, inc: usize) {
         self.offset += inc
     }
-    /// Decrement the step rw operation offset by `dec`.
-    pub(crate) fn offset_sub(&mut self, dec: usize) {
-        self.offset -= dec
-    }
-    /// Reset the step rw operation offset to 0.
-    pub(crate) fn offset_reset(&mut self) {
-        self.offset = 0
-    }
     /// Return the next rw operation from the step.
     pub(crate) fn next(&mut self) -> Rw {
         let rw = self.rws[self.step.rw_index(self.offset)];