Merge remote-tracking branch 'origin/work-notify' into beta

v1.2.1 in beta

Cargo.lock

@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.3.0"
+version = "1.2.1"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -8,16 +8,16 @@ dependencies = [
  "daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.3.0",
+ "ethcore 1.2.0",
- "ethcore-dapps 1.3.0",
+ "ethcore-dapps 1.2.0",
- "ethcore-devtools 1.3.0",
+ "ethcore-devtools 1.2.0",
- "ethcore-ipc 1.3.0",
+ "ethcore-ipc 1.2.0",
- "ethcore-ipc-codegen 1.3.0",
+ "ethcore-ipc-codegen 1.2.0",
- "ethcore-ipc-nano 1.3.0",
+ "ethcore-ipc-nano 1.2.0",
- "ethcore-rpc 1.3.0",
+ "ethcore-rpc 1.2.0",
- "ethcore-signer 1.3.0",
+ "ethcore-signer 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
- "ethsync 1.3.0",
+ "ethsync 1.2.0",
  "fdlimit 0.1.0",
  "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)",
@@ -238,7 +238,7 @@ dependencies = [
 
 [[package]]
 name = "ethash"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -247,17 +247,17 @@ dependencies = [
 
 [[package]]
 name = "ethcore"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.3.0",
+ "ethash 1.2.0",
- "ethcore-devtools 1.3.0",
+ "ethcore-devtools 1.2.0",
- "ethcore-ipc 1.3.0",
+ "ethcore-ipc 1.2.0",
- "ethcore-ipc-codegen 1.3.0",
+ "ethcore-ipc-codegen 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "ethjson 0.1.0",
  "ethstore 0.1.0",
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -274,11 +274,11 @@ dependencies = [
 
 [[package]]
 name = "ethcore-dapps"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-rpc 1.3.0",
+ "ethcore-rpc 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
@@ -298,24 +298,24 @@ dependencies = [
 
 [[package]]
 name = "ethcore-devtools"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore-ipc"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
- "ethcore-devtools 1.3.0",
+ "ethcore-devtools 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
  "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore-ipc-codegen"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quasi 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -326,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "ethcore-ipc-nano"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
- "ethcore-ipc 1.3.0",
+ "ethcore-ipc 1.2.0",
  "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -336,15 +336,15 @@ dependencies = [
 
 [[package]]
 name = "ethcore-rpc"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.3.0",
+ "ethash 1.2.0",
- "ethcore 1.3.0",
+ "ethcore 1.2.0",
- "ethcore-devtools 1.3.0",
+ "ethcore-devtools 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "ethjson 0.1.0",
- "ethsync 1.3.0",
+ "ethsync 1.2.0",
  "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)",
  "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
@@ -359,12 +359,12 @@ dependencies = [
 
 [[package]]
 name = "ethcore-signer"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-rpc 1.3.0",
+ "ethcore-rpc 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-minimal-sysui 0.2.0 (git+https://github.com/ethcore/parity-dapps-minimal-sysui-rs.git)",
@@ -375,7 +375,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-util"
-version = "1.3.0"
+version = "1.2.1"
 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)",
@@ -386,7 +386,7 @@ dependencies = [
  "elastic-array 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-devtools 1.3.0",
+ "ethcore-devtools 1.2.0",
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "igd 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -414,7 +414,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -451,12 +451,12 @@ dependencies = [
 
 [[package]]
 name = "ethsync"
-version = "1.3.0"
+version = "1.2.0"
 dependencies = [
  "clippy 0.0.77 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.3.0",
+ "ethcore 1.2.0",
- "ethcore-util 1.3.0",
+ "ethcore-util 1.2.1",
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.3.0"
+version = "1.2.1"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"

appveyor.yml

@@ -40,6 +40,10 @@ after_test:
 artifacts:
   - path: nsis\installer.exe
     name: Windows Installer (x86_64)
+  - path: target\release\parity.exe
+    name: Windows Executable (x86_64)
+  - path: target\release\parity.pdb
+    name: Windows Executable Debug Symbols (x86_64)
 
 cache:
   - target

dapps/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Dapps crate"
 name = "ethcore-dapps"
-version = "1.3.0"
+version = "1.2.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"

db/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore Database"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-db"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

devtools/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]

ethash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethash"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["arkpar <arkadiy@ethcore.io"]
 
 [lib]

ethcore/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

ethcore/src/miner/miner.rs

@@ -265,6 +265,10 @@ impl Miner {
 				let difficulty = *block.block().fields().header.difficulty();
 				let is_new = original_work_hash.map_or(true, |h| block.block().fields().header.hash() != h);
 				sealing_work.push(block);
+				// If push notifications are enabled we assume all work items are used.
+				if self.work_poster.is_some() && is_new {
+					sealing_work.use_last_ref();
+				}
 				(Some((pow_hash, difficulty, number)), is_new)
 			} else {
 				(None, false)
@@ -272,9 +276,7 @@ impl Miner {
 			trace!(target: "miner", "prepare_sealing: leaving (last={:?})", sealing_work.peek_last_ref().map(|b| b.block().fields().header.hash()));
 			(work, is_new)
 		};
-		if is_new {
+		work.map(|(pow_hash, difficulty, number)| self.work_poster.as_ref().map(|ref p| p.notify(pow_hash, difficulty, number)));
-			work.map(|(pow_hash, difficulty, number)| self.work_poster.as_ref().map(|ref p| p.notify(pow_hash, difficulty, number)));
-		}
 	}
 
 	fn update_gas_limit(&self, chain: &MiningBlockChainClient) {

evmjit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "evmjit"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [lib]

ipc/codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethcore-ipc-codegen"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Nikolay Volf"]
 license = "GPL-3.0"
 description = "Macros to auto-generate implementations for ipc call"

ipc/nano/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethcore-ipc-nano"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Nikolay Volf <nikolay@ethcore.io>"]
 license = "GPL-3.0"
 

ipc/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ethcore-ipc"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Nikolay Volf <nikvolf@gmail.com>"]
 license = "GPL-3.0"
 

nsis/installer.nsi

@@ -3,8 +3,8 @@
 !define COMPANYNAME "Ethcore"
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 3
+!define VERSIONMINOR 2
-!define VERSIONBUILD 0
+!define VERSIONBUILD 1
 
 !addplugindir .\
 

rpc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
-version = "1.3.0"
+version = "1.2.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"

rpc/rpctest/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Rpc test client."
 name = "rpctest"
-version = "1.3.0"
+version = "1.2.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 

signer/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore Trusted Signer"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-signer"
-version = "1.3.0"
+version = "1.2.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 

sync/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore blockchain sync"
 name = "ethsync"
-version = "1.3.0"
+version = "1.2.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 

util/Cargo.toml

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

util/src/misc.rs

@@ -49,7 +49,7 @@ pub fn version() -> String {
 	let date_dash = if commit_date.is_empty() { "" } else { "-" };
 	let env = Target::env();
 	let env_dash = if env.is_empty() { "" } else { "-" };
-	format!("Parity/v{}-unstable{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
+	format!("Parity/v{}-beta{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
 }
 
 /// Get the standard version data for this software.