Make gadgets to handle an execution state instead of an opcode per step

bus-mapping/src/eth_types.rs

@@ -93,6 +93,15 @@ impl ToBigEndian for U256 {
     }
 }
 
+impl ToLittleEndian for U256 {
+    /// Encode the value as byte array in little endian.
+    fn to_le_bytes(&self) -> [u8; 32] {
+        let mut bytes = [0u8; 32];
+        self.to_little_endian(&mut bytes);
+        bytes
+    }
+}
+
 impl<F: FieldExt> ToScalar<F> for U256 {
     fn to_scalar(&self) -> Option<F> {
         let mut bytes = [0u8; 32];

bus-mapping/src/evm.rs

@@ -121,6 +121,12 @@ impl GasCost {
     pub const SLOW: Self = Self(10);
     /// Constant cost for ext step
     pub const EXT: Self = Self(20);
+    /// Constant cost for SHA3
+    pub const SHA3: Self = Self(30);
+    /// Constant cost for SELFDESTRUCT
+    pub const SELFDESTRUCT: Self = Self(5000);
+    /// Constant cost for CREATE
+    pub const CREATE: Self = Self(32000);
     /// Constant cost for every additional word when expanding memory
     pub const MEMORY: Self = Self(3);
     /// Constant cost for a cold SLOAD

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

@@ -1,4 +1,4 @@
-use crate::error::Error;
+use crate::{error::Error, evm::GasCost};
 use core::fmt::Debug;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -486,6 +486,155 @@ impl OpcodeId {
     pub const fn as_u64(&self) -> u64 {
         self.as_u8() as u64
     }
+
+    /// Returns the constant gas cost of `OpcodeId`
+    pub const fn constant_gas_cost(&self) -> GasCost {
+        match self {
+            OpcodeId::STOP => GasCost::ZERO,
+            OpcodeId::ADD => GasCost::FASTEST,
+            OpcodeId::MUL => GasCost::FAST,
+            OpcodeId::SUB => GasCost::FASTEST,
+            OpcodeId::DIV => GasCost::FAST,
+            OpcodeId::SDIV => GasCost::FAST,
+            OpcodeId::MOD => GasCost::FAST,
+            OpcodeId::SMOD => GasCost::FAST,
+            OpcodeId::ADDMOD => GasCost::MID,
+            OpcodeId::MULMOD => GasCost::MID,
+            OpcodeId::EXP => GasCost::ZERO,
+            OpcodeId::SIGNEXTEND => GasCost::FAST,
+            OpcodeId::LT => GasCost::FASTEST,
+            OpcodeId::GT => GasCost::FASTEST,
+            OpcodeId::SLT => GasCost::FASTEST,
+            OpcodeId::SGT => GasCost::FASTEST,
+            OpcodeId::EQ => GasCost::FASTEST,
+            OpcodeId::ISZERO => GasCost::FASTEST,
+            OpcodeId::AND => GasCost::FASTEST,
+            OpcodeId::OR => GasCost::FASTEST,
+            OpcodeId::XOR => GasCost::FASTEST,
+            OpcodeId::NOT => GasCost::FASTEST,
+            OpcodeId::BYTE => GasCost::FASTEST,
+            OpcodeId::SHL => GasCost::FASTEST,
+            OpcodeId::SHR => GasCost::FASTEST,
+            OpcodeId::SAR => GasCost::FASTEST,
+            OpcodeId::SHA3 => GasCost::SHA3,
+            OpcodeId::ADDRESS => GasCost::QUICK,
+            OpcodeId::BALANCE => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::ORIGIN => GasCost::QUICK,
+            OpcodeId::CALLER => GasCost::QUICK,
+            OpcodeId::CALLVALUE => GasCost::QUICK,
+            OpcodeId::CALLDATALOAD => GasCost::FASTEST,
+            OpcodeId::CALLDATASIZE => GasCost::QUICK,
+            OpcodeId::CALLDATACOPY => GasCost::FASTEST,
+            OpcodeId::CODESIZE => GasCost::QUICK,
+            OpcodeId::CODECOPY => GasCost::FASTEST,
+            OpcodeId::GASPRICE => GasCost::QUICK,
+            OpcodeId::EXTCODESIZE => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::EXTCODECOPY => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::RETURNDATASIZE => GasCost::QUICK,
+            OpcodeId::RETURNDATACOPY => GasCost::FASTEST,
+            OpcodeId::EXTCODEHASH => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::BLOCKHASH => GasCost::EXT,
+            OpcodeId::COINBASE => GasCost::QUICK,
+            OpcodeId::TIMESTAMP => GasCost::QUICK,
+            OpcodeId::NUMBER => GasCost::QUICK,
+            OpcodeId::DIFFICULTY => GasCost::QUICK,
+            OpcodeId::GASLIMIT => GasCost::QUICK,
+            OpcodeId::CHAINID => GasCost::QUICK,
+            OpcodeId::SELFBALANCE => GasCost::FAST,
+            OpcodeId::BASEFEE => GasCost::QUICK,
+            OpcodeId::POP => GasCost::QUICK,
+            OpcodeId::MLOAD => GasCost::FASTEST,
+            OpcodeId::MSTORE => GasCost::FASTEST,
+            OpcodeId::MSTORE8 => GasCost::FASTEST,
+            OpcodeId::SLOAD => GasCost::ZERO,
+            OpcodeId::SSTORE => GasCost::ZERO,
+            OpcodeId::JUMP => GasCost::MID,
+            OpcodeId::JUMPI => GasCost::SLOW,
+            OpcodeId::PC => GasCost::QUICK,
+            OpcodeId::MSIZE => GasCost::QUICK,
+            OpcodeId::GAS => GasCost::QUICK,
+            OpcodeId::JUMPDEST => GasCost::ONE,
+            OpcodeId::PUSH1 => GasCost::FASTEST,
+            OpcodeId::PUSH2 => GasCost::FASTEST,
+            OpcodeId::PUSH3 => GasCost::FASTEST,
+            OpcodeId::PUSH4 => GasCost::FASTEST,
+            OpcodeId::PUSH5 => GasCost::FASTEST,
+            OpcodeId::PUSH6 => GasCost::FASTEST,
+            OpcodeId::PUSH7 => GasCost::FASTEST,
+            OpcodeId::PUSH8 => GasCost::FASTEST,
+            OpcodeId::PUSH9 => GasCost::FASTEST,
+            OpcodeId::PUSH10 => GasCost::FASTEST,
+            OpcodeId::PUSH11 => GasCost::FASTEST,
+            OpcodeId::PUSH12 => GasCost::FASTEST,
+            OpcodeId::PUSH13 => GasCost::FASTEST,
+            OpcodeId::PUSH14 => GasCost::FASTEST,
+            OpcodeId::PUSH15 => GasCost::FASTEST,
+            OpcodeId::PUSH16 => GasCost::FASTEST,
+            OpcodeId::PUSH17 => GasCost::FASTEST,
+            OpcodeId::PUSH18 => GasCost::FASTEST,
+            OpcodeId::PUSH19 => GasCost::FASTEST,
+            OpcodeId::PUSH20 => GasCost::FASTEST,
+            OpcodeId::PUSH21 => GasCost::FASTEST,
+            OpcodeId::PUSH22 => GasCost::FASTEST,
+            OpcodeId::PUSH23 => GasCost::FASTEST,
+            OpcodeId::PUSH24 => GasCost::FASTEST,
+            OpcodeId::PUSH25 => GasCost::FASTEST,
+            OpcodeId::PUSH26 => GasCost::FASTEST,
+            OpcodeId::PUSH27 => GasCost::FASTEST,
+            OpcodeId::PUSH28 => GasCost::FASTEST,
+            OpcodeId::PUSH29 => GasCost::FASTEST,
+            OpcodeId::PUSH30 => GasCost::FASTEST,
+            OpcodeId::PUSH31 => GasCost::FASTEST,
+            OpcodeId::PUSH32 => GasCost::FASTEST,
+            OpcodeId::DUP1 => GasCost::FASTEST,
+            OpcodeId::DUP2 => GasCost::FASTEST,
+            OpcodeId::DUP3 => GasCost::FASTEST,
+            OpcodeId::DUP4 => GasCost::FASTEST,
+            OpcodeId::DUP5 => GasCost::FASTEST,
+            OpcodeId::DUP6 => GasCost::FASTEST,
+            OpcodeId::DUP7 => GasCost::FASTEST,
+            OpcodeId::DUP8 => GasCost::FASTEST,
+            OpcodeId::DUP9 => GasCost::FASTEST,
+            OpcodeId::DUP10 => GasCost::FASTEST,
+            OpcodeId::DUP11 => GasCost::FASTEST,
+            OpcodeId::DUP12 => GasCost::FASTEST,
+            OpcodeId::DUP13 => GasCost::FASTEST,
+            OpcodeId::DUP14 => GasCost::FASTEST,
+            OpcodeId::DUP15 => GasCost::FASTEST,
+            OpcodeId::DUP16 => GasCost::FASTEST,
+            OpcodeId::SWAP1 => GasCost::FASTEST,
+            OpcodeId::SWAP2 => GasCost::FASTEST,
+            OpcodeId::SWAP3 => GasCost::FASTEST,
+            OpcodeId::SWAP4 => GasCost::FASTEST,
+            OpcodeId::SWAP5 => GasCost::FASTEST,
+            OpcodeId::SWAP6 => GasCost::FASTEST,
+            OpcodeId::SWAP7 => GasCost::FASTEST,
+            OpcodeId::SWAP8 => GasCost::FASTEST,
+            OpcodeId::SWAP9 => GasCost::FASTEST,
+            OpcodeId::SWAP10 => GasCost::FASTEST,
+            OpcodeId::SWAP11 => GasCost::FASTEST,
+            OpcodeId::SWAP12 => GasCost::FASTEST,
+            OpcodeId::SWAP13 => GasCost::FASTEST,
+            OpcodeId::SWAP14 => GasCost::FASTEST,
+            OpcodeId::SWAP15 => GasCost::FASTEST,
+            OpcodeId::SWAP16 => GasCost::FASTEST,
+            OpcodeId::LOG0 => GasCost::ZERO,
+            OpcodeId::LOG1 => GasCost::ZERO,
+            OpcodeId::LOG2 => GasCost::ZERO,
+            OpcodeId::LOG3 => GasCost::ZERO,
+            OpcodeId::LOG4 => GasCost::ZERO,
+            OpcodeId::CREATE => GasCost::CREATE,
+            OpcodeId::CALL => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::CALLCODE => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::RETURN => GasCost::ZERO,
+            OpcodeId::DELEGATECALL => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::CREATE2 => GasCost::CREATE,
+            OpcodeId::STATICCALL => GasCost::WARM_STORAGE_READ_COST,
+            OpcodeId::REVERT => GasCost::ZERO,
+            OpcodeId::INVALID(_) => GasCost::ZERO,
+            OpcodeId::SELFDESTRUCT => GasCost::SELFDESTRUCT,
+        }
+    }
 }
 
 impl FromStr for OpcodeId {

zkevm-circuits/Cargo.toml

@@ -23,7 +23,7 @@ rand = "0.8"
 
 [dev-dependencies]
 criterion = "0.3"
-num = "0.4"
+rand = "0.8"
 
 [[bench]]
 name = "binary_value"