Circuit for opcode calldatacopy

eth-types/src/evm_types.rs

@@ -95,6 +95,8 @@ impl GasCost {
     pub const CREATE: Self = Self(32000);
     /// Constant cost for every additional word when expanding memory
     pub const MEMORY: Self = Self(3);
+    /// Constant cost for copying every word
+    pub const COPY: Self = Self(3);
     /// Constant cost for a cold SLOAD
     pub const COLD_SLOAD_COST: Self = Self(2100);
     /// Constant cost for a cold account access

zkevm-circuits/src/evm_circuit.rs

@@ -109,7 +109,7 @@ pub mod test {
         },
         util::Expr,
     };
-    use eth_types::Word;
+    use eth_types::{evm_types::GasCost, Word};
     use halo2::{
         arithmetic::{BaseExt, FieldExt},
         circuit::{Layouter, SimpleFloorPlanner},
@@ -132,7 +132,7 @@ pub mod test {
     }
 
     pub(crate) fn rand_bytes(n: usize) -> Vec<u8> {
-        vec![random(); n]
+        (0..n).map(|_| random()).collect()
     }
 
     pub(crate) fn rand_bytes_array<const N: usize>() -> [u8; N] {
@@ -441,4 +441,28 @@ pub mod test {
     ) -> Result<(), Vec<VerifyFailure>> {
         run_test_circuit(block, FixedTableTag::iterator().collect())
     }
+
+    pub(crate) fn calc_memory_expension_gas_cost(
+        curr_memory_word_size: u64,
+        next_memory_word_size: u64,
+    ) -> u64 {
+        if next_memory_word_size <= curr_memory_word_size {
+            0
+        } else {
+            let total_cost = |mem_word_size| {
+                mem_word_size * GasCost::MEMORY.as_u64() + mem_word_size * mem_word_size / 512
+            };
+            total_cost(next_memory_word_size) - total_cost(curr_memory_word_size)
+        }
+    }
+
+    pub(crate) fn calc_memory_copier_gas_cost(
+        curr_memory_word_size: u64,
+        next_memory_word_size: u64,
+        num_copy_bytes: u64,
+    ) -> u64 {
+        let num_words = (num_copy_bytes + 31) / 32;
+        num_words * GasCost::COPY.as_u64()
+            + calc_memory_expension_gas_cost(curr_memory_word_size, next_memory_word_size)
+    }
 }

zkevm-circuits/src/evm_circuit/execution.rs

@@ -20,6 +20,7 @@ mod add;
 mod begin_tx;
 mod bitwise;
 mod byte;
+mod calldatacopy;
 mod caller;
 mod callvalue;
 mod coinbase;
@@ -31,6 +32,7 @@ mod jump;
 mod jumpdest;
 mod jumpi;
 mod memory;
+mod memory_copy;
 mod msize;
 mod mul;
 mod pc;
@@ -46,6 +48,7 @@ use add::AddGadget;
 use begin_tx::BeginTxGadget;
 use bitwise::BitwiseGadget;
 use byte::ByteGadget;
+use calldatacopy::CallDataCopyGadget;
 use caller::CallerGadget;
 use callvalue::CallValueGadget;
 use coinbase::CoinbaseGadget;
@@ -57,6 +60,7 @@ use jump::JumpGadget;
 use jumpdest::JumpdestGadget;
 use jumpi::JumpiGadget;
 use memory::MemoryGadget;
+use memory_copy::CopyToMemoryGadget;
 use msize::MsizeGadget;
 use mul::MulGadget;
 use pc::PcGadget;
@@ -97,6 +101,7 @@ pub(crate) struct ExecutionConfig<F> {
     bitwise_gadget: BitwiseGadget<F>,
     begin_tx_gadget: BeginTxGadget<F>,
     byte_gadget: ByteGadget<F>,
+    calldatacopy_gadget: CallDataCopyGadget<F>,
     caller_gadget: CallerGadget<F>,
     call_value_gadget: CallValueGadget<F>,
     comparator_gadget: ComparatorGadget<F>,
@@ -107,6 +112,7 @@ pub(crate) struct ExecutionConfig<F> {
     jumpi_gadget: JumpiGadget<F>,
     gas_gadget: GasGadget<F>,
     memory_gadget: MemoryGadget<F>,
+    copy_to_memory_gadget: CopyToMemoryGadget<F>,
     pc_gadget: PcGadget<F>,
     pop_gadget: PopGadget<F>,
     push_gadget: PushGadget<F>,
@@ -227,6 +233,7 @@ impl<F: FieldExt> ExecutionConfig<F> {
             bitwise_gadget: configure_gadget!(),
             begin_tx_gadget: configure_gadget!(),
             byte_gadget: configure_gadget!(),
+            calldatacopy_gadget: configure_gadget!(),
             caller_gadget: configure_gadget!(),
             call_value_gadget: configure_gadget!(),
             comparator_gadget: configure_gadget!(),
@@ -237,6 +244,7 @@ impl<F: FieldExt> ExecutionConfig<F> {
             jumpi_gadget: configure_gadget!(),
             gas_gadget: configure_gadget!(),
             memory_gadget: configure_gadget!(),
+            copy_to_memory_gadget: configure_gadget!(),
             pc_gadget: configure_gadget!(),
             pop_gadget: configure_gadget!(),
             push_gadget: configure_gadget!(),
@@ -501,6 +509,12 @@ impl<F: FieldExt> ExecutionConfig<F> {
             ExecutionState::TIMESTAMP => {
                 assign_exec_step!(self.timestamp_gadget)
             }
+            ExecutionState::CALLDATACOPY => {
+                assign_exec_step!(self.calldatacopy_gadget)
+            }
+            ExecutionState::CopyToMemory => {
+                assign_exec_step!(self.copy_to_memory_gadget)
+            }
             ExecutionState::ErrorOutOfGasPureMemory => {
                 assign_exec_step!(self.error_oog_pure_memory_gadget)
             }

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

@@ -67,9 +67,9 @@ impl<F: FieldExt> ExecutionGadget<F> for BeginTxGadget<F> {
                 TxContextFieldTag::CallDataLength,
                 TxContextFieldTag::CallDataGasCost,
             ]
-            .map(|field_tag| cb.tx_context(tx_id.expr(), field_tag));
+            .map(|field_tag| cb.tx_context(tx_id.expr(), field_tag, None));
         let [tx_gas_price, tx_value] = [TxContextFieldTag::GasPrice, TxContextFieldTag::Value]
-            .map(|field_tag| cb.tx_context_as_word(tx_id.expr(), field_tag));
+            .map(|field_tag| cb.tx_context_as_word(tx_id.expr(), field_tag, None));
 
         // Add first step constraint to have both rw_counter and tx_id to be 1
         cb.add_constraint_first_step(
@@ -293,7 +293,7 @@ mod test {
             GasCost::TX.as_u64()
         } + call_data_gas_cost;
 
-        let from_balance_prev = Word::from(10).pow(20.into());
+        let from_balance_prev = Word::from(10_i32).pow(20_i32.into());
         let to_balance_prev = Word::zero();
         let from_balance = from_balance_prev - tx.value - gas_fee;
         let to_balance = to_balance_prev + tx.value;