From 88eb7d3257dcd27bc3206ff7489735f9d7dac7e9 Mon Sep 17 00:00:00 2001
From: POA <33550681+poa@users.noreply.github.com>
Date: Thu, 4 Nov 2021 15:50:48 +0300
Subject: [PATCH] Revert eip1559BaseFeeMinValue activation on xDai

---
 CHANGELOG.md                           | 4 ++++
 Cargo.lock                             | 4 ++--
 Cargo.toml                             | 2 +-
 crates/ethcore/res/chainspec/xdai.json | 4 +---
 crates/util/version/Cargo.toml         | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0d9ad47..fd3736c6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## OpenEthereum v3.3.0-rc.15
+
+* Revert eip1559BaseFeeMinValue activation on xDai at London hardfork block
+
 ## OpenEthereum v3.3.0-rc.14
 
 Enhancements:
diff --git a/Cargo.lock b/Cargo.lock
index b32470db6..00fae65fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2932,7 +2932,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "openethereum"
-version = "3.3.0-rc.14"
+version = "3.3.0-rc.15"
 dependencies = [
  "ansi_term 0.10.2",
  "atty",
@@ -3282,7 +3282,7 @@ dependencies = [
 
 [[package]]
 name = "parity-version"
-version = "3.3.0-rc.14"
+version = "3.3.0-rc.15"
 dependencies = [
  "parity-bytes",
  "rlp",
diff --git a/Cargo.toml b/Cargo.toml
index 7fa130a83..9427865b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "OpenEthereum"
 name = "openethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.3.0-rc.14"
+version = "3.3.0-rc.15"
 license = "GPL-3.0"
 authors = [
 	"OpenEthereum developers",
diff --git a/crates/ethcore/res/chainspec/xdai.json b/crates/ethcore/res/chainspec/xdai.json
index 997e8fd78..40194e42f 100644
--- a/crates/ethcore/res/chainspec/xdai.json
+++ b/crates/ethcore/res/chainspec/xdai.json
@@ -62,9 +62,7 @@
 		"eip1559Transition": 19040000,
 		"eip1559BaseFeeMaxChangeDenominator": "0x8",
 		"eip1559ElasticityMultiplier": "0x2",
-		"eip1559BaseFeeInitialValue": "0x4a817c800",
-		"eip1559BaseFeeMinValue": "0x4a817c800",
-		"eip1559BaseFeeMinValueTransition": 19040000,
+		"eip1559BaseFeeInitialValue": "0x3b9aca00",
 		"eip1559FeeCollector": "0x6BBe78ee9e474842Dbd4AB4987b3CeFE88426A92",
 		"eip1559FeeCollectorTransition": 19040000,
 		"registrar": "0x6B53721D4f2Fb9514B85f5C49b197D857e36Cf03",
diff --git a/crates/util/version/Cargo.toml b/crates/util/version/Cargo.toml
index 42634e735..8b126f188 100644
--- a/crates/util/version/Cargo.toml
+++ b/crates/util/version/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
-version = "3.3.0-rc.14"
+version = "3.3.0-rc.15"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"