From 73076fbf7f45566e246c3d594bc5e6f827793438 Mon Sep 17 00:00:00 2001
From: fredericzha <frederic@aion.network>
Date: Sun, 9 Feb 2020 22:24:38 +0800
Subject: [PATCH] upgrade: bump version to 1.2.0

---
 Cargo.lock              | 10 +++++-----
 Cargo.toml              |  2 +-
 resources/mainnet.json  |  3 ++-
 util/version/Cargo.toml |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46ca12c6..e1868327 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -111,7 +111,7 @@ dependencies = [
  "acore 0.1.0",
  "acore-bytes 0.1.0",
  "aion-types 0.1.0",
- "aion-version 1.1.0",
+ "aion-version 1.2.0",
  "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2b 0.1.0",
  "ethbloom 0.5.1",
@@ -155,7 +155,7 @@ dependencies = [
 
 [[package]]
 name = "aion-version"
-version = "1.1.0"
+version = "1.2.0"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -165,14 +165,14 @@ dependencies = [
 
 [[package]]
 name = "aionr"
-version = "1.1.0"
+version = "1.2.0"
 dependencies = [
  "acore 0.1.0",
  "acore-bytes 0.1.0",
  "acore-io 0.1.0",
  "aion-rpc 0.1.0",
  "aion-types 0.1.0",
- "aion-version 1.1.0",
+ "aion-version 1.2.0",
  "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2b 0.1.0",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1462,7 +1462,7 @@ name = "p2p"
 version = "0.1.0"
 dependencies = [
  "acore-bytes 0.1.0",
- "aion-version 1.1.0",
+ "aion-version 1.2.0",
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 0da841ed..e26f0ff9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "aion network rust implementation"
 name = "aionr"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.1.0"
+version = "1.2.0"
 license = "GPL-3.0"
 authors = ["aion foundation <admin@aion.network>"]
 
diff --git a/resources/mainnet.json b/resources/mainnet.json
index 303cd44f..644c8015 100644
--- a/resources/mainnet.json
+++ b/resources/mainnet.json
@@ -14,7 +14,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x100590",
 		"monetaryPolicyUpdate": "3346000",
-		"unityUpdate": "4721900"
+		"unityUpdate": "4721900",
+		"unityHybridSeedUpdate": "5371168"
 	},
 	"genesis": {
 		"seal": {
diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml
index 1fbf3a5b..4a08d445 100644
--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "aion-version"
 # NOTE: this value is used for Aion version string (via env CARGO_PKG_VERSION)
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Aion Foundation <admin@aion.network>"]
 build = "build.rs"