Merge remote-tracking branch 'origin/master' into na-bump-rand

openethereum · Oct 16, 2019 · 9afd977 · 9afd977
2 parents a29264a + 6b57429
commit 9afd977
Show file tree

Hide file tree

Showing 43 changed files with 677 additions and 390 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -63,35 +63,35 @@ cargo-check 0 3:
   <<:                              *docker-cache-status
   script:
     - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 cargo-check 1 3:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 cargo-check 2 3:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 cargo-check-evmbin:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache -s
+    - sccache --show-stats
 
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check --all --benches --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache -s
+    - sccache --show-stats
 
 cargo-audit:
   stage:                           test

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = "13.2.0"
+jsonrpc-core = "14.0.0"
 keccak-hash = "0.4.0"
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.5"

diff --git a/accounts/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 edit-distance = "2.0"
 parity-crypto = "0.4.0"
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", branch = "master" }
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 ethereum-types = "0.8.0"
 lazy_static = "1.0"
 log = "0.4"

diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0"
 url = "2.1.0"
 matches = "0.1"
 parking_lot = "0.9"
-jsonrpc-core = "13.2.0"
-jsonrpc-ws-server = "13.2.0"
+jsonrpc-core = "14.0.0"
+jsonrpc-ws-server = "14.0.0"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.4.0"
diff --git a/ethcore/builtin/Cargo.toml b/ethcore/builtin/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2018"
 
 [dependencies]
 bn = { git = "https://github.com/paritytech/bn", default-features = false }
+common-types = { path = "../types" }
 ethereum-types = "0.8.0"
 ethjson = { path = "../../json" }
 ethkey = { path = "../../accounts/ethkey" }