Merge branch 'master' into dp/chore/fetch-dependencies-from-crates

* master: evmbin: escape newlines in json errors (#9458) use kvdb-* and parity-snappy crates from crates.io (#9441) Add EIP-1014 transition config flag (#9268) add tags for runner selection of build-linux jobs (#9451) Remove unused BlockStatus::Pending (#9447) ci: only include local paths in coverage script (except target) (#9437) Add POA Networks: Core and Sokol (#9413) docker: install missing dependencies in arm target dockerfiles (#9436) Random small cleanups (#9423)
openethereum · Sep 4, 2018 · df88d32 · df88d32
2 parents 1c53be0 + 1f24262
commit df88d32
Show file tree

Hide file tree

Showing 91 changed files with 583 additions and 271 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -12,22 +12,22 @@ Do **not** open an issue on Github if you think your discovered bug could be a *
 
 Otherwise, just create a [new issue](https://github.com/paritytech/parity-ethereum/issues/new) in our repository and state:
 
-- What's your Parity version?
+- What's your Parity Ethereum version?
 - What's your operating system and version?
-- How did you install parity?
+- How did you install Parity Ethereum?
 - Is your node fully synchronized?
 - Did you try turning it off and on again?
 
 Also, try to include **steps to reproduce** the issue and expand on the **actual versus expected behavior**.
 
 ## Contribute!
 
-If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
+If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
 
 Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
 
 ## License.
 
-By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
 
 Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,13 +1,11 @@
 _Before filing a new issue, please **provide the following information**._
 
-> I'm running:
->
-> - **Which Parity version?**: 0.0.0
-> - **Which operating system?**: Windows / MacOS / Linux
-> - **How installed?**: via installer / homebrew / binaries / from source
-> - **Are you fully synchronized?**: no / yes
-> - **Which network are you connected to?**: ethereum / ropsten / kovan / ...
-> - **Did you try to restart the node?**: no / yes
+- **Parity Ethereum version**: 0.0.0
+- **Operating system**: Windows / MacOS / Linux
+- **Installation**: homebrew / one-line installer / built from source
+- **Fully synchronized**: no / yes
+- **Network**: ethereum / ropsten / kovan / ...
+- **Restarted**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -111,24 +111,32 @@ build-linux-ubuntu-i386:
   image:                           parity/rust-i686:gitlab-ci
   variables:
     CARGO_TARGET:                  i686-unknown-linux-gnu
+  tags:
+    - rust-i686
 
 build-linux-ubuntu-arm64:
   <<:                              *build
   image:                           parity/rust-arm64:gitlab-ci
   variables:
     CARGO_TARGET:                  aarch64-unknown-linux-gnu
+  tags:
+    - rust-arm
 
 build-linux-ubuntu-armhf:
   <<:                              *build
   image:                           parity/rust-armv7:gitlab-ci
   variables:
     CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+  tags:
+    - rust-arm
 
 build-linux-android-armhf:
   <<:                              *build
   image:                           parity/rust-android:gitlab-ci
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
+  tags:
+    - rust-arm
 
 build-darwin-macos-x86_64:
   <<:                              *build

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,7 +63,7 @@ panic_hook = { path = "util/panic_hook" }
 keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
-kvdb-rocksdb = "0.1.2"
+kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
 mem = { path = "util/mem" }
 

diff --git a/README.md b/README.md
@@ -149,6 +149,16 @@ To start Parity Ethereum as a regular user using `systemd` init:
 `systemd` user directory (usually `~/.config/systemd/user`).
 2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
 
+## Parity Ethereum toolchain
+
+In addition to the Parity Ethereum client, there are additional tools in this repository available:
+
+- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/ethstore/) - Parity Ethereum key management.
+- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/ethkey/) - Parity Ethereum keys generator.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
+
 ## Join the chat!
 
 Questions? Get in touch with us on Gitter:

diff --git a/chainspec/Cargo.toml b/chainspec/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chainspec"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Marek Kotewicz <marek@parity.io>"]
 
 [dependencies]
 ethjson = { path = "../json" }

diff --git a/docker/README.md b/docker/README.md
@@ -5,7 +5,6 @@
 ## Usage - CentOS
 
 Builds a lightweight non-root Parity docker image:
-
 ```
 git clone https://github.com/paritytech/parity-ethereum.git
 cd parity-ethereum
@@ -20,7 +19,6 @@ PARITY_RUNNER_IMAGE_TAG=centos-parity-experimental \
 ./docker/centos/build.sh
 ```
 
