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

Merge branch 'master' into split

Browse Source
This commit is contained in:
debris
2017-08-01 14:24:47 +02:00
parent 6e5a563c06 5b0eeb75ef
commit a2c05123fd
69 changed files with 14105 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/Cargo.toml
View File

@@ -46,7 +46,7 @@ ethjson = { path = "../json" }
ethcore-devtools = { path = "../devtools" }
ethcore-light = { path = "../ethcore/light" }
ethcore-logger = { path = "../logger" }
evm = { path = "../ethcore/evm" }
vm = { path = "../ethcore/vm" }
parity-updater = { path = "../updater" }
parity-reactor = { path = "../util/reactor" }
rlp = { path = "../util/rlp" }

2
rpc/src/lib.rs
View File

@@ -52,7 +52,7 @@ extern crate ethkey;
extern crate ethstore;
extern crate ethsync;
extern crate ethcore_logger;
extern crate evm;
extern crate vm;
extern crate fetch;
extern crate parity_reactor;
extern crate parity_updater as updater;

2
rpc/src/v1/helpers/light_fetch.rs
View File

@@ -327,7 +327,7 @@ struct ExecuteParams {
from: Address,
tx: EthTransaction,
hdr: encoded::Header,
env_info: ::evm::env_info::EnvInfo,
env_info: ::vm::EnvInfo,
engine: Arc<::ethcore::engines::Engine>,
on_demand: Arc<OnDemand>,
sync: Arc<LightSync>,

2
rpc/src/v1/tests/mocked/traces.rs
View File

@@ -21,7 +21,7 @@ use ethcore::trace::trace::{Action, Res, Call};
use ethcore::trace::LocalizedTrace;
use ethcore::client::TestBlockChainClient;
use evm::CallType;
use vm::CallType;
use jsonrpc_core::IoHandler;
use v1::tests::helpers::{TestMinerService};

16
rpc/src/v1/types/trace.rs
View File

@@ -22,7 +22,7 @@ use ethcore::trace as et;
use ethcore::state_diff;
use ethcore::account_diff;
use ethcore::client::Executed;
use evm;
use vm;
use v1::types::{Bytes, H160, H256, U256};
#[derive(Debug, Serialize)]
@@ -256,14 +256,14 @@ pub enum CallType {
StaticCall,
}
impl From<evm::CallType> for CallType {
fn from(c: evm::CallType) -> Self {
impl From<vm::CallType> for CallType {
fn from(c: vm::CallType) -> Self {
match c {
evm::CallType::None => CallType::None,
evm::CallType::Call => CallType::Call,
evm::CallType::CallCode => CallType::CallCode,
evm::CallType::DelegateCall => CallType::DelegateCall,
evm::CallType::StaticCall => CallType::StaticCall,
vm::CallType::None => CallType::None,
vm::CallType::Call => CallType::Call,
vm::CallType::CallCode => CallType::CallCode,
vm::CallType::DelegateCall => CallType::DelegateCall,
vm::CallType::StaticCall => CallType::StaticCall,
}
}
}