From f3bdc0da3cf4ef70a90e973c24adf55fcab358bb Mon Sep 17 00:00:00 2001
From: draganrakita <dragan0rakita@gmail.com>
Date: Mon, 18 Jan 2021 21:43:03 +0100
Subject: [PATCH] Bump to 3.1.1

---
 CHANGELOG.md                   | 80 ++++++++++++++++++++++------------
 Cargo.lock                     |  4 +-
 Cargo.toml                     |  2 +-
 crates/util/version/Cargo.toml |  2 +-
 4 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fdf1b30a..08cabf8ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,56 @@
-## OpenEthereum v3.1RC1
+## OpenEthereum v3.1.1
 
-OpenEthereum 3.1rc1 is a candidate release based on v2.5.13 which is the last stable version known of the client that does not include any of the issues introduced in v2.7. 
-It removes non core features like Ethereum Classic, Private Transactions, Light Client, Updater, IPFS and Swarm support, currently deprecated flags such as expanse, kotti, mordor testnets.
+Bug fixes:
+* Ancient target set. InvalidStateRoot bug (#69) (#149)
+* Update linked-hash-map to 0.5.3
+
+Enhancements:
+* Added additional Sg-1,Ca-2,Ca-3 OE bootnodes
+* Add --ws-max-paxload (#155)
+* Add flag to disable storage output in openethereum-evm tool #97 (#115)
+* ethstore - remove unnecessary dir & tiny-keccak dependencies from the lib (#107)
+* Sync block verification (#74) 
+* Add `wasmDisableTransition` spec option (#60)
+* EIP2929 with journaling + Yolov3 (#79)
+* EIP2565 impl (#82)
+* TypedTransaction (EIP-2718) and Optional access list (EIP-2930) (#135)
+
+DevOps:
+* Add custom windows runner (#162)
+* Remove sscache (#138)
+* Fix deprecated set-env declaration (#106)
+
+
+## OpenEthereum v3.1.0
+
+OpenEthereum 3.1.0 is a release based on v2.5.13 which is the last stable version known of the client that does not include any of the issues introduced in v2.7. It removes non core features like Ethereum Classic, Private Transactions, Light Client, Updater, IPFS and Swarm support, currently deprecated flags such as expanse, kotti, mordor testnets.
 
 Database migration utility currently in beta: https://github.com/openethereum/3.1-db-upgrade-tool
 
-The full list of included changes from v2.5.13 to v3.1:
-
-- Remove classic, kotti, mordor, expanse (#52) 
-- Added bad block header hash for ropsten (#49) 
-- Remove accounts bloom (#33) 
-- Bump jsonrpc-- to v15 
-- Implement eth/64, remove eth/62 (#46) 
-- No snapshotting by default (#11814) 
-- Update Ellaism chainspec 
-- Prometheus, heavy memory calls removed (#27) 
-- Update ethereum/tests 
-- Implement JSON test suite (#11801) 
-- Fix issues during block sync (#11265) 
-- Fix race same block (#11400) 
-- EIP-2537: Precompile for BLS12-381 curve operations (#11707) 
-- Remove private transactions 
-- Remove GetNodeData 
-- Remove IPFS integration (#11532) 
-- Remove updater 
-- Remove light client 
-- Remove C and Java bindings (#11346) 
-- Remove whisper (#10855) 
-- EIP-2315: Simple Subroutines for the EVM (#11629) 
-- Remove deprecated flags (removal of --geth flag)
-- Remove support for hardware wallets (#10678) 
-- Update bootnodes 
+The full list of included changes from v2.5.13 to v3.1.0:
 
+* Use ubuntu-16.04 for glibc compatibility (#11888) (#73)
+* Remove classic, kotti, mordor, expanse (#52)
+* Added bad block header hash for ropsten (#49)
+* Remove accounts bloom (#33)
+* Bump jsonrpc-- to v15
+* Implement eth/64, remove eth/62 (#46)
+* No snapshotting by default (#11814)
+* Update Ellaism chainspec
+* Prometheus, heavy memory calls removed (#27)
+* Update ethereum/tests
+* Implement JSON test suite (#11801)
+* Fix issues during block sync (#11265)
+* Fix race same block (#11400)
+* EIP-2537: Precompile for BLS12-381 curve operations (#11707)
+* Remove private transactions
+* Remove GetNodeData
+* Remove IPFS integration (#11532)
+* Remove updater
+* Remove light client
+* Remove C and Java bindings (#11346)
+* Remove whisper (#10855)
+* EIP-2315: Simple Subroutines for the EVM (#11629)
+* Remove deprecated flags (removal of --geth flag)
+* Remove support for hardware wallets (#10678)
+* Update bootnodes
diff --git a/Cargo.lock b/Cargo.lock
index 01f122fe1..56afaddcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2824,7 +2824,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "openethereum"
-version = "3.1.0-rc1"
+version = "3.1.1"
 dependencies = [
  "ansi_term 0.10.2",
  "atty",
@@ -3187,7 +3187,7 @@ dependencies = [
 
 [[package]]
 name = "parity-version"
-version = "3.1.0-rc1"
+version = "3.1.1"
 dependencies = [
  "parity-bytes",
  "rlp 0.3.0",
diff --git a/Cargo.toml b/Cargo.toml
index aed85d039..a9106e73e 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.1.0-rc1"
+version = "3.1.1"
 license = "GPL-3.0"
 authors = [
 	"OpenEthereum developers",
diff --git a/crates/util/version/Cargo.toml b/crates/util/version/Cargo.toml
index ab1099eb9..8e67657f9 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.1.0-rc1"
+version = "3.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"