comment tload - EndBlock.get_step_height is ok now

Author: zemse

zkevm-circuits/src/evm_circuit/execution.rs

@@ -322,7 +322,7 @@ pub struct ExecutionConfig<F> {
     signextend_gadget: Box<SignextendGadget<F>>,
     sload_gadget: Box<SloadGadget<F>>,
     sstore_gadget: Box<SstoreGadget<F>>,
-    tload_gadget: Box<TloadGadget<F>>,
+    // tload_gadget: Box<TloadGadget<F>>,
     tstore_gadget: Box<TstoreGadget<F>>,
     stop_gadget: Box<StopGadget<F>>,
     swap_gadget: Box<SwapGadget<F>>,
@@ -653,7 +653,7 @@ impl<F: Field> ExecutionConfig<F> {
             signextend_gadget: configure_gadget!(),
             sload_gadget: configure_gadget!(),
             sstore_gadget: configure_gadget!(),
-            tload_gadget: configure_gadget!(),
+            // tload_gadget: configure_gadget!(),
             tstore_gadget: configure_gadget!(),
             stop_gadget: configure_gadget!(),
             swap_gadget: configure_gadget!(),
@@ -1583,7 +1583,7 @@ impl<F: Field> ExecutionConfig<F> {
             ExecutionState::SIGNEXTEND => assign_exec_step!(self.signextend_gadget),
             ExecutionState::SLOAD => assign_exec_step!(self.sload_gadget),
             ExecutionState::SSTORE => assign_exec_step!(self.sstore_gadget),
-            ExecutionState::TLOAD => assign_exec_step!(self.tload_gadget),
+            // ExecutionState::TLOAD => assign_exec_step!(self.tload_gadget),
             ExecutionState::TSTORE => assign_exec_step!(self.tstore_gadget),
             ExecutionState::STOP => assign_exec_step!(self.stop_gadget),
             ExecutionState::SWAP => assign_exec_step!(self.swap_gadget),

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

@@ -34,7 +34,7 @@ pub(crate) struct TloadGadget<F> {
 impl<F: Field> ExecutionGadget<F> for TloadGadget<F> {
     const NAME: &'static str = "TLOAD";
 
-    const EXECUTION_STATE: ExecutionState = ExecutionState::TLOAD;
+    const EXECUTION_STATE: ExecutionState = ExecutionState::ADDMOD; // TODO ExecutionState::TLOAD;
 
     fn configure(cb: &mut EVMConstraintBuilder<F>) -> Self {
         let opcode = cb.query_cell();

zkevm-circuits/src/evm_circuit/step.rs

@@ -119,7 +119,7 @@ pub enum ExecutionState {
     MSIZE,
     GAS,
     JUMPDEST,
-    TLOAD,
+    // TLOAD,
     TSTORE,
     /// PUSH0, PUSH1, PUSH2, ..., PUSH32
     PUSH,
@@ -311,7 +311,7 @@ impl From<&ExecStep> for ExecutionState {
                     OpcodeId::SHL | OpcodeId::SHR => ExecutionState::SHL_SHR,
                     OpcodeId::SLOAD => ExecutionState::SLOAD,
                     OpcodeId::SSTORE => ExecutionState::SSTORE,
-                    OpcodeId::TLOAD => ExecutionState::TLOAD,
+                    // OpcodeId::TLOAD => ExecutionState::TLOAD,
                     OpcodeId::TSTORE => ExecutionState::TSTORE,
                     OpcodeId::CALLDATASIZE => ExecutionState::CALLDATASIZE,
                     OpcodeId::CALLDATACOPY => ExecutionState::CALLDATACOPY,
@@ -510,7 +510,7 @@ impl ExecutionState {
             Self::MSIZE => vec![OpcodeId::MSIZE],
             Self::GAS => vec![OpcodeId::GAS],
             Self::JUMPDEST => vec![OpcodeId::JUMPDEST],
-            Self::TLOAD => vec![OpcodeId::TLOAD],
+            // Self::TLOAD => vec![OpcodeId::TLOAD],
             Self::TSTORE => vec![OpcodeId::TSTORE],
             Self::PUSH => vec![
                 OpcodeId::PUSH0,