From fc129b4a26874ba2e0db9c5a13581f4719a98172 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Thu, 5 Dec 2019 14:11:55 +0100 Subject: [PATCH] [stable backport]: add `eip1344_transition` for istanbul (#11301) (#11303) * [chainspec]: add `eip1344_transition` for istanbul (#11301) * Update version and CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- ethcore/res/ethereum/foundation.json | 3 ++- util/version/Cargo.toml | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a56495a6863..809742722a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## Parity-Ethereum [v2.5.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.11) + +Parity Ethereum v2.5.11-stable is an emergency patch release that adds the missing +eip1344_transition for mainnet - Users are advised to update as soon as possible +to prevent any issues with the imminent Istanbul hardfork + +The full list of included changes: +- [chainspec]: add `eip1344_transition` for istanbul (#11301) + ## Parity-Ethereum [v2.5.10](https://github.com/paritytech/parity-ethereum/releases/tag/2.5.10) Parity Ethereum v2.5.10-stable is a patch release that adds block numbers for diff --git a/Cargo.lock b/Cargo.lock index 56fa3601947..f0588ce224e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2726,7 +2726,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "panic_hook 0.1.0", - "parity-ethereum 2.5.10", + "parity-ethereum 2.5.11", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2783,7 +2783,7 @@ dependencies = [ [[package]] name = "parity-ethereum" -version = "2.5.10" +version = "2.5.11" dependencies = [ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2836,7 +2836,7 @@ dependencies = [ "parity-rpc 1.12.0", "parity-runtime 0.1.0", "parity-updater 1.12.0", - "parity-version 2.5.10", + "parity-version 2.5.11", "parity-whisper 0.1.0", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2982,7 +2982,7 @@ dependencies = [ "parity-crypto 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-runtime 0.1.0", "parity-updater 1.12.0", - "parity-version 2.5.10", + "parity-version 2.5.11", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3080,7 +3080,7 @@ dependencies = [ "parity-bytes 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.12.0", "parity-path 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-version 2.5.10", + "parity-version 2.5.11", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3090,7 +3090,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "2.5.10" +version = "2.5.11" dependencies = [ "parity-bytes 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 1f034240b95..56b1cb000dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ description = "Parity Ethereum client" name = "parity-ethereum" # NOTE Make sure to update util/version/Cargo.toml as well -version = "2.5.10" +version = "2.5.11" license = "GPL-3.0" authors = ["Parity Technologies "] diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json index dd7b1b6eaae..417b6fbe0b3 100644 --- a/ethcore/res/ethereum/foundation.json +++ b/ethcore/res/ethereum/foundation.json @@ -167,7 +167,8 @@ "eip1283Transition": "0x8a61c8", "eip1706Transition": "0x8a61c8", "eip1884Transition": "0x8a61c8", - "eip2028Transition": "0x8a61c8" + "eip2028Transition": "0x8a61c8", + "eip1344Transition": "0x8a61c8" }, "genesis": { "seal": { diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index 4f5f943e886..fb8449d5bc8 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "parity-version" # NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION) -version = "2.5.10" +version = "2.5.11" authors = ["Parity Technologies "] build = "build.rs"