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

Author: niklasad1

.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

Cargo.lock

@@ -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"

Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [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"

accounts/ethkey/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"

cli-signer/rpc-client/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" }