Merge branch 'master' into dp/chore/ensure-we-ignore-old-snapshots

* master:
  [informant]: `MillisecondDuration` -> `as_millis()` (#11211)
  Step duration map configuration parameter ported from the POA Network fork (#10902)
  Upgrade jsonrpc to latest (#11206)
  [export hardcoded sync]: use debug for `H256` (#11204)
  Pause pruning while snapshotting (#11178)

Cargo.toml

@@ -37,7 +37,7 @@ ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.1"
+jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.5"

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 = "14.0.1"
-jsonrpc-ws-server = "14.0.1"
+jsonrpc-core = "14.0.3"
+jsonrpc-ws-server = "14.0.3"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.4.0"

ethcore/Cargo.toml

@@ -51,6 +51,7 @@ rayon = "1.1"
 registrar = { path = "../util/registrar" }
 rlp = "0.4.0"
 rustc-hex = "2"
+scopeguard = "1.0.0"
 serde = "1.0"
 serde_derive = "1.0"
 snapshot = { path = "snapshot" }