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

all to ethcore

This commit is contained in:
Nikolay Volf 2016-05-06 14:58:37 +04:00
parent 2cb085db91
commit c16a46dca7
6 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Cargo.lock generated
View File

@ -3,7 +3,7 @@ name = "parity"
version = "1.2.0"
dependencies = [
"clippy 0.0.64 (registry+https://github.com/rust-lang/crates.io-index)",
"ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)",
"ctrlc 1.1.1 (git+https://github.com/ethcore/rust-ctrlc.git)",
"daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -160,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ctrlc"
version = "1.1.1"
source = "git+https://github.com/tomusdrw/rust-ctrlc.git#f4927770f89eca80ec250911eea3adcbf579ac48"
source = "git+https://github.com/ethcore/rust-ctrlc.git#f4927770f89eca80ec250911eea3adcbf579ac48"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -284,7 +284,7 @@ name = "ethcore-ipc-nano"
version = "1.2.0"
dependencies = [
"ethcore-ipc 1.2.0",
"jsonrpc-core 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"nanomsg 0.5.0 (git+https://github.com/ethcore/nanomsg.rs.git)",
]
@ -299,15 +299,15 @@ dependencies = [
"ethcore-util 1.2.0",
"ethminer 1.2.0",
"ethsync 1.2.0",
"json-ipc-server 0.1.0 (git+https://github.com/NikVolf/json-ipc-server.git)",
"jsonrpc-core 2.0.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)",
"jsonrpc-http-server 5.1.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)",
"json-ipc-server 0.1.0 (git+https://github.com/ethcore/json-ipc-server.git)",
"jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)",
"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)",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
"transient-hashmap 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -355,8 +355,8 @@ dependencies = [
"ethcore-rpc 1.2.0",
"ethcore-util 1.2.0",
"hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)",
"jsonrpc-core 2.0.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)",
"jsonrpc-http-server 5.1.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)",
"jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)",
"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-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)",
@ -547,6 +547,17 @@ dependencies = [
"slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "json-ipc-server"
version = "0.1.0"
source = "git+https://github.com/ethcore/json-ipc-server.git#c44572fa19c1077e59298df3c3c6533c7cdae11e"
dependencies = [
"bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 2.0.3 (git+https://github.com/ethcore/jsonrpc-core.git)",
"mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "json-tests"
version = "0.1.0"
@ -569,7 +580,7 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
version = "2.0.3"
source = "git+https://github.com/tomusdrw/jsonrpc-core.git#9d51f1b6679938846d93cbafdd052733c816d28b"
source = "git+https://github.com/ethcore/jsonrpc-core.git#195358904e256e7f130fd151edba42b1bc214354"
dependencies = [
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -577,13 +588,24 @@ dependencies = [
"syntex 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "jsonrpc-core"
version = "2.0.3"
source = "git+https://github.com/tomusdrw/jsonrpc-core.git#ede5fe06d9a96ad245b082c00bc49088d038e5f3"
dependencies = [
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "jsonrpc-http-server"
version = "5.1.0"
source = "git+https://github.com/tomusdrw/jsonrpc-http-server.git#fafd6410284710b7e662fe7d76249cc496451f27"
source = "git+https://github.com/ethcore/jsonrpc-http-server.git#b32815330c191aff06a6e017ba00c10e872bb4f6"
dependencies = [
"hyper 0.9.2 (git+https://github.com/hyperium/hyper?branch=mio)",
"jsonrpc-core 2.0.3 (git+https://github.com/tomusdrw/jsonrpc-core.git)",
"jsonrpc-core 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

2
Cargo.toml
View File

@ -17,7 +17,7 @@ env_logger = "0.3"
rustc-serialize = "0.3"
docopt = "0.6"
time = "0.1"
ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
fdlimit = { path = "util/fdlimit" }
daemonize = "0.2"
num_cpus = "0.2"

2
ipc/nano/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "GPL-3.0"
[features]
[dependencies]
jsonrpc-core = { git = "https://github.com/tomusdrw/jsonrpc-core.git" }
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
"ethcore-ipc" = { path = "../rpc" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
log = "0.3"

6
rpc/Cargo.toml
View File

@ -12,8 +12,8 @@ build = "build.rs"
log = "0.3"
serde = "0.7.0"
serde_json = "0.7.0"
jsonrpc-core = { git = "https://github.com/tomusdrw/jsonrpc-core.git" }
jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git", version = "5.1.0" }
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
ethcore-util = { path = "../util" }
ethcore = { path = "../ethcore" }
ethash = { path = "../ethash" }
@ -23,7 +23,7 @@ rustc-serialize = "0.3"
transient-hashmap = "0.1"
serde_macros = { version = "0.7.0", optional = true }
clippy = { version = "0.0.64", optional = true}
json-ipc-server = { git = "https://github.com/NikVolf/json-ipc-server.git" }
json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
[build-dependencies]
serde_codegen = { version = "0.7.0", optional = true }

2
rpc/rpctest/Cargo.toml
View File

@ -6,7 +6,7 @@ license = "GPL-3.0"
authors = ["Ethcore <admin@ethcore.io>"]
[dependencies]
ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
docopt = "0.6"
rustc-serialize = "0.3"
ethcore = { path = "../../ethcore" }

4
webapp/Cargo.toml
View File

@ -9,8 +9,8 @@ authors = ["Ethcore <admin@ethcore.io"]
[dependencies]
log = "0.3"
jsonrpc-core = { git = "https://github.com/tomusdrw/jsonrpc-core.git" }
jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git", version = "5.1.0" }
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
hyper = { default-features = false, git = "https://github.com/hyperium/hyper", branch = "mio" }
url = "1.0"
ethcore-rpc = { path = "../rpc" }