Merge branch 'master' into dp/fix/maximumEmptySteps-11445

* master: Use parity-crypto updated to use upstream rust-secp256k1 (#11406) Cleanup some code in Aura (#11466) 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 10, 2020 · 917c094 · 917c094
2 parents b1be876 + 99271db
commit 917c094
Show file tree

Hide file tree

Showing 130 changed files with 1,275 additions and 943 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,16 +41,16 @@ futures = "0.1"
 journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
+kvdb = "0.4.0"
+kvdb-rocksdb = "0.5.0"
 log = "0.4"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }
 num_cpus = "1.2"
 number_prefix = "0.2"
 panic_hook = { path = "util/panic-hook" }
 parity-bytes = "0.1"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
+parity-crypto = { version = "0.5.0", features = ["publickey"] }
 parity-daemonize = "0.3"
 parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
@@ -59,9 +59,9 @@ parity-path = "0.1"
 parity-rpc = { path = "rpc" }
 parity-runtime = { path = "util/runtime" }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.3.0", features = ["jemalloc-global"] }
+parity-util-mem = { version = "0.5.1", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 regex = "1.0"
 registrar = { path = "util/registrar" }
 rlp = "0.4.0"
@@ -75,7 +75,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]
@@ -135,4 +135,5 @@ members = [
 	"chainspec",
 	"ethcore/wasm/run",
 	"evmbin",
+	"util/EIP-2124"
 ]
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/Cargo.toml b/accounts/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2018"
 ethkey = { path = "ethkey" }
 ethstore = { path = "ethstore" }
 log = "0.4"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parking_lot = "0.9"
+parity-crypto = { version = "0.5.0", features = ["publickey"] }
+parking_lot = "0.10.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/accounts/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml
@@ -9,5 +9,5 @@ edit-distance = "2.0"
 log = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist = "1.3"
+parity-crypto = { version = "0.5.0", features = ["publickey"] }
+parity-wordlist = "1.3.1"
diff --git a/accounts/ethkey/cli/Cargo.toml b/accounts/ethkey/cli/Cargo.toml
@@ -9,8 +9,8 @@ docopt = "1.0"
 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-crypto = { version = "0.5.0", features = ["publickey"] }
+parity-wordlist= "1.3.1"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/accounts/ethkey/cli/src/main.rs b/accounts/ethkey/cli/src/main.rs
@@ -199,7 +199,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let result = if args.flag_brain {
 			let phrase = args.arg_secret_or_phrase;
 			let phrase_info = validate_phrase(&phrase);
-			let keypair = Brain::new(phrase).generate().expect("Brain wallet generator is infallible; qed");
+			let keypair = Brain::new(phrase).generate();
 			(keypair, Some(phrase_info))
 		} else {
 			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecretKey)?;
