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

Merge branch 'master' into new-jsonrpc

Browse Source
This commit is contained in:
Tomasz Drwięga
2017-03-13 16:33:10 +01:00
parent 8bf5be0cc4 29bed6ff69
commit b51d7e9f6a
245 changed files with 9409 additions and 3004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dapps/Cargo.toml
View File

@@ -26,10 +26,10 @@ url = "1.0"
zip = { version = "0.1", default-features = false }
hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git", branch = "master" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git", branch = "master" }
# TODO [ToDr] Temporary solution, server should be merged with RPC.
jsonrpc-server-utils = { git = "https://github.com/ethcore/jsonrpc.git" }
jsonrpc-server-utils = { git = "https://github.com/ethcore/jsonrpc.git", branch = "master" }
ethcore-devtools = { path = "../devtools" }
ethcore-rpc = { path = "../rpc" }

3
dapps/ui/Cargo.toml
View File

@@ -11,7 +11,8 @@ rustc_version = "0.1"
[dependencies]
parity-ui-dev = { path = "../../js", optional = true }
parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true }
# This is managed by the js/scripts/release.sh script on CI - keep it in a single line
parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true, branch = "master" }
[features]
no-precompiled-js = ["parity-ui-dev"]