Merge branch 'master' into signer-wsnotification

2016-06-02 13:02:10 +02:00
parent 716c9bb43c 29e18cfc4d
commit 77942c0b48
36 changed files with 742 additions and 172 deletions
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -153,7 +153,7 @@ pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet
 				}
 			},
 			Api::Ethcore => {
-				server.add_delegate(EthcoreClient::new(&deps.miner, deps.logger.clone(), deps.settings.clone()).to_delegate())
+				server.add_delegate(EthcoreClient::new(&deps.client, &deps.miner, deps.logger.clone(), deps.settings.clone()).to_delegate())
 			},
 			Api::Traces => {
 				server.add_delegate(TracesClient::new(&deps.client).to_delegate())