feat/privacy-scaling-explorations#1576 refactor rw counter delta for …

…CommonErrorGadget (privacy-scaling-explorations#1577)

### Description

refactor  rw counter delta for CommonErrorGadget

### Issue Link

privacy-scaling-explorations#1576 

### Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] This change requires a documentation update

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

@@ -85,7 +85,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorCodeStoreGadget<F> {
         let common_error_gadget = CommonErrorGadget::construct_with_return_data(
             cb,
             opcode.expr(),
-            5.expr(),
+            cb.rw_counter_offset(),
             memory_address.offset(),
             memory_address.length(),
         );

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

@@ -55,7 +55,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorInvalidCreationCodeGadget<F> {
         let common_error_gadget = CommonErrorGadget::construct_with_return_data(
             cb,
             opcode.expr(),
-            5.expr(),
+            cb.rw_counter_offset(),
             memory_address.offset(),
             memory_address.length(),
         );

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

@@ -90,7 +90,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorInvalidJumpGadget<F> {
         });
 
         let common_error_gadget =
-            CommonErrorGadget::construct(cb, opcode.expr(), 3.expr() + is_jumpi.expr());
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -39,7 +39,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorInvalidOpcodeGadget<F> {
             },
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 2.expr());
+        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 0.expr());
 
         Self {
             opcode,

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

@@ -71,7 +71,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGAccountAccessGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 5.expr());
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
         Self {
             opcode,
             address,

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

@@ -86,11 +86,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGCallGadget<F> {
 
         // Both CALL and CALLCODE opcodes have an extra stack pop `value` relative to
         // DELEGATECALL and STATICCALL.
-        let common_error_gadget = CommonErrorGadget::construct(
-            cb,
-            opcode.expr(),
-            13.expr() + is_call.expr() + is_callcode.expr(),
-        );
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -46,7 +46,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGConstantGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 2.expr());
+        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 0.expr());
 
         Self {
             opcode,

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

@@ -80,7 +80,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGExpGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 4.expr());
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
         Self {
             opcode,
             base,

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

@@ -83,7 +83,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGLogGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 5.expr());
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -128,13 +128,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGMemoryCopyGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(
-            cb,
-            opcode.expr(),
-            // EXTCODECOPY has extra 1 call context lookup (tx_id), 1 account access list
-            // read (is_warm), and 1 stack pop (external_address).
-            5.expr() + 3.expr() * is_extcodecopy.expr(),
-        );
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -71,7 +71,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGSha3Gadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 4.expr());
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -129,11 +129,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGSloadSstoreGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(
-            cb,
-            opcode.expr(),
-            7.expr() + 2.expr() * is_sstore.expr().0,
-        );
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -84,10 +84,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorOOGStaticMemoryGadget<F> {
             1.expr(),
         );
 
-        // TODO: `+2` bcs CommonErrorGadget looks up IsSuccess and RwCounterEndOfReversion,
-        // ,but `+2` should be moved inside CommonErrorGadget
         let common_error_gadget =
-            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset() + 2.expr());
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -102,7 +102,8 @@ impl<F: Field> ExecutionGadget<F> for ErrorReturnDataOutOfBoundGadget<F> {
             1.expr(),
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 6.expr());
+        let common_error_gadget =
+            CommonErrorGadget::construct(cb, opcode.expr(), cb.rw_counter_offset());
 
         Self {
             opcode,

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

@@ -40,7 +40,7 @@ impl<F: Field> ExecutionGadget<F> for ErrorStackGadget<F> {
             },
         );
 
-        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 2.expr());
+        let common_error_gadget = CommonErrorGadget::construct(cb, opcode.expr(), 0.expr());
 
         Self {
             opcode,

zkevm-circuits/src/evm_circuit/util/common_gadget.rs

@@ -973,6 +973,8 @@ impl<F: Field> CommonErrorGadget<F> {
             CallContextFieldTag::RwCounterEndOfReversion,
             rw_counter_end_of_reversion.to_word(),
         );
+        // Have two rw lookups, `IsSuccess` and `RwCounterEndOfReversion` so we add `2` here.
+        let updated_rw_counter_delta = rw_counter_delta + 2.expr();
 
         // Go to EndTx only when is_root
         let is_to_end_tx = cb.next.execution_state_selector([ExecutionState::EndTx]);
@@ -987,7 +989,9 @@ impl<F: Field> CommonErrorGadget<F> {
             // Do step state transition
             cb.require_step_state_transition(StepStateTransition {
                 call_id: Same,
-                rw_counter: Delta(rw_counter_delta + cb.curr.state.reversible_write_counter.expr()),
+                rw_counter: Delta(
+                    updated_rw_counter_delta + cb.curr.state.reversible_write_counter.expr(),
+                ),
                 ..StepStateTransition::any()
             });
         });