@@ -215,7 +215,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 				let phrase = format!("recovery phrase: {}", brain.phrase());
 				(keypair, Some(phrase))
 			} else {
-				(Random.generate()?, None)
+				(Random.generate(), None)
 			}
 		} else if args.cmd_prefix {
 			let prefix = args.arg_prefix.from_hex()?;
@@ -271,7 +271,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 				while let Some(phrase) = it.next() {
 					i += 1;
 
-					let keypair = Brain::new(phrase.clone()).generate().unwrap();
+					let keypair = Brain::new(phrase.clone()).generate();
 					if keypair.address() == address {
 						return Ok(Some((phrase, keypair)))
 					}

diff --git a/accounts/ethkey/src/brain.rs b/accounts/ethkey/src/brain.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::convert::Infallible;
 use parity_crypto::publickey::{KeyPair, Generator, Secret};
 use parity_crypto::Keccak256;
 use parity_wordlist;
@@ -33,9 +32,7 @@ impl Brain {
 }
 
 impl Generator for Brain {
-	type Error = Infallible;
-
-	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+	fn generate(&mut self) -> KeyPair {
 		let seed = self.0.clone();
 		let mut secret = seed.into_bytes().keccak256();
 
@@ -51,7 +48,7 @@ impl Generator for Brain {
 					{
 						if pair.address()[0] == 0 {
 							trace!("Testing: {}, got: {:?}", self.0, pair.address());
-							return Ok(pair)
+							return pair
 						}
 					}
 				},
@@ -68,8 +65,8 @@ mod tests {
 	#[test]
 	fn test_brain() {
 		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain::new(words.clone()).generate().unwrap();
-		let second_keypair = Brain::new(words.clone()).generate().unwrap();
+		let first_keypair = Brain::new(words.clone()).generate();
+		let second_keypair = Brain::new(words.clone()).generate();
 		assert_eq!(first_keypair.secret(), second_keypair.secret());
 	}
 }
diff --git a/accounts/ethkey/src/brain_prefix.rs b/accounts/ethkey/src/brain_prefix.rs
@@ -39,15 +39,11 @@ impl BrainPrefix {
 	pub fn phrase(&self) -> &str {
 		&self.last_phrase
 	}
-}
-
-impl Generator for BrainPrefix {
-	type Error = Error;
 
-	fn generate(&mut self) -> Result<KeyPair, Error> {
+	pub fn generate(&mut self) -> Result<KeyPair, Error> {
 		for _ in 0..self.iterations {
 			let phrase = wordlist::random_phrase(self.no_of_words);
-			let keypair = Brain::new(phrase.clone()).generate().unwrap();
+			let keypair = Brain::new(phrase.clone()).generate();
 			if keypair.address().as_ref().starts_with(&self.prefix) {
 				self.last_phrase = phrase;
 				return Ok(keypair)

diff --git a/accounts/ethkey/src/brain_recover.rs b/accounts/ethkey/src/brain_recover.rs
@@ -33,7 +33,7 @@ pub fn brain_recover(
 ) -> Option<String> {
 	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
 	for phrase in it {
-		let keypair = Brain::new(phrase.clone()).generate().expect("Brain wallets are infallible; qed");
+		let keypair = Brain::new(phrase.clone()).generate();
 		trace!("Testing: {}, got: {:?}", phrase, keypair.address());
 		if &keypair.address() == address {
 			return Some(phrase);

diff --git a/accounts/ethkey/src/prefix.rs b/accounts/ethkey/src/prefix.rs
@@ -24,19 +24,12 @@ pub struct Prefix {
 
 impl Prefix {
 	pub fn new(prefix: Vec<u8>, iterations: usize) -> Self {
-		Prefix {
-			prefix: prefix,
-			iterations: iterations,
-		}
+		Prefix { prefix, iterations }
 	}
-}
-
-impl Generator for Prefix {
-	type Error = Error;
 
-	fn generate(&mut self) -> Result<KeyPair, Error> {
+	pub fn generate(&mut self) -> Result<KeyPair, Error> {
 		for _ in 0..self.iterations {
-			let keypair = Random.generate()?;
+			let keypair = Random.generate();
 			if keypair.address().as_ref().starts_with(&self.prefix) {
 				return Ok(keypair)
 			}

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.9"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
+parking_lot = "0.10.0"
+parity-crypto = { version = "0.5.0", 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/cli/Cargo.toml b/accounts/ethstore/cli/Cargo.toml
@@ -11,10 +11,10 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 ethstore = { path = "../" }
 ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
+parity-crypto = { version = "0.5.0", features = ["publickey"] }
 dir = { path = '../../../util/dir' }
 panic_hook = { path = "../../../util/panic-hook" }
 

diff --git a/accounts/ethstore/src/account/crypto.rs b/accounts/ethstore/src/account/crypto.rs
@@ -164,7 +164,7 @@ mod tests {
 
 	#[test]
 	fn crypto_with_secret_create() {
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let passwd = "this is sparta".into();
 		let crypto = Crypto::with_secret(keypair.secret(), &passwd, 10240).unwrap();
 		let secret = crypto.secret(&passwd).unwrap();
@@ -173,7 +173,7 @@ mod tests {
 
 	#[test]
 	fn crypto_with_secret_invalid_password() {
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let crypto = Crypto::with_secret(keypair.secret(), &"this is sparta".into(), 10240).unwrap();
 		assert_matches!(crypto.secret(&"this is sparta!".into()), Err(Error::InvalidPassword))
 	}

diff --git a/accounts/ethstore/src/account/safe_account.rs b/accounts/ethstore/src/account/safe_account.rs
@@ -205,21 +205,21 @@ mod tests {
 
 	#[test]
 	fn sign_and_verify_public() {
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let password = "hello world".into();
-		let message = Message::default();
+		let message = [1u8; 32].into();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 10240, "Test".to_owned(), "{}".to_owned());
 		let signature = account.unwrap().sign(&password, &message).unwrap();
 		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
 	}
 
 	#[test]
 	fn change_password() {
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let first_password = "hello world".into();
 		let sec_password = "this is sparta".into();
 		let i = 10240;
-		let message = Message::default();
+		let message = [1u8; 32].into();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &first_password, i, "Test".to_owned(), "{}".to_owned()).unwrap();
 		let new_account = account.change_password(&first_password, &sec_password, i).unwrap();
 		assert!(account.sign(&first_password, &message).is_ok());

diff --git a/accounts/ethstore/src/accounts_dir/disk.rs b/accounts/ethstore/src/accounts_dir/disk.rs
@@ -364,7 +364,7 @@ mod test {
 		// given
 		let mut dir = env::temp_dir();
 		dir.push("ethstore_should_create_new_account");
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let password = "hello world".into();
 		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
 
@@ -385,7 +385,7 @@ mod test {
 		// given
 		let mut dir = env::temp_dir();
 		dir.push("ethstore_should_handle_duplicate_filenames");
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let password = "hello world".into();
 		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
 
@@ -472,7 +472,7 @@ mod test {
 			15130871412783076140
 		);
 
-		let keypair = Random.generate().unwrap();
+		let keypair = Random.generate();
 		let password = "test pass".into();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
 		directory.insert(account.unwrap()).expect("Account should be inserted ok");

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/ethstore.rs b/accounts/ethstore/src/ethstore.rs
@@ -698,7 +698,7 @@ mod tests {
 	use ethereum_types::H256;
 
 	fn keypair() -> KeyPair {
-		Random.generate().unwrap()
+		Random.generate()
 	}
 
 	fn store() -> EthStore {
@@ -820,6 +820,7 @@ mod tests {
 		let passwd2 = "xzy".into();
 		let multi_store = multi_store();
 		let keypair = keypair();
+		let message = [1u8; 32].into();
 		let address = store.insert_account(SecretVaultRef::Root, keypair.secret().clone(), &passwd1).unwrap();
 		assert_eq!(multi_store.accounts().unwrap().len(), 0);
 
@@ -828,7 +829,7 @@ mod tests {
 
 		// then
 		assert!(store.test_password(&address, &passwd1).unwrap(), "First password should work for store.");
-		assert!(multi_store.sign(&address, &passwd2, &Default::default()).is_ok(), "Second password should work for second store.");
+		assert!(multi_store.sign(&address, &passwd2, &message).is_ok(), "Second password should work for second store.");
 		assert_eq!(multi_store.accounts().unwrap().len(), 1);
 	}
 
@@ -1092,8 +1093,9 @@ mod tests {
 		let accounts = store.accounts().unwrap();
 		assert_eq!(accounts.len(), 2);
 
+		let message = [1u8; 32].into();
 		// and we can sign with the derived contract
-		assert!(store.sign(&derived, &"test".into(), &Default::default()).is_ok(), "Second password should work for second store.");
+		assert!(store.sign(&derived, &"test".into(), &message).is_ok(), "Second password should work for second store.");
 	}
 
 	#[test]