Backporting to beta (#5657)

* Add CHANGELOG.md (#5513)

* Add CHANGELOG.md

* Add some more verbose CHANGELOG information for beta and stable releases

* Add dates to releases

* reorg into blocks before minimum history (#5558)

* v1.6.7

Cargo.lock

@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.6.6"
+version = "1.6.7"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -23,7 +23,7 @@ dependencies = [
  "ethcore-secretstore 1.0.0",
  "ethcore-signer 1.6.0",
  "ethcore-stratum 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethsync 1.6.0",
  "evmbin 0.1.0",
  "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -394,7 +394,7 @@ dependencies = [
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
  "ethcore-stratum 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
  "ethstore 0.1.0",
@@ -444,7 +444,7 @@ dependencies = [
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "fetch 0.1.0",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
@@ -492,7 +492,7 @@ name = "ethcore-ipc"
 version = "1.6.0"
 dependencies = [
  "ethcore-devtools 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.7)",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -539,7 +539,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git?branch=parity-1.7)",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -554,7 +554,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-network 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -570,7 +570,7 @@ name = "ethcore-logger"
 version = "1.6.0"
 dependencies = [
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -586,7 +586,7 @@ dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
  "ethcore-io 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -614,7 +614,7 @@ dependencies = [
  "ethcore-io 1.6.0",
  "ethcore-ipc 1.6.0",
  "ethcore-light 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethcrypto 0.1.0",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
@@ -649,7 +649,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "hyper 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -667,7 +667,7 @@ dependencies = [
  "ethcore-devtools 1.6.0",
  "ethcore-io 1.6.0",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -686,7 +686,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "jsonrpc-macros 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
@@ -700,7 +700,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-util"
-version = "1.6.6"
+version = "1.6.7"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -749,7 +749,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -777,7 +777,7 @@ version = "0.1.0"
 dependencies = [
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -810,7 +810,7 @@ dependencies = [
  "ethcore-ipc-nano 1.6.0",
  "ethcore-light 1.6.0",
  "ethcore-network 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethkey 0.2.0",
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -828,7 +828,7 @@ version = "0.1.0"
 dependencies = [
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1056,7 +1056,7 @@ version = "1.6.0"
 dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1623,7 +1623,7 @@ name = "parity-hash-fetch"
 version = "1.6.0"
 dependencies = [
  "ethabi 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "fetch 0.1.0",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1640,7 +1640,7 @@ version = "1.6.0"
 dependencies = [
  "cid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-http-server 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1654,7 +1654,7 @@ version = "0.1.0"
 dependencies = [
  "ethcore 1.6.0",
  "ethcore-io 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethkey 0.2.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
@@ -1677,7 +1677,7 @@ version = "1.4.0"
 dependencies = [
  "ethcore-rpc 1.6.0",
  "ethcore-signer 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1721,7 +1721,7 @@ dependencies = [
  "ethcore 1.6.0",
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "ethsync 1.6.0",
  "ipc-common-types 1.6.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1998,7 +1998,7 @@ version = "1.4.0"
 dependencies = [
  "ethcore-bigint 0.1.2",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.6",
+ "ethcore-util 1.6.7",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-rpc-client 1.4.0",
  "rpassword 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.6.6"
+version = "1.6.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

ethcore/res/ethereum/tests

@@ -1 +1 @@
-Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2
+Subproject commit 4e8b9be3fba16ec32e0cdf50b8f9329826283aaa

ethcore/src/client/client.rs

@@ -355,7 +355,7 @@ impl Client {
 		let chain = self.chain.read();
 		// Check the block isn't so old we won't be able to enact it.
 		let best_block_number = chain.best_block_number();
-		if best_block_number >= self.history && header.number() <= best_block_number - self.history {
+		if self.pruning_info().earliest_state > header.number() {
 			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
 			return Err(());
 		}
@@ -677,7 +677,7 @@ impl Client {
 			let db = self.state_db.lock().boxed_clone();
 
 			// early exit for pruned blocks
-			if db.is_pruned() && self.chain.read().best_block_number() >= block_number + self.history {
+			if db.is_pruned() && self.pruning_info().earliest_state > block_number {
 				return None;
 			}
 
@@ -778,7 +778,7 @@ impl Client {
 		let best_block_number = self.chain_info().best_block_number;
 		let block_number = self.block_number(at).ok_or(snapshot::Error::InvalidStartingBlock(at))?;
 
-		if best_block_number > self.history + block_number && db.is_pruned() {
+		if db.is_pruned() && self.pruning_info().earliest_state > block_number {
 			return Err(snapshot::Error::OldBlockPrunedDB.into());
 		}
 

mac/Parity.pkgproj

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

mac/Parity/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.6</string>
+	<string>1.6.7</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>

nsis/installer.nsi

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

util/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.6.6"
+version = "1.6.7"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"