grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'evm' into evm_stack_fix

Browse Source 
Conflicts:
	src/evm/instructions.rs
	src/evm/interpreter.rs
This commit is contained in:
Tomusdrw 2016-01-16 17:27:54 +01:00
commit e9dab4d567
11 changed files with 474 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -20,5 +20,4 @@ time = "0.1"
evmjit = { path = "rust-evmjit", optional = true } evmjit = { path = "rust-evmjit", optional = true }
[features] [features]
default = ["jit"]
jit = ["evmjit"] jit = ["evmjit"]

5
src/evm/ext.rs
View File

@ -1,5 +1,6 @@
//! Interface for Evm externalities. //! Interface for Evm externalities.
use common::Bytes;
use util::hash::*; use util::hash::*;
use util::uint::*; use util::uint::*;
use evm::{Schedule, Error}; use evm::{Schedule, Error};
@ -38,10 +39,10 @@ pub trait Ext {
output: &mut [u8]) -> Result<(U256, bool), Error>; output: &mut [u8]) -> Result<(U256, bool), Error>;
/// Returns code at given address /// Returns code at given address
fn extcode(&self, address: &Address) -> Vec<u8>; fn extcode(&self, address: &Address) -> Bytes;
/// Creates log entry with given topics and data /// Creates log entry with given topics and data
fn log(&mut self, topics: Vec<H256>, data: Vec<u8>); fn log(&mut self, topics: Vec<H256>, data: &[u8]);
/// Should be called when transaction calls `RETURN` opcode. /// Should be called when transaction calls `RETURN` opcode.
/// Returns gas_left if cost of returning the data is not too high. /// Returns gas_left if cost of returning the data is not too high.

9
src/evm/factory.rs
View File

@ -7,6 +7,7 @@ pub enum VMType {
Jit, Jit,
Interpreter Interpreter
} }
impl fmt::Display for VMType { impl fmt::Display for VMType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", match *self { write!(f, "{}", match *self {
@ -17,10 +18,13 @@ impl fmt::Display for VMType {
} }
impl VMType { impl VMType {
/// Return all possible VMs (JIT, Interpreter)
#[cfg(feature="jit")] #[cfg(feature="jit")]
pub fn all() -> Vec<VMType> { pub fn all() -> Vec<VMType> {
vec![VMType::Jit, VMType::Interpreter] vec![VMType::Jit, VMType::Interpreter]
} }
/// Return all possible VMs (Interpreter)
#[cfg(not(feature="jit"))] #[cfg(not(feature="jit"))]
pub fn all() -> Vec<VMType> { pub fn all() -> Vec<VMType> {
vec![VMType::Interpreter] vec![VMType::Interpreter]
@ -33,7 +37,7 @@ pub struct Factory {
} }
impl Factory { impl Factory {
/// Create fresh instance of VM
pub fn create(&self) -> Box<Evm> { pub fn create(&self) -> Box<Evm> {
match self.evm { match self.evm {
VMType::Jit => { VMType::Jit => {
@ -45,6 +49,7 @@ impl Factory {
} }
} }
/// Create new instance of specific `VMType` factory
pub fn new(evm: VMType) -> Factory { pub fn new(evm: VMType) -> Factory {
Factory { Factory {
evm: evm evm: evm
@ -83,6 +88,7 @@ fn test_create_vm() {
let _vm = Factory::default().create(); let _vm = Factory::default().create();
} }
/// Create tests by injecting different VM factories
#[macro_export] #[macro_export]
macro_rules! evm_test( macro_rules! evm_test(
($name_test: ident: $name_jit: ident, $name_int: ident) => { ($name_test: ident: $name_jit: ident, $name_int: ident) => {
@ -98,6 +104,7 @@ macro_rules! evm_test(
} }
); );
/// Create ignored tests by injecting different VM factories
#[macro_export] #[macro_export]
macro_rules! evm_test_ignore( macro_rules! evm_test_ignore(
($name_test: ident: $name_jit: ident, $name_int: ident) => { ($name_test: ident: $name_jit: ident, $name_int: ident) => {

717
src/evm/instructions.rs
View File

@ -2,12 +2,15 @@
pub type Instruction = u8; pub type Instruction = u8;
pub fn is_push (i : Instruction) -> bool { /// Returns true if given instruction is `PUSHN` instruction.
pub fn is_push(i: Instruction) -> bool {
i >= PUSH1 && i <= PUSH32 i >= PUSH1 && i <= PUSH32
} }
pub fn get_push_bytes (i : Instruction) -> usize { /// Returns number of bytes to read for `PUSHN` instruction
// TODO [todr] range checking? /// PUSH1 -> 1
pub fn get_push_bytes(i: Instruction) -> usize {
assert!(is_push(i), "Only for PUSH instructions.");
(i - PUSH1 + 1) as usize (i - PUSH1 + 1) as usize
} }
@ -18,8 +21,10 @@ fn test_get_push_bytes() {
assert_eq!(get_push_bytes(PUSH32), 32); assert_eq!(get_push_bytes(PUSH32), 32);
} }
pub fn get_dup_position (i: Instruction) -> usize { /// Returns stack position of item to duplicate
// TODO [todr] range checking? /// DUP1 -> 0
pub fn get_dup_position(i: Instruction) -> usize {
assert!(i >= DUP1 && i <= DUP16);
(i - DUP1) as usize (i - DUP1) as usize
} }
@ -30,8 +35,10 @@ fn test_get_dup_position() {
assert_eq!(get_dup_position(DUP10), 9); assert_eq!(get_dup_position(DUP10), 9);
} }
pub fn get_swap_position (i : Instruction) -> usize { /// Returns stack position of item to SWAP top with
// TODO [todr] range checking? /// SWAP1 -> 1
pub fn get_swap_position(i: Instruction) -> usize {
assert!(i >= SWAP1 && i <= SWAP16);
(i - SWAP1 + 1) as usize (i - SWAP1 + 1) as usize
} }
@ -42,7 +49,10 @@ fn test_get_swap_position() {
assert_eq!(get_swap_position(SWAP10), 10); assert_eq!(get_swap_position(SWAP10), 10);
} }
/// Returns number of topcis to take from stack
/// LOG0 -> 0
pub fn get_log_topics (i: Instruction) -> usize { pub fn get_log_topics (i: Instruction) -> usize {
assert!(i >= LOG0 && i <= LOG4);
(i - LOG0) as usize (i - LOG0) as usize
} }
@ -56,36 +66,37 @@ fn test_get_log_topics() {
#[derive(PartialEq)] #[derive(PartialEq)]
pub enum GasPriceTier { pub enum GasPriceTier {
/// 0 Zero /// 0 Zero
ZeroTier, Zero,
/// 2 Quick /// 2 Quick
BaseTier, Base,
/// 3 Fastest /// 3 Fastest
VeryLowTier, VeryLow,
/// 5 Fast /// 5 Fast
LowTier, Low,
/// 8 Mid /// 8 Mid
MidTier, Mid,
/// 10 Slow /// 10 Slow
HighTier, High,
/// 20 Ext /// 20 Ext
ExtTier, Ext,
/// Multiparam or otherwise special /// Multiparam or otherwise special
SpecialTier, Special,
/// Invalid /// Invalid
InvalidTier Invalid
} }
/// Returns the index in schedule for specific `GasPriceTier`
pub fn get_tier_idx (tier: GasPriceTier) -> usize { pub fn get_tier_idx (tier: GasPriceTier) -> usize {
match tier { match tier {
GasPriceTier::ZeroTier => 0, GasPriceTier::Zero => 0,
GasPriceTier::BaseTier => 1, GasPriceTier::Base => 1,
GasPriceTier::VeryLowTier => 2, GasPriceTier::VeryLow => 2,
GasPriceTier::LowTier => 3, GasPriceTier::Low => 3,
GasPriceTier::MidTier => 4, GasPriceTier::Mid => 4,
GasPriceTier::HighTier => 5, GasPriceTier::High => 5,
GasPriceTier::ExtTier => 6, GasPriceTier::Ext => 6,
GasPriceTier::SpecialTier => 7, GasPriceTier::Special => 7,
GasPriceTier::InvalidTier => 8 GasPriceTier::Invalid => 8
} }
} }
@ -110,282 +121,414 @@ impl InstructionInfo {
} }
} }
/// Return details about specific instruction
pub fn get_info (instruction: Instruction) -> InstructionInfo { pub fn get_info (instruction: Instruction) -> InstructionInfo {
match instruction { match instruction {
STOP => InstructionInfo::new("STOP", 0, 0, 0, true, GasPriceTier::ZeroTier), STOP => InstructionInfo::new("STOP", 0, 0, 0, true, GasPriceTier::Zero),
ADD => InstructionInfo::new("ADD", 0, 2, 1, false, GasPriceTier::VeryLowTier), ADD => InstructionInfo::new("ADD", 0, 2, 1, false, GasPriceTier::VeryLow),
SUB => InstructionInfo::new("SUB", 0, 2, 1, false, GasPriceTier::VeryLowTier), SUB => InstructionInfo::new("SUB", 0, 2, 1, false, GasPriceTier::VeryLow),
MUL => InstructionInfo::new("MUL", 0, 2, 1, false, GasPriceTier::LowTier), MUL => InstructionInfo::new("MUL", 0, 2, 1, false, GasPriceTier::Low),
DIV => InstructionInfo::new("DIV", 0, 2, 1, false, GasPriceTier::LowTier), DIV => InstructionInfo::new("DIV", 0, 2, 1, false, GasPriceTier::Low),
SDIV => InstructionInfo::new("SDIV", 0, 2, 1, false, GasPriceTier::LowTier), SDIV => InstructionInfo::new("SDIV", 0, 2, 1, false, GasPriceTier::Low),
MOD => InstructionInfo::new("MOD", 0, 2, 1, false, GasPriceTier::LowTier), MOD => InstructionInfo::new("MOD", 0, 2, 1, false, GasPriceTier::Low),
SMOD => InstructionInfo::new("SMOD", 0, 2, 1, false, GasPriceTier::LowTier), SMOD => InstructionInfo::new("SMOD", 0, 2, 1, false, GasPriceTier::Low),
EXP => InstructionInfo::new("EXP", 0, 2, 1, false, GasPriceTier::SpecialTier), EXP => InstructionInfo::new("EXP", 0, 2, 1, false, GasPriceTier::Special),
NOT => InstructionInfo::new("NOT", 0, 1, 1, false, GasPriceTier::VeryLowTier), NOT => InstructionInfo::new("NOT", 0, 1, 1, false, GasPriceTier::VeryLow),
LT => InstructionInfo::new("LT", 0, 2, 1, false, GasPriceTier::VeryLowTier), LT => InstructionInfo::new("LT", 0, 2, 1, false, GasPriceTier::VeryLow),
GT => InstructionInfo::new("GT", 0, 2, 1, false, GasPriceTier::VeryLowTier), GT => InstructionInfo::new("GT", 0, 2, 1, false, GasPriceTier::VeryLow),
SLT => InstructionInfo::new("SLT", 0, 2, 1, false, GasPriceTier::VeryLowTier), SLT => InstructionInfo::new("SLT", 0, 2, 1, false, GasPriceTier::VeryLow),
SGT => InstructionInfo::new("SGT", 0, 2, 1, false, GasPriceTier::VeryLowTier), SGT => InstructionInfo::new("SGT", 0, 2, 1, false, GasPriceTier::VeryLow),
EQ => InstructionInfo::new("EQ", 0, 2, 1, false, GasPriceTier::VeryLowTier), EQ => InstructionInfo::new("EQ", 0, 2, 1, false, GasPriceTier::VeryLow),
ISZERO => InstructionInfo::new("ISZERO", 0, 1, 1, false, GasPriceTier::VeryLowTier), ISZERO => InstructionInfo::new("ISZERO", 0, 1, 1, false, GasPriceTier::VeryLow),
AND => InstructionInfo::new("AND", 0, 2, 1, false, GasPriceTier::VeryLowTier), AND => InstructionInfo::new("AND", 0, 2, 1, false, GasPriceTier::VeryLow),
OR => InstructionInfo::new("OR", 0, 2, 1, false, GasPriceTier::VeryLowTier), OR => InstructionInfo::new("OR", 0, 2, 1, false, GasPriceTier::VeryLow),
XOR => InstructionInfo::new("XOR", 0, 2, 1, false, GasPriceTier::VeryLowTier), XOR => InstructionInfo::new("XOR", 0, 2, 1, false, GasPriceTier::VeryLow),
BYTE => InstructionInfo::new("BYTE", 0, 2, 1, false, GasPriceTier::VeryLowTier), BYTE => InstructionInfo::new("BYTE", 0, 2, 1, false, GasPriceTier::VeryLow),
ADDMOD => InstructionInfo::new("ADDMOD", 0, 3, 1, false, GasPriceTier::MidTier), ADDMOD => InstructionInfo::new("ADDMOD", 0, 3, 1, false, GasPriceTier::Mid),
MULMOD => InstructionInfo::new("MULMOD", 0, 3, 1, false, GasPriceTier::MidTier), MULMOD => InstructionInfo::new("MULMOD", 0, 3, 1, false, GasPriceTier::Mid),
SIGNEXTEND => InstructionInfo::new("SIGNEXTEND", 0, 2, 1, false, GasPriceTier::LowTier), SIGNEXTEND => InstructionInfo::new("SIGNEXTEND", 0, 2, 1, false, GasPriceTier::Low),
SHA3 => InstructionInfo::new("SHA3", 0, 2, 1, false, GasPriceTier::SpecialTier), SHA3 => InstructionInfo::new("SHA3", 0, 2, 1, false, GasPriceTier::Special),
ADDRESS => InstructionInfo::new("ADDRESS", 0, 0, 1, false, GasPriceTier::BaseTier), ADDRESS => InstructionInfo::new("ADDRESS", 0, 0, 1, false, GasPriceTier::Base),
BALANCE => InstructionInfo::new("BALANCE", 0, 1, 1, false, GasPriceTier::ExtTier), BALANCE => InstructionInfo::new("BALANCE", 0, 1, 1, false, GasPriceTier::Ext),
ORIGIN => InstructionInfo::new("ORIGIN", 0, 0, 1, false, GasPriceTier::BaseTier), ORIGIN => InstructionInfo::new("ORIGIN", 0, 0, 1, false, GasPriceTier::Base),
CALLER => InstructionInfo::new("CALLER", 0, 0, 1, false, GasPriceTier::BaseTier), CALLER => InstructionInfo::new("CALLER", 0, 0, 1, false, GasPriceTier::Base),
CALLVALUE => InstructionInfo::new("CALLVALUE", 0, 0, 1, false, GasPriceTier::BaseTier), CALLVALUE => InstructionInfo::new("CALLVALUE", 0, 0, 1, false, GasPriceTier::Base),
CALLDATALOAD => InstructionInfo::new("CALLDATALOAD", 0, 1, 1, false, GasPriceTier::VeryLowTier), CALLDATALOAD => InstructionInfo::new("CALLDATALOAD", 0, 1, 1, false, GasPriceTier::VeryLow),
CALLDATASIZE => InstructionInfo::new("CALLDATASIZE", 0, 0, 1, false, GasPriceTier::BaseTier), CALLDATASIZE => InstructionInfo::new("CALLDATASIZE", 0, 0, 1, false, GasPriceTier::Base),
CALLDATACOPY => InstructionInfo::new("CALLDATACOPY", 0, 3, 0, true, GasPriceTier::VeryLowTier), CALLDATACOPY => InstructionInfo::new("CALLDATACOPY", 0, 3, 0, true, GasPriceTier::VeryLow),
CODESIZE => InstructionInfo::new("CODESIZE", 0, 0, 1, false, GasPriceTier::BaseTier), CODESIZE => InstructionInfo::new("CODESIZE", 0, 0, 1, false, GasPriceTier::Base),
CODECOPY => InstructionInfo::new("CODECOPY", 0, 3, 0, true, GasPriceTier::VeryLowTier), CODECOPY => InstructionInfo::new("CODECOPY", 0, 3, 0, true, GasPriceTier::VeryLow),
GASPRICE => InstructionInfo::new("GASPRICE", 0, 0, 1, false, GasPriceTier::BaseTier), GASPRICE => InstructionInfo::new("GASPRICE", 0, 0, 1, false, GasPriceTier::Base),
EXTCODESIZE => InstructionInfo::new("EXTCODESIZE", 0, 1, 1, false, GasPriceTier::ExtTier), EXTCODESIZE => InstructionInfo::new("EXTCODESIZE", 0, 1, 1, false, GasPriceTier::Ext),
EXTCODECOPY => InstructionInfo::new("EXTCODECOPY", 0, 4, 0, true, GasPriceTier::ExtTier), EXTCODECOPY => InstructionInfo::new("EXTCODECOPY", 0, 4, 0, true, GasPriceTier::Ext),
BLOCKHASH => InstructionInfo::new("BLOCKHASH", 0, 1, 1, false, GasPriceTier::ExtTier), BLOCKHASH => InstructionInfo::new("BLOCKHASH", 0, 1, 1, false, GasPriceTier::Ext),
COINBASE => InstructionInfo::new("COINBASE", 0, 0, 1, false, GasPriceTier::BaseTier), COINBASE => InstructionInfo::new("COINBASE", 0, 0, 1, false, GasPriceTier::Base),
TIMESTAMP => InstructionInfo::new("TIMESTAMP", 0, 0, 1, false, GasPriceTier::BaseTier), TIMESTAMP => InstructionInfo::new("TIMESTAMP", 0, 0, 1, false, GasPriceTier::Base),
NUMBER => InstructionInfo::new("NUMBER", 0, 0, 1, false, GasPriceTier::BaseTier), NUMBER => InstructionInfo::new("NUMBER", 0, 0, 1, false, GasPriceTier::Base),
DIFFICULTY => InstructionInfo::new("DIFFICULTY", 0, 0, 1, false, GasPriceTier::BaseTier), DIFFICULTY => InstructionInfo::new("DIFFICULTY", 0, 0, 1, false, GasPriceTier::Base),
GASLIMIT => InstructionInfo::new("GASLIMIT", 0, 0, 1, false, GasPriceTier::BaseTier), GASLIMIT => InstructionInfo::new("GASLIMIT", 0, 0, 1, false, GasPriceTier::Base),
POP => InstructionInfo::new("POP", 0, 1, 0, false, GasPriceTier::BaseTier), POP => InstructionInfo::new("POP", 0, 1, 0, false, GasPriceTier::Base),
MLOAD => InstructionInfo::new("MLOAD", 0, 1, 1, false, GasPriceTier::VeryLowTier), MLOAD => InstructionInfo::new("MLOAD", 0, 1, 1, false, GasPriceTier::VeryLow),
MSTORE => InstructionInfo::new("MSTORE", 0, 2, 0, true, GasPriceTier::VeryLowTier), MSTORE => InstructionInfo::new("MSTORE", 0, 2, 0, true, GasPriceTier::VeryLow),
MSTORE8 => InstructionInfo::new("MSTORE8", 0, 2, 0, true, GasPriceTier::VeryLowTier), MSTORE8 => InstructionInfo::new("MSTORE8", 0, 2, 0, true, GasPriceTier::VeryLow),
SLOAD => InstructionInfo::new("SLOAD", 0, 1, 1, false, GasPriceTier::SpecialTier), SLOAD => InstructionInfo::new("SLOAD", 0, 1, 1, false, GasPriceTier::Special),
SSTORE => InstructionInfo::new("SSTORE", 0, 2, 0, true, GasPriceTier::SpecialTier), SSTORE => InstructionInfo::new("SSTORE", 0, 2, 0, true, GasPriceTier::Special),
JUMP => InstructionInfo::new("JUMP", 0, 1, 0, true, GasPriceTier::MidTier), JUMP => InstructionInfo::new("JUMP", 0, 1, 0, true, GasPriceTier::Mid),
JUMPI => InstructionInfo::new("JUMPI", 0, 2, 0, true, GasPriceTier::HighTier), JUMPI => InstructionInfo::new("JUMPI", 0, 2, 0, true, GasPriceTier::High),
PC => InstructionInfo::new("PC", 0, 0, 1, false, GasPriceTier::BaseTier), PC => InstructionInfo::new("PC", 0, 0, 1, false, GasPriceTier::Base),
MSIZE => InstructionInfo::new("MSIZE", 0, 0, 1, false, GasPriceTier::BaseTier), MSIZE => InstructionInfo::new("MSIZE", 0, 0, 1, false, GasPriceTier::Base),
GAS => InstructionInfo::new("GAS", 0, 0, 1, false, GasPriceTier::BaseTier), GAS => InstructionInfo::new("GAS", 0, 0, 1, false, GasPriceTier::Base),
JUMPDEST => InstructionInfo::new("JUMPDEST", 0, 0, 0, true, GasPriceTier::SpecialTier), JUMPDEST => InstructionInfo::new("JUMPDEST", 0, 0, 0, true, GasPriceTier::Special),
PUSH1 => InstructionInfo::new("PUSH1", 1, 0, 1, false, GasPriceTier::VeryLowTier), PUSH1 => InstructionInfo::new("PUSH1", 1, 0, 1, false, GasPriceTier::VeryLow),
PUSH2 => InstructionInfo::new("PUSH2", 2, 0, 1, false, GasPriceTier::VeryLowTier), PUSH2 => InstructionInfo::new("PUSH2", 2, 0, 1, false, GasPriceTier::VeryLow),
PUSH3 => InstructionInfo::new("PUSH3", 3, 0, 1, false, GasPriceTier::VeryLowTier), PUSH3 => InstructionInfo::new("PUSH3", 3, 0, 1, false, GasPriceTier::VeryLow),
PUSH4 => InstructionInfo::new("PUSH4", 4, 0, 1, false, GasPriceTier::VeryLowTier), PUSH4 => InstructionInfo::new("PUSH4", 4, 0, 1, false, GasPriceTier::VeryLow),
PUSH5 => InstructionInfo::new("PUSH5", 5, 0, 1, false, GasPriceTier::VeryLowTier), PUSH5 => InstructionInfo::new("PUSH5", 5, 0, 1, false, GasPriceTier::VeryLow),
PUSH6 => InstructionInfo::new("PUSH6", 6, 0, 1, false, GasPriceTier::VeryLowTier), PUSH6 => InstructionInfo::new("PUSH6", 6, 0, 1, false, GasPriceTier::VeryLow),
PUSH7 => InstructionInfo::new("PUSH7", 7, 0, 1, false, GasPriceTier::VeryLowTier), PUSH7 => InstructionInfo::new("PUSH7", 7, 0, 1, false, GasPriceTier::VeryLow),
PUSH8 => InstructionInfo::new("PUSH8", 8, 0, 1, false, GasPriceTier::VeryLowTier), PUSH8 => InstructionInfo::new("PUSH8", 8, 0, 1, false, GasPriceTier::VeryLow),
PUSH9 => InstructionInfo::new("PUSH9", 9, 0, 1, false, GasPriceTier::VeryLowTier), PUSH9 => InstructionInfo::new("PUSH9", 9, 0, 1, false, GasPriceTier::VeryLow),
PUSH10 => InstructionInfo::new("PUSH10", 10, 0, 1, false, GasPriceTier::VeryLowTier), PUSH10 => InstructionInfo::new("PUSH10", 10, 0, 1, false, GasPriceTier::VeryLow),
PUSH11 => InstructionInfo::new("PUSH11", 11, 0, 1, false, GasPriceTier::VeryLowTier), PUSH11 => InstructionInfo::new("PUSH11", 11, 0, 1, false, GasPriceTier::VeryLow),
PUSH12 => InstructionInfo::new("PUSH12", 12, 0, 1, false, GasPriceTier::VeryLowTier), PUSH12 => InstructionInfo::new("PUSH12", 12, 0, 1, false, GasPriceTier::VeryLow),
PUSH13 => InstructionInfo::new("PUSH13", 13, 0, 1, false, GasPriceTier::VeryLowTier), PUSH13 => InstructionInfo::new("PUSH13", 13, 0, 1, false, GasPriceTier::VeryLow),
PUSH14 => InstructionInfo::new("PUSH14", 14, 0, 1, false, GasPriceTier::VeryLowTier), PUSH14 => InstructionInfo::new("PUSH14", 14, 0, 1, false, GasPriceTier::VeryLow),
PUSH15 => InstructionInfo::new("PUSH15", 15, 0, 1, false, GasPriceTier::VeryLowTier), PUSH15 => InstructionInfo::new("PUSH15", 15, 0, 1, false, GasPriceTier::VeryLow),
PUSH16 => InstructionInfo::new("PUSH16", 16, 0, 1, false, GasPriceTier::VeryLowTier), PUSH16 => InstructionInfo::new("PUSH16", 16, 0, 1, false, GasPriceTier::VeryLow),
PUSH17 => InstructionInfo::new("PUSH17", 17, 0, 1, false, GasPriceTier::VeryLowTier), PUSH17 => InstructionInfo::new("PUSH17", 17, 0, 1, false, GasPriceTier::VeryLow),
PUSH18 => InstructionInfo::new("PUSH18", 18, 0, 1, false, GasPriceTier::VeryLowTier), PUSH18 => InstructionInfo::new("PUSH18", 18, 0, 1, false, GasPriceTier::VeryLow),
PUSH19 => InstructionInfo::new("PUSH19", 19, 0, 1, false, GasPriceTier::VeryLowTier), PUSH19 => InstructionInfo::new("PUSH19", 19, 0, 1, false, GasPriceTier::VeryLow),
PUSH20 => InstructionInfo::new("PUSH20", 20, 0, 1, false, GasPriceTier::VeryLowTier), PUSH20 => InstructionInfo::new("PUSH20", 20, 0, 1, false, GasPriceTier::VeryLow),
PUSH21 => InstructionInfo::new("PUSH21", 21, 0, 1, false, GasPriceTier::VeryLowTier), PUSH21 => InstructionInfo::new("PUSH21", 21, 0, 1, false, GasPriceTier::VeryLow),
PUSH22 => InstructionInfo::new("PUSH22", 22, 0, 1, false, GasPriceTier::VeryLowTier), PUSH22 => InstructionInfo::new("PUSH22", 22, 0, 1, false, GasPriceTier::VeryLow),
PUSH23 => InstructionInfo::new("PUSH23", 23, 0, 1, false, GasPriceTier::VeryLowTier), PUSH23 => InstructionInfo::new("PUSH23", 23, 0, 1, false, GasPriceTier::VeryLow),
PUSH24 => InstructionInfo::new("PUSH24", 24, 0, 1, false, GasPriceTier::VeryLowTier), PUSH24 => InstructionInfo::new("PUSH24", 24, 0, 1, false, GasPriceTier::VeryLow),
PUSH25 => InstructionInfo::new("PUSH25", 25, 0, 1, false, GasPriceTier::VeryLowTier), PUSH25 => InstructionInfo::new("PUSH25", 25, 0, 1, false, GasPriceTier::VeryLow),
PUSH26 => InstructionInfo::new("PUSH26", 26, 0, 1, false, GasPriceTier::VeryLowTier), PUSH26 => InstructionInfo::new("PUSH26", 26, 0, 1, false, GasPriceTier::VeryLow),
PUSH27 => InstructionInfo::new("PUSH27", 27, 0, 1, false, GasPriceTier::VeryLowTier), PUSH27 => InstructionInfo::new("PUSH27", 27, 0, 1, false, GasPriceTier::VeryLow),
PUSH28 => InstructionInfo::new("PUSH28", 28, 0, 1, false, GasPriceTier::VeryLowTier), PUSH28 => InstructionInfo::new("PUSH28", 28, 0, 1, false, GasPriceTier::VeryLow),
PUSH29 => InstructionInfo::new("PUSH29", 29, 0, 1, false, GasPriceTier::VeryLowTier), PUSH29 => InstructionInfo::new("PUSH29", 29, 0, 1, false, GasPriceTier::VeryLow),
PUSH30 => InstructionInfo::new("PUSH30", 30, 0, 1, false, GasPriceTier::VeryLowTier), PUSH30 => InstructionInfo::new("PUSH30", 30, 0, 1, false, GasPriceTier::VeryLow),
PUSH31 => InstructionInfo::new("PUSH31", 31, 0, 1, false, GasPriceTier::VeryLowTier), PUSH31 => InstructionInfo::new("PUSH31", 31, 0, 1, false, GasPriceTier::VeryLow),
PUSH32 => InstructionInfo::new("PUSH32", 32, 0, 1, false, GasPriceTier::VeryLowTier), PUSH32 => InstructionInfo::new("PUSH32", 32, 0, 1, false, GasPriceTier::VeryLow),
DUP1 => InstructionInfo::new("DUP1", 0, 1, 2, false, GasPriceTier::VeryLowTier), DUP1 => InstructionInfo::new("DUP1", 0, 1, 2, false, GasPriceTier::VeryLow),
DUP2 => InstructionInfo::new("DUP2", 0, 2, 3, false, GasPriceTier::VeryLowTier), DUP2 => InstructionInfo::new("DUP2", 0, 2, 3, false, GasPriceTier::VeryLow),
DUP3 => InstructionInfo::new("DUP3", 0, 3, 4, false, GasPriceTier::VeryLowTier), DUP3 => InstructionInfo::new("DUP3", 0, 3, 4, false, GasPriceTier::VeryLow),
DUP4 => InstructionInfo::new("DUP4", 0, 4, 5, false, GasPriceTier::VeryLowTier), DUP4 => InstructionInfo::new("DUP4", 0, 4, 5, false, GasPriceTier::VeryLow),
DUP5 => InstructionInfo::new("DUP5", 0, 5, 6, false, GasPriceTier::VeryLowTier), DUP5 => InstructionInfo::new("DUP5", 0, 5, 6, false, GasPriceTier::VeryLow),
DUP6 => InstructionInfo::new("DUP6", 0, 6, 7, false, GasPriceTier::VeryLowTier), DUP6 => InstructionInfo::new("DUP6", 0, 6, 7, false, GasPriceTier::VeryLow),
DUP7 => InstructionInfo::new("DUP7", 0, 7, 8, false, GasPriceTier::VeryLowTier), DUP7 => InstructionInfo::new("DUP7", 0, 7, 8, false, GasPriceTier::VeryLow),
DUP8 => InstructionInfo::new("DUP8", 0, 8, 9, false, GasPriceTier::VeryLowTier), DUP8 => InstructionInfo::new("DUP8", 0, 8, 9, false, GasPriceTier::VeryLow),
DUP9 => InstructionInfo::new("DUP9", 0, 9, 10, false, GasPriceTier::VeryLowTier), DUP9 => InstructionInfo::new("DUP9", 0, 9, 10, false, GasPriceTier::VeryLow),
DUP10 => InstructionInfo::new("DUP10", 0, 10, 11, false, GasPriceTier::VeryLowTier), DUP10 => InstructionInfo::new("DUP10", 0, 10, 11, false, GasPriceTier::VeryLow),
DUP11 => InstructionInfo::new("DUP11", 0, 11, 12, false, GasPriceTier::VeryLowTier), DUP11 => InstructionInfo::new("DUP11", 0, 11, 12, false, GasPriceTier::VeryLow),
DUP12 => InstructionInfo::new("DUP12", 0, 12, 13, false, GasPriceTier::VeryLowTier), DUP12 => InstructionInfo::new("DUP12", 0, 12, 13, false, GasPriceTier::VeryLow),
DUP13 => InstructionInfo::new("DUP13", 0, 13, 14, false, GasPriceTier::VeryLowTier), DUP13 => InstructionInfo::new("DUP13", 0, 13, 14, false, GasPriceTier::VeryLow),
DUP14 => InstructionInfo::new("DUP14", 0, 14, 15, false, GasPriceTier::VeryLowTier), DUP14 => InstructionInfo::new("DUP14", 0, 14, 15, false, GasPriceTier::VeryLow),
DUP15 => InstructionInfo::new("DUP15", 0, 15, 16, false, GasPriceTier::VeryLowTier), DUP15 => InstructionInfo::new("DUP15", 0, 15, 16, false, GasPriceTier::VeryLow),
DUP16 => InstructionInfo::new("DUP16", 0, 16, 17, false, GasPriceTier::VeryLowTier), DUP16 => InstructionInfo::new("DUP16", 0, 16, 17, false, GasPriceTier::VeryLow),
SWAP1 => InstructionInfo::new("SWAP1", 0, 2, 2, false, GasPriceTier::VeryLowTier), SWAP1 => InstructionInfo::new("SWAP1", 0, 2, 2, false, GasPriceTier::VeryLow),
SWAP2 => InstructionInfo::new("SWAP2", 0, 3, 3, false, GasPriceTier::VeryLowTier), SWAP2 => InstructionInfo::new("SWAP2", 0, 3, 3, false, GasPriceTier::VeryLow),
SWAP3 => InstructionInfo::new("SWAP3", 0, 4, 4, false, GasPriceTier::VeryLowTier), SWAP3 => InstructionInfo::new("SWAP3", 0, 4, 4, false, GasPriceTier::VeryLow),
SWAP4 => InstructionInfo::new("SWAP4", 0, 5, 5, false, GasPriceTier::VeryLowTier), SWAP4 => InstructionInfo::new("SWAP4", 0, 5, 5, false, GasPriceTier::VeryLow),
SWAP5 => InstructionInfo::new("SWAP5", 0, 6, 6, false, GasPriceTier::VeryLowTier), SWAP5 => InstructionInfo::new("SWAP5", 0, 6, 6, false, GasPriceTier::VeryLow),
SWAP6 => InstructionInfo::new("SWAP6", 0, 7, 7, false, GasPriceTier::VeryLowTier), SWAP6 => InstructionInfo::new("SWAP6", 0, 7, 7, false, GasPriceTier::VeryLow),
SWAP7 => InstructionInfo::new("SWAP7", 0, 8, 8, false, GasPriceTier::VeryLowTier), SWAP7 => InstructionInfo::new("SWAP7", 0, 8, 8, false, GasPriceTier::VeryLow),
SWAP8 => InstructionInfo::new("SWAP8", 0, 9, 9, false, GasPriceTier::VeryLowTier), SWAP8 => InstructionInfo::new("SWAP8", 0, 9, 9, false, GasPriceTier::VeryLow),
SWAP9 => InstructionInfo::new("SWAP9", 0, 10, 10, false, GasPriceTier::VeryLowTier), SWAP9 => InstructionInfo::new("SWAP9", 0, 10, 10, false, GasPriceTier::VeryLow),
SWAP10 => InstructionInfo::new("SWAP10", 0, 11, 11, false, GasPriceTier::VeryLowTier), SWAP10 => InstructionInfo::new("SWAP10", 0, 11, 11, false, GasPriceTier::VeryLow),
SWAP11 => InstructionInfo::new("SWAP11", 0, 12, 12, false, GasPriceTier::VeryLowTier), SWAP11 => InstructionInfo::new("SWAP11", 0, 12, 12, false, GasPriceTier::VeryLow),
SWAP12 => InstructionInfo::new("SWAP12", 0, 13, 13, false, GasPriceTier::VeryLowTier), SWAP12 => InstructionInfo::new("SWAP12", 0, 13, 13, false, GasPriceTier::VeryLow),
SWAP13 => InstructionInfo::new("SWAP13", 0, 14, 14, false, GasPriceTier::VeryLowTier), SWAP13 => InstructionInfo::new("SWAP13", 0, 14, 14, false, GasPriceTier::VeryLow),
SWAP14 => InstructionInfo::new("SWAP14", 0, 15, 15, false, GasPriceTier::VeryLowTier), SWAP14 => InstructionInfo::new("SWAP14", 0, 15, 15, false, GasPriceTier::VeryLow),
SWAP15 => InstructionInfo::new("SWAP15", 0, 16, 16, false, GasPriceTier::VeryLowTier), SWAP15 => InstructionInfo::new("SWAP15", 0, 16, 16, false, GasPriceTier::VeryLow),
SWAP16 => InstructionInfo::new("SWAP16", 0, 17, 17, false, GasPriceTier::VeryLowTier), SWAP16 => InstructionInfo::new("SWAP16", 0, 17, 17, false, GasPriceTier::VeryLow),
LOG0 => InstructionInfo::new("LOG0", 0, 2, 0, true, GasPriceTier::SpecialTier), LOG0 => InstructionInfo::new("LOG0", 0, 2, 0, true, GasPriceTier::Special),
LOG1 => InstructionInfo::new("LOG1", 0, 3, 0, true, GasPriceTier::SpecialTier), LOG1 => InstructionInfo::new("LOG1", 0, 3, 0, true, GasPriceTier::Special),
LOG2 => InstructionInfo::new("LOG2", 0, 4, 0, true, GasPriceTier::SpecialTier), LOG2 => InstructionInfo::new("LOG2", 0, 4, 0, true, GasPriceTier::Special),
LOG3 => InstructionInfo::new("LOG3", 0, 5, 0, true, GasPriceTier::SpecialTier), LOG3 => InstructionInfo::new("LOG3", 0, 5, 0, true, GasPriceTier::Special),
LOG4 => InstructionInfo::new("LOG4", 0, 6, 0, true, GasPriceTier::SpecialTier), LOG4 => InstructionInfo::new("LOG4", 0, 6, 0, true, GasPriceTier::Special),
CREATE => InstructionInfo::new("CREATE", 0, 3, 1, true, GasPriceTier::SpecialTier), CREATE => InstructionInfo::new("CREATE", 0, 3, 1, true, GasPriceTier::Special),
CALL => InstructionInfo::new("CALL", 0, 7, 1, true, GasPriceTier::SpecialTier), CALL => InstructionInfo::new("CALL", 0, 7, 1, true, GasPriceTier::Special),
CALLCODE => InstructionInfo::new("CALLCODE", 0, 7, 1, true, GasPriceTier::SpecialTier), CALLCODE => InstructionInfo::new("CALLCODE", 0, 7, 1, true, GasPriceTier::Special),
RETURN => InstructionInfo::new("RETURN", 0, 2, 0, true, GasPriceTier::ZeroTier), RETURN => InstructionInfo::new("RETURN", 0, 2, 0, true, GasPriceTier::Zero),
DELEGATECALL => InstructionInfo::new("DELEGATECALL", 0, 6, 1, true, GasPriceTier::SpecialTier), DELEGATECALL => InstructionInfo::new("DELEGATECALL", 0, 6, 1, true, GasPriceTier::Special),
SUICIDE => InstructionInfo::new("SUICIDE", 0, 1, 0, true, GasPriceTier::ZeroTier), SUICIDE => InstructionInfo::new("SUICIDE", 0, 1, 0, true, GasPriceTier::Zero),
_ => InstructionInfo::new("INVALID_INSTRUCTION", 0, 0, 0, false, GasPriceTier::InvalidTier) _ => InstructionInfo::new("INVALID_INSTRUCTION", 0, 0, 0, false, GasPriceTier::Invalid)
} }
} }
// Virtual machine bytecode instruction. /// Virtual machine bytecode instruction.
pub const STOP: Instruction = 0x00; //< halts execution /// halts execution
pub const ADD: Instruction = 0x01; //< addition operation pub const STOP: Instruction = 0x00;
pub const MUL: Instruction = 0x02; //< mulitplication operation /// addition operation
pub const SUB: Instruction = 0x03; //< subtraction operation pub const ADD: Instruction = 0x01;
pub const DIV: Instruction = 0x04; //< integer division operation /// mulitplication operation
pub const SDIV: Instruction = 0x05; //< signed integer division operation pub const MUL: Instruction = 0x02;
pub const MOD: Instruction = 0x06; //< modulo remainder operation /// subtraction operation
pub const SMOD: Instruction = 0x07; //< signed modulo remainder operation pub const SUB: Instruction = 0x03;
pub const ADDMOD: Instruction = 0x08; //< unsigned modular addition /// integer division operation
pub const MULMOD: Instruction = 0x09; //< unsigned modular multiplication pub const DIV: Instruction = 0x04;
pub const EXP: Instruction = 0x0a; //< exponential operation /// signed integer division operation
pub const SIGNEXTEND: Instruction = 0x0b; //< extend length of signed integer pub const SDIV: Instruction = 0x05;
/// modulo remainder operation
pub const MOD: Instruction = 0x06;
/// signed modulo remainder operation
pub const SMOD: Instruction = 0x07;
/// unsigned modular addition
pub const ADDMOD: Instruction = 0x08;
/// unsigned modular multiplication
pub const MULMOD: Instruction = 0x09;
/// exponential operation
pub const EXP: Instruction = 0x0a;
/// extend length of signed integer
pub const SIGNEXTEND: Instruction = 0x0b;
pub const LT: Instruction = 0x10; //< less-than comparision /// less-than comparision
pub const GT: Instruction = 0x11; //< greater-than comparision pub const LT: Instruction = 0x10;
pub const SLT: Instruction = 0x12; //< signed less-than comparision /// greater-than comparision
pub const SGT: Instruction = 0x13; //< signed greater-than comparision pub const GT: Instruction = 0x11;
pub const EQ: Instruction = 0x14; //< equality comparision /// signed less-than comparision
pub const ISZERO: Instruction = 0x15; //< simple not operator pub const SLT: Instruction = 0x12;
pub const AND: Instruction = 0x16; //< bitwise AND operation /// signed greater-than comparision
pub const OR: Instruction = 0x17; //< bitwise OR operation pub const SGT: Instruction = 0x13;
pub const XOR: Instruction = 0x18; //< bitwise XOR operation /// equality comparision
pub const NOT: Instruction = 0x19; //< bitwise NOT opertation pub const EQ: Instruction = 0x14;
pub const BYTE: Instruction = 0x1a; //< retrieve single byte from word /// simple not operator
pub const ISZERO: Instruction = 0x15;
/// bitwise AND operation
pub const AND: Instruction = 0x16;
/// bitwise OR operation
pub const OR: Instruction = 0x17;
/// bitwise XOR operation
pub const XOR: Instruction = 0x18;
/// bitwise NOT opertation
pub const NOT: Instruction = 0x19;
/// retrieve single byte from word
pub const BYTE: Instruction = 0x1a;
pub const SHA3: Instruction = 0x20; //< compute SHA3-256 hash /// compute SHA3-256 hash
pub const SHA3: Instruction = 0x20;
pub const ADDRESS: Instruction = 0x30; //< get address of currently executing account /// get address of currently executing account
pub const BALANCE: Instruction = 0x31; //< get balance of the given account pub const ADDRESS: Instruction = 0x30;
pub const ORIGIN: Instruction = 0x32; //< get execution origination address /// get balance of the given account
pub const CALLER: Instruction = 0x33; //< get caller address pub const BALANCE: Instruction = 0x31;
pub const CALLVALUE: Instruction = 0x34; //< get deposited value by the instruction/transaction responsible for this execution /// get execution origination address
pub const CALLDATALOAD: Instruction = 0x35; //< get input data of current environment pub const ORIGIN: Instruction = 0x32;
pub const CALLDATASIZE: Instruction = 0x36; //< get size of input data in current environment /// get caller address
pub const CALLDATACOPY: Instruction = 0x37; //< copy input data in current environment to memory pub const CALLER: Instruction = 0x33;
pub const CODESIZE: Instruction = 0x38; //< get size of code running in current environment /// get deposited value by the instruction/transaction responsible for this execution
pub const CODECOPY: Instruction = 0x39; //< copy code running in current environment to memory pub const CALLVALUE: Instruction = 0x34;
pub const GASPRICE: Instruction = 0x3a; //< get price of gas in current environment /// get input data of current environment
pub const EXTCODESIZE: Instruction = 0x3b; //< get external code size (from another contract) pub const CALLDATALOAD: Instruction = 0x35;
pub const EXTCODECOPY: Instruction = 0x3c; //< copy external code (from another contract) /// get size of input data in current environment
pub const CALLDATASIZE: Instruction = 0x36;
/// copy input data in current environment to memory
pub const CALLDATACOPY: Instruction = 0x37;
/// get size of code running in current environment
pub const CODESIZE: Instruction = 0x38;
/// copy code running in current environment to memory
pub const CODECOPY: Instruction = 0x39;
/// get price of gas in current environment
pub const GASPRICE: Instruction = 0x3a;
/// get external code size (from another contract)
pub const EXTCODESIZE: Instruction = 0x3b;
/// copy external code (from another contract)
pub const EXTCODECOPY: Instruction = 0x3c;
pub const BLOCKHASH: Instruction = 0x40; //< get hash of most recent complete block /// get hash of most recent complete block
pub const COINBASE: Instruction = 0x41; //< get the block's coinbase address pub const BLOCKHASH: Instruction = 0x40;
pub const TIMESTAMP: Instruction = 0x42; //< get the block's timestamp /// get the block's coinbase address
pub const NUMBER: Instruction = 0x43; //< get the block's number pub const COINBASE: Instruction = 0x41;
pub const DIFFICULTY: Instruction = 0x44; //< get the block's difficulty /// get the block's timestamp
pub const GASLIMIT: Instruction = 0x45; //< get the block's gas limit pub const TIMESTAMP: Instruction = 0x42;
/// get the block's number
pub const NUMBER: Instruction = 0x43;
/// get the block's difficulty
pub const DIFFICULTY: Instruction = 0x44;
/// get the block's gas limit
pub const GASLIMIT: Instruction = 0x45;
pub const POP: Instruction = 0x50; //< remove item from stack /// remove item from stack
pub const MLOAD: Instruction = 0x51; //< load word from memory pub const POP: Instruction = 0x50;
pub const MSTORE: Instruction = 0x52; //< save word to memory /// load word from memory
pub const MSTORE8: Instruction = 0x53; //< save byte to memory pub const MLOAD: Instruction = 0x51;
pub const SLOAD: Instruction = 0x54; //< load word from storage /// save word to memory
pub const SSTORE: Instruction = 0x55; //< save word to storage pub const MSTORE: Instruction = 0x52;
pub const JUMP: Instruction = 0x56; //< alter the program counter /// save byte to memory
pub const JUMPI: Instruction = 0x57; //< conditionally alter the program counter pub const MSTORE8: Instruction = 0x53;
pub const PC: Instruction = 0x58; //< get the program counter /// load word from storage
pub const MSIZE: Instruction = 0x59; //< get the size of active memory pub const SLOAD: Instruction = 0x54;
pub const GAS: Instruction = 0x5a; //< get the amount of available gas /// save word to storage
pub const JUMPDEST: Instruction = 0x5b; //< set a potential jump destination pub const SSTORE: Instruction = 0x55;
/// alter the program counter
pub const JUMP: Instruction = 0x56;
/// conditionally alter the program counter
pub const JUMPI: Instruction = 0x57;
/// get the program counter
pub const PC: Instruction = 0x58;
/// get the size of active memory
pub const MSIZE: Instruction = 0x59;
/// get the amount of available gas
pub const GAS: Instruction = 0x5a;
/// set a potential jump destination
pub const JUMPDEST: Instruction = 0x5b;
pub const PUSH1: Instruction = 0x60; //< place 1 byte item on stack /// place 1 byte item on stack
pub const PUSH2: Instruction = 0x61; //< place 2 byte item on stack pub const PUSH1: Instruction = 0x60;
pub const PUSH3: Instruction = 0x62; //< place 3 byte item on stack /// place 2 byte item on stack
pub const PUSH4: Instruction = 0x63; //< place 4 byte item on stack pub const PUSH2: Instruction = 0x61;
pub const PUSH5: Instruction = 0x64; //< place 5 byte item on stack /// place 3 byte item on stack
pub const PUSH6: Instruction = 0x65; //< place 6 byte item on stack pub const PUSH3: Instruction = 0x62;
pub const PUSH7: Instruction = 0x66; //< place 7 byte item on stack /// place 4 byte item on stack
pub const PUSH8: Instruction = 0x67; //< place 8 byte item on stack pub const PUSH4: Instruction = 0x63;
pub const PUSH9: Instruction = 0x68; //< place 9 byte item on stack /// place 5 byte item on stack
pub const PUSH10: Instruction = 0x69; //< place 10 byte item on stack pub const PUSH5: Instruction = 0x64;
pub const PUSH11: Instruction = 0x6a; //< place 11 byte item on stack /// place 6 byte item on stack
pub const PUSH12: Instruction = 0x6b; //< place 12 byte item on stack pub const PUSH6: Instruction = 0x65;
pub const PUSH13: Instruction = 0x6c; //< place 13 byte item on stack /// place 7 byte item on stack
pub const PUSH14: Instruction = 0x6d; //< place 14 byte item on stack pub const PUSH7: Instruction = 0x66;
pub const PUSH15: Instruction = 0x6e; //< place 15 byte item on stack /// place 8 byte item on stack
pub const PUSH16: Instruction = 0x6f; //< place 16 byte item on stack pub const PUSH8: Instruction = 0x67;
pub const PUSH17: Instruction = 0x70; //< place 17 byte item on stack /// place 9 byte item on stack
pub const PUSH18: Instruction = 0x71; //< place 18 byte item on stack pub const PUSH9: Instruction = 0x68;
pub const PUSH19: Instruction = 0x72; //< place 19 byte item on stack /// place 10 byte item on stack
pub const PUSH20: Instruction = 0x73; //< place 20 byte item on stack pub const PUSH10: Instruction = 0x69;
pub const PUSH21: Instruction = 0x74; //< place 21 byte item on stack /// place 11 byte item on stack
pub const PUSH22: Instruction = 0x75; //< place 22 byte item on stack pub const PUSH11: Instruction = 0x6a;
pub const PUSH23: Instruction = 0x76; //< place 23 byte item on stack /// place 12 byte item on stack
pub const PUSH24: Instruction = 0x77; //< place 24 byte item on stack pub const PUSH12: Instruction = 0x6b;
pub const PUSH25: Instruction = 0x78; //< place 25 byte item on stack /// place 13 byte item on stack
pub const PUSH26: Instruction = 0x79; //< place 26 byte item on stack pub const PUSH13: Instruction = 0x6c;
pub const PUSH27: Instruction = 0x7a; //< place 27 byte item on stack /// place 14 byte item on stack
pub const PUSH28: Instruction = 0x7b; //< place 28 byte item on stack pub const PUSH14: Instruction = 0x6d;
pub const PUSH29: Instruction = 0x7c; //< place 29 byte item on stack /// place 15 byte item on stack
pub const PUSH30: Instruction = 0x7d; //< place 30 byte item on stack pub const PUSH15: Instruction = 0x6e;
pub const PUSH31: Instruction = 0x7e; //< place 31 byte item on stack /// place 16 byte item on stack
pub const PUSH32: Instruction = 0x7f; //< place 32 byte item on stack pub const PUSH16: Instruction = 0x6f;
/// place 17 byte item on stack
pub const PUSH17: Instruction = 0x70;
/// place 18 byte item on stack
pub const PUSH18: Instruction = 0x71;
/// place 19 byte item on stack
pub const PUSH19: Instruction = 0x72;
/// place 20 byte item on stack
pub const PUSH20: Instruction = 0x73;
/// place 21 byte item on stack
pub const PUSH21: Instruction = 0x74;
/// place 22 byte item on stack
pub const PUSH22: Instruction = 0x75;
/// place 23 byte item on stack
pub const PUSH23: Instruction = 0x76;
/// place 24 byte item on stack
pub const PUSH24: Instruction = 0x77;
/// place 25 byte item on stack
pub const PUSH25: Instruction = 0x78;
/// place 26 byte item on stack
pub const PUSH26: Instruction = 0x79;
/// place 27 byte item on stack
pub const PUSH27: Instruction = 0x7a;
/// place 28 byte item on stack
pub const PUSH28: Instruction = 0x7b;
/// place 29 byte item on stack
pub const PUSH29: Instruction = 0x7c;
/// place 30 byte item on stack
pub const PUSH30: Instruction = 0x7d;
/// place 31 byte item on stack
pub const PUSH31: Instruction = 0x7e;
/// place 32 byte item on stack
pub const PUSH32: Instruction = 0x7f;
pub const DUP1: Instruction = 0x80; //< copies the highest item in the stack to the top of the stack /// copies the highest item in the stack to the top of the stack
pub const DUP2: Instruction = 0x81; //< copies the second highest item in the stack to the top of the stack pub const DUP1: Instruction = 0x80;
pub const DUP3: Instruction = 0x82; //< copies the third highest item in the stack to the top of the stack /// copies the second highest item in the stack to the top of the stack
pub const DUP4: Instruction = 0x83; //< copies the 4th highest item in the stack to the top of the stack pub const DUP2: Instruction = 0x81;
pub const DUP5: Instruction = 0x84; //< copies the 5th highest item in the stack to the top of the stack /// copies the third highest item in the stack to the top of the stack
pub const DUP6: Instruction = 0x85; //< copies the 6th highest item in the stack to the top of the stack pub const DUP3: Instruction = 0x82;
pub const DUP7: Instruction = 0x86; //< copies the 7th highest item in the stack to the top of the stack /// copies the 4th highest item in the stack to the top of the stack
pub const DUP8: Instruction = 0x87; //< copies the 8th highest item in the stack to the top of the stack pub const DUP4: Instruction = 0x83;
pub const DUP9: Instruction = 0x88; //< copies the 9th highest item in the stack to the top of the stack /// copies the 5th highest item in the stack to the top of the stack
pub const DUP10: Instruction = 0x89; //< copies the 10th highest item in the stack to the top of the stack pub const DUP5: Instruction = 0x84;
pub const DUP11: Instruction = 0x8a; //< copies the 11th highest item in the stack to the top of the stack /// copies the 6th highest item in the stack to the top of the stack
pub const DUP12: Instruction = 0x8b; //< copies the 12th highest item in the stack to the top of the stack pub const DUP6: Instruction = 0x85;
pub const DUP13: Instruction = 0x8c; //< copies the 13th highest item in the stack to the top of the stack /// copies the 7th highest item in the stack to the top of the stack
pub const DUP14: Instruction = 0x8d; //< copies the 14th highest item in the stack to the top of the stack pub const DUP7: Instruction = 0x86;
pub const DUP15: Instruction = 0x8e; //< copies the 15th highest item in the stack to the top of the stack /// copies the 8th highest item in the stack to the top of the stack
pub const DUP16: Instruction = 0x8f; //< copies the 16th highest item in the stack to the top of the stack pub const DUP8: Instruction = 0x87;
/// copies the 9th highest item in the stack to the top of the stack
pub const DUP9: Instruction = 0x88;
/// copies the 10th highest item in the stack to the top of the stack
pub const DUP10: Instruction = 0x89;
/// copies the 11th highest item in the stack to the top of the stack
pub const DUP11: Instruction = 0x8a;
/// copies the 12th highest item in the stack to the top of the stack
pub const DUP12: Instruction = 0x8b;
/// copies the 13th highest item in the stack to the top of the stack
pub const DUP13: Instruction = 0x8c;
/// copies the 14th highest item in the stack to the top of the stack
pub const DUP14: Instruction = 0x8d;
/// copies the 15th highest item in the stack to the top of the stack
pub const DUP15: Instruction = 0x8e;
/// copies the 16th highest item in the stack to the top of the stack
pub const DUP16: Instruction = 0x8f;
pub const SWAP1: Instruction = 0x90; //< swaps the highest and second highest value on the stack /// swaps the highest and second highest value on the stack
pub const SWAP2: Instruction = 0x91; //< swaps the highest and third highest value on the stack pub const SWAP1: Instruction = 0x90;
pub const SWAP3: Instruction = 0x92; //< swaps the highest and 4th highest value on the stack /// swaps the highest and third highest value on the stack
pub const SWAP4: Instruction = 0x93; //< swaps the highest and 5th highest value on the stack pub const SWAP2: Instruction = 0x91;
pub const SWAP5: Instruction = 0x94; //< swaps the highest and 6th highest value on the stack /// swaps the highest and 4th highest value on the stack
pub const SWAP6: Instruction = 0x95; //< swaps the highest and 7th highest value on the stack pub const SWAP3: Instruction = 0x92;
pub const SWAP7: Instruction = 0x96; //< swaps the highest and 8th highest value on the stack /// swaps the highest and 5th highest value on the stack
pub const SWAP8: Instruction = 0x97; //< swaps the highest and 9th highest value on the stack pub const SWAP4: Instruction = 0x93;
pub const SWAP9: Instruction = 0x98; //< swaps the highest and 10th highest value on the stack /// swaps the highest and 6th highest value on the stack
pub const SWAP10: Instruction = 0x99; //< swaps the highest and 11th highest value on the stack pub const SWAP5: Instruction = 0x94;
pub const SWAP11: Instruction = 0x9a; //< swaps the highest and 12th highest value on the stack /// swaps the highest and 7th highest value on the stack
pub const SWAP12: Instruction = 0x9b; //< swaps the highest and 13th highest value on the stack pub const SWAP6: Instruction = 0x95;
pub const SWAP13: Instruction = 0x9c; //< swaps the highest and 14th highest value on the stack /// swaps the highest and 8th highest value on the stack
pub const SWAP14: Instruction = 0x9d; //< swaps the highest and 15th highest value on the stack pub const SWAP7: Instruction = 0x96;
pub const SWAP15: Instruction = 0x9e; //< swaps the highest and 16th highest value on the stack /// swaps the highest and 9th highest value on the stack
pub const SWAP16: Instruction = 0x9f; //< swaps the highest and 17th highest value on the stack pub const SWAP8: Instruction = 0x97;
/// swaps the highest and 10th highest value on the stack
pub const SWAP9: Instruction = 0x98;
/// swaps the highest and 11th highest value on the stack
pub const SWAP10: Instruction = 0x99;
/// swaps the highest and 12th highest value on the stack
pub const SWAP11: Instruction = 0x9a;
/// swaps the highest and 13th highest value on the stack
pub const SWAP12: Instruction = 0x9b;
/// swaps the highest and 14th highest value on the stack
pub const SWAP13: Instruction = 0x9c;
/// swaps the highest and 15th highest value on the stack
pub const SWAP14: Instruction = 0x9d;
/// swaps the highest and 16th highest value on the stack
pub const SWAP15: Instruction = 0x9e;
/// swaps the highest and 17th highest value on the stack
pub const SWAP16: Instruction = 0x9f;
pub const LOG0: Instruction = 0xa0; //< Makes a log entry; no topics. /// Makes a log entry; no topics.
pub const LOG1: Instruction = 0xa1; //< Makes a log entry; 1 topic. pub const LOG0: Instruction = 0xa0;
pub const LOG2: Instruction = 0xa2; //< Makes a log entry; 2 topics. /// Makes a log entry; 1 topic.
pub const LOG3: Instruction = 0xa3; //< Makes a log entry; 3 topics. pub const LOG1: Instruction = 0xa1;
pub const LOG4: Instruction = 0xa4; //< Makes a log entry; 4 topics. /// Makes a log entry; 2 topics.
pub const LOG2: Instruction = 0xa2;
/// Makes a log entry; 3 topics.
pub const LOG3: Instruction = 0xa3;
/// Makes a log entry; 4 topics.
pub const LOG4: Instruction = 0xa4;
/// Maximal number of topics for log instructions
pub const MAX_NO_OF_TOPICS : usize = 4; pub const MAX_NO_OF_TOPICS : usize = 4;
pub const CREATE: Instruction = 0xf0; //< create a new account with associated code /// create a new account with associated code
pub const CALL: Instruction = 0xf1; //< message-call into an account pub const CREATE: Instruction = 0xf0;
pub const CALLCODE: Instruction = 0xf2; //< message-call with another account's code only /// message-call into an account
pub const RETURN: Instruction = 0xf3; //< halt execution returning output data pub const CALL: Instruction = 0xf1;
pub const DELEGATECALL: Instruction = 0xf4; //< like CALLCODE but keeps caller's value and sender /// message-call with another account's code only
pub const SUICIDE: Instruction = 0xff; //< halt execution and register account for later deletion pub const CALLCODE: Instruction = 0xf2;
/// halt execution returning output data
pub const RETURN: Instruction = 0xf3;
/// like CALLCODE but keeps caller's value and sender
pub const DELEGATECALL: Instruction = 0xf4;
/// halt execution and register account for later deletion
pub const SUICIDE: Instruction = 0xff;

37
src/evm/interpreter.rs
View File

@ -13,6 +13,7 @@ macro_rules! evm_debug {
println!($x); println!($x);
} }
} }
#[cfg(feature = "evm_debug")] #[cfg(feature = "evm_debug")]
fn color(instruction: Instruction, name: &'static str) -> String { fn color(instruction: Instruction, name: &'static str) -> String {
let c = instruction as usize % 6; let c = instruction as usize % 6;
@ -25,7 +26,6 @@ macro_rules! evm_debug {
($x: expr) => {} ($x: expr) => {}
} }
type CodePosition = usize; type CodePosition = usize;
type Gas = U256; type Gas = U256;
type ProgramCounter = usize; type ProgramCounter = usize;
@ -62,8 +62,7 @@ impl<S : Copy> VecStack<S> {
} }
} }
impl<S> Stack<S> for VecStack<S> { impl<S : fmt::Display> Stack<S> for VecStack<S> {
fn peek(&self, no_from_top: usize) -> &S { fn peek(&self, no_from_top: usize) -> &S {
return &self.stack[self.stack.len() - no_from_top - 1]; return &self.stack[self.stack.len() - no_from_top - 1];
} }
@ -133,6 +132,7 @@ trait Memory {
fn dump(&self); fn dump(&self);
} }
/// Checks whether offset and size is valid memory range
fn is_valid_range(off: usize, size: usize) -> bool { fn is_valid_range(off: usize, size: usize) -> bool {
// When size is zero we haven't actually expanded the memory // When size is zero we haven't actually expanded the memory
let (_a, overflow) = off.overflowing_add(size); let (_a, overflow) = off.overflowing_add(size);
@ -140,7 +140,6 @@ fn is_valid_range(off: usize, size: usize) -> bool {
} }
impl Memory for Vec<u8> { impl Memory for Vec<u8> {
fn dump(&self) { fn dump(&self) {
println!("MemoryDump:"); println!("MemoryDump:");
for i in self.iter() { for i in self.iter() {
@ -220,6 +219,7 @@ struct CodeReader<'a> {
position: ProgramCounter, position: ProgramCounter,
code: &'a Bytes code: &'a Bytes
} }
impl<'a> CodeReader<'a> { impl<'a> CodeReader<'a> {
/// Get `no_of_bytes` from code and convert to U256. Move PC /// Get `no_of_bytes` from code and convert to U256. Move PC
fn read(&mut self, no_of_bytes: usize) -> U256 { fn read(&mut self, no_of_bytes: usize) -> U256 {
@ -252,7 +252,7 @@ enum InstructionResult {
StopExecution StopExecution
} }
/// Intepreter EVM implementation
pub struct Interpreter; pub struct Interpreter;
impl evm::Evm for Interpreter { impl evm::Evm for Interpreter {
@ -317,7 +317,6 @@ impl evm::Evm for Interpreter {
} }
impl Interpreter { impl Interpreter {
fn get_gas_cost_mem(&self, fn get_gas_cost_mem(&self,
ext: &evm::Ext, ext: &evm::Ext,
instruction: Instruction, instruction: Instruction,
@ -332,7 +331,7 @@ impl Interpreter {
instruction: instruction instruction: instruction
}); });
} }
if info.tier == instructions::GasPriceTier::InvalidTier { if info.tier == instructions::GasPriceTier::Invalid {
return Err(evm::Error::BadInstruction { return Err(evm::Error::BadInstruction {
instruction: instruction instruction: instruction
}); });
@ -478,7 +477,6 @@ impl Interpreter {
let s = mem_size >> 5; let s = mem_size >> 5;
s * U256::from(schedule.memory_gas) + s * s / U256::from(schedule.quad_coeff_div) s * U256::from(schedule.memory_gas) + s * s / U256::from(schedule.quad_coeff_div)
}; };
let current_mem_size = U256::from(current_mem_size); let current_mem_size = U256::from(current_mem_size);
let req_mem_size_rounded = ((mem_size.clone() + U256::from(31)) >> 5) << 5; let req_mem_size_rounded = ((mem_size.clone() + U256::from(31)) >> 5) << 5;
let new_mem_gas = gas_for_mem(U256::from(req_mem_size_rounded)); let new_mem_gas = gas_for_mem(U256::from(req_mem_size_rounded));
@ -491,7 +489,6 @@ impl Interpreter {
}, req_mem_size_rounded.low_u64() as usize) }, req_mem_size_rounded.low_u64() as usize)
} }
fn mem_max(&self, m_a: RequiredMem, m_b: RequiredMem) -> RequiredMem { fn mem_max(&self, m_a: RequiredMem, m_b: RequiredMem) -> RequiredMem {
match (m_a, m_b) { match (m_a, m_b) {
(RequiredMem::Mem(a), RequiredMem::Mem(b)) => { (RequiredMem::Mem(a), RequiredMem::Mem(b)) => {
@ -512,8 +509,9 @@ impl Interpreter {
fn mem_needed(&self, offset: &U256, size: &U256) -> RequiredMem { fn mem_needed(&self, offset: &U256, size: &U256) -> RequiredMem {
if self.is_zero(size) { if self.is_zero(size) {
RequiredMem::Mem(U256::zero()) return RequiredMem::Mem(U256::zero());
} else { }
match offset.clone().overflowing_add(size.clone()) { match offset.clone().overflowing_add(size.clone()) {
(_result, true) => RequiredMem::OutOfMemory, (_result, true) => RequiredMem::OutOfMemory,
(result, false) => { (result, false) => {
@ -521,7 +519,6 @@ impl Interpreter {
} }
} }
} }
}
fn exec_instruction(&self, fn exec_instruction(&self,
gas: Gas, gas: Gas,
@ -632,7 +629,7 @@ impl Interpreter {
.iter() .iter()
.map(H256::from) .map(H256::from)
.collect(); .collect();
ext.log(topics, mem.read_slice(offset, size).to_vec()); ext.log(topics, mem.read_slice(offset, size));
}, },
instructions::PUSH1...instructions::PUSH32 => { instructions::PUSH1...instructions::PUSH32 => {
let bytes = instructions::get_push_bytes(instruction); let bytes = instructions::get_push_bytes(instruction);
@ -835,7 +832,7 @@ impl Interpreter {
} }
} }
fn exec_stack_instruction(&self, instruction: Instruction, stack : &mut Stack<U256>) -> Result<(), evm::Error> { fn exec_stack_instruction(&self, instruction: Instruction, stack: &mut Stack<U256>) -> Result<(), evm::Error> {
match instruction { match instruction {
instructions::DUP1...instructions::DUP16 => { instructions::DUP1...instructions::DUP16 => {
let position = instructions::get_dup_position(instruction); let position = instructions::get_dup_position(instruction);
@ -1042,7 +1039,7 @@ impl Interpreter {
Ok(()) Ok(())
} }
fn find_jump_destinations(&self, code : &Bytes) -> HashSet<CodePosition> { fn find_jump_destinations(&self, code: &Bytes) -> HashSet<CodePosition> {
let mut jump_dests = HashSet::new(); let mut jump_dests = HashSet::new();
let mut position = 0; let mut position = 0;
@ -1059,7 +1056,6 @@ impl Interpreter {
return jump_dests; return jump_dests;
} }
} }
fn get_and_reset_sign(value: U256) -> (U256, bool) { fn get_and_reset_sign(value: U256) -> (U256, bool) {
@ -1067,7 +1063,7 @@ fn get_and_reset_sign(value: U256) -> (U256, bool) {
(set_sign(value, sign), sign) (set_sign(value, sign), sign)
} }
pub fn set_sign(value: U256, sign: bool) -> U256 { fn set_sign(value: U256, sign: bool) -> U256 {
if sign { if sign {
let (val, _overflow) = (!U256::zero() ^ value).overflowing_add(U256::one()); let (val, _overflow) = (!U256::zero() ^ value).overflowing_add(U256::one());
val val
@ -1076,14 +1072,17 @@ pub fn set_sign(value: U256, sign: bool) -> U256 {
} }
} }
#[inline]
fn add_u256_usize(value: &U256, num: usize) -> (U256, bool) { fn add_u256_usize(value: &U256, num: usize) -> (U256, bool) {
value.clone().overflowing_add(U256::from(num)) value.clone().overflowing_add(U256::from(num))
} }
#[inline]
fn u256_to_address(value: &U256) -> Address { fn u256_to_address(value: &U256) -> Address {
Address::from(H256::from(value)) Address::from(H256::from(value))
} }
#[inline]
fn address_to_u256(value: Address) -> U256 { fn address_to_u256(value: Address) -> U256 {
U256::from(H256::from(value).as_slice()) U256::from(H256::from(value).as_slice())
} }
@ -1126,7 +1125,7 @@ mod tests {
#[test] #[test]
fn test_memory_read_and_write() { fn test_memory_read_and_write() {
// given // given
let mem : &mut super::Memory = &mut vec![]; let mem: &mut super::Memory = &mut vec![];
mem.resize(0x80 + 32); mem.resize(0x80 + 32);
// when // when
@ -1139,7 +1138,7 @@ mod tests {
#[test] #[test]
fn test_memory_read_and_write_byte() { fn test_memory_read_and_write_byte() {
// given // given
let mem : &mut super::Memory = &mut vec![]; let mem: &mut super::Memory = &mut vec![];
mem.resize(32); mem.resize(32);
// when // when

4
src/evm/jit.rs
View File

@ -7,7 +7,7 @@ use evm;
struct RuntimeData { struct RuntimeData {
gas: U256, gas: U256,
gas_price: U256, gas_price: U256,
call_data: Vec<u8>, call_data: Bytes,
address: Address, address: Address,
caller: Address, caller: Address,
origin: Address, origin: Address,
@ -17,7 +17,7 @@ struct RuntimeData {
gas_limit: U256, gas_limit: U256,
number: u64, number: u64,
timestamp: u64, timestamp: u64,
code: Vec<u8> code: Bytes
} }
impl RuntimeData { impl RuntimeData {

6
src/evm/tests.rs
View File

@ -66,14 +66,14 @@ impl Ext for FakeExt {
unimplemented!(); unimplemented!();
} }
fn extcode(&self, address: &Address) -> Vec<u8> { fn extcode(&self, address: &Address) -> Bytes {
self.codes.get(address).unwrap_or(&Bytes::new()).clone() self.codes.get(address).unwrap_or(&Bytes::new()).clone()
} }
fn log(&mut self, topics: Vec<H256>, data: Vec<u8>) { fn log(&mut self, topics: Vec<H256>, data: &[u8]) {
self.logs.push(FakeLogEntry { self.logs.push(FakeLogEntry {
topics: topics, topics: topics,
data: data data: data.to_vec()
}); });
} }

6
src/externalities.rs
View File

@ -187,7 +187,7 @@ impl<'a> Ext for Externalities<'a> {
} }
} }
fn extcode(&self, address: &Address) -> Vec<u8> { fn extcode(&self, address: &Address) -> Bytes {
self.state.code(address).unwrap_or(vec![]) self.state.code(address).unwrap_or(vec![])
} }
@ -227,9 +227,9 @@ impl<'a> Ext for Externalities<'a> {
} }
} }
fn log(&mut self, topics: Vec<H256>, data: Bytes) { fn log(&mut self, topics: Vec<H256>, data: &[u8]) {
let address = self.params.address.clone(); let address = self.params.address.clone();
self.substate.logs.push(LogEntry::new(address, topics, data)); self.substate.logs.push(LogEntry::new(address, topics, data.to_vec()));
} }
fn suicide(&mut self, refund_address: &Address) { fn suicide(&mut self, refund_address: &Address) {

2
src/state.rs
View File

@ -101,7 +101,7 @@ impl State {
} }
/// Mutate storage of account `a` so that it is `value` for `key`. /// Mutate storage of account `a` so that it is `value` for `key`.
pub fn code(&self, a: &Address) -> Option<Vec<u8>> { pub fn code(&self, a: &Address) -> Option<Bytes> {
self.get(a, true).as_ref().map(|a|a.code().map(|x|x.to_vec())).unwrap_or(None) self.get(a, true).as_ref().map(|a|a.code().map(|x|x.to_vec())).unwrap_or(None)
} }

4
src/tests/executive.rs
View File

@ -132,11 +132,11 @@ impl<'a> Ext for TestExt<'a> {
res res
} }
fn extcode(&self, address: &Address) -> Vec<u8> { fn extcode(&self, address: &Address) -> Bytes {
self.ext.extcode(address) self.ext.extcode(address)
} }
fn log(&mut self, topics: Vec<H256>, data: Vec<u8>) { fn log(&mut self, topics: Vec<H256>, data: &[u8]) {
self.ext.log(topics, data) self.ext.log(topics, data)
} }

3
src/tests/state.rs
View File

@ -13,9 +13,6 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
flush(format!("\n")); flush(format!("\n"));
for (name, test) in json.as_object().unwrap() { for (name, test) in json.as_object().unwrap() {
// if name != "TestStoreGasPrices" {
// continue;
// }
let mut fail = false; let mut fail = false;
{ {
let mut fail_unless = |cond: bool| if !cond && !fail { let mut fail_unless = |cond: bool| if !cond && !fail {