Add precompile contracts' addresses to the access list (#1640)

### Description

We upstream scroll's precompile handling in bus mapping so that the EVM
circuit warms the precompile addresses at the beginning of the
transaction.

### Issue Link

#1626

### Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

### Content

- Warm precompile addresses
- Fix some minor issues in StepRws offset and the Rws debugging
messages.

---------

Co-authored-by: adria0.eth <5526331+adria0@users.noreply.github.com>

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

@@ -6,7 +6,7 @@ use crate::{
     Error,
 };
 use eth_types::{
-    evm_types::{GasCost, MAX_REFUND_QUOTIENT_OF_GAS_USED},
+    evm_types::{GasCost, MAX_REFUND_QUOTIENT_OF_GAS_USED, PRECOMPILE_COUNT},
     evm_unimplemented, ToWord, Word,
 };
 use ethers_core::utils::get_contract_address;
@@ -60,6 +60,19 @@ fn gen_begin_tx_steps(state: &mut CircuitInputStateRef) -> Result<ExecStep, Erro
         false,
     )?;
 
+    // Add precompile contract address to access list
+    for address in 1..=PRECOMPILE_COUNT {
+        let address = eth_types::Address::from_low_u64_be(address);
+        let is_warm_prev = !state.sdb.add_account_to_access_list(address);
+        state.tx_accesslist_account_write(
+            &mut exec_step,
+            state.tx_ctx.id(),
+            address,
+            true,
+            is_warm_prev,
+        )?;
+    }
+
     // Add caller, callee and coinbase (for EIP-3651) to access list.
     for address in [call.caller_address, call.address, state.block.coinbase] {
         let is_warm_prev = !state.sdb.add_account_to_access_list(address);

eth-types/src/evm_types.rs

@@ -127,3 +127,6 @@ impl GasCost {
     /// it from 10 to 50.
     pub const EXP_BYTE_TIMES: u64 = 50;
 }
+
+/// This constant is used to iterate through precompile contract addresses 0x01 to 0x09
+pub const PRECOMPILE_COUNT: u64 = 9;

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

@@ -28,7 +28,10 @@ use crate::{
     },
 };
 use bus_mapping::state_db::CodeDB;
-use eth_types::{evm_types::GasCost, keccak256, Field, ToWord, U256};
+use eth_types::{
+    evm_types::{GasCost, PRECOMPILE_COUNT},
+    keccak256, Field, ToWord, U256,
+};
 use halo2_proofs::{
     circuit::Value,
     plonk::{Error, Expression},
@@ -170,6 +173,17 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
         let gas_left = tx_gas.expr() - intrinsic_gas_cost;
         let sufficient_gas_left = RangeCheckGadget::construct(cb, gas_left.clone());
 
+        // Add precompile contract address to access list
+        for addr in 1..=PRECOMPILE_COUNT {
+            cb.account_access_list_write_unchecked(
+                tx_id.expr(),
+                Word::new([addr.expr(), 0.expr()]),
+                1.expr(),
+                0.expr(),
+                None,
+            );
+        } // rwc_delta += PRECOMPILE_COUNT
+
         // Prepare access list of caller and callee
         cb.account_access_list_write_unchecked(
             tx_id.expr(),
@@ -320,6 +334,7 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                 //   - Write CallContext IsPersistent
                 //   - Write CallContext IsSuccess
                 //   - Write Account (Caller) Nonce
+                //   - Write TxAccessListAccount (Precompile) x PRECOMPILE_COUNT
                 //   - Write TxAccessListAccount (Caller)
                 //   - Write TxAccessListAccount (Callee)
                 //   - Write TxAccessListAccount (Coinbase) for EIP-3651
@@ -338,7 +353,9 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                 //   - Write CallContext IsRoot
                 //   - Write CallContext IsCreate
                 //   - Write CallContext CodeHash
-                rw_counter: Delta(23.expr() + transfer_with_gas_fee.rw_delta()),
+                rw_counter: Delta(
+                    23.expr() + transfer_with_gas_fee.rw_delta() + PRECOMPILE_COUNT.expr(),
+                ),
                 call_id: To(call_id.expr()),
                 is_root: To(true.expr()),
                 is_create: To(tx_is_create.expr()),
@@ -377,12 +394,15 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                     //   - Write CallContext IsPersistent
                     //   - Write CallContext IsSuccess
                     //   - Write Account Nonce
+                    //   - Write TxAccessListAccount (Precompile) x PRECOMPILE_COUNT
                     //   - Write TxAccessListAccount (Caller)
                     //   - Write TxAccessListAccount (Callee)
                     //   - Write TxAccessListAccount (Coinbase) for EIP-3651
                     //   - Read Account CodeHash
                     //   - a TransferWithGasFeeGadget
-                    rw_counter: Delta(9.expr() + transfer_with_gas_fee.rw_delta()),
+                    rw_counter: Delta(
+                        9.expr() + transfer_with_gas_fee.rw_delta() + PRECOMPILE_COUNT.expr(),
+                    ),
                     call_id: To(call_id.expr()),
                     ..StepStateTransition::any()
                 });
@@ -437,6 +457,7 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                     //   - Write CallContext IsPersistent
                     //   - Write CallContext IsSuccess
                     //   - Write Account Nonce
+                    //   - Write TxAccessListAccount (Precompile) x PRECOMPILE_COUNT
                     //   - Write TxAccessListAccount (Caller)
                     //   - Write TxAccessListAccount (Callee)
                     //   - Write TxAccessListAccount (Coinbase) for EIP-3651
@@ -455,7 +476,9 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
                     //   - Write CallContext IsRoot
                     //   - Write CallContext IsCreate
                     //   - Write CallContext CodeHash
-                    rw_counter: Delta(22.expr() + transfer_with_gas_fee.rw_delta()),
+                    rw_counter: Delta(
+                        22.expr() + transfer_with_gas_fee.rw_delta() + PRECOMPILE_COUNT.expr(),
+                    ),
                     call_id: To(call_id.expr()),
                     is_root: To(true.expr()),
                     is_create: To(tx_is_create.expr()),
@@ -511,6 +534,8 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
         let mut rws = StepRws::new(block, step);
         rws.offset_add(7);
 
+        rws.offset_add(PRECOMPILE_COUNT as usize);
+
         let is_coinbase_warm = rws.next().tx_access_list_value_pair().1;
         let mut callee_code_hash = zero;
         if !is_precompiled(&tx.to_or_contract_addr()) {

zkevm-circuits/src/evm_circuit/util.rs

@@ -473,9 +473,9 @@ impl<'a> StepRws<'a> {
             offset: 0,
         }
     }
-    /// Increment the step rw operation offset by `offset`.
-    pub(crate) fn offset_add(&mut self, offset: usize) {
-        self.offset = offset
+    /// Increment the step rw operation offset by `inc`.
+    pub(crate) fn offset_add(&mut self, inc: usize) {
+        self.offset += inc
     }
     /// Return the next rw operation from the step.
     pub(crate) fn next(&mut self) -> Rw {

zkevm-circuits/src/witness/block.rs

@@ -63,7 +63,7 @@ impl<F: Field> Block<F> {
                 println!("> Step {:?}", step.exec_state);
                 for rw_idx in 0..step.bus_mapping_instance.len() {
                     let rw = self.get_rws(step, rw_idx);
-                    let rw_str = if rw.is_write() { "READ" } else { "WRIT" };
+                    let rw_str = if rw.is_write() { "WRIT" } else { "READ" };
                     println!("  {} {} {:?}", rw.rw_counter(), rw_str, rw);
                 }
             }