Merge branch 'master' into ao-sled

* master: upgrade some of the dependencies (#11467) Some more release track changes to README.md (#11465) Update simple one-line installer due to switching to a single stable release track (#11463) update Dockerfile (#11461) Implement EIP-2124 (#11456)
openethereum · Feb 7, 2020 · 12a2d64 · 12a2d64
2 parents 56d2431 + 6546322
commit 12a2d64
Show file tree

Hide file tree

Showing 53 changed files with 589 additions and 454 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,7 +58,7 @@ parity-path = "0.1"
 parity-rpc = { path = "rpc" }
 parity-runtime = { path = "util/runtime" }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.5.0", features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.5.1", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
 parking_lot = "0.10.0"
 regex = "1.0"
@@ -74,7 +74,7 @@ snapshot = { path = "ethcore/snapshot" }
 spec = { path = "ethcore/spec" }
 term_size = "0.3"
 textwrap = "0.9"
-toml = "0.4"
+toml = "0.5.6"
 verification = { path = "ethcore/verification" }
 
 [build-dependencies]
@@ -134,6 +134,7 @@ members = [
 	"chainspec",
 	"ethcore/wasm/run",
 	"evmbin",
+	"util/EIP-2124"
 ]
 
 [patch.crates-io]

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a We
 
 If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).
 
-Parity Ethereum's current beta-release is 2.6. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+You can download Parity Ethereum's latest release at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
 ## 3. Building <a id="chapter-003"></a>
 
