Set empty keccak codehash when account comes into existence (#536)

* Set empty keccak codehash

* Handle non-scroll feature flag

* Fix rebase

* clippy

* lint

* Next rws for keccak code hash

---------

Co-authored-by: Mason Liang <[email protected]>
Co-authored-by: Zhuo Zhang <[email protected]>

Author: 3 people

bus-mapping/src/circuit_input_builder/input_state_ref.rs

@@ -5,6 +5,8 @@ use super::{
     CallKind, CodeSource, CopyEvent, ExecState, ExecStep, ExpEvent, Transaction,
     TransactionContext,
 };
+#[cfg(feature = "scroll")]
+use crate::util::KECCAK_CODE_HASH_ZERO;
 use crate::{
     error::{
         get_step_reported_error, ContractAddressCollisionError, DepthError, ExecError,
@@ -590,6 +592,16 @@ impl<'a> CircuitInputStateRef<'a> {
                     value_prev: Word::zero(),
                 },
             )?;
+            #[cfg(feature = "scroll")]
+            self.push_op_reversible(
+                step,
+                AccountOp {
+                    address: receiver,
+                    field: AccountField::KeccakCodeHash,
+                    value: KECCAK_CODE_HASH_ZERO.to_word(),
+                    value_prev: Word::zero(),
+                },
+            )?;
         }
         if value.is_zero() {
             // Skip transfer if value == 0

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

@@ -642,6 +642,8 @@ impl<F: Field> ExecutionGadget<F> for BeginTxGadget<F> {
         let must_create = tx.is_create;
         if (!callee_exists && !tx.value.is_zero()) || must_create {
             callee_code_hash = rws.next().account_codehash_pair().1;
+            #[cfg(feature = "scroll")]
+            let _callee_keccak_code_hash = rws.next();
         }
         let mut caller_balance_sub_value_pair = (zero, zero);
         let mut callee_balance_pair = (zero, zero);

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

@@ -619,6 +619,11 @@ impl<F: Field, const IS_CREATE2: bool, const S: ExecutionState> ExecutionGadget<
             .assign_value(region, offset, code_hash_previous_rlc)?;
         let is_address_collision = !code_hash_previous.0.is_zero();
 
+        #[cfg(feature = "scroll")]
+        {
+            rw_offset += 1; // Write empty Keccak code hash.
+        }
+
         if is_precheck_ok == 1 && !is_address_collision {
             let [caller_balance_pair, callee_balance_pair] = if !value.is_zero() {
                 let account_balance_pair = [16, 17]

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

@@ -412,6 +412,14 @@ impl<F: Field> TransferWithGasFeeGadget<F> {
                     0.expr(),
                     Some(reversion_info),
                 );
+                #[cfg(feature = "scroll")]
+                cb.account_write(
+                    receiver_address.clone(),
+                    AccountFieldTag::KeccakCodeHash,
+                    cb.empty_keccak_hash_rlc(),
+                    0.expr(),
+                    Some(reversion_info),
+                );
             },
         );
         // Skip transfer if value == 0
@@ -445,10 +453,11 @@ impl<F: Field> TransferWithGasFeeGadget<F> {
         // +1 Write Account (sender) Balance (Not Reversible tx fee)
         1.expr() +
         // +1 Write Account (receiver) CodeHash (account creation via code_hash update)
+        // feature = "scroll": +1 Write Account (receiver) KeccakCodeHash
         or::expr([
             not::expr(self.value_is_zero.expr()) * not::expr(self.receiver_exists.clone()),
             self.must_create.clone()]
-        ) * 1.expr() +
+        ) * if cfg!(feature = "scroll") {2.expr()} else {1.expr()} +
         // +1 Write Account (sender) Balance
         // +1 Write Account (receiver) Balance
         not::expr(self.value_is_zero.expr()) * 2.expr()
@@ -457,10 +466,11 @@ impl<F: Field> TransferWithGasFeeGadget<F> {
     pub(crate) fn reversible_w_delta(&self) -> Expression<F> {
         // NOTE: Write Account (sender) Balance (Not Reversible tx fee)
         // +1 Write Account (receiver) CodeHash (account creation via code_hash update)
+        // feature = "scroll": +1 Write Account (receiver) KeccakCodeHash
         or::expr([
             not::expr(self.value_is_zero.expr()) * not::expr(self.receiver_exists.clone()),
             self.must_create.clone()]
-        ) * 1.expr() +
+        ) * if cfg!(feature = "scroll") {2.expr()} else {1.expr()} +
         // +1 Write Account (sender) Balance
         // +1 Write Account (receiver) Balance
         not::expr(self.value_is_zero.expr()) * 2.expr()
@@ -542,8 +552,14 @@ impl<F: Field> TransferGadget<F> {
                     0.expr(),
                     Some(reversion_info),
                 );
-                // TODO: also write empty keccak code hash? codesize seems not need yet. write a
-                // test to verify this.
+                #[cfg(feature = "scroll")]
+                cb.account_write(
+                    receiver_address.clone(),
+                    AccountFieldTag::KeccakCodeHash,
+                    cb.empty_keccak_hash_rlc(),
+                    0.expr(),
+                    Some(reversion_info),
+                );
             },
         );
         // Skip transfer if value == 0
@@ -582,21 +598,23 @@ impl<F: Field> TransferGadget<F> {
 
     pub(crate) fn rw_delta(&self) -> Expression<F> {
         // +1 Write Account (receiver) CodeHash (account creation via code_hash update)
+        // feature = "scroll": +1 Write Account (receiver) KeccakCodeHash
         or::expr([
             not::expr(self.value_is_zero.expr()) * not::expr(self.receiver_exists.clone()),
             self.must_create.clone()]
-        ) * 1.expr() +
+        ) * if cfg!(feature = "scroll") {2.expr()} else {1.expr()} +
         // +1 Write Account (sender) Balance
         // +1 Write Account (receiver) Balance
         not::expr(self.value_is_zero.expr()) * 2.expr()
     }
 
     pub(crate) fn reversible_w_delta(&self) -> Expression<F> {
         // +1 Write Account (receiver) CodeHash (account creation via code_hash update)
+        // if feature = "scroll": +1 Write Account (receiver) KeccakCodeHash
         or::expr([
             not::expr(self.value_is_zero.expr()) * not::expr(self.receiver_exists.clone()),
-            self.must_create.clone()]
-        ) * 1.expr() +
+            self.must_create.clone(),
+        ]) * if cfg!(feature = "scroll") {2.expr()} else {1.expr()} +
         // +1 Write Account (sender) Balance
         // +1 Write Account (receiver) Balance
         not::expr(self.value_is_zero.expr()) * 2.expr()