From 6616b5e17d2810e9dffa3f021106dbf1e409e1ad Mon Sep 17 00:00:00 2001 From: goldylucks Date: Thu, 30 Jun 2016 18:14:20 +0200 Subject: [PATCH 01/13] bump status page v0.5.1 --- Cargo.lock | 6 +++--- dapps/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18168f795..6faa0cf32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,7 +286,7 @@ dependencies = [ "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-dapps-rs.git)", "parity-dapps-builtins 0.5.2 (git+https://github.com/ethcore/parity-dapps-builtins-rs.git)", - "parity-dapps-status 0.5.0 (git+https://github.com/ethcore/parity-dapps-status-rs.git)", + "parity-dapps-status 0.5.1 (git+https://github.com/ethcore/parity-dapps-status-rs.git)", "parity-dapps-wallet 0.6.1 (git+https://github.com/ethcore/parity-dapps-wallet-rs.git)", "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)", @@ -919,8 +919,8 @@ dependencies = [ [[package]] name = "parity-dapps-status" -version = "0.5.0" -source = "git+https://github.com/ethcore/parity-dapps-status-rs.git#0cdd3512004e403aff7da3b8c16ba0bf5d6c911c" +version = "0.5.1" +source = "git+https://github.com/ethcore/parity-dapps-status-rs.git#110ef2e66142ec8dc15fc40b8ddda5ed3bcfc1fb" dependencies = [ "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-dapps-rs.git)", ] diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index 6aaceb50a..d33bd6702 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -22,7 +22,7 @@ ethcore-rpc = { path = "../rpc" } ethcore-util = { path = "../util" } parity-dapps = { git = "https://github.com/ethcore/parity-dapps-rs.git", version = "0.3" } # List of apps -parity-dapps-status = { git = "https://github.com/ethcore/parity-dapps-status-rs.git", version = "0.5.0" } +parity-dapps-status = { git = "https://github.com/ethcore/parity-dapps-status-rs.git", version = "0.5.1" } parity-dapps-builtins = { git = "https://github.com/ethcore/parity-dapps-builtins-rs.git", version = "0.5.2" } parity-dapps-wallet = { git = "https://github.com/ethcore/parity-dapps-wallet-rs.git", version = "0.6.0", optional = true } parity-dapps-dao = { git = "https://github.com/ethcore/parity-dapps-dao-rs.git", version = "0.4.0", optional = true } From 673c5afd4ddb3f3af050e447087c5b58f632d823 Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Thu, 30 Jun 2016 18:56:16 +0200 Subject: [PATCH 02/13] Update install-parity.sh --- install-parity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-parity.sh b/install-parity.sh index eadf698db..eae35f764 100755 --- a/install-parity.sh +++ b/install-parity.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PARITY_DEB_URL=https://github.com/ethcore/parity/releases/download/v1.2.0/parity_linux_1.2.0-0_amd64.deb +PARITY_DEB_URL=https://github.com/ethcore/parity/releases/download/v1.2.1/parity_linux_1.2.1-0_amd64.deb function run_installer() From d3cb79833b4a087f7f258a478cc6501521103a00 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:07:22 +0700 Subject: [PATCH 03/13] Update Ubuntu Dockerfile [ci skip] --- docker/ubuntu/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 9999909c3..6c80238a1 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -27,7 +27,9 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ + git checkout master && \ + git pull && \ cargo build --release --verbose && \ - ls /build/parity/target/release/parity && \ + ls /build/parity/target/release/parity && \ strip /build/parity/target/release/parity RUN file /build/parity/target/release/parity From 8134a89b87f398e27094eae6c810c38da4e2f1da Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:08:07 +0700 Subject: [PATCH 04/13] Update Ubuntu-jit Dockerfile [ci skip] --- docker/ubuntu-jit/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile index 89c38cee7..07f351460 100644 --- a/docker/ubuntu-jit/Dockerfile +++ b/docker/ubuntu-jit/Dockerfile @@ -47,6 +47,8 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ + git checkout master && \ + git pull && \ cargo build --release --features ethcore/jit --verbose && \ ls /build/parity/target/release/parity && \ strip /build/parity/target/release/parity From bb70cd889eccef2070264b09969e339ced34dcfa Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:08:58 +0700 Subject: [PATCH 05/13] Update Ubuntu-arm Dockerfile [ci skip] --- docker/ubuntu-arm/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile index fab325e5e..075f7324e 100644 --- a/docker/ubuntu-arm/Dockerfile +++ b/docker/ubuntu-arm/Dockerfile @@ -36,6 +36,8 @@ ENV CC arm-linux-gnueabihf-gcc # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ + git checkout master && \ + git pull && \ mkdir -p .cargo && \ echo '[target.armv7-unknown-linux-gnueabihf]\n\ linker = "arm-linux-gnueabihf-gcc"\n'\ From bee2102424a52c690f41aea0da071c3e4d9e31a7 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:09:48 +0700 Subject: [PATCH 06/13] Update Dockerfile ubuntu-aarch64 [ci skip] --- docker/ubuntu-aarch64/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/ubuntu-aarch64/Dockerfile b/docker/ubuntu-aarch64/Dockerfile index 3212f84d0..c9939074c 100644 --- a/docker/ubuntu-aarch64/Dockerfile +++ b/docker/ubuntu-aarch64/Dockerfile @@ -36,6 +36,8 @@ ENV CC aarch64-linux-gnu-gcc # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ + git checkout master && \ + git pull && \ mkdir -p .cargo && \ echo '[target.aarch64-unknown-linux-gnu]\n\ linker = "aarch64-linux-gnu-gcc"\n'\ From 90a4475f526537ddecc085e9ee1155047ce4abeb Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:10:58 +0700 Subject: [PATCH 07/13] Update CentOS Dockerfile [ci skip] --- docker/centos/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile index 56015422c..ea0571cca 100644 --- a/docker/centos/Dockerfile +++ b/docker/centos/Dockerfile @@ -20,6 +20,8 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity&&\ + git checkout master && \ + git pull && \ ls -a&&\ cargo build --release --verbose && \ ls /build/parity/target/release/parity && \ From f370e17a544c9fd7af117611036cb9b0b7a25d1d Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:26:56 +0700 Subject: [PATCH 08/13] Update CentOS Dockerfile [ci skip] --- docker/centos/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile index ea0571cca..9fd33f4ff 100644 --- a/docker/centos/Dockerfile +++ b/docker/centos/Dockerfile @@ -20,7 +20,7 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity&&\ - git checkout master && \ + git checkout beta && \ git pull && \ ls -a&&\ cargo build --release --verbose && \ From 6bdbc2cb9344614dedacbaf821ca451b259ae3c1 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:27:36 +0700 Subject: [PATCH 09/13] Update Dockerfile ubuntu-aarch64 [ci skip] --- docker/ubuntu-aarch64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubuntu-aarch64/Dockerfile b/docker/ubuntu-aarch64/Dockerfile index c9939074c..38ed4c9b1 100644 --- a/docker/ubuntu-aarch64/Dockerfile +++ b/docker/ubuntu-aarch64/Dockerfile @@ -36,7 +36,7 @@ ENV CC aarch64-linux-gnu-gcc # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - git checkout master && \ + git checkout beta && \ git pull && \ mkdir -p .cargo && \ echo '[target.aarch64-unknown-linux-gnu]\n\ From 6bbd237711f8fa4d1214de68ba1bfd4d133ec55d Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:28:18 +0700 Subject: [PATCH 10/13] Update Ubuntu-arm Dockerfile [ci skip] --- docker/ubuntu-arm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubuntu-arm/Dockerfile b/docker/ubuntu-arm/Dockerfile index 075f7324e..b59573a0f 100644 --- a/docker/ubuntu-arm/Dockerfile +++ b/docker/ubuntu-arm/Dockerfile @@ -36,7 +36,7 @@ ENV CC arm-linux-gnueabihf-gcc # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - git checkout master && \ + git checkout beta && \ git pull && \ mkdir -p .cargo && \ echo '[target.armv7-unknown-linux-gnueabihf]\n\ From c8c7fbbf277555d9bfe35dede9305449f115bebe Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:29:00 +0700 Subject: [PATCH 11/13] Update Ubuntu-jit Dockerfile [ci skip] --- docker/ubuntu-jit/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubuntu-jit/Dockerfile b/docker/ubuntu-jit/Dockerfile index 07f351460..666b16904 100644 --- a/docker/ubuntu-jit/Dockerfile +++ b/docker/ubuntu-jit/Dockerfile @@ -47,7 +47,7 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - git checkout master && \ + git checkout beta && \ git pull && \ cargo build --release --features ethcore/jit --verbose && \ ls /build/parity/target/release/parity && \ From 038ef2b3c30c2d7f8cb57ea78fbddbb223562510 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Fri, 1 Jul 2016 03:29:45 +0700 Subject: [PATCH 12/13] Update Ubuntu Dockerfile [ci skip] --- docker/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 6c80238a1..4c82e1ecc 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -27,7 +27,7 @@ g++ -v # build parity RUN git clone https://github.com/ethcore/parity && \ cd parity && \ - git checkout master && \ + git checkout beta && \ git pull && \ cargo build --release --verbose && \ ls /build/parity/target/release/parity && \ From 1ce3fc24cf8bbba2361a1f82e79c059cb75aa6b2 Mon Sep 17 00:00:00 2001 From: arkpar Date: Thu, 30 Jun 2016 17:33:21 +0200 Subject: [PATCH 13/13] Save the block reference in the queue on notification --- ethcore/src/miner/miner.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index d3e32c797..40254b8c2 100644 --- a/ethcore/src/miner/miner.rs +++ b/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)