Merge pull request #3521 from ethcore/stable-testing

[stable] Check tx signatures before adding to the queue.
Check transaction signature when adding to the queue (#3508 )
2016-11-19 02:50:52 +08:00 · 2016-11-18 18:14:43 +01:00 · 2016-11-18 18:08:28 +01:00 · 2016-11-16 22:19:42 +01:00
6 changed files with 65 additions and 16 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.3.12"
+version = "1.3.13"
 dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "clippy 0.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -20,7 +20,7 @@ dependencies = [
 "ethcore-logger 1.3.0",
 "ethcore-rpc 1.3.0",
 "ethcore-signer 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "ethsync 1.3.0",
 "fdlimit 0.1.0",
 "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -270,7 +270,7 @@ dependencies = [
 "ethcore-ipc 1.3.0",
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "ethjson 0.1.0",
 "ethstore 0.1.0",
 "evmjit 1.3.0",
@@ -294,7 +294,7 @@ version = "1.3.0"
 dependencies = [
 "clippy 0.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-rpc 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
 "jsonrpc-core 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-http-server 6.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git?branch=beta)",
@@ -336,7 +336,7 @@ name = "ethcore-ipc"
 version = "1.3.0"
 dependencies = [
 "ethcore-devtools 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "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)",
 ]
@@ -381,7 +381,7 @@ dependencies = [
 "ethcore-ipc 1.3.0",
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "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)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -393,7 +393,7 @@ name = "ethcore-logger"
 version = "1.3.0"
 dependencies = [
 "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "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)",
@@ -408,7 +408,7 @@ dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-devtools 1.3.0",
 "ethcore-io 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -432,7 +432,7 @@ dependencies = [
 "ethcore-devtools 1.3.0",
 "ethcore-io 1.3.0",
 "ethcore-ipc 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "ethjson 0.1.0",
 "ethsync 1.3.0",
 "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git?branch=beta)",
@@ -455,7 +455,7 @@ dependencies = [
 "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-io 1.3.0",
 "ethcore-rpc 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "jsonrpc-core 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-dapps-signer 1.4.0 (git+https://github.com/ethcore/parity-ui.git)",
@@ -466,7 +466,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.3.12"
+version = "1.3.13"
 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)",
@@ -499,7 +499,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "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)",
@@ -547,7 +547,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
 "ethcore-network 1.3.0",
- "ethcore-util 1.3.12",
+ "ethcore-util 1.3.13",
 "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)",
 "parking_lot 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.3.12"
+version = "1.3.13"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
--- a/docker/ubuntu-stable/Dockerfile
+++ b/docker/ubuntu-stable/Dockerfile
@@ -0,0 +1,40 @@
+FROM ubuntu:14.04
+WORKDIR /build
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y \
+        g++ \
+        curl \
+        git \
+        file \
+        binutils \
+	make
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
+# build parity
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout stable && \
+        git pull && \
+        cargo build --release --verbose && \
+        ls /build/parity/target/release/parity && \
+        strip /build/parity/target/release/parity
+
+RUN file /build/parity/target/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/release/parity"]
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -21,6 +21,7 @@ use util::*;
 use util::using_queue::{UsingQueue, GetAction};
 use account_provider::AccountProvider;
 use views::{BlockView, HeaderView};
+use header::Header;
 use state::{State, CleanupMode};
 use client::{MiningBlockChainClient, Executive, Executed, EnvInfo, TransactOptions, BlockID, CallAnalytics};
 use executive::contract_address;
@@ -467,7 +468,15 @@ impl Miner {
 			balance: chain.latest_balance(a),
 		};

+		let best_block_header: Header = ::util::rlp::decode(&chain.best_block_header());
 		transactions.into_iter()
+			.filter(|tx| match self.engine.verify_transaction_basic(tx, &best_block_header) {
+				Ok(()) => true,
+				Err(e) => {
+					debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", tx.hash(), e);
+					false
+				}
+			})
 			.map(|tx| transaction_queue.add(tx, &fetch_account, origin))
 			.collect()
 	}
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -4,7 +4,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 3
-!define VERSIONBUILD 12
+!define VERSIONBUILD 13

 !addplugindir .\

--- a/util/Cargo.toml
+++ b/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.12"
+version = "1.3.13"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
Author	SHA1	Message	Date
Gav Wood	b669dbb390	Merge pull request #3521 from ethcore/stable-testing [stable] Check tx signatures before adding to the queue.	2016-11-19 02:50:52 +08:00
Arkadiy Paronyan	45d8fc9bf1	Check transaction signature when adding to the queue (#3508 )	2016-11-18 18:14:43 +01:00
arkpar	2981a23880	v1.3.13	2016-11-18 18:08:28 +01:00
kumavis	76952ff363	Fix Stable Docker Build (#3479 ) * Dockerfile for ubuntu stable Add Dockerfile for parity stable branch * Update Dockerfile add make	2016-11-16 22:19:42 +01:00