-
 Default values:
 ```
 # The image name

diff --git a/docker/ubuntu-aarch64/Dockerfile b/docker/ubuntu-aarch64/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get -y update && \
         apt-get install -y --force-yes --no-install-recommends \
         curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
         libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
-        binutils-aarch64-linux-gnu cmake \
+        binutils-aarch64-linux-gnu cmake3 libudev-dev \
         && \
     apt-get clean
 

diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get -y update && \
         apt-get install -y --force-yes --no-install-recommends \
         curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
         libc6-dev-armhf-cross wget file ca-certificates \
-        binutils-arm-linux-gnueabihf cmake \
+        binutils-arm-linux-gnueabihf cmake3 libudev-dev \
         && \
     apt-get clean
 

diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
@@ -3,8 +3,6 @@ name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
-[lib]
-
 [dependencies]
 crunchy = "0.1.0"
 either = "1.0.0"

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -66,7 +66,7 @@ triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 journaldb = { path = "../util/journaldb" }
 keccak-hasher = { path = "../util/keccak-hasher" }
-kvdb-rocksdb = "0.1.2"
+kvdb-rocksdb = "0.1.3"
 tempdir = {version="0.3", optional = true}
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]

diff --git a/ethcore/evm/src/instructions.rs b/ethcore/evm/src/instructions.rs
@@ -328,7 +328,7 @@ enum_with_from_u8! {
 		#[doc = "like CALLCODE but keeps caller's value and sender"]
 		DELEGATECALL = 0xf4,
 		#[doc = "create a new account and set creation address to sha3(sender + sha3(init code)) % 2**160"]
-		CREATE2 = 0xfb,
+		CREATE2 = 0xf5,
 		#[doc = "stop execution and revert state changes. Return output data."]
 		REVERT = 0xfd,
 		#[doc = "like CALL but it does not take value, nor modify the state"]

diff --git a/ethcore/evm/src/interpreter/mod.rs b/ethcore/evm/src/interpreter/mod.rs
@@ -426,13 +426,13 @@ impl<Cost: CostType> Interpreter<Cost> {
 			},
 			instructions::CREATE | instructions::CREATE2 => {
 				let endowment = self.stack.pop_back();
+				let init_off = self.stack.pop_back();
+				let init_size = self.stack.pop_back();
 				let address_scheme = match instruction {
 					instructions::CREATE => CreateContractAddress::FromSenderAndNonce,
 					instructions::CREATE2 => CreateContractAddress::FromSenderSaltAndCodeHash(self.stack.pop_back().into()),
 					_ => unreachable!("instruction can only be CREATE/CREATE2 checked above; qed"),
 				};
-				let init_off = self.stack.pop_back();
-				let init_size = self.stack.pop_back();
 
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 

diff --git a/ethcore/light/src/client/mod.rs b/ethcore/light/src/client/mod.rs
@@ -127,9 +127,6 @@ pub trait LightChainClient: Send + Sync {
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;
 
-	/// Get the EIP-86 transition block number.
-	fn eip86_transition(&self) -> BlockNumber;
-
 	/// Get a report of import activity since the last call.
 	fn report(&self) -> ClientReport;
 }
@@ -585,10 +582,6 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::cht_root(self, i)
 	}
 
-	fn eip86_transition(&self) -> BlockNumber {
-		self.engine().params().eip86_transition
-	}
-
 	fn report(&self) -> ClientReport {
 		Client::report(self)
 	}

diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
@@ -31,8 +31,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": 3000000,
-		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

diff --git a/ethcore/res/ethereum/easthub.json b/ethcore/res/ethereum/easthub.json
@@ -27,8 +27,7 @@
 		"eip155Transition": "0x0",
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
-		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {

diff --git a/ethcore/res/ethereum/eip150_test.json b/ethcore/res/ethereum/eip150_test.json
@@ -23,7 +23,6 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffffff",
-		"eip86Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x7fffffffffffffff"

diff --git a/ethcore/res/ethereum/eip161_test.json b/ethcore/res/ethereum/eip161_test.json
@@ -23,7 +23,6 @@
 		"eip161abcTransition": "0x0",
 		"eip161dTransition": "0x0",
 		"eip98Transition": "0x7fffffffffffffff",
-		"eip86Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0"

diff --git a/ethcore/res/ethereum/ellaism.json b/ethcore/res/ethereum/ellaism.json
@@ -29,7 +29,6 @@
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": "0x0",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"wasmActivationTransition": 2000000,
 		"eip140Transition": 2000000,
 		"eip211Transition": 2000000,

diff --git a/ethcore/res/ethereum/expanse.json b/ethcore/res/ethereum/expanse.json
@@ -38,7 +38,6 @@
 		"eip161abcTransition": "0x927C0",
 		"eip161dTransition": "0x927C0",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x927C0",
 		"eip140Transition": "0xC3500",
 		"eip211Transition": "0xC3500",

diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
@@ -150,7 +150,6 @@
 		"eip161dTransition": 2675000,
 		"eip155Transition": 2675000,
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": 2675000,
 		"eip140Transition": 4370000,

diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json
@@ -143,7 +143,6 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {