Ethcore crate split part 1 (#6041)
* split out types into separate crate * split out evm into its own crate
This commit is contained in:
parent
24c8510932
commit
d365281cce
36
Cargo.lock
generated
36
Cargo.lock
generated
@ -253,6 +253,16 @@ dependencies = [
|
|||||||
"unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "common-types"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"ethcore-util 1.7.0",
|
||||||
|
"ethjson 0.1.0",
|
||||||
|
"rlp 0.2.0",
|
||||||
|
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "conv"
|
name = "conv"
|
||||||
version = "0.3.3"
|
version = "0.3.3"
|
||||||
@ -436,6 +446,7 @@ dependencies = [
|
|||||||
"bn 0.4.4 (git+https://github.com/paritytech/bn)",
|
"bn 0.4.4 (git+https://github.com/paritytech/bn)",
|
||||||
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
|
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"common-types 0.1.0",
|
||||||
"crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
"crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -452,7 +463,7 @@ dependencies = [
|
|||||||
"ethjson 0.1.0",
|
"ethjson 0.1.0",
|
||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"ethstore 0.1.0",
|
"ethstore 0.1.0",
|
||||||
"evmjit 1.7.0",
|
"evm 0.1.0",
|
||||||
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"hardware-wallet 1.7.0",
|
"hardware-wallet 1.7.0",
|
||||||
"hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
|
"hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
|
||||||
@ -464,7 +475,6 @@ dependencies = [
|
|||||||
"native-contracts 0.1.0",
|
"native-contracts 0.1.0",
|
||||||
"num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rlp 0.2.0",
|
"rlp 0.2.0",
|
||||||
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -474,7 +484,6 @@ dependencies = [
|
|||||||
"stats 0.1.0",
|
"stats 0.1.0",
|
||||||
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -585,6 +594,7 @@ dependencies = [
|
|||||||
"ethcore-ipc-codegen 1.7.0",
|
"ethcore-ipc-codegen 1.7.0",
|
||||||
"ethcore-network 1.7.0",
|
"ethcore-network 1.7.0",
|
||||||
"ethcore-util 1.7.0",
|
"ethcore-util 1.7.0",
|
||||||
|
"evm 0.1.0",
|
||||||
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
"itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -839,6 +849,24 @@ dependencies = [
|
|||||||
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "evm"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"common-types 0.1.0",
|
||||||
|
"ethcore-util 1.7.0",
|
||||||
|
"ethjson 0.1.0",
|
||||||
|
"evmjit 1.7.0",
|
||||||
|
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rlp 0.2.0",
|
||||||
|
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "evmbin"
|
name = "evmbin"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@ -846,6 +874,7 @@ dependencies = [
|
|||||||
"docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ethcore 1.7.0",
|
"ethcore 1.7.0",
|
||||||
"ethcore-util 1.7.0",
|
"ethcore-util 1.7.0",
|
||||||
|
"evm 0.1.0",
|
||||||
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -1850,6 +1879,7 @@ dependencies = [
|
|||||||
"ethkey 0.2.0",
|
"ethkey 0.2.0",
|
||||||
"ethstore 0.1.0",
|
"ethstore 0.1.0",
|
||||||
"ethsync 1.7.0",
|
"ethsync 1.7.0",
|
||||||
|
"evm 0.1.0",
|
||||||
"fetch 0.1.0",
|
"fetch 0.1.0",
|
||||||
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"futures-cpupool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -16,6 +16,7 @@ bloomchain = "0.1"
|
|||||||
bn = { git = "https://github.com/paritytech/bn" }
|
bn = { git = "https://github.com/paritytech/bn" }
|
||||||
byteorder = "1.0"
|
byteorder = "1.0"
|
||||||
clippy = { version = "0.0.103", optional = true}
|
clippy = { version = "0.0.103", optional = true}
|
||||||
|
common-types = { path = "types" }
|
||||||
crossbeam = "0.2.9"
|
crossbeam = "0.2.9"
|
||||||
env_logger = "0.4"
|
env_logger = "0.4"
|
||||||
ethabi = "2.0"
|
ethabi = "2.0"
|
||||||
@ -31,7 +32,7 @@ ethcore-util = { path = "../util" }
|
|||||||
ethjson = { path = "../json" }
|
ethjson = { path = "../json" }
|
||||||
ethkey = { path = "../ethkey" }
|
ethkey = { path = "../ethkey" }
|
||||||
ethstore = { path = "../ethstore" }
|
ethstore = { path = "../ethstore" }
|
||||||
evmjit = { path = "../evmjit", optional = true }
|
evm = { path = "evm" }
|
||||||
futures = "0.1"
|
futures = "0.1"
|
||||||
hardware-wallet = { path = "../hw" }
|
hardware-wallet = { path = "../hw" }
|
||||||
hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
|
hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
|
||||||
@ -52,14 +53,12 @@ semver = "0.6"
|
|||||||
stats = { path = "../util/stats" }
|
stats = { path = "../util/stats" }
|
||||||
time = "0.1"
|
time = "0.1"
|
||||||
transient-hashmap = "0.4"
|
transient-hashmap = "0.4"
|
||||||
parity-wasm = "0.12"
|
|
||||||
wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
native-contracts = { path = "native_contracts", features = ["test_contracts"] }
|
native-contracts = { path = "native_contracts", features = ["test_contracts"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
jit = ["evmjit"]
|
jit = ["evm/jit"]
|
||||||
evm-debug = ["slow-blocks"]
|
evm-debug = ["slow-blocks"]
|
||||||
evm-debug-tests = ["evm-debug"]
|
evm-debug-tests = ["evm-debug"]
|
||||||
slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
|
slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
extern crate ethcore_ipc_codegen;
|
extern crate ethcore_ipc_codegen;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
|
|
||||||
ethcore_ipc_codegen::derive_ipc_cond("src/client/traits.rs", cfg!(feature="ipc")).unwrap();
|
ethcore_ipc_codegen::derive_ipc_cond("src/client/traits.rs", cfg!(feature="ipc")).unwrap();
|
||||||
ethcore_ipc_codegen::derive_ipc_cond("src/snapshot/snapshot_service_trait.rs", cfg!(feature="ipc")).unwrap();
|
ethcore_ipc_codegen::derive_ipc_cond("src/snapshot/snapshot_service_trait.rs", cfg!(feature="ipc")).unwrap();
|
||||||
ethcore_ipc_codegen::derive_ipc_cond("src/client/chain_notify.rs", cfg!(feature="ipc")).unwrap();
|
ethcore_ipc_codegen::derive_ipc_cond("src/client/chain_notify.rs", cfg!(feature="ipc")).unwrap();
|
||||||
|
23
ethcore/evm/Cargo.toml
Normal file
23
ethcore/evm/Cargo.toml
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
[package]
|
||||||
|
name = "evm"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Parity Technologies <admin@parity.io>"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
bit-set = "0.4"
|
||||||
|
byteorder = "1.0"
|
||||||
|
common-types = { path = "../types" }
|
||||||
|
ethcore-util = { path = "../../util" }
|
||||||
|
evmjit = { path = "../../evmjit", optional = true }
|
||||||
|
ethjson = { path = "../../json" }
|
||||||
|
lazy_static = "0.2"
|
||||||
|
log = "0.3"
|
||||||
|
rlp = { path = "../../util/rlp" }
|
||||||
|
parity-wasm = "0.12"
|
||||||
|
wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
rustc-hex = "1.0"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
jit = ["evmjit"]
|
@ -19,7 +19,8 @@ use util::{Address, Bytes, U256};
|
|||||||
use util::hash::{H256};
|
use util::hash::{H256};
|
||||||
use util::sha3::{Hashable, SHA3_EMPTY};
|
use util::sha3::{Hashable, SHA3_EMPTY};
|
||||||
use ethjson;
|
use ethjson;
|
||||||
use types::executed::CallType;
|
|
||||||
|
use {CallType};
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
@ -25,7 +25,7 @@ extern crate test;
|
|||||||
use self::test::{Bencher, black_box};
|
use self::test::{Bencher, black_box};
|
||||||
|
|
||||||
use util::*;
|
use util::*;
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use evm::{self, Factory, VMType};
|
use evm::{self, Factory, VMType};
|
||||||
use evm::tests::FakeExt;
|
use evm::tests::FakeExt;
|
||||||
|
|
70
ethcore/evm/src/call_type.rs
Normal file
70
ethcore/evm/src/call_type.rs
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
//! EVM call types.
|
||||||
|
|
||||||
|
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
|
||||||
|
|
||||||
|
/// The type of the call-like instruction.
|
||||||
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
|
pub enum CallType {
|
||||||
|
/// Not a CALL.
|
||||||
|
None,
|
||||||
|
/// CALL.
|
||||||
|
Call,
|
||||||
|
/// CALLCODE.
|
||||||
|
CallCode,
|
||||||
|
/// DELEGATECALL.
|
||||||
|
DelegateCall,
|
||||||
|
/// STATICCALL
|
||||||
|
StaticCall,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Encodable for CallType {
|
||||||
|
fn rlp_append(&self, s: &mut RlpStream) {
|
||||||
|
let v = match *self {
|
||||||
|
CallType::None => 0u32,
|
||||||
|
CallType::Call => 1,
|
||||||
|
CallType::CallCode => 2,
|
||||||
|
CallType::DelegateCall => 3,
|
||||||
|
CallType::StaticCall => 4,
|
||||||
|
};
|
||||||
|
Encodable::rlp_append(&v, s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Decodable for CallType {
|
||||||
|
fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
|
||||||
|
rlp.as_val().and_then(|v| Ok(match v {
|
||||||
|
0u32 => CallType::None,
|
||||||
|
1 => CallType::Call,
|
||||||
|
2 => CallType::CallCode,
|
||||||
|
3 => CallType::DelegateCall,
|
||||||
|
4 => CallType::StaticCall,
|
||||||
|
_ => return Err(DecoderError::Custom("Invalid value of CallType item")),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use rlp::*;
|
||||||
|
use super::CallType;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn encode_call_type() {
|
||||||
|
let ct = CallType::Call;
|
||||||
|
|
||||||
|
let mut s = RlpStream::new_list(2);
|
||||||
|
s.append(&ct);
|
||||||
|
assert!(!s.is_finished(), "List shouldn't finished yet");
|
||||||
|
s.append(&ct);
|
||||||
|
assert!(s.is_finished(), "List should be finished now");
|
||||||
|
s.out();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn should_encode_and_decode_call_type() {
|
||||||
|
let original = CallType::Call;
|
||||||
|
let encoded = encode(&original);
|
||||||
|
let decoded = decode(&encoded);
|
||||||
|
assert_eq!(original, decoded);
|
||||||
|
}
|
||||||
|
}
|
@ -19,7 +19,7 @@
|
|||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use util::{U256, Address, H256, Hashable};
|
use util::{U256, Address, H256, Hashable};
|
||||||
use header::BlockNumber;
|
use types::BlockNumber;
|
||||||
use ethjson;
|
use ethjson;
|
||||||
|
|
||||||
/// Simple vector of hashes, should be at most 256 items large, can be smaller if being used
|
/// Simple vector of hashes, should be at most 256 items large, can be smaller if being used
|
||||||
@ -82,7 +82,7 @@ mod tests {
|
|||||||
use ethjson;
|
use ethjson;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn it_serializes_form_json() {
|
fn it_serializes_from_json() {
|
||||||
let env_info = EnvInfo::from(ethjson::vm::Env {
|
let env_info = EnvInfo::from(ethjson::vm::Env {
|
||||||
author: ethjson::hash::Address(Address::from_str("000000f00000000f000000000000f00000000f00").unwrap()),
|
author: ethjson::hash::Address(Address::from_str("000000f00000000f000000000000f00000000f00").unwrap()),
|
||||||
number: ethjson::uint::Uint(U256::from(1_112_339)),
|
number: ethjson::uint::Uint(U256::from(1_112_339)),
|
@ -19,8 +19,8 @@
|
|||||||
use std::{ops, cmp, fmt};
|
use std::{ops, cmp, fmt};
|
||||||
use util::{U128, U256, U512, trie};
|
use util::{U128, U256, U512, trie};
|
||||||
use action_params::ActionParams;
|
use action_params::ActionParams;
|
||||||
use evm::Ext;
|
use {Ext};
|
||||||
use builtin;
|
|
||||||
use super::wasm;
|
use super::wasm;
|
||||||
|
|
||||||
/// Evm errors.
|
/// Evm errors.
|
||||||
@ -77,12 +77,6 @@ impl From<Box<trie::TrieError>> for Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<builtin::Error> for Error {
|
|
||||||
fn from(err: builtin::Error) -> Self {
|
|
||||||
Error::BuiltIn(err.0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<wasm::RuntimeError> for Error {
|
impl From<wasm::RuntimeError> for Error {
|
||||||
fn from(err: wasm::RuntimeError) -> Self {
|
fn from(err: wasm::RuntimeError) -> Self {
|
||||||
Error::Wasm(format!("Runtime error: {:?}", err))
|
Error::Wasm(format!("Runtime error: {:?}", err))
|
||||||
@ -109,7 +103,6 @@ impl fmt::Display for Error {
|
|||||||
/// A specialized version of Result over EVM errors.
|
/// A specialized version of Result over EVM errors.
|
||||||
pub type Result<T> = ::std::result::Result<T, Error>;
|
pub type Result<T> = ::std::result::Result<T, Error>;
|
||||||
|
|
||||||
|
|
||||||
/// Return data buffer. Holds memory from a previous call and a slice into that memory.
|
/// Return data buffer. Holds memory from a previous call and a slice into that memory.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct ReturnData {
|
pub struct ReturnData {
|
@ -17,9 +17,10 @@
|
|||||||
//! Interface for Evm externalities.
|
//! Interface for Evm externalities.
|
||||||
|
|
||||||
use util::*;
|
use util::*;
|
||||||
use evm::{self, Schedule, ReturnData};
|
use call_type::CallType;
|
||||||
use env_info::*;
|
use env_info::EnvInfo;
|
||||||
use types::executed::CallType;
|
use schedule::Schedule;
|
||||||
|
use evm::{self, ReturnData};
|
||||||
|
|
||||||
/// Result of externalities create function.
|
/// Result of externalities create function.
|
||||||
pub enum ContractCreateResult {
|
pub enum ContractCreateResult {
|
@ -16,10 +16,11 @@
|
|||||||
|
|
||||||
use util::*;
|
use util::*;
|
||||||
use super::u256_to_address;
|
use super::u256_to_address;
|
||||||
use evm::{self, CostType};
|
|
||||||
use evm::instructions::{self, Instruction, InstructionInfo};
|
use {evm, ext};
|
||||||
use evm::interpreter::stack::Stack;
|
use instructions::{self, Instruction, InstructionInfo};
|
||||||
use evm::schedule::Schedule;
|
use interpreter::stack::Stack;
|
||||||
|
use schedule::Schedule;
|
||||||
|
|
||||||
macro_rules! overflowing {
|
macro_rules! overflowing {
|
||||||
($x: expr) => {{
|
($x: expr) => {{
|
||||||
@ -30,26 +31,26 @@ macro_rules! overflowing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(feature="dev", allow(enum_variant_names))]
|
#[cfg_attr(feature="dev", allow(enum_variant_names))]
|
||||||
enum Request<Cost: CostType> {
|
enum Request<Cost: ::evm::CostType> {
|
||||||
Gas(Cost),
|
Gas(Cost),
|
||||||
GasMem(Cost, Cost),
|
GasMem(Cost, Cost),
|
||||||
GasMemProvide(Cost, Cost, Option<U256>),
|
GasMemProvide(Cost, Cost, Option<U256>),
|
||||||
GasMemCopy(Cost, Cost, Cost)
|
GasMemCopy(Cost, Cost, Cost)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct InstructionRequirements<Cost: CostType> {
|
pub struct InstructionRequirements<Cost> {
|
||||||
pub gas_cost: Cost,
|
pub gas_cost: Cost,
|
||||||
pub provide_gas: Option<Cost>,
|
pub provide_gas: Option<Cost>,
|
||||||
pub memory_total_gas: Cost,
|
pub memory_total_gas: Cost,
|
||||||
pub memory_required_size: usize,
|
pub memory_required_size: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Gasometer<Gas: CostType> {
|
pub struct Gasometer<Gas> {
|
||||||
pub current_gas: Gas,
|
pub current_gas: Gas,
|
||||||
pub current_mem_gas: Gas,
|
pub current_mem_gas: Gas,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Gas: CostType> Gasometer<Gas> {
|
impl<Gas: evm::CostType> Gasometer<Gas> {
|
||||||
|
|
||||||
pub fn new(current_gas: Gas) -> Self {
|
pub fn new(current_gas: Gas) -> Self {
|
||||||
Gasometer {
|
Gasometer {
|
||||||
@ -106,7 +107,7 @@ impl<Gas: CostType> Gasometer<Gas> {
|
|||||||
/// it will be the amount of gas that the current context provides to the child context.
|
/// it will be the amount of gas that the current context provides to the child context.
|
||||||
pub fn requirements(
|
pub fn requirements(
|
||||||
&mut self,
|
&mut self,
|
||||||
ext: &evm::Ext,
|
ext: &ext::Ext,
|
||||||
instruction: Instruction,
|
instruction: Instruction,
|
||||||
info: &InstructionInfo,
|
info: &InstructionInfo,
|
||||||
stack: &Stack<U256>,
|
stack: &Stack<U256>,
|
||||||
@ -290,7 +291,7 @@ impl<Gas: CostType> Gasometer<Gas> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn mem_gas_cost(&self, schedule: &evm::Schedule, current_mem_size: usize, mem_size: &Gas) -> evm::Result<(Gas, Gas, usize)> {
|
fn mem_gas_cost(&self, schedule: &Schedule, current_mem_size: usize, mem_size: &Gas) -> evm::Result<(Gas, Gas, usize)> {
|
||||||
let gas_for_mem = |mem_size: Gas| {
|
let gas_for_mem = |mem_size: Gas| {
|
||||||
let s = mem_size >> 5;
|
let s = mem_size >> 5;
|
||||||
// s * memory_gas + s * s / quad_coeff_div
|
// s * memory_gas + s * s / quad_coeff_div
|
||||||
@ -318,12 +319,12 @@ impl<Gas: CostType> Gasometer<Gas> {
|
|||||||
|
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn mem_needed_const<Gas: CostType>(mem: &U256, add: usize) -> evm::Result<Gas> {
|
fn mem_needed_const<Gas: evm::CostType>(mem: &U256, add: usize) -> evm::Result<Gas> {
|
||||||
Gas::from_u256(overflowing!(mem.overflowing_add(U256::from(add))))
|
Gas::from_u256(overflowing!(mem.overflowing_add(U256::from(add))))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn mem_needed<Gas: CostType>(offset: &U256, size: &U256) -> evm::Result<Gas> {
|
fn mem_needed<Gas: evm::CostType>(offset: &U256, size: &U256) -> evm::Result<Gas> {
|
||||||
if size.is_zero() {
|
if size.is_zero() {
|
||||||
return Ok(Gas::from(0));
|
return Ok(Gas::from(0));
|
||||||
}
|
}
|
||||||
@ -332,7 +333,7 @@ fn mem_needed<Gas: CostType>(offset: &U256, size: &U256) -> evm::Result<Gas> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
fn add_gas_usize<Gas: CostType>(value: Gas, num: usize) -> (Gas, bool) {
|
fn add_gas_usize<Gas: evm::CostType>(value: Gas, num: usize) -> (Gas, bool) {
|
||||||
value.overflow_add(Gas::from(num))
|
value.overflow_add(Gas::from(num))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,7 +341,7 @@ fn add_gas_usize<Gas: CostType>(value: Gas, num: usize) -> (Gas, bool) {
|
|||||||
fn test_mem_gas_cost() {
|
fn test_mem_gas_cost() {
|
||||||
// given
|
// given
|
||||||
let gasometer = Gasometer::<U256>::new(U256::zero());
|
let gasometer = Gasometer::<U256>::new(U256::zero());
|
||||||
let schedule = evm::Schedule::default();
|
let schedule = Schedule::default();
|
||||||
let current_mem_size = 5;
|
let current_mem_size = 5;
|
||||||
let mem_size = !U256::zero();
|
let mem_size = !U256::zero();
|
||||||
|
|
||||||
@ -357,7 +358,7 @@ fn test_mem_gas_cost() {
|
|||||||
fn test_calculate_mem_cost() {
|
fn test_calculate_mem_cost() {
|
||||||
// given
|
// given
|
||||||
let gasometer = Gasometer::<usize>::new(0);
|
let gasometer = Gasometer::<usize>::new(0);
|
||||||
let schedule = evm::Schedule::default();
|
let schedule = Schedule::default();
|
||||||
let current_mem_size = 0;
|
let current_mem_size = 0;
|
||||||
let mem_size = 5;
|
let mem_size = 5;
|
||||||
|
|
@ -15,7 +15,7 @@
|
|||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use util::U256;
|
use util::U256;
|
||||||
use evm::ReturnData;
|
use {ReturnData};
|
||||||
|
|
||||||
const MAX_RETURN_WASTE_BYTES: usize = 16384;
|
const MAX_RETURN_WASTE_BYTES: usize = 16384;
|
||||||
|
|
@ -30,9 +30,10 @@ pub use self::shared_cache::SharedCache;
|
|||||||
|
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use action_params::{ActionParams, ActionValue};
|
||||||
use types::executed::CallType;
|
use call_type::CallType;
|
||||||
use evm::instructions::{self, Instruction, InstructionInfo};
|
use instructions::{self, Instruction, InstructionInfo};
|
||||||
use evm::{self, MessageCallResult, ContractCreateResult, GasLeft, CostType, CreateContractAddress, ReturnData};
|
use evm::{self, GasLeft, CostType, ReturnData};
|
||||||
|
use ext::{self, MessageCallResult, ContractCreateResult, CreateContractAddress};
|
||||||
use bit_set::BitSet;
|
use bit_set::BitSet;
|
||||||
|
|
||||||
use util::*;
|
use util::*;
|
||||||
@ -107,7 +108,7 @@ pub struct Interpreter<Cost: CostType> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<Cost: CostType> evm::Evm for Interpreter<Cost> {
|
impl<Cost: CostType> evm::Evm for Interpreter<Cost> {
|
||||||
fn exec(&mut self, params: ActionParams, ext: &mut evm::Ext) -> evm::Result<GasLeft> {
|
fn exec(&mut self, params: ActionParams, ext: &mut ext::Ext) -> evm::Result<GasLeft> {
|
||||||
self.mem.clear();
|
self.mem.clear();
|
||||||
|
|
||||||
let mut informant = informant::EvmInformant::new(ext.depth());
|
let mut informant = informant::EvmInformant::new(ext.depth());
|
||||||
@ -204,7 +205,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn verify_instruction(&self, ext: &evm::Ext, instruction: Instruction, info: &InstructionInfo, stack: &Stack<U256>) -> evm::Result<()> {
|
fn verify_instruction(&self, ext: &ext::Ext, instruction: Instruction, info: &InstructionInfo, stack: &Stack<U256>) -> evm::Result<()> {
|
||||||
let schedule = ext.schedule();
|
let schedule = ext.schedule();
|
||||||
|
|
||||||
if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
|
if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
|
||||||
@ -270,7 +271,7 @@ impl<Cost: CostType> Interpreter<Cost> {
|
|||||||
&mut self,
|
&mut self,
|
||||||
gas: Cost,
|
gas: Cost,
|
||||||
params: &ActionParams,
|
params: &ActionParams,
|
||||||
ext: &mut evm::Ext,
|
ext: &mut ext::Ext,
|
||||||
instruction: Instruction,
|
instruction: Instruction,
|
||||||
code: &mut CodeReader,
|
code: &mut CodeReader,
|
||||||
stack: &mut Stack<U256>,
|
stack: &mut Stack<U256>,
|
@ -15,7 +15,7 @@
|
|||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use evm::instructions;
|
use instructions;
|
||||||
|
|
||||||
/// Stack trait with VM-friendly API
|
/// Stack trait with VM-friendly API
|
||||||
pub trait Stack<T> {
|
pub trait Stack<T> {
|
@ -18,7 +18,7 @@
|
|||||||
use util::*;
|
use util::*;
|
||||||
use evmjit;
|
use evmjit;
|
||||||
use evm::{self, GasLeft};
|
use evm::{self, GasLeft};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
/// Should be used to convert jit types to ethcore
|
/// Should be used to convert jit types to ethcore
|
||||||
trait FromJit<T>: Sized {
|
trait FromJit<T>: Sized {
|
@ -16,16 +16,41 @@
|
|||||||
|
|
||||||
//! Ethereum virtual machine.
|
//! Ethereum virtual machine.
|
||||||
|
|
||||||
|
extern crate byteorder;
|
||||||
|
extern crate bit_set;
|
||||||
|
extern crate common_types as types;
|
||||||
|
extern crate ethcore_util as util;
|
||||||
|
extern crate ethjson;
|
||||||
|
extern crate rlp;
|
||||||
|
extern crate parity_wasm;
|
||||||
|
extern crate wasm_utils;
|
||||||
|
|
||||||
|
#[macro_use]
|
||||||
|
extern crate lazy_static;
|
||||||
|
|
||||||
|
#[macro_use]
|
||||||
|
extern crate log;
|
||||||
|
|
||||||
|
#[cfg(feature = "jit")]
|
||||||
|
extern crate evmjit;
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
extern crate rustc_hex;
|
||||||
|
|
||||||
|
pub mod action_params;
|
||||||
|
pub mod call_type;
|
||||||
|
pub mod env_info;
|
||||||
pub mod ext;
|
pub mod ext;
|
||||||
pub mod evm;
|
pub mod evm;
|
||||||
pub mod interpreter;
|
pub mod interpreter;
|
||||||
#[macro_use]
|
|
||||||
pub mod factory;
|
|
||||||
pub mod schedule;
|
pub mod schedule;
|
||||||
pub mod wasm;
|
pub mod wasm;
|
||||||
|
|
||||||
|
#[macro_use]
|
||||||
|
pub mod factory;
|
||||||
mod vmtype;
|
mod vmtype;
|
||||||
mod instructions;
|
mod instructions;
|
||||||
|
|
||||||
#[cfg(feature = "jit" )]
|
#[cfg(feature = "jit" )]
|
||||||
mod jit;
|
mod jit;
|
||||||
|
|
||||||
@ -34,10 +59,12 @@ mod tests;
|
|||||||
#[cfg(all(feature="benches", test))]
|
#[cfg(all(feature="benches", test))]
|
||||||
mod benches;
|
mod benches;
|
||||||
|
|
||||||
|
pub use self::action_params::ActionParams;
|
||||||
|
pub use self::call_type::CallType;
|
||||||
|
pub use self::env_info::EnvInfo;
|
||||||
pub use self::evm::{Evm, Error, Finalize, FinalizationResult, GasLeft, Result, CostType, ReturnData};
|
pub use self::evm::{Evm, Error, Finalize, FinalizationResult, GasLeft, Result, CostType, ReturnData};
|
||||||
pub use self::ext::{Ext, ContractCreateResult, MessageCallResult, CreateContractAddress};
|
pub use self::ext::{Ext, ContractCreateResult, MessageCallResult, CreateContractAddress};
|
||||||
pub use self::instructions::{InstructionInfo, INSTRUCTIONS, push_bytes};
|
pub use self::instructions::{InstructionInfo, INSTRUCTIONS, push_bytes};
|
||||||
pub use self::vmtype::VMType;
|
pub use self::vmtype::VMType;
|
||||||
pub use self::factory::Factory;
|
pub use self::factory::Factory;
|
||||||
pub use self::schedule::{Schedule, CleanDustMode};
|
pub use self::schedule::{Schedule, CleanDustMode};
|
||||||
pub use types::executed::CallType;
|
|
@ -15,7 +15,6 @@
|
|||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
//! Cost schedule and other parameterisations for the EVM.
|
//! Cost schedule and other parameterisations for the EVM.
|
||||||
use spec::CommonParams;
|
|
||||||
|
|
||||||
/// Definition of the cost schedule and other parameterisations for the EVM.
|
/// Definition of the cost schedule and other parameterisations for the EVM.
|
||||||
pub struct Schedule {
|
pub struct Schedule {
|
||||||
@ -185,26 +184,6 @@ impl Schedule {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Schedule for the post-EIP-150-era of the Ethereum main net.
|
|
||||||
pub fn from_params(block_number: u64, params: &CommonParams) -> Schedule {
|
|
||||||
let mut schedule = Schedule::new_post_eip150(usize::max_value(), true, true, true);
|
|
||||||
schedule.apply_params(block_number, params);
|
|
||||||
schedule
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Apply common spec config parameters to the schedule.
|
|
||||||
pub fn apply_params(&mut self, block_number: u64, params: &CommonParams) {
|
|
||||||
self.have_create2 = block_number >= params.eip86_transition;
|
|
||||||
self.have_revert = block_number >= params.eip140_transition;
|
|
||||||
self.have_static_call = block_number >= params.eip214_transition;
|
|
||||||
if block_number >= params.eip210_transition {
|
|
||||||
self.blockhash_gas = 350;
|
|
||||||
}
|
|
||||||
if block_number >= params.dust_protection_transition {
|
|
||||||
self.kill_dust = if params.remove_dust_contracts { CleanDustMode::WithCodeAndStorage } else { CleanDustMode::BasicOnly };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Schedule for the Metropolis of the Ethereum main net.
|
/// Schedule for the Metropolis of the Ethereum main net.
|
||||||
pub fn new_metropolis() -> Schedule {
|
pub fn new_metropolis() -> Schedule {
|
||||||
let mut schedule = Self::new_post_eip150(24576, true, true, true);
|
let mut schedule = Self::new_post_eip150(24576, true, true, true);
|
@ -19,13 +19,12 @@ use rustc_hex::FromHex;
|
|||||||
use util::*;
|
use util::*;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use action_params::{ActionParams, ActionValue};
|
||||||
use env_info::EnvInfo;
|
use env_info::EnvInfo;
|
||||||
use types::executed::CallType;
|
use call_type::CallType;
|
||||||
use evm::{self, Ext, Schedule, Factory, GasLeft, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
|
use schedule::Schedule;
|
||||||
use tests::helpers::*;
|
use evm::{self, GasLeft, ReturnData};
|
||||||
use types::transaction::SYSTEM_ADDRESS;
|
use ext::{Ext, ContractCreateResult, MessageCallResult, CreateContractAddress};
|
||||||
use executive::Executive;
|
use factory::Factory;
|
||||||
use state::Substate;
|
use vmtype::VMType;
|
||||||
use trace::{NoopVMTracer, NoopTracer};
|
|
||||||
|
|
||||||
pub struct FakeLogEntry {
|
pub struct FakeLogEntry {
|
||||||
topics: Vec<H256>,
|
topics: Vec<H256>,
|
||||||
@ -438,67 +437,6 @@ fn test_blockhash(factory: super::Factory) {
|
|||||||
assert_eq!(ext.store.get(&H256::new()).unwrap(), &blockhash);
|
assert_eq!(ext.store.get(&H256::new()).unwrap(), &blockhash);
|
||||||
}
|
}
|
||||||
|
|
||||||
evm_test!{test_blockhash_eip210: test_blockhash_eip210_jit, test_blockhash_eip210_int}
|
|
||||||
fn test_blockhash_eip210(factory: super::Factory) {
|
|
||||||
let get_prev_hash_code = Arc::new("600143034060205260206020f3".from_hex().unwrap()); // this returns previous block hash
|
|
||||||
let get_prev_hash_code_hash = get_prev_hash_code.sha3();
|
|
||||||
// This is same as DEFAULT_BLOCKHASH_CONTRACT except for metropolis transition block check removed.
|
|
||||||
let test_blockhash_contract = "73fffffffffffffffffffffffffffffffffffffffe33141561007a57600143036020526000356101006020510755600061010060205107141561005057600035610100610100602051050761010001555b6000620100006020510714156100755760003561010062010000602051050761020001555b61014a565b4360003512151561009057600060405260206040f35b610100600035430312156100b357610100600035075460605260206060f3610149565b62010000600035430312156100d157600061010060003507146100d4565b60005b156100f6576101006101006000350507610100015460805260206080f3610148565b630100000060003543031215610116576000620100006000350714610119565b60005b1561013c57610100620100006000350507610200015460a052602060a0f3610147565b600060c052602060c0f35b5b5b5b5b";
|
|
||||||
let blockhash_contract_code = Arc::new(test_blockhash_contract.from_hex().unwrap());
|
|
||||||
let blockhash_contract_code_hash = blockhash_contract_code.sha3();
|
|
||||||
let engine = TestEngine::new_metropolis();
|
|
||||||
let mut env_info = EnvInfo::default();
|
|
||||||
|
|
||||||
// populate state with 256 last hashes
|
|
||||||
let mut state = get_temp_state_with_factory(factory);
|
|
||||||
let contract_address: Address = 0xf0.into();
|
|
||||||
state.init_code(&contract_address, (*blockhash_contract_code).clone()).unwrap();
|
|
||||||
for i in 1 .. 257 {
|
|
||||||
env_info.number = i.into();
|
|
||||||
let params = ActionParams {
|
|
||||||
code_address: contract_address.clone(),
|
|
||||||
address: contract_address,
|
|
||||||
sender: SYSTEM_ADDRESS.clone(),
|
|
||||||
origin: SYSTEM_ADDRESS.clone(),
|
|
||||||
gas: 100000.into(),
|
|
||||||
gas_price: 0.into(),
|
|
||||||
value: ActionValue::Transfer(0.into()),
|
|
||||||
code: Some(blockhash_contract_code.clone()),
|
|
||||||
code_hash: Some(blockhash_contract_code_hash),
|
|
||||||
data: Some(H256::from(i - 1).to_vec()),
|
|
||||||
call_type: CallType::Call,
|
|
||||||
};
|
|
||||||
let mut ex = Executive::new(&mut state, &env_info, &engine);
|
|
||||||
let mut substate = Substate::new();
|
|
||||||
let mut output = [];
|
|
||||||
if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
|
|
||||||
panic!("Encountered error on updating last hashes: {}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
env_info.number = 256;
|
|
||||||
let params = ActionParams {
|
|
||||||
code_address: Address::new(),
|
|
||||||
address: Address::new(),
|
|
||||||
sender: Address::new(),
|
|
||||||
origin: Address::new(),
|
|
||||||
gas: 100000.into(),
|
|
||||||
gas_price: 0.into(),
|
|
||||||
value: ActionValue::Transfer(0.into()),
|
|
||||||
code: Some(get_prev_hash_code),
|
|
||||||
code_hash: Some(get_prev_hash_code_hash),
|
|
||||||
data: None,
|
|
||||||
call_type: CallType::Call,
|
|
||||||
};
|
|
||||||
let mut ex = Executive::new(&mut state, &env_info, &engine);
|
|
||||||
let mut substate = Substate::new();
|
|
||||||
let mut output = H256::new();
|
|
||||||
if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
|
|
||||||
panic!("Encountered error on getting last hash: {}", e);
|
|
||||||
}
|
|
||||||
assert_eq!(output, 255.into());
|
|
||||||
}
|
|
||||||
|
|
||||||
evm_test!{test_calldataload: test_calldataload_jit, test_calldataload_int}
|
evm_test!{test_calldataload: test_calldataload_jit, test_calldataload_int}
|
||||||
fn test_calldataload(factory: super::Factory) {
|
fn test_calldataload(factory: super::Factory) {
|
||||||
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
|
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
|
@ -58,7 +58,7 @@ impl WasmInterpreter {
|
|||||||
|
|
||||||
impl evm::Evm for WasmInterpreter {
|
impl evm::Evm for WasmInterpreter {
|
||||||
|
|
||||||
fn exec(&mut self, params: ActionParams, ext: &mut evm::Ext) -> evm::Result<GasLeft> {
|
fn exec(&mut self, params: ActionParams, ext: &mut ::ext::Ext) -> evm::Result<GasLeft> {
|
||||||
use parity_wasm::elements::Deserialize;
|
use parity_wasm::elements::Deserialize;
|
||||||
|
|
||||||
let code = params.code.expect("exec is only called on contract with code; qed");
|
let code = params.code.expect("exec is only called on contract with code; qed");
|
@ -20,7 +20,7 @@ use std::sync::Arc;
|
|||||||
|
|
||||||
use byteorder::{LittleEndian, ByteOrder};
|
use byteorder::{LittleEndian, ByteOrder};
|
||||||
|
|
||||||
use evm;
|
use ext;
|
||||||
|
|
||||||
use parity_wasm::interpreter;
|
use parity_wasm::interpreter;
|
||||||
use util::{Address, H256, U256};
|
use util::{Address, H256, U256};
|
||||||
@ -62,14 +62,14 @@ pub struct Runtime<'a> {
|
|||||||
gas_counter: u64,
|
gas_counter: u64,
|
||||||
gas_limit: u64,
|
gas_limit: u64,
|
||||||
dynamic_top: u32,
|
dynamic_top: u32,
|
||||||
ext: &'a mut evm::Ext,
|
ext: &'a mut ext::Ext,
|
||||||
memory: Arc<interpreter::MemoryInstance>,
|
memory: Arc<interpreter::MemoryInstance>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Runtime<'a> {
|
impl<'a> Runtime<'a> {
|
||||||
/// New runtime for wasm contract with specified params
|
/// New runtime for wasm contract with specified params
|
||||||
pub fn with_params<'b>(
|
pub fn with_params<'b>(
|
||||||
ext: &'b mut evm::Ext,
|
ext: &'b mut ext::Ext,
|
||||||
memory: Arc<interpreter::MemoryInstance>,
|
memory: Arc<interpreter::MemoryInstance>,
|
||||||
stack_space: u32,
|
stack_space: u32,
|
||||||
gas_limit: u64,
|
gas_limit: u64,
|
||||||
@ -153,14 +153,14 @@ impl<'a> Runtime<'a> {
|
|||||||
.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?
|
.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?
|
||||||
.into();
|
.into();
|
||||||
|
|
||||||
match self.ext.create(&gas_left, &endowment, &code, evm::CreateContractAddress::FromSenderAndCodeHash) {
|
match self.ext.create(&gas_left, &endowment, &code, ext::CreateContractAddress::FromSenderAndCodeHash) {
|
||||||
evm::ContractCreateResult::Created(address, gas_left) => {
|
ext::ContractCreateResult::Created(address, gas_left) => {
|
||||||
self.memory.set(result_ptr, &*address)?;
|
self.memory.set(result_ptr, &*address)?;
|
||||||
self.gas_counter = self.gas_limit - gas_left.low_u64();
|
self.gas_counter = self.gas_limit - gas_left.low_u64();
|
||||||
trace!(target: "wasm", "runtime: create contract success (@{:?})", address);
|
trace!(target: "wasm", "runtime: create contract success (@{:?})", address);
|
||||||
Ok(Some(0i32.into()))
|
Ok(Some(0i32.into()))
|
||||||
},
|
},
|
||||||
evm::ContractCreateResult::Failed => {
|
ext::ContractCreateResult::Failed => {
|
||||||
trace!(target: "wasm", "runtime: create contract fail");
|
trace!(target: "wasm", "runtime: create contract fail");
|
||||||
Ok(Some((-1i32).into()))
|
Ok(Some((-1i32).into()))
|
||||||
}
|
}
|
@ -1,22 +1,31 @@
|
|||||||
use std::path::PathBuf;
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||||
use std::fs::File;
|
// This file is part of Parity.
|
||||||
use std::io::Read;
|
|
||||||
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
|
||||||
|
// Parity is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use ethcore_logger::init_log;
|
|
||||||
use super::super::tests::{FakeExt, FakeCall, FakeCallType};
|
use super::super::tests::{FakeExt, FakeCall, FakeCallType};
|
||||||
use super::WasmInterpreter;
|
use super::WasmInterpreter;
|
||||||
use evm::{self, Evm, GasLeft};
|
use evm::{self, Evm, GasLeft};
|
||||||
use action_params::{ActionParams, ActionValue};
|
use action_params::{ActionParams, ActionValue};
|
||||||
use util::{U256, H256, Address};
|
use util::{U256, H256, Address};
|
||||||
|
|
||||||
fn load_sample(name: &str) -> Vec<u8> {
|
macro_rules! load_sample {
|
||||||
let mut path = PathBuf::from("./res/wasm-tests/compiled");
|
($name: expr) => {
|
||||||
path.push(name);
|
include_bytes!(concat!("../../../res/wasm-tests/compiled/", $name)).to_vec()
|
||||||
let mut file = File::open(path).expect(&format!("File {} for test to exist", name));
|
}
|
||||||
let mut data = vec![];
|
|
||||||
file.read_to_end(&mut data).expect(&format!("Test {} to load ok", name));
|
|
||||||
data
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_finalize(res: Result<GasLeft, evm::Error>) -> Result<U256, evm::Error> {
|
fn test_finalize(res: Result<GasLeft, evm::Error>) -> Result<U256, evm::Error> {
|
||||||
@ -34,9 +43,7 @@ fn wasm_interpreter() -> WasmInterpreter {
|
|||||||
/// Empty contract does almost nothing except producing 1 (one) local node debug log message
|
/// Empty contract does almost nothing except producing 1 (one) local node debug log message
|
||||||
#[test]
|
#[test]
|
||||||
fn empty() {
|
fn empty() {
|
||||||
init_log();
|
let code = load_sample!("empty.wasm");
|
||||||
|
|
||||||
let code = load_sample("empty.wasm");
|
|
||||||
let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
|
let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
|
||||||
|
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
@ -58,9 +65,7 @@ fn empty() {
|
|||||||
// logger.wasm writes all these provided fixed header fields to some arbitrary storage keys.
|
// logger.wasm writes all these provided fixed header fields to some arbitrary storage keys.
|
||||||
#[test]
|
#[test]
|
||||||
fn logger() {
|
fn logger() {
|
||||||
init_log();
|
let code = load_sample!("logger.wasm");
|
||||||
|
|
||||||
let code = load_sample("logger.wasm");
|
|
||||||
let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
|
let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
|
||||||
let sender: Address = "0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d".parse().unwrap();
|
let sender: Address = "0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d".parse().unwrap();
|
||||||
let origin: Address = "0102030405060708090a0b0c0d0e0f1011121314".parse().unwrap();
|
let origin: Address = "0102030405060708090a0b0c0d0e0f1011121314".parse().unwrap();
|
||||||
@ -113,9 +118,7 @@ fn logger() {
|
|||||||
// if it has any result.
|
// if it has any result.
|
||||||
#[test]
|
#[test]
|
||||||
fn identity() {
|
fn identity() {
|
||||||
init_log();
|
let code = load_sample!("identity.wasm");
|
||||||
|
|
||||||
let code = load_sample("identity.wasm");
|
|
||||||
let sender: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
|
let sender: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
|
||||||
|
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
@ -148,9 +151,7 @@ fn identity() {
|
|||||||
// This also tests byte-perfect memory allocation and in/out ptr lifecycle.
|
// This also tests byte-perfect memory allocation and in/out ptr lifecycle.
|
||||||
#[test]
|
#[test]
|
||||||
fn dispersion() {
|
fn dispersion() {
|
||||||
init_log();
|
let code = load_sample!("dispersion.wasm");
|
||||||
|
|
||||||
let code = load_sample("dispersion.wasm");
|
|
||||||
|
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
params.gas = U256::from(100_000);
|
params.gas = U256::from(100_000);
|
||||||
@ -179,9 +180,7 @@ fn dispersion() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn suicide_not() {
|
fn suicide_not() {
|
||||||
init_log();
|
let code = load_sample!("suicidal.wasm");
|
||||||
|
|
||||||
let code = load_sample("suicidal.wasm");
|
|
||||||
|
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
params.gas = U256::from(100_000);
|
params.gas = U256::from(100_000);
|
||||||
@ -210,9 +209,7 @@ fn suicide_not() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn suicide() {
|
fn suicide() {
|
||||||
init_log();
|
let code = load_sample!("suicidal.wasm");
|
||||||
|
|
||||||
let code = load_sample("suicidal.wasm");
|
|
||||||
|
|
||||||
let refund: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
|
let refund: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
@ -242,11 +239,9 @@ fn suicide() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn create() {
|
fn create() {
|
||||||
init_log();
|
|
||||||
|
|
||||||
let mut params = ActionParams::default();
|
let mut params = ActionParams::default();
|
||||||
params.gas = U256::from(100_000);
|
params.gas = U256::from(100_000);
|
||||||
params.code = Some(Arc::new(load_sample("creator.wasm")));
|
params.code = Some(Arc::new(load_sample!("creator.wasm")));
|
||||||
params.data = Some(vec![0u8, 2, 4, 8, 16, 32, 64, 128]);
|
params.data = Some(vec![0u8, 2, 4, 8, 16, 32, 64, 128]);
|
||||||
params.value = ActionValue::transfer(1_000_000_000);
|
params.value = ActionValue::transfer(1_000_000_000);
|
||||||
|
|
@ -18,6 +18,7 @@ ethcore-network = { path = "../../util/network" }
|
|||||||
ethcore-io = { path = "../../util/io" }
|
ethcore-io = { path = "../../util/io" }
|
||||||
ethcore-ipc = { path = "../../ipc/rpc", optional = true }
|
ethcore-ipc = { path = "../../ipc/rpc", optional = true }
|
||||||
ethcore-devtools = { path = "../../devtools" }
|
ethcore-devtools = { path = "../../devtools" }
|
||||||
|
evm = { path = "../evm" }
|
||||||
rlp = { path = "../../util/rlp" }
|
rlp = { path = "../../util/rlp" }
|
||||||
time = "0.1"
|
time = "0.1"
|
||||||
smallvec = "0.4"
|
smallvec = "0.4"
|
||||||
|
@ -18,10 +18,10 @@
|
|||||||
|
|
||||||
use std::sync::{Weak, Arc};
|
use std::sync::{Weak, Arc};
|
||||||
|
|
||||||
use ethcore::block_import_error::BlockImportError;
|
|
||||||
use ethcore::block_status::BlockStatus;
|
use ethcore::block_status::BlockStatus;
|
||||||
use ethcore::client::{ClientReport, EnvInfo};
|
use ethcore::client::{ClientReport, EnvInfo};
|
||||||
use ethcore::engines::Engine;
|
use ethcore::engines::Engine;
|
||||||
|
use ethcore::error::BlockImportError;
|
||||||
use ethcore::ids::BlockId;
|
use ethcore::ids::BlockId;
|
||||||
use ethcore::header::Header;
|
use ethcore::header::Header;
|
||||||
use ethcore::verification::queue::{self, HeaderQueue};
|
use ethcore::verification::queue::{self, HeaderQueue};
|
||||||
|
@ -71,6 +71,7 @@ extern crate ethcore_io as io;
|
|||||||
extern crate ethcore_network as network;
|
extern crate ethcore_network as network;
|
||||||
extern crate ethcore_util as util;
|
extern crate ethcore_util as util;
|
||||||
extern crate ethcore;
|
extern crate ethcore;
|
||||||
|
extern crate evm;
|
||||||
extern crate futures;
|
extern crate futures;
|
||||||
extern crate itertools;
|
extern crate itertools;
|
||||||
extern crate rand;
|
extern crate rand;
|
||||||
|
@ -21,10 +21,10 @@ use std::sync::Arc;
|
|||||||
use ethcore::basic_account::BasicAccount;
|
use ethcore::basic_account::BasicAccount;
|
||||||
use ethcore::encoded;
|
use ethcore::encoded;
|
||||||
use ethcore::engines::Engine;
|
use ethcore::engines::Engine;
|
||||||
use ethcore::env_info::EnvInfo;
|
|
||||||
use ethcore::receipt::Receipt;
|
use ethcore::receipt::Receipt;
|
||||||
use ethcore::state::{self, ProvedExecution};
|
use ethcore::state::{self, ProvedExecution};
|
||||||
use ethcore::transaction::SignedTransaction;
|
use ethcore::transaction::SignedTransaction;
|
||||||
|
use evm::env_info::EnvInfo;
|
||||||
|
|
||||||
use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
|
use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
|
||||||
|
|
||||||
|
@ -26,9 +26,8 @@
|
|||||||
use std::collections::{BTreeMap, HashMap};
|
use std::collections::{BTreeMap, HashMap};
|
||||||
use std::collections::hash_map::Entry;
|
use std::collections::hash_map::Entry;
|
||||||
|
|
||||||
use ethcore::error::TransactionError;
|
use ethcore::error::{TransactionError, TransactionImportResult};
|
||||||
use ethcore::transaction::{Condition, PendingTransaction, SignedTransaction};
|
use ethcore::transaction::{Condition, PendingTransaction, SignedTransaction};
|
||||||
use ethcore::transaction_import::TransactionImportResult;
|
|
||||||
use util::{Address, U256, H256, H256FastMap};
|
use util::{Address, U256, H256, H256FastMap};
|
||||||
|
|
||||||
// Knowledge of an account's current nonce.
|
// Knowledge of an account's current nonce.
|
||||||
|
@ -16,13 +16,11 @@
|
|||||||
|
|
||||||
//! Ethcore basic typenames.
|
//! Ethcore basic typenames.
|
||||||
|
|
||||||
use util::hash::H2048;
|
|
||||||
|
|
||||||
/// Type for a 2048-bit log-bloom, as used by our blocks.
|
/// Type for a 2048-bit log-bloom, as used by our blocks.
|
||||||
pub type LogBloom = H2048;
|
pub type LogBloom = ::log_entry::LogBloom;
|
||||||
|
|
||||||
/// Constant 2048-bit datum for 0. Often used as a default.
|
/// Constant 2048-bit datum for 0. Often used as a default.
|
||||||
pub static ZERO_LOGBLOOM: LogBloom = H2048([0x00; 256]);
|
pub static ZERO_LOGBLOOM: LogBloom = ::util::hash::H2048([0x00; 256]);
|
||||||
|
|
||||||
#[cfg_attr(feature="dev", allow(enum_variant_names))]
|
#[cfg_attr(feature="dev", allow(enum_variant_names))]
|
||||||
/// Semantic boolean for when a seal/signature is included.
|
/// Semantic boolean for when a seal/signature is included.
|
||||||
|
@ -25,7 +25,7 @@ use util::{Bytes, Address, Hashable, U256, H256, ordered_trie_root, SHA3_NULL_RL
|
|||||||
use util::error::{Mismatch, OutOfBounds};
|
use util::error::{Mismatch, OutOfBounds};
|
||||||
|
|
||||||
use basic_types::{LogBloom, Seal};
|
use basic_types::{LogBloom, Seal};
|
||||||
use env_info::{EnvInfo, LastHashes};
|
use evm::env_info::{EnvInfo, LastHashes};
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use error::{Error, BlockError, TransactionError};
|
use error::{Error, BlockError, TransactionError};
|
||||||
use factory::Factories;
|
use factory::Factories;
|
||||||
@ -656,7 +656,7 @@ mod tests {
|
|||||||
use tests::helpers::*;
|
use tests::helpers::*;
|
||||||
use super::*;
|
use super::*;
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::LastHashes;
|
use evm::env_info::LastHashes;
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use header::Header;
|
use header::Header;
|
||||||
use factory::Factories;
|
use factory::Factories;
|
||||||
|
@ -36,6 +36,12 @@ impl From<&'static str> for Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Into<::evm::Error> for Error {
|
||||||
|
fn into(self) -> ::evm::Error {
|
||||||
|
::evm::Error::BuiltIn(self.0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Native implementation of a built-in contract.
|
/// Native implementation of a built-in contract.
|
||||||
pub trait Impl: Send + Sync {
|
pub trait Impl: Send + Sync {
|
||||||
/// execute this built-in on the given input, writing to the given output.
|
/// execute this built-in on the given input, writing to the given output.
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
|
use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::sync::{Arc, Weak};
|
use std::sync::{Arc, Weak};
|
||||||
use std::fmt;
|
|
||||||
use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
|
use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
|
||||||
use std::time::{Instant};
|
use std::time::{Instant};
|
||||||
use time::precise_time_ns;
|
use time::precise_time_ns;
|
||||||
@ -43,8 +42,8 @@ use client::{
|
|||||||
};
|
};
|
||||||
use encoded;
|
use encoded;
|
||||||
use engines::{Engine, EpochTransition};
|
use engines::{Engine, EpochTransition};
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use env_info::LastHashes;
|
use evm::env_info::LastHashes;
|
||||||
use error::{ImportError, ExecutionError, CallError, BlockError, ImportResult, Error as EthcoreError};
|
use error::{ImportError, ExecutionError, CallError, BlockError, ImportResult, Error as EthcoreError};
|
||||||
use evm::{Factory as EvmFactory, Schedule};
|
use evm::{Factory as EvmFactory, Schedule};
|
||||||
use executive::{Executive, Executed, TransactOptions, contract_address};
|
use executive::{Executive, Executed, TransactOptions, contract_address};
|
||||||
@ -84,12 +83,6 @@ const MAX_TX_QUEUE_SIZE: usize = 4096;
|
|||||||
const MAX_QUEUE_SIZE_TO_SLEEP_ON: usize = 2;
|
const MAX_QUEUE_SIZE_TO_SLEEP_ON: usize = 2;
|
||||||
const MIN_HISTORY_SIZE: u64 = 8;
|
const MIN_HISTORY_SIZE: u64 = 8;
|
||||||
|
|
||||||
impl fmt::Display for BlockChainInfo {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
||||||
write!(f, "#{}.{}", self.best_block_number, self.best_block_hash)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Report on the status of a client.
|
/// Report on the status of a client.
|
||||||
#[derive(Default, Clone, Debug, Eq, PartialEq)]
|
#[derive(Default, Clone, Debug, Eq, PartialEq)]
|
||||||
pub struct ClientReport {
|
pub struct ClientReport {
|
||||||
|
@ -17,14 +17,16 @@
|
|||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::fmt::{Display, Formatter, Error as FmtError};
|
use std::fmt::{Display, Formatter, Error as FmtError};
|
||||||
|
|
||||||
|
use mode::Mode as IpcMode;
|
||||||
|
use verification::{VerifierType, QueueConfig};
|
||||||
|
use util::{journaldb, CompactionProfile};
|
||||||
|
|
||||||
pub use std::time::Duration;
|
pub use std::time::Duration;
|
||||||
pub use blockchain::Config as BlockChainConfig;
|
pub use blockchain::Config as BlockChainConfig;
|
||||||
pub use trace::Config as TraceConfig;
|
pub use trace::Config as TraceConfig;
|
||||||
pub use evm::VMType;
|
pub use evm::VMType;
|
||||||
|
|
||||||
use verification::{VerifierType, QueueConfig};
|
|
||||||
use util::{journaldb, CompactionProfile};
|
|
||||||
|
|
||||||
/// Client state db compaction profile
|
/// Client state db compaction profile
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
pub enum DatabaseCompactionProfile {
|
pub enum DatabaseCompactionProfile {
|
||||||
@ -98,6 +100,29 @@ impl Display for Mode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Into<IpcMode> for Mode {
|
||||||
|
fn into(self) -> IpcMode {
|
||||||
|
match self {
|
||||||
|
Mode::Off => IpcMode::Off,
|
||||||
|
Mode::Dark(timeout) => IpcMode::Dark(timeout.as_secs()),
|
||||||
|
Mode::Passive(timeout, alarm) => IpcMode::Passive(timeout.as_secs(), alarm.as_secs()),
|
||||||
|
Mode::Active => IpcMode::Active,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<IpcMode> for Mode {
|
||||||
|
fn from(mode: IpcMode) -> Self {
|
||||||
|
match mode {
|
||||||
|
IpcMode::Off => Mode::Off,
|
||||||
|
IpcMode::Dark(timeout) => Mode::Dark(Duration::from_secs(timeout)),
|
||||||
|
IpcMode::Passive(timeout, alarm) => Mode::Passive(Duration::from_secs(timeout), Duration::from_secs(alarm)),
|
||||||
|
IpcMode::Active => Mode::Active,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Client configuration. Includes configs for all sub-systems.
|
/// Client configuration. Includes configs for all sub-systems.
|
||||||
#[derive(Debug, PartialEq, Default)]
|
#[derive(Debug, PartialEq, Default)]
|
||||||
pub struct ClientConfig {
|
pub struct ClientConfig {
|
||||||
|
@ -23,7 +23,7 @@ use util::kvdb::{self, KeyValueDB};
|
|||||||
use {state, state_db, client, executive, trace, db, spec};
|
use {state, state_db, client, executive, trace, db, spec};
|
||||||
use factory::Factories;
|
use factory::Factories;
|
||||||
use evm::{self, VMType};
|
use evm::{self, VMType};
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
|
|
||||||
/// EVM test Error.
|
/// EVM test Error.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
@ -40,11 +40,9 @@ pub use types::pruning_info::PruningInfo;
|
|||||||
pub use types::call_analytics::CallAnalytics;
|
pub use types::call_analytics::CallAnalytics;
|
||||||
|
|
||||||
pub use executive::{Executed, Executive, TransactOptions};
|
pub use executive::{Executed, Executive, TransactOptions};
|
||||||
pub use env_info::{LastHashes, EnvInfo};
|
pub use evm::env_info::{LastHashes, EnvInfo};
|
||||||
|
|
||||||
pub use block_import_error::BlockImportError;
|
pub use error::{BlockImportError, TransactionImportError, TransactionImportResult};
|
||||||
pub use transaction_import::TransactionImportResult;
|
|
||||||
pub use transaction_import::TransactionImportError;
|
|
||||||
pub use verification::VerifierType;
|
pub use verification::VerifierType;
|
||||||
|
|
||||||
/// IPC interfaces
|
/// IPC interfaces
|
||||||
|
@ -15,24 +15,27 @@
|
|||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use util::{U256, Address, H256, H2048, Bytes, Itertools};
|
|
||||||
use util::hashdb::DBValue;
|
|
||||||
use blockchain::TreeRoute;
|
|
||||||
use verification::queue::QueueInfo as BlockQueueInfo;
|
|
||||||
use block::{OpenBlock, SealedBlock, ClosedBlock};
|
use block::{OpenBlock, SealedBlock, ClosedBlock};
|
||||||
use header::{BlockNumber};
|
use blockchain::TreeRoute;
|
||||||
use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
|
use encoded;
|
||||||
use transaction_import::TransactionImportResult;
|
use evm::env_info::LastHashes;
|
||||||
use log_entry::LocalizedLogEntry;
|
|
||||||
use filter::Filter;
|
|
||||||
use error::{ImportResult, CallError, Error as EthcoreError};
|
use error::{ImportResult, CallError, Error as EthcoreError};
|
||||||
use receipt::LocalizedReceipt;
|
use error::{TransactionImportResult, BlockImportError};
|
||||||
use trace::LocalizedTrace;
|
|
||||||
use evm::{Factory as EvmFactory, Schedule};
|
use evm::{Factory as EvmFactory, Schedule};
|
||||||
use executive::Executed;
|
use executive::Executed;
|
||||||
use env_info::LastHashes;
|
use filter::Filter;
|
||||||
use block_import_error::BlockImportError;
|
use header::{BlockNumber};
|
||||||
use ipc::IpcConfig;
|
use ipc::IpcConfig;
|
||||||
|
use log_entry::LocalizedLogEntry;
|
||||||
|
use receipt::LocalizedReceipt;
|
||||||
|
use trace::LocalizedTrace;
|
||||||
|
use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
|
||||||
|
use verification::queue::QueueInfo as BlockQueueInfo;
|
||||||
|
|
||||||
|
use util::{U256, Address, H256, H2048, Bytes, Itertools};
|
||||||
|
use util::hashdb::DBValue;
|
||||||
|
|
||||||
use types::ids::*;
|
use types::ids::*;
|
||||||
use types::basic_account::BasicAccount;
|
use types::basic_account::BasicAccount;
|
||||||
use types::trace_filter::Filter as TraceFilter;
|
use types::trace_filter::Filter as TraceFilter;
|
||||||
@ -41,7 +44,6 @@ use types::blockchain_info::BlockChainInfo;
|
|||||||
use types::block_status::BlockStatus;
|
use types::block_status::BlockStatus;
|
||||||
use types::mode::Mode;
|
use types::mode::Mode;
|
||||||
use types::pruning_info::PruningInfo;
|
use types::pruning_info::PruningInfo;
|
||||||
use encoded;
|
|
||||||
|
|
||||||
#[ipc(client_ident="RemoteClient")]
|
#[ipc(client_ident="RemoteClient")]
|
||||||
/// Blockchain database client. Owns and manages a blockchain and a block queue.
|
/// Blockchain database client. Owns and manages a blockchain and a block queue.
|
||||||
|
@ -532,7 +532,7 @@ impl Engine for AuthorityRound {
|
|||||||
fn on_new_block(
|
fn on_new_block(
|
||||||
&self,
|
&self,
|
||||||
block: &mut ExecutedBlock,
|
block: &mut ExecutedBlock,
|
||||||
last_hashes: Arc<::env_info::LastHashes>,
|
last_hashes: Arc<::evm::env_info::LastHashes>,
|
||||||
epoch_begin: bool,
|
epoch_begin: bool,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
let parent_hash = block.fields().header.parent_hash().clone();
|
let parent_hash = block.fields().header.parent_hash().clone();
|
||||||
|
@ -43,7 +43,7 @@ use account_provider::AccountProvider;
|
|||||||
use block::ExecutedBlock;
|
use block::ExecutedBlock;
|
||||||
use builtin::Builtin;
|
use builtin::Builtin;
|
||||||
use client::Client;
|
use client::Client;
|
||||||
use env_info::{EnvInfo, LastHashes};
|
use evm::env_info::{EnvInfo, LastHashes};
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use evm::Schedule;
|
use evm::Schedule;
|
||||||
use header::{Header, BlockNumber};
|
use header::{Header, BlockNumber};
|
||||||
@ -193,7 +193,7 @@ pub trait Engine : Sync + Send {
|
|||||||
|
|
||||||
/// Get the EVM schedule for the given `block_number`.
|
/// Get the EVM schedule for the given `block_number`.
|
||||||
fn schedule(&self, block_number: BlockNumber) -> Schedule {
|
fn schedule(&self, block_number: BlockNumber) -> Schedule {
|
||||||
Schedule::from_params(block_number, self.params())
|
self.params().schedule(block_number)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Builtin-contracts we would like to see in the chain.
|
/// Builtin-contracts we would like to see in the chain.
|
||||||
@ -394,12 +394,12 @@ pub trait Engine : Sync + Send {
|
|||||||
/// Common engine utilities
|
/// Common engine utilities
|
||||||
pub mod common {
|
pub mod common {
|
||||||
use block::ExecutedBlock;
|
use block::ExecutedBlock;
|
||||||
use env_info::{EnvInfo, LastHashes};
|
use evm::env_info::{EnvInfo, LastHashes};
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use transaction::SYSTEM_ADDRESS;
|
use transaction::SYSTEM_ADDRESS;
|
||||||
use executive::Executive;
|
use executive::Executive;
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use evm::action_params::{ActionParams, ActionValue};
|
||||||
use trace::{NoopTracer, NoopVMTracer};
|
use trace::{NoopTracer, NoopVMTracer};
|
||||||
use state::Substate;
|
use state::Substate;
|
||||||
|
|
||||||
|
@ -901,7 +901,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn seal_submission() {
|
fn seal_submission() {
|
||||||
use ethkey::{Generator, Random};
|
use ethkey::{Generator, Random};
|
||||||
use types::transaction::{Transaction, Action};
|
use transaction::{Transaction, Action};
|
||||||
use client::BlockChainClient;
|
use client::BlockChainClient;
|
||||||
|
|
||||||
let tap = Arc::new(AccountProvider::transient_provider());
|
let tap = Arc::new(AccountProvider::transient_provider());
|
||||||
|
@ -297,7 +297,7 @@ impl ValidatorSet for ValidatorSafeContract {
|
|||||||
let (old_header, state_items) = decode_first_proof(&rlp)?;
|
let (old_header, state_items) = decode_first_proof(&rlp)?;
|
||||||
let old_hash = old_header.hash();
|
let old_hash = old_header.hash();
|
||||||
|
|
||||||
let env_info = ::env_info::EnvInfo {
|
let env_info = ::evm::env_info::EnvInfo {
|
||||||
number: old_header.number(),
|
number: old_header.number(),
|
||||||
author: *old_header.author(),
|
author: *old_header.author(),
|
||||||
difficulty: *old_header.difficulty(),
|
difficulty: *old_header.difficulty(),
|
||||||
|
@ -22,13 +22,12 @@ use header::BlockNumber;
|
|||||||
use basic_types::LogBloom;
|
use basic_types::LogBloom;
|
||||||
use client::Error as ClientError;
|
use client::Error as ClientError;
|
||||||
use ipc::binary::{BinaryConvertError, BinaryConvertable};
|
use ipc::binary::{BinaryConvertError, BinaryConvertable};
|
||||||
use types::block_import_error::BlockImportError;
|
|
||||||
use snapshot::Error as SnapshotError;
|
use snapshot::Error as SnapshotError;
|
||||||
use engines::EngineError;
|
use engines::EngineError;
|
||||||
use ethkey::Error as EthkeyError;
|
use ethkey::Error as EthkeyError;
|
||||||
use account_provider::SignError as AccountsError;
|
use account_provider::SignError as AccountsError;
|
||||||
|
|
||||||
pub use types::executed::{ExecutionError, CallError};
|
pub use executed::{ExecutionError, CallError};
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Clone, Copy)]
|
#[derive(Debug, PartialEq, Clone, Copy)]
|
||||||
/// Errors concerning transaction processing.
|
/// Errors concerning transaction processing.
|
||||||
@ -239,6 +238,53 @@ impl fmt::Display for ImportError {
|
|||||||
f.write_fmt(format_args!("Block import error ({})", msg))
|
f.write_fmt(format_args!("Block import error ({})", msg))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Error dedicated to import block function
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum BlockImportError {
|
||||||
|
/// Import error
|
||||||
|
Import(ImportError),
|
||||||
|
/// Block error
|
||||||
|
Block(BlockError),
|
||||||
|
/// Other error
|
||||||
|
Other(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<Error> for BlockImportError {
|
||||||
|
fn from(e: Error) -> Self {
|
||||||
|
match e {
|
||||||
|
Error::Block(block_error) => BlockImportError::Block(block_error),
|
||||||
|
Error::Import(import_error) => BlockImportError::Import(import_error),
|
||||||
|
_ => BlockImportError::Other(format!("other block import error: {:?}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Represents the result of importing transaction.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||||
|
pub enum TransactionImportResult {
|
||||||
|
/// Transaction was imported to current queue.
|
||||||
|
Current,
|
||||||
|
/// Transaction was imported to future queue.
|
||||||
|
Future
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Api-level error for transaction import
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub enum TransactionImportError {
|
||||||
|
/// Transaction error
|
||||||
|
Transaction(TransactionError),
|
||||||
|
/// Other error
|
||||||
|
Other(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<Error> for TransactionImportError {
|
||||||
|
fn from(e: Error) -> Self {
|
||||||
|
match e {
|
||||||
|
Error::Transaction(transaction_error) => TransactionImportError::Transaction(transaction_error),
|
||||||
|
_ => TransactionImportError::Other(format!("other block import error: {:?}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
/// General error type which should be capable of representing all errors in ethcore.
|
/// General error type which should be capable of representing all errors in ethcore.
|
||||||
|
@ -19,7 +19,7 @@ use ethash::{quick_get_difficulty, slow_get_seedhash, EthashManager};
|
|||||||
use util::*;
|
use util::*;
|
||||||
use block::*;
|
use block::*;
|
||||||
use builtin::Builtin;
|
use builtin::Builtin;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use error::{BlockError, Error, TransactionError};
|
use error::{BlockError, Error, TransactionError};
|
||||||
use header::{Header, BlockNumber};
|
use header::{Header, BlockNumber};
|
||||||
use state::CleanupMode;
|
use state::CleanupMode;
|
||||||
@ -29,7 +29,7 @@ use engines::{self, Engine};
|
|||||||
use evm::Schedule;
|
use evm::Schedule;
|
||||||
use ethjson;
|
use ethjson;
|
||||||
use rlp::{self, UntrustedRlp};
|
use rlp::{self, UntrustedRlp};
|
||||||
use env_info::LastHashes;
|
use evm::env_info::LastHashes;
|
||||||
|
|
||||||
/// Parity tries to round block.gas_limit to multiple of this constant
|
/// Parity tries to round block.gas_limit to multiple of this constant
|
||||||
pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
|
pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
|
||||||
@ -209,7 +209,8 @@ impl Engine for Arc<Ethash> {
|
|||||||
block_number >= self.ethash_params.eip160_transition,
|
block_number >= self.ethash_params.eip160_transition,
|
||||||
block_number >= self.ethash_params.eip161abc_transition,
|
block_number >= self.ethash_params.eip161abc_transition,
|
||||||
block_number >= self.ethash_params.eip161d_transition);
|
block_number >= self.ethash_params.eip161d_transition);
|
||||||
schedule.apply_params(block_number, self.params());
|
|
||||||
|
self.params().update_schedule(block_number, &mut schedule);
|
||||||
schedule
|
schedule
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1027,7 +1028,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn rejects_transactions_below_min_gas_price() {
|
fn rejects_transactions_below_min_gas_price() {
|
||||||
use ethkey::{Generator, Random};
|
use ethkey::{Generator, Random};
|
||||||
use types::transaction::{Transaction, Action};
|
use transaction::{Transaction, Action};
|
||||||
|
|
||||||
let spec = new_homestead_test();
|
let spec = new_homestead_test();
|
||||||
let mut ethparams = get_default_ethash_params();
|
let mut ethparams = get_default_ethash_params();
|
||||||
|
@ -17,58 +17,15 @@
|
|||||||
//! Transaction execution format module.
|
//! Transaction execution format module.
|
||||||
|
|
||||||
use util::{Bytes, U256, Address, U512, trie};
|
use util::{Bytes, U256, Address, U512, trie};
|
||||||
use rlp::*;
|
|
||||||
use evm;
|
use evm;
|
||||||
use trace::{VMTrace, FlatTrace};
|
use trace::{VMTrace, FlatTrace};
|
||||||
use types::log_entry::LogEntry;
|
use log_entry::LogEntry;
|
||||||
use types::state_diff::StateDiff;
|
use state_diff::StateDiff;
|
||||||
|
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
/// The type of the call-like instruction.
|
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum CallType {
|
|
||||||
/// Not a CALL.
|
|
||||||
None,
|
|
||||||
/// CALL.
|
|
||||||
Call,
|
|
||||||
/// CALLCODE.
|
|
||||||
CallCode,
|
|
||||||
/// DELEGATECALL.
|
|
||||||
DelegateCall,
|
|
||||||
/// STATICCALL
|
|
||||||
StaticCall,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Encodable for CallType {
|
|
||||||
fn rlp_append(&self, s: &mut RlpStream) {
|
|
||||||
let v = match *self {
|
|
||||||
CallType::None => 0u32,
|
|
||||||
CallType::Call => 1,
|
|
||||||
CallType::CallCode => 2,
|
|
||||||
CallType::DelegateCall => 3,
|
|
||||||
CallType::StaticCall => 4,
|
|
||||||
};
|
|
||||||
Encodable::rlp_append(&v, s);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Decodable for CallType {
|
|
||||||
fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
|
|
||||||
rlp.as_val().and_then(|v| Ok(match v {
|
|
||||||
0u32 => CallType::None,
|
|
||||||
1 => CallType::Call,
|
|
||||||
2 => CallType::CallCode,
|
|
||||||
3 => CallType::DelegateCall,
|
|
||||||
4 => CallType::StaticCall,
|
|
||||||
_ => return Err(DecoderError::Custom("Invalid value of CallType item")),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Transaction execution receipt.
|
/// Transaction execution receipt.
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct Executed {
|
pub struct Executed {
|
||||||
/// True if the outer call/create resulted in an exceptional exit.
|
/// True if the outer call/create resulted in an exceptional exit.
|
||||||
pub exception: Option<evm::Error>,
|
pub exception: Option<evm::Error>,
|
||||||
@ -112,7 +69,6 @@ pub struct Executed {
|
|||||||
|
|
||||||
/// Result of executing the transaction.
|
/// Result of executing the transaction.
|
||||||
#[derive(PartialEq, Debug, Clone)]
|
#[derive(PartialEq, Debug, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum ExecutionError {
|
pub enum ExecutionError {
|
||||||
/// Returned when there gas paid for transaction execution is
|
/// Returned when there gas paid for transaction execution is
|
||||||
/// lower than base gas required.
|
/// lower than base gas required.
|
||||||
@ -192,7 +148,6 @@ impl fmt::Display for ExecutionError {
|
|||||||
|
|
||||||
/// Result of executing the transaction.
|
/// Result of executing the transaction.
|
||||||
#[derive(PartialEq, Debug, Clone)]
|
#[derive(PartialEq, Debug, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum CallError {
|
pub enum CallError {
|
||||||
/// Couldn't find the transaction in the chain.
|
/// Couldn't find the transaction in the chain.
|
||||||
TransactionNotFound,
|
TransactionNotFound,
|
||||||
@ -230,29 +185,3 @@ impl fmt::Display for CallError {
|
|||||||
|
|
||||||
/// Transaction execution result.
|
/// Transaction execution result.
|
||||||
pub type ExecutionResult = Result<Executed, ExecutionError>;
|
pub type ExecutionResult = Result<Executed, ExecutionError>;
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use rlp::*;
|
|
||||||
use super::CallType;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn encode_call_type() {
|
|
||||||
let ct = CallType::Call;
|
|
||||||
|
|
||||||
let mut s = RlpStream::new_list(2);
|
|
||||||
s.append(&ct);
|
|
||||||
assert!(!s.is_finished(), "List shouldn't finished yet");
|
|
||||||
s.append(&ct);
|
|
||||||
assert!(s.is_finished(), "List should be finished now");
|
|
||||||
s.out();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn should_encode_and_decode_call_type() {
|
|
||||||
let original = CallType::Call;
|
|
||||||
let encoded = encode(&original);
|
|
||||||
let decoded = decode(&encoded);
|
|
||||||
assert_eq!(original, decoded);
|
|
||||||
}
|
|
||||||
}
|
|
@ -16,18 +16,18 @@
|
|||||||
|
|
||||||
//! Transaction Execution environment.
|
//! Transaction Execution environment.
|
||||||
use util::*;
|
use util::*;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use evm::action_params::{ActionParams, ActionValue};
|
||||||
use state::{Backend as StateBackend, State, Substate, CleanupMode};
|
use state::{Backend as StateBackend, State, Substate, CleanupMode};
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use error::ExecutionError;
|
use error::ExecutionError;
|
||||||
use evm::{self, wasm, Factory, Ext, Finalize, CreateContractAddress, FinalizationResult, ReturnData, CleanDustMode};
|
use evm::{self, wasm, Factory, Ext, Finalize, CreateContractAddress, FinalizationResult, ReturnData, CleanDustMode};
|
||||||
use externalities::*;
|
use externalities::*;
|
||||||
use trace::{FlatTrace, Tracer, NoopTracer, ExecutiveTracer, VMTrace, VMTracer, ExecutiveVMTracer, NoopVMTracer};
|
use trace::{FlatTrace, Tracer, NoopTracer, ExecutiveTracer, VMTrace, VMTracer, ExecutiveVMTracer, NoopVMTracer};
|
||||||
use transaction::{Action, SignedTransaction};
|
use transaction::{Action, SignedTransaction};
|
||||||
use crossbeam;
|
use crossbeam;
|
||||||
pub use types::executed::{Executed, ExecutionResult};
|
pub use executed::{Executed, ExecutionResult};
|
||||||
|
|
||||||
/// Roughly estimate what stack size each level of evm depth will use
|
/// Roughly estimate what stack size each level of evm depth will use
|
||||||
/// TODO [todr] We probably need some more sophisticated calculations here (limit on my machine 132)
|
/// TODO [todr] We probably need some more sophisticated calculations here (limit on my machine 132)
|
||||||
@ -602,8 +602,8 @@ mod tests {
|
|||||||
use super::*;
|
use super::*;
|
||||||
use util::{H256, U256, U512, Address, FromStr};
|
use util::{H256, U256, U512, Address, FromStr};
|
||||||
use util::bytes::BytesRef;
|
use util::bytes::BytesRef;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use evm::action_params::{ActionParams, ActionValue};
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use evm::{Factory, VMType, CreateContractAddress};
|
use evm::{Factory, VMType, CreateContractAddress};
|
||||||
use error::ExecutionError;
|
use error::ExecutionError;
|
||||||
use state::{Substate, CleanupMode};
|
use state::{Substate, CleanupMode};
|
||||||
@ -613,7 +613,7 @@ mod tests {
|
|||||||
use trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, VMTracer, NoopVMTracer, ExecutiveVMTracer};
|
use trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, VMTracer, NoopVMTracer, ExecutiveVMTracer};
|
||||||
use transaction::{Action, Transaction};
|
use transaction::{Action, Transaction};
|
||||||
|
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_contract_address() {
|
fn test_contract_address() {
|
||||||
|
@ -16,14 +16,14 @@
|
|||||||
|
|
||||||
//! Transaction Execution environment.
|
//! Transaction Execution environment.
|
||||||
use util::*;
|
use util::*;
|
||||||
use action_params::{ActionParams, ActionValue};
|
use evm::action_params::{ActionParams, ActionValue};
|
||||||
use state::{Backend as StateBackend, State, Substate, CleanupMode};
|
use state::{Backend as StateBackend, State, Substate, CleanupMode};
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use executive::*;
|
use executive::*;
|
||||||
use evm::{self, Schedule, Ext, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
|
use evm::{self, Schedule, Ext, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use types::transaction::UNSIGNED_SENDER;
|
use transaction::UNSIGNED_SENDER;
|
||||||
use trace::{Tracer, VMTracer};
|
use trace::{Tracer, VMTracer};
|
||||||
|
|
||||||
/// Policy for handling output data on `RETURN` opcode.
|
/// Policy for handling output data on `RETURN` opcode.
|
||||||
@ -396,13 +396,13 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
|
|||||||
mod tests {
|
mod tests {
|
||||||
use util::*;
|
use util::*;
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use evm::Ext;
|
use evm::Ext;
|
||||||
use state::{State, Substate};
|
use state::{State, Substate};
|
||||||
use tests::helpers::*;
|
use tests::helpers::*;
|
||||||
use super::*;
|
use super::*;
|
||||||
use trace::{NoopTracer, NoopVMTracer};
|
use trace::{NoopTracer, NoopVMTracer};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
fn get_test_origin() -> OriginInfo {
|
fn get_test_origin() -> OriginInfo {
|
||||||
OriginInfo {
|
OriginInfo {
|
||||||
|
@ -25,8 +25,7 @@ use std::cell::RefCell;
|
|||||||
|
|
||||||
pub use basic_types::Seal;
|
pub use basic_types::Seal;
|
||||||
|
|
||||||
/// Type for Block number
|
pub use types::BlockNumber;
|
||||||
pub type BlockNumber = u64;
|
|
||||||
|
|
||||||
/// A block header.
|
/// A block header.
|
||||||
///
|
///
|
||||||
|
@ -15,15 +15,15 @@
|
|||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use super::test_common::*;
|
use super::test_common::*;
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use state::{Backend as StateBackend, State, Substate};
|
use state::{Backend as StateBackend, State, Substate};
|
||||||
use executive::*;
|
use executive::*;
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use evm;
|
use evm;
|
||||||
use evm::{Schedule, Ext, Finalize, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
|
use evm::{Schedule, Ext, Finalize, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData};
|
||||||
use externalities::*;
|
use externalities::*;
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use tests::helpers::*;
|
use tests::helpers::*;
|
||||||
use ethjson;
|
use ethjson;
|
||||||
use trace::{Tracer, NoopTracer};
|
use trace::{Tracer, NoopTracer};
|
||||||
|
@ -21,8 +21,8 @@ use ethereum;
|
|||||||
use spec::Spec;
|
use spec::Spec;
|
||||||
use ethjson;
|
use ethjson;
|
||||||
use ethjson::state::test::ForkSpec;
|
use ethjson::state::test::ForkSpec;
|
||||||
use types::transaction::SignedTransaction;
|
use transaction::SignedTransaction;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
pub static ref FRONTIER: Spec = ethereum::new_frontier_test();
|
pub static ref FRONTIER: Spec = ethereum::new_frontier_test();
|
||||||
|
@ -76,6 +76,7 @@ extern crate bloomchain;
|
|||||||
extern crate bn;
|
extern crate bn;
|
||||||
extern crate byteorder;
|
extern crate byteorder;
|
||||||
extern crate crossbeam;
|
extern crate crossbeam;
|
||||||
|
extern crate common_types as types;
|
||||||
extern crate crypto;
|
extern crate crypto;
|
||||||
extern crate env_logger;
|
extern crate env_logger;
|
||||||
extern crate ethabi;
|
extern crate ethabi;
|
||||||
@ -105,8 +106,6 @@ extern crate semver;
|
|||||||
extern crate stats;
|
extern crate stats;
|
||||||
extern crate time;
|
extern crate time;
|
||||||
extern crate transient_hashmap;
|
extern crate transient_hashmap;
|
||||||
extern crate parity_wasm;
|
|
||||||
extern crate wasm_utils;
|
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate log;
|
extern crate log;
|
||||||
@ -116,6 +115,8 @@ extern crate ethcore_util as util;
|
|||||||
extern crate lazy_static;
|
extern crate lazy_static;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate ethcore_ipc as ipc;
|
extern crate ethcore_ipc as ipc;
|
||||||
|
#[cfg_attr(test, macro_use)]
|
||||||
|
extern crate evm;
|
||||||
|
|
||||||
#[cfg(feature = "jit" )]
|
#[cfg(feature = "jit" )]
|
||||||
extern crate evmjit;
|
extern crate evmjit;
|
||||||
@ -123,26 +124,26 @@ extern crate evmjit;
|
|||||||
pub extern crate ethstore;
|
pub extern crate ethstore;
|
||||||
|
|
||||||
pub mod account_provider;
|
pub mod account_provider;
|
||||||
pub mod engines;
|
|
||||||
pub mod block;
|
pub mod block;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
|
pub mod db;
|
||||||
|
pub mod encoded;
|
||||||
|
pub mod engines;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod ethereum;
|
pub mod ethereum;
|
||||||
|
pub mod executed;
|
||||||
pub mod header;
|
pub mod header;
|
||||||
pub mod service;
|
|
||||||
pub mod trace;
|
|
||||||
pub mod spec;
|
|
||||||
pub mod views;
|
|
||||||
pub mod pod_state;
|
|
||||||
pub mod migrations;
|
pub mod migrations;
|
||||||
pub mod miner;
|
pub mod miner;
|
||||||
|
pub mod pod_state;
|
||||||
|
pub mod service;
|
||||||
pub mod snapshot;
|
pub mod snapshot;
|
||||||
pub mod action_params;
|
pub mod spec;
|
||||||
pub mod db;
|
|
||||||
pub mod verification;
|
|
||||||
pub mod state;
|
pub mod state;
|
||||||
pub mod env_info;
|
pub mod trace;
|
||||||
#[macro_use] pub mod evm;
|
pub mod transaction;
|
||||||
|
pub mod verification;
|
||||||
|
pub mod views;
|
||||||
|
|
||||||
mod cache_manager;
|
mod cache_manager;
|
||||||
mod blooms;
|
mod blooms;
|
||||||
@ -154,7 +155,6 @@ mod builtin;
|
|||||||
mod executive;
|
mod executive;
|
||||||
mod externalities;
|
mod externalities;
|
||||||
mod blockchain;
|
mod blockchain;
|
||||||
mod types;
|
|
||||||
mod factory;
|
mod factory;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
@ -1280,7 +1280,7 @@ mod tests {
|
|||||||
use ethkey::{Generator, Random};
|
use ethkey::{Generator, Random};
|
||||||
use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
|
use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
|
||||||
use header::BlockNumber;
|
use header::BlockNumber;
|
||||||
use types::transaction::{SignedTransaction, Transaction, PendingTransaction, Action};
|
use transaction::{SignedTransaction, Transaction, PendingTransaction, Action};
|
||||||
use spec::Spec;
|
use spec::Spec;
|
||||||
use tests::helpers::{generate_dummy_client, generate_dummy_client_with_spec_and_accounts};
|
use tests::helpers::{generate_dummy_client, generate_dummy_client_with_spec_and_accounts};
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ mod tests {
|
|||||||
use views::BlockView;
|
use views::BlockView;
|
||||||
use block::Block;
|
use block::Block;
|
||||||
use super::AbridgedBlock;
|
use super::AbridgedBlock;
|
||||||
use types::transaction::{Action, Transaction};
|
use transaction::{Action, Transaction};
|
||||||
|
|
||||||
use util::{Address, H256, U256, Bytes};
|
use util::{Address, H256, U256, Bytes};
|
||||||
|
|
||||||
|
@ -20,10 +20,10 @@ use rustc_hex::FromHex;
|
|||||||
use super::genesis::Genesis;
|
use super::genesis::Genesis;
|
||||||
use super::seal::Generic as GenericSeal;
|
use super::seal::Generic as GenericSeal;
|
||||||
|
|
||||||
use action_params::{ActionValue, ActionParams};
|
use evm::action_params::{ActionValue, ActionParams};
|
||||||
use builtin::Builtin;
|
use builtin::Builtin;
|
||||||
use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint, DEFAULT_BLOCKHASH_CONTRACT};
|
use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint, DEFAULT_BLOCKHASH_CONTRACT};
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use ethereum;
|
use ethereum;
|
||||||
use ethjson;
|
use ethjson;
|
||||||
@ -36,7 +36,7 @@ use state_db::StateDB;
|
|||||||
use state::{Backend, State, Substate};
|
use state::{Backend, State, Substate};
|
||||||
use state::backend::Basic as BasicBackend;
|
use state::backend::Basic as BasicBackend;
|
||||||
use trace::{NoopTracer, NoopVMTracer};
|
use trace::{NoopTracer, NoopVMTracer};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use util::*;
|
use util::*;
|
||||||
|
|
||||||
/// Parameters common to all engines.
|
/// Parameters common to all engines.
|
||||||
@ -87,6 +87,31 @@ pub struct CommonParams {
|
|||||||
pub wasm: bool,
|
pub wasm: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl CommonParams {
|
||||||
|
/// Schedule for an EVM in the post-EIP-150-era of the Ethereum main net.
|
||||||
|
pub fn schedule(&self, block_number: u64) -> ::evm::Schedule {
|
||||||
|
let mut schedule = ::evm::Schedule::new_post_eip150(usize::max_value(), true, true, true);
|
||||||
|
self.update_schedule(block_number, &mut schedule);
|
||||||
|
schedule
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Apply common spec config parameters to the schedule.
|
||||||
|
pub fn update_schedule(&self, block_number: u64, schedule: &mut ::evm::Schedule) {
|
||||||
|
schedule.have_create2 = block_number >= self.eip86_transition;
|
||||||
|
schedule.have_revert = block_number >= self.eip140_transition;
|
||||||
|
schedule.have_static_call = block_number >= self.eip214_transition;
|
||||||
|
if block_number >= self.eip210_transition {
|
||||||
|
schedule.blockhash_gas = 350;
|
||||||
|
}
|
||||||
|
if block_number >= self.dust_protection_transition {
|
||||||
|
schedule.kill_dust = match self.remove_dust_contracts {
|
||||||
|
true => ::evm::CleanDustMode::WithCodeAndStorage,
|
||||||
|
false => ::evm::CleanDustMode::BasicOnly,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl From<ethjson::spec::Params> for CommonParams {
|
impl From<ethjson::spec::Params> for CommonParams {
|
||||||
fn from(p: ethjson::spec::Params) -> Self {
|
fn from(p: ethjson::spec::Params) -> Self {
|
||||||
CommonParams {
|
CommonParams {
|
||||||
|
@ -24,7 +24,7 @@ use std::collections::hash_map::Entry;
|
|||||||
|
|
||||||
use receipt::Receipt;
|
use receipt::Receipt;
|
||||||
use engines::Engine;
|
use engines::Engine;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use executive::{Executive, TransactOptions};
|
use executive::{Executive, TransactOptions};
|
||||||
use factory::Factories;
|
use factory::Factories;
|
||||||
@ -32,7 +32,7 @@ use trace::FlatTrace;
|
|||||||
use pod_account::*;
|
use pod_account::*;
|
||||||
use pod_state::{self, PodState};
|
use pod_state::{self, PodState};
|
||||||
use types::basic_account::BasicAccount;
|
use types::basic_account::BasicAccount;
|
||||||
use types::executed::{Executed, ExecutionError};
|
use executed::{Executed, ExecutionError};
|
||||||
use types::state_diff::StateDiff;
|
use types::state_diff::StateDiff;
|
||||||
use transaction::SignedTransaction;
|
use transaction::SignedTransaction;
|
||||||
use state_db::StateDB;
|
use state_db::StateDB;
|
||||||
@ -982,12 +982,12 @@ mod tests {
|
|||||||
use ethkey::Secret;
|
use ethkey::Secret;
|
||||||
use util::{U256, H256, Address, Hashable};
|
use util::{U256, H256, Address, Hashable};
|
||||||
use tests::helpers::*;
|
use tests::helpers::*;
|
||||||
use env_info::EnvInfo;
|
use evm::env_info::EnvInfo;
|
||||||
use spec::*;
|
use spec::*;
|
||||||
use transaction::*;
|
use transaction::*;
|
||||||
use ethcore_logger::init_log;
|
use ethcore_logger::init_log;
|
||||||
use trace::{FlatTrace, TraceError, trace};
|
use trace::{FlatTrace, TraceError, trace};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
fn secret() -> Secret {
|
fn secret() -> Secret {
|
||||||
"".sha3().into()
|
"".sha3().into()
|
||||||
|
76
ethcore/src/tests/evm.rs
Normal file
76
ethcore/src/tests/evm.rs
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
//! Tests of EVM integration with transaction execution.
|
||||||
|
|
||||||
|
use evm::action_params::{ActionParams, ActionValue};
|
||||||
|
use evm::env_info::EnvInfo;
|
||||||
|
use evm::{Factory, VMType};
|
||||||
|
use evm::call_type::CallType;
|
||||||
|
use executive::Executive;
|
||||||
|
use state::Substate;
|
||||||
|
use tests::helpers::*;
|
||||||
|
use trace::{NoopVMTracer, NoopTracer};
|
||||||
|
use transaction::SYSTEM_ADDRESS;
|
||||||
|
|
||||||
|
use rustc_hex::FromHex;
|
||||||
|
|
||||||
|
use util::*;
|
||||||
|
|
||||||
|
evm_test!{test_blockhash_eip210: test_blockhash_eip210_jit, test_blockhash_eip210_int}
|
||||||
|
fn test_blockhash_eip210(factory: Factory) {
|
||||||
|
let get_prev_hash_code = Arc::new("600143034060205260206020f3".from_hex().unwrap()); // this returns previous block hash
|
||||||
|
let get_prev_hash_code_hash = get_prev_hash_code.sha3();
|
||||||
|
// This is same as DEFAULT_BLOCKHASH_CONTRACT except for metropolis transition block check removed.
|
||||||
|
let test_blockhash_contract = "73fffffffffffffffffffffffffffffffffffffffe33141561007a57600143036020526000356101006020510755600061010060205107141561005057600035610100610100602051050761010001555b6000620100006020510714156100755760003561010062010000602051050761020001555b61014a565b4360003512151561009057600060405260206040f35b610100600035430312156100b357610100600035075460605260206060f3610149565b62010000600035430312156100d157600061010060003507146100d4565b60005b156100f6576101006101006000350507610100015460805260206080f3610148565b630100000060003543031215610116576000620100006000350714610119565b60005b1561013c57610100620100006000350507610200015460a052602060a0f3610147565b600060c052602060c0f35b5b5b5b5b";
|
||||||
|
let blockhash_contract_code = Arc::new(test_blockhash_contract.from_hex().unwrap());
|
||||||
|
let blockhash_contract_code_hash = blockhash_contract_code.sha3();
|
||||||
|
let engine = TestEngine::new_metropolis();
|
||||||
|
let mut env_info = EnvInfo::default();
|
||||||
|
|
||||||
|
// populate state with 256 last hashes
|
||||||
|
let mut state = get_temp_state_with_factory(factory);
|
||||||
|
let contract_address: Address = 0xf0.into();
|
||||||
|
state.init_code(&contract_address, (*blockhash_contract_code).clone()).unwrap();
|
||||||
|
for i in 1 .. 257 {
|
||||||
|
env_info.number = i.into();
|
||||||
|
let params = ActionParams {
|
||||||
|
code_address: contract_address.clone(),
|
||||||
|
address: contract_address,
|
||||||
|
sender: SYSTEM_ADDRESS.clone(),
|
||||||
|
origin: SYSTEM_ADDRESS.clone(),
|
||||||
|
gas: 100000.into(),
|
||||||
|
gas_price: 0.into(),
|
||||||
|
value: ActionValue::Transfer(0.into()),
|
||||||
|
code: Some(blockhash_contract_code.clone()),
|
||||||
|
code_hash: Some(blockhash_contract_code_hash),
|
||||||
|
data: Some(H256::from(i - 1).to_vec()),
|
||||||
|
call_type: CallType::Call,
|
||||||
|
};
|
||||||
|
let mut ex = Executive::new(&mut state, &env_info, &engine);
|
||||||
|
let mut substate = Substate::new();
|
||||||
|
let mut output = [];
|
||||||
|
if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
|
||||||
|
panic!("Encountered error on updating last hashes: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
env_info.number = 256;
|
||||||
|
let params = ActionParams {
|
||||||
|
code_address: Address::new(),
|
||||||
|
address: Address::new(),
|
||||||
|
sender: Address::new(),
|
||||||
|
origin: Address::new(),
|
||||||
|
gas: 100000.into(),
|
||||||
|
gas_price: 0.into(),
|
||||||
|
value: ActionValue::Transfer(0.into()),
|
||||||
|
code: Some(get_prev_hash_code),
|
||||||
|
code_hash: Some(get_prev_hash_code_hash),
|
||||||
|
data: None,
|
||||||
|
call_type: CallType::Call,
|
||||||
|
};
|
||||||
|
let mut ex = Executive::new(&mut state, &env_info, &engine);
|
||||||
|
let mut substate = Substate::new();
|
||||||
|
let mut output = H256::new();
|
||||||
|
if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
|
||||||
|
panic!("Encountered error on getting last hash: {}", e);
|
||||||
|
}
|
||||||
|
assert_eq!(output, 255.into());
|
||||||
|
}
|
@ -16,5 +16,8 @@
|
|||||||
|
|
||||||
pub mod helpers;
|
pub mod helpers;
|
||||||
mod client;
|
mod client;
|
||||||
|
mod evm;
|
||||||
|
|
||||||
#[cfg(feature="ipc")]
|
#[cfg(feature="ipc")]
|
||||||
mod rpc;
|
mod rpc;
|
||||||
|
|
||||||
|
@ -410,7 +410,7 @@ mod tests {
|
|||||||
use trace::{Filter, LocalizedTrace, AddressesFilter, TraceError};
|
use trace::{Filter, LocalizedTrace, AddressesFilter, TraceError};
|
||||||
use trace::trace::{Call, Action, Res};
|
use trace::trace::{Call, Action, Res};
|
||||||
use trace::flat::{FlatTrace, FlatBlockTraces, FlatTransactionTraces};
|
use trace::flat::{FlatTrace, FlatBlockTraces, FlatTransactionTraces};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
struct NoopExtras;
|
struct NoopExtras;
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
//! Simple executive tracer.
|
//! Simple executive tracer.
|
||||||
|
|
||||||
use util::{Bytes, Address, U256};
|
use util::{Bytes, Address, U256};
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide};
|
use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide};
|
||||||
use trace::{Tracer, VMTracer, FlatTrace, TraceError};
|
use trace::{Tracer, VMTracer, FlatTrace, TraceError};
|
||||||
|
|
||||||
|
@ -22,21 +22,24 @@ mod db;
|
|||||||
mod executive_tracer;
|
mod executive_tracer;
|
||||||
mod import;
|
mod import;
|
||||||
mod noop_tracer;
|
mod noop_tracer;
|
||||||
|
mod types;
|
||||||
|
|
||||||
pub use types::trace_types::{filter, flat, localized, trace};
|
|
||||||
pub use types::trace_types::error::Error as TraceError;
|
|
||||||
pub use self::config::Config;
|
pub use self::config::Config;
|
||||||
pub use self::db::TraceDB;
|
pub use self::db::TraceDB;
|
||||||
pub use types::trace_types::trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff};
|
|
||||||
pub use types::trace_types::flat::{FlatTrace, FlatTransactionTraces, FlatBlockTraces};
|
|
||||||
pub use self::noop_tracer::{NoopTracer, NoopVMTracer};
|
pub use self::noop_tracer::{NoopTracer, NoopVMTracer};
|
||||||
pub use self::executive_tracer::{ExecutiveTracer, ExecutiveVMTracer};
|
pub use self::executive_tracer::{ExecutiveTracer, ExecutiveVMTracer};
|
||||||
pub use types::trace_types::filter::{Filter, AddressesFilter};
|
|
||||||
pub use self::import::ImportRequest;
|
pub use self::import::ImportRequest;
|
||||||
pub use self::localized::LocalizedTrace;
|
pub use self::localized::LocalizedTrace;
|
||||||
|
|
||||||
|
pub use self::types::{filter, flat, localized, trace};
|
||||||
|
pub use self::types::error::Error as TraceError;
|
||||||
|
pub use self::types::trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff};
|
||||||
|
pub use self::types::flat::{FlatTrace, FlatTransactionTraces, FlatBlockTraces};
|
||||||
|
pub use self::types::filter::{Filter, AddressesFilter};
|
||||||
|
|
||||||
use util::{Bytes, Address, U256, H256, DBTransaction};
|
use util::{Bytes, Address, U256, H256, DBTransaction};
|
||||||
use self::trace::{Call, Create};
|
use self::trace::{Call, Create};
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use header::BlockNumber;
|
use header::BlockNumber;
|
||||||
|
|
||||||
/// This trait is used by executive to build traces.
|
/// This trait is used by executive to build traces.
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
//! Nonoperative tracer.
|
//! Nonoperative tracer.
|
||||||
|
|
||||||
use util::{Bytes, Address, U256};
|
use util::{Bytes, Address, U256};
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use trace::{Tracer, VMTracer, FlatTrace, TraceError};
|
use trace::{Tracer, VMTracer, FlatTrace, TraceError};
|
||||||
use trace::trace::{Call, Create, VMTrace};
|
use trace::trace::{Call, Create, VMTrace};
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ use evm::Error as EvmError;
|
|||||||
|
|
||||||
/// Trace evm errors.
|
/// Trace evm errors.
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
/// `OutOfGas` is returned when transaction execution runs out of gas.
|
/// `OutOfGas` is returned when transaction execution runs out of gas.
|
||||||
OutOfGas,
|
OutOfGas,
|
@ -23,13 +23,12 @@ use util::sha3::Hashable;
|
|||||||
use util::bloom::Bloomable;
|
use util::bloom::Bloomable;
|
||||||
use basic_types::LogBloom;
|
use basic_types::LogBloom;
|
||||||
use trace::flat::FlatTrace;
|
use trace::flat::FlatTrace;
|
||||||
use types::trace_types::trace::{Action, Res};
|
use super::trace::{Action, Res};
|
||||||
|
|
||||||
/// Addresses filter.
|
/// Addresses filter.
|
||||||
///
|
///
|
||||||
/// Used to create bloom possibilities and match filters.
|
/// Used to create bloom possibilities and match filters.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct AddressesFilter {
|
pub struct AddressesFilter {
|
||||||
list: Vec<Address>
|
list: Vec<Address>
|
||||||
}
|
}
|
||||||
@ -76,7 +75,6 @@ impl AddressesFilter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
/// Traces filter.
|
/// Traces filter.
|
||||||
pub struct Filter {
|
pub struct Filter {
|
||||||
/// Block range.
|
/// Block range.
|
||||||
@ -143,7 +141,7 @@ mod tests {
|
|||||||
use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide};
|
use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide};
|
||||||
use trace::flat::FlatTrace;
|
use trace::flat::FlatTrace;
|
||||||
use trace::{Filter, AddressesFilter, TraceError};
|
use trace::{Filter, AddressesFilter, TraceError};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn empty_trace_filter_bloom_possibilities() {
|
fn empty_trace_filter_bloom_possibilities() {
|
@ -26,7 +26,6 @@ use super::trace::{Action, Res};
|
|||||||
///
|
///
|
||||||
/// Parent and children indexes refer to positions in this vector.
|
/// Parent and children indexes refer to positions in this vector.
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct FlatTrace {
|
pub struct FlatTrace {
|
||||||
/// Type of action performed by a transaction.
|
/// Type of action performed by a transaction.
|
||||||
pub action: Action,
|
pub action: Action,
|
||||||
@ -164,7 +163,7 @@ mod tests {
|
|||||||
use rlp::*;
|
use rlp::*;
|
||||||
use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
|
use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
|
||||||
use trace::trace::{Action, Res, CallResult, Call, Suicide};
|
use trace::trace::{Action, Res, CallResult, Call, Suicide};
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn encode_flat_transaction_traces() {
|
fn encode_flat_transaction_traces() {
|
@ -22,7 +22,6 @@ use header::BlockNumber;
|
|||||||
|
|
||||||
/// Localized trace.
|
/// Localized trace.
|
||||||
#[derive(Debug, PartialEq, Clone)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct LocalizedTrace {
|
pub struct LocalizedTrace {
|
||||||
/// Type of action performed by a transaction.
|
/// Type of action performed by a transaction.
|
||||||
pub action: Action,
|
pub action: Action,
|
@ -21,9 +21,9 @@ use util::sha3::Hashable;
|
|||||||
use util::bloom::Bloomable;
|
use util::bloom::Bloomable;
|
||||||
use rlp::*;
|
use rlp::*;
|
||||||
|
|
||||||
use action_params::ActionParams;
|
use evm::action_params::ActionParams;
|
||||||
use basic_types::LogBloom;
|
use basic_types::LogBloom;
|
||||||
use types::executed::CallType;
|
use evm::CallType;
|
||||||
use super::error::Error;
|
use super::error::Error;
|
||||||
|
|
||||||
/// `Call` result.
|
/// `Call` result.
|
@ -32,9 +32,8 @@ pub const UNSIGNED_SENDER: Address = ::util::H160([0xff; 20]);
|
|||||||
/// System sender address for internal state updates.
|
/// System sender address for internal state updates.
|
||||||
pub const SYSTEM_ADDRESS: Address = ::util::H160([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xfe]);
|
pub const SYSTEM_ADDRESS: Address = ::util::H160([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xfe]);
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
/// Transaction action type.
|
/// Transaction action type.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
/// Create creates new contract.
|
/// Create creates new contract.
|
||||||
Create,
|
Create,
|
||||||
@ -59,7 +58,6 @@ impl Decodable for Action {
|
|||||||
|
|
||||||
/// Transaction activation condition.
|
/// Transaction activation condition.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum Condition {
|
pub enum Condition {
|
||||||
/// Valid at this block number or later.
|
/// Valid at this block number or later.
|
||||||
Number(BlockNumber),
|
Number(BlockNumber),
|
||||||
@ -70,7 +68,6 @@ pub enum Condition {
|
|||||||
/// A set of information describing an externally-originating message call
|
/// A set of information describing an externally-originating message call
|
||||||
/// or contract creation operation.
|
/// or contract creation operation.
|
||||||
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct Transaction {
|
pub struct Transaction {
|
||||||
/// Nonce.
|
/// Nonce.
|
||||||
pub nonce: U256,
|
pub nonce: U256,
|
||||||
@ -241,9 +238,8 @@ impl Transaction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Signed transaction information.
|
/// Signed transaction information without verified signature.
|
||||||
#[derive(Debug, Clone, Eq, PartialEq)]
|
#[derive(Debug, Clone, Eq, PartialEq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct UnverifiedTransaction {
|
pub struct UnverifiedTransaction {
|
||||||
/// Plain Transaction.
|
/// Plain Transaction.
|
||||||
unsigned: Transaction,
|
unsigned: Transaction,
|
||||||
@ -470,7 +466,6 @@ impl SignedTransaction {
|
|||||||
|
|
||||||
/// Signed Transaction that is a part of canon blockchain.
|
/// Signed Transaction that is a part of canon blockchain.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct LocalizedTransaction {
|
pub struct LocalizedTransaction {
|
||||||
/// Signed part.
|
/// Signed part.
|
||||||
pub signed: UnverifiedTransaction,
|
pub signed: UnverifiedTransaction,
|
||||||
@ -511,7 +506,6 @@ impl Deref for LocalizedTransaction {
|
|||||||
|
|
||||||
/// Queued transaction with additional information.
|
/// Queued transaction with additional information.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct PendingTransaction {
|
pub struct PendingTransaction {
|
||||||
/// Signed transaction data.
|
/// Signed transaction data.
|
||||||
pub transaction: SignedTransaction,
|
pub transaction: SignedTransaction,
|
||||||
@ -544,8 +538,13 @@ impl From<SignedTransaction> for PendingTransaction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[cfg(test)]
|
||||||
fn sender_test() {
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use util::{Hashable, U256};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sender_test() {
|
||||||
let t: UnverifiedTransaction = decode(&::rustc_hex::FromHex::from_hex("f85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804").unwrap());
|
let t: UnverifiedTransaction = decode(&::rustc_hex::FromHex::from_hex("f85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804").unwrap());
|
||||||
assert_eq!(t.data, b"");
|
assert_eq!(t.data, b"");
|
||||||
assert_eq!(t.gas, U256::from(0x5208u64));
|
assert_eq!(t.gas, U256::from(0x5208u64));
|
||||||
@ -557,10 +556,10 @@ fn sender_test() {
|
|||||||
assert_eq!(t.value, U256::from(0x0au64));
|
assert_eq!(t.value, U256::from(0x0au64));
|
||||||
assert_eq!(public_to_address(&t.recover_public().unwrap()), "0f65fe9276bc9a24ae7083ae28e2660ef72df99e".into());
|
assert_eq!(public_to_address(&t.recover_public().unwrap()), "0f65fe9276bc9a24ae7083ae28e2660ef72df99e".into());
|
||||||
assert_eq!(t.network_id(), None);
|
assert_eq!(t.network_id(), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn signing() {
|
fn signing() {
|
||||||
use ethkey::{Random, Generator};
|
use ethkey::{Random, Generator};
|
||||||
|
|
||||||
let key = Random.generate().unwrap();
|
let key = Random.generate().unwrap();
|
||||||
@ -574,10 +573,10 @@ fn signing() {
|
|||||||
}.sign(&key.secret(), None);
|
}.sign(&key.secret(), None);
|
||||||
assert_eq!(Address::from(key.public().sha3()), t.sender());
|
assert_eq!(Address::from(key.public().sha3()), t.sender());
|
||||||
assert_eq!(t.network_id(), None);
|
assert_eq!(t.network_id(), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn fake_signing() {
|
fn fake_signing() {
|
||||||
let t = Transaction {
|
let t = Transaction {
|
||||||
action: Action::Create,
|
action: Action::Create,
|
||||||
nonce: U256::from(42),
|
nonce: U256::from(42),
|
||||||
@ -592,10 +591,10 @@ fn fake_signing() {
|
|||||||
let t = t.clone();
|
let t = t.clone();
|
||||||
assert_eq!(Address::from(0x69), t.sender());
|
assert_eq!(Address::from(0x69), t.sender());
|
||||||
assert_eq!(t.network_id(), None);
|
assert_eq!(t.network_id(), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn should_recover_from_network_specific_signing() {
|
fn should_recover_from_network_specific_signing() {
|
||||||
use ethkey::{Random, Generator};
|
use ethkey::{Random, Generator};
|
||||||
let key = Random.generate().unwrap();
|
let key = Random.generate().unwrap();
|
||||||
let t = Transaction {
|
let t = Transaction {
|
||||||
@ -608,10 +607,10 @@ fn should_recover_from_network_specific_signing() {
|
|||||||
}.sign(&key.secret(), Some(69));
|
}.sign(&key.secret(), Some(69));
|
||||||
assert_eq!(Address::from(key.public().sha3()), t.sender());
|
assert_eq!(Address::from(key.public().sha3()), t.sender());
|
||||||
assert_eq!(t.network_id(), Some(69));
|
assert_eq!(t.network_id(), Some(69));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn should_agree_with_vitalik() {
|
fn should_agree_with_vitalik() {
|
||||||
use rustc_hex::FromHex;
|
use rustc_hex::FromHex;
|
||||||
|
|
||||||
let test_vector = |tx_data: &str, address: &'static str| {
|
let test_vector = |tx_data: &str, address: &'static str| {
|
||||||
@ -631,4 +630,5 @@ fn should_agree_with_vitalik() {
|
|||||||
test_vector("f867078504a817c807830290409435353535353535353535353535353535353535358201578025a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021", "0xd37922162ab7cea97c97a87551ed02c9a38b7332");
|
test_vector("f867078504a817c807830290409435353535353535353535353535353535353535358201578025a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021", "0xd37922162ab7cea97c97a87551ed02c9a38b7332");
|
||||||
test_vector("f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10", "0x9bddad43f934d313c2b79ca28a432dd2b7281029");
|
test_vector("f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10", "0x9bddad43f934d313c2b79ca28a432dd2b7281029");
|
||||||
test_vector("f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb", "0x3c24d7329e92f84f08556ceb6df1cdb0104ca49f");
|
test_vector("f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb", "0x3c24d7329e92f84f08556ceb6df1cdb0104ca49f");
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,42 +0,0 @@
|
|||||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
|
||||||
// This file is part of Parity.
|
|
||||||
|
|
||||||
// Parity is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
|
|
||||||
// Parity is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
//! Block import error related types
|
|
||||||
|
|
||||||
use error::{ImportError, BlockError, Error};
|
|
||||||
use std::convert::From;
|
|
||||||
|
|
||||||
/// Error dedicated to import block function
|
|
||||||
#[derive(Debug)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum BlockImportError {
|
|
||||||
/// Import error
|
|
||||||
Import(ImportError),
|
|
||||||
/// Block error
|
|
||||||
Block(BlockError),
|
|
||||||
/// Other error
|
|
||||||
Other(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Error> for BlockImportError {
|
|
||||||
fn from(e: Error) -> Self {
|
|
||||||
match e {
|
|
||||||
Error::Block(block_error) => BlockImportError::Block(block_error),
|
|
||||||
Error::Import(import_error) => BlockImportError::Import(import_error),
|
|
||||||
_ => BlockImportError::Other(format!("other block import error: {:?}", e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,42 +0,0 @@
|
|||||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
|
||||||
// This file is part of Parity.
|
|
||||||
|
|
||||||
// Parity is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
|
|
||||||
// Parity is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
//! Block status description module
|
|
||||||
use verification::queue::Status as QueueStatus;
|
|
||||||
|
|
||||||
/// General block status
|
|
||||||
#[derive(Debug, Eq, PartialEq)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum BlockStatus {
|
|
||||||
/// Part of the blockchain.
|
|
||||||
InChain,
|
|
||||||
/// Queued for import.
|
|
||||||
Queued,
|
|
||||||
/// Known as bad.
|
|
||||||
Bad,
|
|
||||||
/// Unknown.
|
|
||||||
Unknown,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<QueueStatus> for BlockStatus {
|
|
||||||
fn from(status: QueueStatus) -> Self {
|
|
||||||
match status {
|
|
||||||
QueueStatus::Queued => BlockStatus::Queued,
|
|
||||||
QueueStatus::Bad => BlockStatus::Bad,
|
|
||||||
QueueStatus::Unknown => BlockStatus::Unknown,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,50 +0,0 @@
|
|||||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
|
||||||
// This file is part of Parity.
|
|
||||||
|
|
||||||
// Parity is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
|
|
||||||
// Parity is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
//! Transaction import result related types
|
|
||||||
|
|
||||||
use ipc::binary::{BinaryConvertError, BinaryConvertable};
|
|
||||||
use error::{TransactionError, Error};
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
|
||||||
/// Represents the result of importing transaction.
|
|
||||||
pub enum TransactionImportResult {
|
|
||||||
/// Transaction was imported to current queue.
|
|
||||||
Current,
|
|
||||||
/// Transaction was imported to future queue.
|
|
||||||
Future
|
|
||||||
}
|
|
||||||
|
|
||||||
binary_fixed_size!(TransactionImportResult);
|
|
||||||
|
|
||||||
/// Api-level error for transaction import
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum TransactionImportError {
|
|
||||||
/// Transaction error
|
|
||||||
Transaction(TransactionError),
|
|
||||||
/// Other error
|
|
||||||
Other(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Error> for TransactionImportError {
|
|
||||||
fn from(e: Error) -> Self {
|
|
||||||
match e {
|
|
||||||
Error::Transaction(transaction_error) => TransactionImportError::Transaction(transaction_error),
|
|
||||||
_ => TransactionImportError::Other(format!("other block import error: {:?}", e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -115,6 +115,17 @@ pub enum Status {
|
|||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Into<::block_status::BlockStatus> for Status {
|
||||||
|
fn into(self) -> ::block_status::BlockStatus {
|
||||||
|
use ::block_status::BlockStatus;
|
||||||
|
match self {
|
||||||
|
Status::Queued => BlockStatus::Queued,
|
||||||
|
Status::Bad => BlockStatus::Bad,
|
||||||
|
Status::Unknown => BlockStatus::Unknown,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// the internal queue sizes.
|
// the internal queue sizes.
|
||||||
struct Sizes {
|
struct Sizes {
|
||||||
unverified: AtomicUsize,
|
unverified: AtomicUsize,
|
||||||
|
@ -585,7 +585,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn dust_protection() {
|
fn dust_protection() {
|
||||||
use ethkey::{Generator, Random};
|
use ethkey::{Generator, Random};
|
||||||
use types::transaction::{Transaction, Action};
|
use transaction::{Transaction, Action};
|
||||||
use engines::NullEngine;
|
use engines::NullEngine;
|
||||||
|
|
||||||
let mut params = CommonParams::default();
|
let mut params = CommonParams::default();
|
||||||
|
13
ethcore/types/Cargo.toml
Normal file
13
ethcore/types/Cargo.toml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
[package]
|
||||||
|
name = "common-types"
|
||||||
|
description = "Common types used throughout the codebase"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Parity Technologies <admin@parity.io>"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
rlp = { path = "../../util/rlp" }
|
||||||
|
ethcore-util = { path = "../../util" }
|
||||||
|
ethjson = { path = "../../json" }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
rustc-hex= "1.0"
|
@ -20,12 +20,10 @@ use std::cmp::*;
|
|||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use util::{U256, H256, Bytes};
|
use util::{U256, H256, Bytes};
|
||||||
use ipc::binary::BinaryConvertable;
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
#[derive(Debug, PartialEq, Eq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
/// Diff type for specifying a change (or not).
|
/// Diff type for specifying a change (or not).
|
||||||
pub enum Diff<T> where T: Eq + BinaryConvertable {
|
pub enum Diff<T> where T: Eq {
|
||||||
/// Both sides are the same.
|
/// Both sides are the same.
|
||||||
Same,
|
Same,
|
||||||
/// Left (pre, source) side doesn't include value, right side (post, destination) does.
|
/// Left (pre, source) side doesn't include value, right side (post, destination) does.
|
||||||
@ -36,7 +34,7 @@ pub enum Diff<T> where T: Eq + BinaryConvertable {
|
|||||||
Died(T),
|
Died(T),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T> Diff<T> where T: Eq + BinaryConvertable {
|
impl<T> Diff<T> where T: Eq {
|
||||||
/// Construct new object with given `pre` and `post`.
|
/// Construct new object with given `pre` and `post`.
|
||||||
pub fn new(pre: T, post: T) -> Self { if pre == post { Diff::Same } else { Diff::Changed(pre, post) } }
|
pub fn new(pre: T, post: T) -> Self { if pre == post { Diff::Same } else { Diff::Changed(pre, post) } }
|
||||||
|
|
@ -14,12 +14,15 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
//! Types used in the public api
|
/// General block status
|
||||||
|
#[derive(Debug, Eq, PartialEq)]
|
||||||
#![cfg_attr(feature = "ipc", allow(dead_code, unused_assignments, unused_variables))] // codegen issues
|
pub enum BlockStatus {
|
||||||
|
/// Part of the blockchain.
|
||||||
#[cfg(feature = "ipc")]
|
InChain,
|
||||||
include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
|
/// Queued for import.
|
||||||
|
Queued,
|
||||||
#[cfg(not(feature = "ipc"))]
|
/// Known as bad.
|
||||||
include!("mod.rs.in");
|
Bad,
|
||||||
|
/// Unknown.
|
||||||
|
Unknown,
|
||||||
|
}
|
@ -16,13 +16,14 @@
|
|||||||
|
|
||||||
//! Blockhain info type definition
|
//! Blockhain info type definition
|
||||||
|
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
use util::{U256, H256};
|
use util::{U256, H256};
|
||||||
use header::BlockNumber;
|
use security_level::SecurityLevel;
|
||||||
use types::security_level::SecurityLevel;
|
use {BlockNumber};
|
||||||
|
|
||||||
/// Information about the blockchain gathered together.
|
/// Information about the blockchain gathered together.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct BlockChainInfo {
|
pub struct BlockChainInfo {
|
||||||
/// Blockchain difficulty.
|
/// Blockchain difficulty.
|
||||||
pub total_difficulty: U256,
|
pub total_difficulty: U256,
|
||||||
@ -57,3 +58,9 @@ impl BlockChainInfo {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for BlockChainInfo {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
write!(f, "#{}.{}", self.best_block_number, self.best_block_hash)
|
||||||
|
}
|
||||||
|
}
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
/// Options concerning what analytics we run on the call.
|
/// Options concerning what analytics we run on the call.
|
||||||
#[derive(Eq, PartialEq, Default, Clone, Copy, Debug)]
|
#[derive(Eq, PartialEq, Default, Clone, Copy, Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct CallAnalytics {
|
pub struct CallAnalytics {
|
||||||
/// Make a transaction trace.
|
/// Make a transaction trace.
|
||||||
pub transaction_tracing: bool,
|
pub transaction_tracing: bool,
|
@ -18,12 +18,11 @@
|
|||||||
|
|
||||||
use util::{Address, H256, Hashable, H2048};
|
use util::{Address, H256, Hashable, H2048};
|
||||||
use util::bloom::Bloomable;
|
use util::bloom::Bloomable;
|
||||||
use client::BlockId;
|
use ids::BlockId;
|
||||||
use log_entry::LogEntry;
|
use log_entry::LogEntry;
|
||||||
|
|
||||||
/// Blockchain Filter.
|
/// Blockchain Filter.
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct Filter {
|
pub struct Filter {
|
||||||
/// Blockchain will be searched from this block.
|
/// Blockchain will be searched from this block.
|
||||||
pub from_block: BlockId,
|
pub from_block: BlockId,
|
||||||
@ -114,7 +113,7 @@ impl Filter {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use filter::Filter;
|
use filter::Filter;
|
||||||
use client::BlockId;
|
use ids::BlockId;
|
||||||
use log_entry::LogEntry;
|
use log_entry::LogEntry;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
@ -17,11 +17,10 @@
|
|||||||
//! Unique identifiers.
|
//! Unique identifiers.
|
||||||
|
|
||||||
use util::hash::H256;
|
use util::hash::H256;
|
||||||
use header::BlockNumber;
|
use {BlockNumber};
|
||||||
|
|
||||||
/// Uniquely identifies block.
|
/// Uniquely identifies block.
|
||||||
#[derive(Debug, PartialEq, Copy, Clone, Hash, Eq)]
|
#[derive(Debug, PartialEq, Copy, Clone, Hash, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum BlockId {
|
pub enum BlockId {
|
||||||
/// Block's sha3.
|
/// Block's sha3.
|
||||||
/// Querying by hash is always faster.
|
/// Querying by hash is always faster.
|
||||||
@ -38,7 +37,6 @@ pub enum BlockId {
|
|||||||
|
|
||||||
/// Uniquely identifies transaction.
|
/// Uniquely identifies transaction.
|
||||||
#[derive(Debug, PartialEq, Clone, Hash, Eq)]
|
#[derive(Debug, PartialEq, Clone, Hash, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum TransactionId {
|
pub enum TransactionId {
|
||||||
/// Transaction's sha3.
|
/// Transaction's sha3.
|
||||||
Hash(H256),
|
Hash(H256),
|
||||||
@ -48,7 +46,6 @@ pub enum TransactionId {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Uniquely identifies Trace.
|
/// Uniquely identifies Trace.
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct TraceId {
|
pub struct TraceId {
|
||||||
/// Transaction
|
/// Transaction
|
||||||
pub transaction: TransactionId,
|
pub transaction: TransactionId,
|
||||||
@ -58,7 +55,6 @@ pub struct TraceId {
|
|||||||
|
|
||||||
/// Uniquely identifies Uncle.
|
/// Uniquely identifies Uncle.
|
||||||
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
|
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct UncleId {
|
pub struct UncleId {
|
||||||
/// Block id.
|
/// Block id.
|
||||||
pub block: BlockId,
|
pub block: BlockId,
|
@ -14,27 +14,33 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
pub mod transaction;
|
//! Types used in the public API
|
||||||
pub mod ids;
|
|
||||||
pub mod receipt;
|
extern crate ethcore_util as util;
|
||||||
pub mod tree_route;
|
extern crate ethjson;
|
||||||
pub mod blockchain_info;
|
extern crate rlp;
|
||||||
pub mod log_entry;
|
|
||||||
pub mod trace_types;
|
#[cfg(test)]
|
||||||
pub mod executed;
|
extern crate rustc_hex;
|
||||||
pub mod block_status;
|
|
||||||
pub mod account_diff;
|
pub mod account_diff;
|
||||||
pub mod state_diff;
|
pub mod basic_account;
|
||||||
pub mod verification_queue_info;
|
pub mod block_status;
|
||||||
pub mod filter;
|
pub mod blockchain_info;
|
||||||
pub mod trace_filter;
|
|
||||||
pub mod call_analytics;
|
pub mod call_analytics;
|
||||||
pub mod transaction_import;
|
pub mod filter;
|
||||||
pub mod block_import_error;
|
pub mod ids;
|
||||||
pub mod restoration_status;
|
pub mod log_entry;
|
||||||
pub mod snapshot_manifest;
|
|
||||||
pub mod mode;
|
pub mod mode;
|
||||||
pub mod pruning_info;
|
pub mod pruning_info;
|
||||||
|
pub mod receipt;
|
||||||
|
pub mod restoration_status;
|
||||||
pub mod security_level;
|
pub mod security_level;
|
||||||
pub mod encoded;
|
pub mod snapshot_manifest;
|
||||||
pub mod basic_account;
|
pub mod state_diff;
|
||||||
|
pub mod trace_filter;
|
||||||
|
pub mod tree_route;
|
||||||
|
pub mod verification_queue_info;
|
||||||
|
|
||||||
|
/// Type for block number.
|
||||||
|
pub type BlockNumber = u64;
|
@ -21,13 +21,13 @@ use util::{H256, Address, Bytes, HeapSizeOf, Hashable};
|
|||||||
use util::bloom::Bloomable;
|
use util::bloom::Bloomable;
|
||||||
use rlp::*;
|
use rlp::*;
|
||||||
|
|
||||||
use basic_types::LogBloom;
|
use {BlockNumber};
|
||||||
use header::BlockNumber;
|
|
||||||
use ethjson;
|
use ethjson;
|
||||||
|
|
||||||
|
pub type LogBloom = ::util::H2048;
|
||||||
|
|
||||||
/// A record of execution for a `LOG` operation.
|
/// A record of execution for a `LOG` operation.
|
||||||
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct LogEntry {
|
pub struct LogEntry {
|
||||||
/// The address of the contract executing at the point of the `LOG` operation.
|
/// The address of the contract executing at the point of the `LOG` operation.
|
||||||
pub address: Address,
|
pub address: Address,
|
||||||
@ -82,7 +82,6 @@ impl From<ethjson::state::Log> for LogEntry {
|
|||||||
|
|
||||||
/// Log localized in a blockchain.
|
/// Log localized in a blockchain.
|
||||||
#[derive(Default, Debug, PartialEq, Clone)]
|
#[derive(Default, Debug, PartialEq, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct LocalizedLogEntry {
|
pub struct LocalizedLogEntry {
|
||||||
/// Plain log entry.
|
/// Plain log entry.
|
||||||
pub entry: LogEntry,
|
pub entry: LogEntry,
|
@ -17,11 +17,9 @@
|
|||||||
//! Mode type
|
//! Mode type
|
||||||
|
|
||||||
pub use std::time::Duration;
|
pub use std::time::Duration;
|
||||||
use client::Mode as ClientMode;
|
|
||||||
|
|
||||||
/// IPC-capable shadow-type for `client::config::Mode`
|
/// IPC-capable shadow-type for `client::config::Mode`
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum Mode {
|
pub enum Mode {
|
||||||
/// Same as `ClientMode::Off`.
|
/// Same as `ClientMode::Off`.
|
||||||
Off,
|
Off,
|
||||||
@ -32,25 +30,3 @@ pub enum Mode {
|
|||||||
/// Same as `ClientMode::Active`.
|
/// Same as `ClientMode::Active`.
|
||||||
Active,
|
Active,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<ClientMode> for Mode {
|
|
||||||
fn from(mode: ClientMode) -> Self {
|
|
||||||
match mode {
|
|
||||||
ClientMode::Off => Mode::Off,
|
|
||||||
ClientMode::Dark(timeout) => Mode::Dark(timeout.as_secs()),
|
|
||||||
ClientMode::Passive(timeout, alarm) => Mode::Passive(timeout.as_secs(), alarm.as_secs()),
|
|
||||||
ClientMode::Active => Mode::Active,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Mode> for ClientMode {
|
|
||||||
fn from(mode: Mode) -> Self {
|
|
||||||
match mode {
|
|
||||||
Mode::Off => ClientMode::Off,
|
|
||||||
Mode::Dark(timeout) => ClientMode::Dark(Duration::from_secs(timeout)),
|
|
||||||
Mode::Passive(timeout, alarm) => ClientMode::Passive(Duration::from_secs(timeout), Duration::from_secs(alarm)),
|
|
||||||
Mode::Active => ClientMode::Active,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
/// Client pruning info. See module-level docs for more details.
|
/// Client pruning info. See module-level docs for more details.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct PruningInfo {
|
pub struct PruningInfo {
|
||||||
/// The first block which everything can be served after.
|
/// The first block which everything can be served after.
|
||||||
pub earliest_chain: u64,
|
pub earliest_chain: u64,
|
@ -20,13 +20,11 @@ use util::{H256, U256, Address};
|
|||||||
use util::HeapSizeOf;
|
use util::HeapSizeOf;
|
||||||
use rlp::*;
|
use rlp::*;
|
||||||
|
|
||||||
use basic_types::LogBloom;
|
use {BlockNumber};
|
||||||
use header::BlockNumber;
|
use log_entry::{LogBloom, LogEntry, LocalizedLogEntry};
|
||||||
use log_entry::{LogEntry, LocalizedLogEntry};
|
|
||||||
|
|
||||||
/// Information describing execution of a transaction.
|
/// Information describing execution of a transaction.
|
||||||
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct Receipt {
|
pub struct Receipt {
|
||||||
/// The state root after executing the transaction. Optional since EIP98
|
/// The state root after executing the transaction. Optional since EIP98
|
||||||
pub state_root: Option<H256>,
|
pub state_root: Option<H256>,
|
||||||
@ -92,7 +90,6 @@ impl HeapSizeOf for Receipt {
|
|||||||
|
|
||||||
/// Receipt with additional info.
|
/// Receipt with additional info.
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct RichReceipt {
|
pub struct RichReceipt {
|
||||||
/// Transaction hash.
|
/// Transaction hash.
|
||||||
pub transaction_hash: H256,
|
pub transaction_hash: H256,
|
||||||
@ -114,7 +111,6 @@ pub struct RichReceipt {
|
|||||||
|
|
||||||
/// Receipt with additional info.
|
/// Receipt with additional info.
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct LocalizedReceipt {
|
pub struct LocalizedReceipt {
|
||||||
/// Transaction hash.
|
/// Transaction hash.
|
||||||
pub transaction_hash: H256,
|
pub transaction_hash: H256,
|
||||||
@ -138,8 +134,13 @@ pub struct LocalizedReceipt {
|
|||||||
pub state_root: Option<H256>,
|
pub state_root: Option<H256>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[cfg(test)]
|
||||||
fn test_no_state_root() {
|
mod tests {
|
||||||
|
use super::Receipt;
|
||||||
|
use log_entry::LogEntry;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_no_state_root() {
|
||||||
let expected = ::rustc_hex::FromHex::from_hex("f9014183040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
|
let expected = ::rustc_hex::FromHex::from_hex("f9014183040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
|
||||||
let r = Receipt::new(
|
let r = Receipt::new(
|
||||||
None,
|
None,
|
||||||
@ -150,11 +151,11 @@ fn test_no_state_root() {
|
|||||||
data: vec![0u8; 32]
|
data: vec![0u8; 32]
|
||||||
}]
|
}]
|
||||||
);
|
);
|
||||||
assert_eq!(&encode(&r)[..], &expected[..]);
|
assert_eq!(&::rlp::encode(&r)[..], &expected[..]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_basic() {
|
fn test_basic() {
|
||||||
let expected = ::rustc_hex::FromHex::from_hex("f90162a02f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee83040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
|
let expected = ::rustc_hex::FromHex::from_hex("f90162a02f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee83040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
|
||||||
let r = Receipt::new(
|
let r = Receipt::new(
|
||||||
Some("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
|
Some("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
|
||||||
@ -165,8 +166,9 @@ fn test_basic() {
|
|||||||
data: vec![0u8; 32]
|
data: vec![0u8; 32]
|
||||||
}]
|
}]
|
||||||
);
|
);
|
||||||
let encoded = encode(&r);
|
let encoded = ::rlp::encode(&r);
|
||||||
assert_eq!(&encoded[..], &expected[..]);
|
assert_eq!(&encoded[..], &expected[..]);
|
||||||
let decoded: Receipt = decode(&encoded);
|
let decoded: Receipt = ::rlp::decode(&encoded);
|
||||||
assert_eq!(decoded, r);
|
assert_eq!(decoded, r);
|
||||||
|
}
|
||||||
}
|
}
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
/// Statuses for restorations.
|
/// Statuses for restorations.
|
||||||
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
|
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum RestorationStatus {
|
pub enum RestorationStatus {
|
||||||
/// No restoration.
|
/// No restoration.
|
||||||
Inactive,
|
Inactive,
|
@ -16,11 +16,10 @@
|
|||||||
|
|
||||||
//! Indication of how secure the chain is.
|
//! Indication of how secure the chain is.
|
||||||
|
|
||||||
use header::BlockNumber;
|
use {BlockNumber};
|
||||||
|
|
||||||
/// Indication of how secure the chain is.
|
/// Indication of how secure the chain is.
|
||||||
#[derive(Debug, PartialEq, Copy, Clone, Hash, Eq)]
|
#[derive(Debug, PartialEq, Copy, Clone, Hash, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub enum SecurityLevel {
|
pub enum SecurityLevel {
|
||||||
/// All blocks from genesis to chain head are known to have valid state transitions and PoW.
|
/// All blocks from genesis to chain head are known to have valid state transitions and PoW.
|
||||||
FullState,
|
FullState,
|
@ -22,7 +22,6 @@ use util::Bytes;
|
|||||||
|
|
||||||
/// Manifest data.
|
/// Manifest data.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct ManifestData {
|
pub struct ManifestData {
|
||||||
/// Snapshot format version.
|
/// Snapshot format version.
|
||||||
pub version: u64,
|
pub version: u64,
|
@ -22,10 +22,9 @@ use std::collections::BTreeMap;
|
|||||||
use util::Address;
|
use util::Address;
|
||||||
use account_diff::*;
|
use account_diff::*;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
/// Expression for the delta between two system states. Encoded the
|
/// Expression for the delta between two system states. Encoded the
|
||||||
/// delta of every altered account.
|
/// delta of every altered account.
|
||||||
|
#[derive(Debug, PartialEq, Eq, Clone)]
|
||||||
pub struct StateDiff {
|
pub struct StateDiff {
|
||||||
/// Raw diff key-value
|
/// Raw diff key-value
|
||||||
pub raw: BTreeMap<Address, AccountDiff>
|
pub raw: BTreeMap<Address, AccountDiff>
|
@ -18,10 +18,9 @@
|
|||||||
|
|
||||||
use std::ops::Range;
|
use std::ops::Range;
|
||||||
use util::{Address};
|
use util::{Address};
|
||||||
use types::ids::BlockId;
|
use ids::BlockId;
|
||||||
|
|
||||||
/// Easy to use trace filter.
|
/// Easy to use trace filter.
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct Filter {
|
pub struct Filter {
|
||||||
/// Range of filtering.
|
/// Range of filtering.
|
||||||
pub range: Range<BlockId>,
|
pub range: Range<BlockId>,
|
@ -20,7 +20,6 @@ use util::H256;
|
|||||||
|
|
||||||
/// Represents a tree route between `from` block and `to` block:
|
/// Represents a tree route between `from` block and `to` block:
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct TreeRoute {
|
pub struct TreeRoute {
|
||||||
/// A vector of hashes of all blocks, ordered from `from` to `to`.
|
/// A vector of hashes of all blocks, ordered from `from` to `to`.
|
||||||
pub blocks: Vec<H256>,
|
pub blocks: Vec<H256>,
|
||||||
@ -29,4 +28,3 @@ pub struct TreeRoute {
|
|||||||
/// An index where best common ancestor would be.
|
/// An index where best common ancestor would be.
|
||||||
pub index: usize,
|
pub index: usize,
|
||||||
}
|
}
|
||||||
|
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
/// Verification queue status
|
/// Verification queue status
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
#[cfg_attr(feature = "ipc", binary)]
|
|
||||||
pub struct VerificationQueueInfo {
|
pub struct VerificationQueueInfo {
|
||||||
/// Number of queued items pending verification
|
/// Number of queued items pending verification
|
||||||
pub unverified_queue_size: usize,
|
pub unverified_queue_size: usize,
|
@ -15,6 +15,7 @@ serde = "1.0"
|
|||||||
serde_derive = "1.0"
|
serde_derive = "1.0"
|
||||||
ethcore = { path = "../ethcore" }
|
ethcore = { path = "../ethcore" }
|
||||||
ethcore-util = { path = "../util" }
|
ethcore-util = { path = "../util" }
|
||||||
|
evm = { path = "../ethcore/evm" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
evm-debug = ["ethcore/evm-debug-tests"]
|
evm-debug = ["ethcore/evm-debug-tests"]
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user