@@ -104,30 +104,18 @@ Note, when compiling a crate and you receive errors, it's in most cases your out
 $ cargo clean
 ```
 
-This always compiles the latest nightly builds. If you want to build stable or beta, do a
+This always compiles the latest nightly builds. If you want to build stable, do a
 
 ```bash
 $ git checkout stable
 ```
 
-or
-
-```bash
-$ git checkout beta
-```
-
 ### 3.3 Simple One-Line Installer for Mac and Linux <a id="chapter-0033"></a>
 
 ```bash
 bash <(curl https://get.parity.io -L)
 ```
 
-The one-line installer always defaults to the latest beta release. To install a stable release, run:
-
-```bash
-bash <(curl https://get.parity.io -L) -r stable
-```
-
 ### 3.4 Starting Parity Ethereum <a id="chapter-0034"></a>
 
 #### Manually

diff --git a/accounts/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml
@@ -10,4 +10,4 @@ log = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist = "1.3"
+parity-wordlist = "1.3.1"
diff --git a/accounts/ethkey/cli/Cargo.toml b/accounts/ethkey/cli/Cargo.toml
@@ -10,7 +10,7 @@ env_logger = "0.5"
 ethkey = { path = "../" }
 panic_hook = { path = "../../../util/panic-hook" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist="1.2"
+parity-wordlist= "1.3.1"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/accounts/ethstore/Cargo.toml b/accounts/ethstore/Cargo.toml
@@ -15,13 +15,12 @@ serde_derive = "1.0"
 rustc-hex = "1.0"
 tiny-keccak = "1.4"
 time = "0.1.34"
-itertools = "0.5"
 parking_lot = "0.10.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 ethereum-types = "0.8.0"
 dir = { path = "../../util/dir" }
-smallvec = "0.6"
-parity-wordlist = "1.0"
+smallvec = "1.2.0"
+parity-wordlist = "1.3.1"
 tempdir = "0.3"
 
 [dev-dependencies]

diff --git a/accounts/ethstore/src/accounts_dir/memory.rs b/accounts/ethstore/src/accounts_dir/memory.rs
@@ -16,7 +16,6 @@
 
 use std::collections::HashMap;
 use parking_lot::RwLock;
-use itertools;
 use crypto::publickey::Address;
 
 use {SafeAccount, Error};
@@ -30,7 +29,7 @@ pub struct MemoryDirectory {
 
 impl KeyDirectory for MemoryDirectory {
 	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		Ok(itertools::Itertools::flatten(self.accounts.read().values().cloned()).collect())
+		Ok(self.accounts.read().values().cloned().flatten().collect())
 	}
 
 	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {

diff --git a/accounts/ethstore/src/lib.rs b/accounts/ethstore/src/lib.rs
@@ -19,7 +19,6 @@
 #![warn(missing_docs)]
 
 extern crate dir;
-extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
 extern crate rand;
@@ -97,4 +96,3 @@ impl<'a> From<&'a json::H160> for Address {
 		From::from(a)
 	}
 }
-
diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4"
 memmap = "0.6"
 parking_lot = "0.10.0"
 primal = "0.2.3"
-static_assertions = "0.3.3"
+static_assertions = "1.1.0"
 
 [dev-dependencies]
 criterion = "0.3"

diff --git a/ethash/src/shared.rs b/ethash/src/shared.rs
@@ -69,7 +69,7 @@ pub type NodeBytes = [u8; NODE_BYTES];
 pub type NodeWords = [u32; NODE_WORDS];
 pub type NodeDwords = [u64; NODE_DWORDS];
 
-assert_eq_size!(node; Node, NodeBytes, NodeWords, NodeDwords);
+assert_eq_size!(Node, NodeBytes, NodeWords, NodeDwords);
 
 #[repr(C)]
 pub union Node {

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -28,7 +28,7 @@ evm = { path = "evm" }
 executive-state = { path = "executive-state" }
 futures = "0.1"
 hash-db = "0.15.0"
-itertools = "0.5"
+itertools = "0.8.2"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.4.0"
 kvdb = "0.4.0"
@@ -42,15 +42,15 @@ memory-cache = { path = "../util/memory-cache" }
 parity-bytes = "0.1"
 parking_lot = "0.10.0"
 pod = { path = "pod", optional = true }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 parity-crypto = { version = "0.4.2", features = ["publickey"], optional = true }
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
 rand = "0.7"
 rand_xorshift = "0.2"
 rayon = "1.1"
 registrar = { path = "../util/registrar" }
 rlp = "0.4.0"
-rustc-hex = "2"
+rustc-hex = "2.1.0"
 scopeguard = "1.0.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml
@@ -19,14 +19,14 @@ keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.4.0"
 log = "0.4"
 lru-cache = "0.1.2"
-memory-db = "0.18.0"
+memory-db = "0.19.0"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 parking_lot = "0.10.0"
 pod = { path = "../pod" }
 rlp = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 
 [dev-dependencies]
 account-db = { path = "../account-db" }

diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml
@@ -14,8 +14,8 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
-parity-util-mem = "0.5.0"
-itertools = "0.5"
+parity-util-mem = "0.5.1"
+itertools = "0.8.2"
 kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1"

diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 common-types = { path = "../types" }
 ethereum-types = "0.8.0"
 kvdb = "0.4.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 parking_lot = "0.10.0"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
diff --git a/ethcore/engines/authority-round/Cargo.toml b/ethcore/engines/authority-round/Cargo.toml
@@ -20,7 +20,7 @@ ethjson = { path = "../../../json" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 engine = { path = "../../engine" }
 io = { package = "ethcore-io", path = "../../../util/io" }
-itertools = "0.5"
+itertools = "0.8.2"
 keccak-hash = "0.4.0"
 lazy_static = "1.3.0"
 log = "0.4"

diff --git a/ethcore/engines/validator-set/Cargo.toml b/ethcore/engines/validator-set/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4.8"
 machine = { path = "../../machine" }
 memory-cache = { path = "../../../util/memory-cache" }
 parity-bytes = "0.1.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 parking_lot = "0.10.0"
 rlp = "0.4.2"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../../util/triehash-ethereum" }

diff --git a/ethcore/engines/validator-set/src/lib.rs b/ethcore/engines/validator-set/src/lib.rs
@@ -37,8 +37,6 @@ use engine::SystemCall;
 use ethereum_types::{H256, Address};
 use ethjson::spec::ValidatorSet as ValidatorSpec;
 use machine::Machine;
-// The MallocSizeOf derive looks for this in the root
-use parity_util_mem as malloc_size_of;
 use parity_bytes::Bytes;
 
 #[cfg(any(test, feature = "test-helpers"))]

diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 bit-set = "0.4"
 parity-bytes = "0.1"
 ethereum-types = "0.8.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }

diff --git a/ethcore/executive-state/Cargo.toml b/ethcore/executive-state/Cargo.toml
@@ -30,5 +30,5 @@ keccak-hash = "0.4.0"
 pod = { path = "../pod" }
 rustc-hex = "1.0"
 spec = { path = "../spec" }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -18,20 +18,20 @@ ethcore-blockchain = { path = "../blockchain" }
 ethereum-types = "0.8.0"
 executive-state = { path = "../executive-state" }
 machine = { path = "../machine" }
-memory-db = "0.18.0"
-trie-db = "0.18.0"
+memory-db = "0.19.0"
+trie-db = "0.20.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-miner = { path = "../../miner" }
 ethcore-io = { path = "../../util/io" }
 hash-db = "0.15.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
 failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }
-smallvec = "0.6"
+smallvec = "1.2.0"
 futures = "0.1"
 rand = "0.7"
 bincode = "1.1"

diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml
@@ -12,16 +12,16 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../json" }
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 hash-db = "0.15.0"
-itertools = "0.8"
+itertools = "0.8.2"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1.0"
 rlp = "0.4"
-rustc-hex = "1"
+rustc-hex = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }
 
 [dev-dependencies]

diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml
@@ -22,7 +22,7 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../json" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
@@ -33,7 +33,7 @@ journaldb = { path = "../../util/journaldb" }
 parity-bytes = "0.1"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 parking_lot = "0.10.0"
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 registrar = { path = "../../util/registrar" }
 rlp = "0.4.0"

diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml
@@ -25,7 +25,7 @@ ethcore-io = { path = "../../util/io" }
 ethereum-types = "0.8.0"
 ethtrie  = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 hash-db = "0.15.0"
-itertools = "0.5"
+itertools = "0.8.2"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
@@ -40,7 +40,7 @@ rlp_derive = { path = "../../util/rlp-derive" }
 scopeguard = "1.0.0"
 snappy = { package = "parity-snappy", version ="0.1.0" }
 state-db = { path = "../state-db" }
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }
 
 [dev-dependencies]

diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml
@@ -35,7 +35,7 @@ snappy = { package = "parity-snappy", version ="0.1.0" }
 snapshot = { path = "../../snapshot", features = ["test-helpers"] }
 spec = { path = "../../spec" }
 tempdir = "0.3"
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 trie-standardmap = "0.15.0"
 ethabi = "9.0.1"
 ethabi-contract = "9.0.0"

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -29,7 +29,6 @@ use bytes::ToPretty;
 use ethereum_types::{Address, H256, H264, U256};
 use hash::keccak;
 use hash_db::EMPTY_PREFIX;
-use itertools::Itertools;
 use kvdb::{DBTransaction, DBValue, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
 use rand::rngs::OsRng;
@@ -2355,7 +2354,7 @@ impl PrepareOpenBlock for Client {
 			.unwrap_or_else(Vec::new)
 			.into_iter()
 			.take(engine.maximum_uncle_count(open_block.header.number()))
-			.foreach(|h| {
+			.for_each(|h| {
 				open_block.push_uncle(h.decode().expect("decoding failure")).expect("pushing maximum_uncle_count;
 												open_block was just created;
 												push_uncle is not ok only if more than maximum_uncle_count is pushed;

diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
@@ -27,7 +27,7 @@ macros = { path = "../../util/macros" }
 network = { package = "ethcore-network", path = "../../util/network" }
 parity-runtime = { path = "../../util/runtime" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 rand = "0.7"
 parking_lot = "0.10.0"
 rlp = "0.4.0"

diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml
@@ -14,7 +14,7 @@ evm = { path = "../evm" }
 kvdb = "0.4.0"
 log = "0.4"
 parity-bytes = "0.1.0"
-parity-util-mem = "0.5.0"
+parity-util-mem = "0.5.1"
 parking_lot = "0.10.0"
 rlp = "0.4.0"
 rlp_derive = { path = "../../util/rlp-derive" }

diff --git a/ethcore/trace/src/lib.rs b/ethcore/trace/src/lib.rs
@@ -19,8 +19,6 @@
 use ethereum_types::{U256, Address};
 use kvdb::DBTransaction;
 use vm::{Error as VmError, ActionParams};
-// The MallocSizeOf derive looks for this in the root
-use parity_util_mem as malloc_size_of;
 
 mod config;
 mod db;

diff --git a/ethcore/trie-vm-factories/Cargo.toml b/ethcore/trie-vm-factories/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-trie-db = "0.18.0"
+trie-db = "0.20.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 account-db = { path = "../account-db" }
 evm = { path = "../evm" }