Merge branch 'master' into client-ipc-refact

2016-07-05 11:29:46 +03:00
parent cfcf061e41 bbf20c3637
commit b873d3befb
69 changed files with 929 additions and 246 deletions
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -42,6 +42,7 @@ use v1::traits::Eth;
 use v1::types::{Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, SyncInfo, Transaction, CallRequest, OptionalValue, Index, Filter, Log, Receipt};
 use v1::impls::{default_gas_price, dispatch_transaction, error_codes};
 use serde;
+use ethcore::header::Header as BlockHeader;

 /// Eth rpc implementation.
 pub struct EthClient<C, S, M, EM> where