updated broken indices

Author: maschad

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

@@ -11,7 +11,7 @@ use crate::{
                 MulWordByU64Gadget,
             },
             tx::EndTxHelperGadget,
-            CachedRegion, Cell,
+            CachedRegion, Cell, StepRws,
         },
         witness::{Block, Call, ExecStep, Transaction},
     },
@@ -152,9 +152,14 @@ impl<F: Field> ExecutionGadget<F> for EndTxGadget<F> {
         step: &ExecStep,
     ) -> Result<(), Error> {
         let gas_used = tx.gas() - step.gas_left;
-        let (refund, _) = block.get_rws(step, 2).tx_refund_value_pair();
-        let (caller_balance, caller_balance_prev) = block.get_rws(step, 3).account_balance_pair();
-        let (coinbase_code_hash_prev, _) = block.get_rws(step, 4).account_codehash_pair();
+
+        let mut rws = StepRws::new(block, step);
+
+        rws.offset_add(2);
+
+        let (refund, _) = rws.next().tx_refund_value_pair();
+        let (caller_balance, caller_balance_prev) = rws.next().account_balance_pair();
+        let (coinbase_code_hash_prev, _) = rws.next().account_codehash_pair();
 
         self.tx_id
             .assign(region, offset, Value::known(F::from(tx.id)))?;
@@ -209,16 +214,10 @@ impl<F: Field> ExecutionGadget<F> for EndTxGadget<F> {
         self.coinbase_code_hash_is_zero
             .assign_u256(region, offset, coinbase_code_hash_prev)?;
         if !coinbase_reward.is_zero() {
-            let coinbase_balance_pair = block
-                .get_rws(
-                    step,
-                    if coinbase_code_hash_prev.is_zero() {
-                        6
-                    } else {
-                        5
-                    },
-                )
-                .account_balance_pair();
+            if coinbase_code_hash_prev.is_zero() {
+                rws.offset_add(1)
+            }
+            let coinbase_balance_pair = rws.next().account_balance_pair();
             self.coinbase_reward.assign(
                 region,
                 offset,

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

@@ -204,7 +204,7 @@ impl<F: Field> ExecutionGadget<F> for ExtcodecopyGadget<F> {
             call.is_persistent,
         )?;
 
-        rws.offset_add(4);
+        rws.offset_add(3);
 
         let (_, is_warm) = rws.next().tx_access_list_value_pair();
         self.is_warm

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

@@ -8,7 +8,7 @@ use crate::{
             constraint_builder::{
                 EVMConstraintBuilder, ReversionInfo, StepStateTransition, Transition::Delta,
             },
-            select, AccountAddress, CachedRegion, Cell,
+            select, AccountAddress, CachedRegion, Cell, StepRws,
         },
         witness::{Block, Call, ExecStep, Transaction},
     },
@@ -106,7 +106,10 @@ impl<F: Field> ExecutionGadget<F> for ExtcodehashGadget<F> {
     ) -> Result<(), Error> {
         self.same_context.assign_exec_step(region, offset, step)?;
 
-        let address = block.get_rws(step, 0).stack_value();
+        let mut rws = StepRws::new(block, step);
+
+        let address = rws.next().stack_value();
+
         self.address_word.assign_u256(region, offset, address)?;
 
         self.tx_id
@@ -118,11 +121,13 @@ impl<F: Field> ExecutionGadget<F> for ExtcodehashGadget<F> {
             call.is_persistent,
         )?;
 
-        let (_, is_warm) = block.get_rws(step, 4).tx_access_list_value_pair();
+        rws.offset_add(3);
+
+        let (_, is_warm) = rws.next().tx_access_list_value_pair();
         self.is_warm
             .assign(region, offset, Value::known(F::from(is_warm as u64)))?;
 
-        let code_hash = block.get_rws(step, 5).account_codehash_pair().0;
+        let code_hash = rws.next().account_codehash_pair().0;
         self.code_hash.assign_u256(region, offset, code_hash)?;
 
         Ok(())

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

@@ -203,7 +203,9 @@ impl<F: Field> ExecutionGadget<F> for LogGadget<F> {
 
         let mut rws = StepRws::new(block, step);
 
-        let [memory_start, msize] = [0, 1].map(|_| rws.next().stack_value());
+        let memory_start = rws.next().stack_value();
+        let msize = rws.next().stack_value();
+
         let memory_address = self
             .memory_address
             .assign(region, offset, memory_start, msize)?;
@@ -223,8 +225,9 @@ impl<F: Field> ExecutionGadget<F> for LogGadget<F> {
             // It takes 6 + is_persistent reads or writes to reach the topic stack write section.
             // Each topic takes at least 1 stack read. They take an additional tx log write if the
             // call is persistent.
-            rws.offset_add(6 + is_persistent + topic * (1 + is_persistent));
-            rws.next().stack_value()
+            block
+                .get_rws(step, 6 + is_persistent + topic * (1 + is_persistent))
+                .stack_value()
         });
         for i in 0..4 {
             let topic = topics.next();