From 7f26b5cbba64b43cdf2a9bdc1c87c514a160eaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 9 May 2016 14:32:16 +0200 Subject: [PATCH] Updating status page. Bringing back wallet --- Cargo.lock | 15 ++++++++++++--- webapp/Cargo.toml | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be8cab787..849b8277c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,7 +358,8 @@ dependencies = [ "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-status 0.3.6 (git+https://github.com/ethcore/parity-status.git)", + "parity-status 0.3.7 (git+https://github.com/ethcore/parity-status.git)", + "parity-wallet 0.1.1 (git+https://github.com/ethcore/parity-wallet.git)", "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)", "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -821,8 +822,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-status" -version = "0.3.6" -source = "git+https://github.com/ethcore/parity-status.git#738f8d9da554f82492721f99ba064e7fec693300" +version = "0.3.7" +source = "git+https://github.com/ethcore/parity-status.git#b0ae32a7fe2f843e4e22dc38903fd2c3e7fb0763" +dependencies = [ + "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)", +] + +[[package]] +name = "parity-wallet" +version = "0.1.1" +source = "git+https://github.com/ethcore/parity-wallet.git#125b2c05118890eac7b845f832f39b069d9b4be8" dependencies = [ "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)", ] diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml index ccc0d189d..70ee5bc35 100644 --- a/webapp/Cargo.toml +++ b/webapp/Cargo.toml @@ -17,10 +17,10 @@ ethcore-rpc = { path = "../rpc" } ethcore-util = { path = "../util" } parity-webapp = { git = "https://github.com/ethcore/parity-webapp.git" } # List of apps -parity-status = { git = "https://github.com/ethcore/parity-status.git", version = "0.3.6" } -parity-wallet = { git = "https://github.com/ethcore/parity-wallet.git", optional = true } +parity-status = { git = "https://github.com/ethcore/parity-status.git", version = "0.3.7" } +parity-wallet = { git = "https://github.com/ethcore/parity-wallet.git", version = "0.1.1", optional = true } clippy = { version = "0.0.64", optional = true} [features] -default = [] +default = ["parity-wallet"] dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]