Merge branch 'master' into signer-ui

Cargo.lock

@@ -357,7 +357,7 @@ dependencies = [
  "ethcore-util 1.2.0",
  "jsonrpc-core 2.0.4 (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.1.0",
+ "parity-minimal-sysui 0.1.0 (git+https://github.com/ethcore/parity-dapps-minimal-sysui-rs.git)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws 0.4.6 (git+https://github.com/ethcore/ws-rs.git)",
 ]
@@ -934,6 +934,7 @@ dependencies = [
 [[package]]
 name = "parity-minimal-sysui"
 version = "0.1.0"
+source = "git+https://github.com/ethcore/parity-dapps-minimal-sysui-rs.git#bc5d76f9666ce19993e6f7b636a3a7af329ea19e"
 
 [[package]]
 name = "phf"

cov.sh

@@ -22,7 +22,6 @@ cargo test \
 	-p ethsync \
 	-p ethcore-rpc \
 	-p parity \
-	-p ethminer \
 	-p ethcore-signer \
 	-p ethcore-dapps \
 	--no-run || exit $?
@@ -37,5 +36,4 @@ kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage t
 kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_rpc-*
 kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_signer-*
 kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_dapps-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethminer-*
 xdg-open target/coverage/index.html

doc.sh

@@ -10,4 +10,3 @@ cargo doc --no-deps --verbose \
 	-p ethcore-signer \
 	-p ethcore-dapps \
 	-p parity \
-	-p ethminer

hook.sh

@@ -7,6 +7,6 @@ echo "set -e" >> $FILE
 echo "cargo build --features dev" >> $FILE
 # Build tests
 echo "cargo test --no-run --features dev \\" >> $FILE
-echo "	-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer -p ethcore-dapps -p ethcore-signer" >> $FILE
+echo "	-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethcore-dapps -p ethcore-signer" >> $FILE
 echo "" >> $FILE
 chmod +x $FILE

rpc/src/v1/impls/eth_filter.rs

@@ -169,8 +169,9 @@ impl<C, M> EthFilter for EthFilterClient<C, M> where
 								logs.extend(new_pending_logs);
 							}
 
-							// save current block number as next from block number
+							// save the number of the next block as a first block from which
-							*block_number = current_number;
+							// we want to get logs
+							*block_number = current_number + 1;
 
 							to_value(&logs)
 						}

signer/Cargo.toml

@@ -17,7 +17,7 @@ env_logger = "0.3"
 ws = { git = "https://github.com/ethcore/ws-rs.git" }
 ethcore-util = { path = "../util" }
 ethcore-rpc = { path = "../rpc" }
-parity-minimal-sysui = { path = "../../parity-dapps-minimal-sysui-rs" }
+parity-minimal-sysui = { git = "https://github.com/ethcore/parity-dapps-minimal-sysui-rs.git" }
 
 clippy = { version = "0.0.69", optional = true}
 

signer/src/ws_server/session.rs

@@ -48,6 +48,9 @@ impl ws::Handler for Session {
 						headers.push(("Connection".into(), b"Closed".to_vec()));
 						headers.push(("Content-Length".into(), content_len.as_bytes().to_vec()));
 						headers.push(("Content-Type".into(), f.mime.as_bytes().to_vec()));
+						if !f.safe_to_embed {
+							headers.push(("X-Frame-Options".into(), b"SAMEORIGIN".to_vec()));
+						}
 					}
 					Ok(res)
 				})