parity-version: beta release 1.11.4 (#8856)

* Cherry-pick network-specific release flag (#8821)

* parity-version: bump beta to 1.11.4

* parity-version: remove merge leftovers

Cargo.lock

@@ -1956,7 +1956,7 @@ dependencies = [
 
 [[package]]
 name = "parity"
-version = "1.11.3"
+version = "1.11.4"
 dependencies = [
  "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2007,7 +2007,7 @@ dependencies = [
  "parity-rpc 1.11.0",
  "parity-rpc-client 1.4.0",
  "parity-updater 1.11.0",
- "parity-version 1.11.3",
+ "parity-version 1.11.4",
  "parity-whisper 0.1.0",
  "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "path 0.1.0",
@@ -2055,7 +2055,7 @@ dependencies = [
  "parity-reactor 0.1.0",
  "parity-ui 1.11.0",
  "parity-ui-deprecation 1.10.0",
- "parity-version 1.11.3",
+ "parity-version 1.11.4",
  "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "registrar 0.0.1",
@@ -2211,7 +2211,7 @@ dependencies = [
  "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-reactor 0.1.0",
  "parity-updater 1.11.0",
- "parity-version 1.11.3",
+ "parity-version 1.11.4",
  "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.1.0",
  "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2332,7 +2332,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-hash-fetch 1.11.0",
- "parity-version 1.11.3",
+ "parity-version 1.11.4",
  "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "path 0.1.0",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2343,7 +2343,7 @@ dependencies = [
 
 [[package]]
 name = "parity-version"
-version = "1.11.3"
+version = "1.11.4"
 dependencies = [
  "ethcore-bytes 0.1.0",
  "rlp 0.2.1",

Cargo.toml

@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.11.3"
+version = "1.11.4"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

mac/Parity.pkgproj

@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.11.3</string>
+				<string>1.11.4</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>

nsis/installer.nsi

@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 11
-!define VERSIONBUILD 3
+!define VERSIONBUILD 4
 !define ARGS ""
 !define FIRST_START_ARGS "--mode=passive ui"
 

util/version/Cargo.toml

@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION)
-version = "1.11.3"
+version = "1.11.4"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
@@ -12,14 +12,13 @@ build = "build.rs"
 # Used by auto-updater and for Parity version string.
 track = "beta"
 
-# Indicates a critical release in this track (i.e. consensus issue)
+# Network specific settings, used ONLY by auto-updater.
-critical = true
+# Latest supported fork blocks.
-
+# Indicates a critical release in this track (i.e. consensus issue).
-# Latest supported fork blocks for various networks. Used ONLY by auto-updater.
+[package.metadata.networks]
-[package.metadata.forks]
+foundation = { forkBlock = 4370000, critical = false }
-foundation = 4370000
+ropsten = { forkBlock = 10, critical = false }
-ropsten = 10
+kovan = { forkBlock = 6600000, critical = false }
-kovan = 6600000
 
 [dependencies]
 ethcore-bytes = { path = "../bytes" }