js-precompiled 20171009-113503

[beta] Backporting (#6676 )
* Fix wallet view (#6597) * Add safe fail for empty logs * Filter transactions * Add more logging * Fix Wallet Creation and wallet tx list * Remove logs * Prevent selecting twice same wallet owner * Fix tests * Remove unused props * Remove unused props * Disallow pasting recovery phrases on first run (#6602) * Fix disallowing paste of recovery phrase on first run, ref #6581 * Allow the leader of CATS pasting recovery phrases. * Updated systemd files for linux (#6592) Previous version put $BASE directory in root directory. This version clearly explains how to run as root or as specific user. Additional configuration: * send SIGHUP for clean exit, * restart on fail. Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel * Don't expose port 80 for parity anymore (#6633)
2017-10-09 16:43:52 +02:00 · 2017-10-09 13:20:28 +02:00 · 2017-10-09 13:07:57 +02:00 · 2017-10-09 11:26:39 +02:00 · 2017-10-06 10:22:08 +00:00 · 2017-10-06 10:02:22 +02:00
48 changed files with 485 additions and 243 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -277,7 +277,7 @@ dependencies = [
 name = "common-types"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethjson 0.1.0",
 "rlp 0.2.0",
 "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -476,7 +476,7 @@ dependencies = [
 "ethcore-ipc-nano 1.7.0",
 "ethcore-logger 1.7.0",
 "ethcore-stratum 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
 "ethstore 0.1.0",
@@ -545,7 +545,7 @@ name = "ethcore-ipc"
 version = "1.7.0"
 dependencies = [
 "ethcore-devtools 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -594,7 +594,7 @@ dependencies = [
 "ethcore-ipc 1.7.0",
 "ethcore-ipc-codegen 1.7.0",
 "ethcore-ipc-nano 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -611,7 +611,7 @@ dependencies = [
 "ethcore-ipc 1.7.0",
 "ethcore-ipc-codegen 1.7.0",
 "ethcore-network 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "evm 0.1.0",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -650,7 +650,7 @@ dependencies = [
 "ethcore-devtools 1.7.0",
 "ethcore-io 1.7.0",
 "ethcore-logger 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethcrypto 0.1.0",
 "ethkey 0.2.0",
 "igd 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -681,7 +681,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.7.0",
 "ethcore-ipc-nano 1.7.0",
 "ethcore-logger 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethcrypto 0.1.0",
 "ethkey 0.2.0",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -711,7 +711,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.7.0",
 "ethcore-ipc-nano 1.7.0",
 "ethcore-logger 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
 "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -724,7 +724,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.7.2"
+version = "1.7.3"
 dependencies = [
 "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -774,7 +774,7 @@ name = "ethjson"
 version = "0.1.0"
 dependencies = [
 "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -855,7 +855,7 @@ dependencies = [
 "ethcore-ipc-nano 1.7.0",
 "ethcore-light 1.7.0",
 "ethcore-network 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethkey 0.2.0",
 "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -874,7 +874,7 @@ dependencies = [
 "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "common-types 0.1.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethjson 0.1.0",
 "evmjit 1.7.0",
 "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -891,7 +891,7 @@ version = "0.1.0"
 dependencies = [
 "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethjson 0.1.0",
 "evm 0.1.0",
 "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1136,7 +1136,7 @@ version = "1.7.0"
 dependencies = [
 "ethcore-ipc 1.7.0",
 "ethcore-ipc-codegen 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1530,7 +1530,7 @@ version = "0.1.0"
 dependencies = [
 "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "native-contract-generator 0.1.0",
 ]
@@ -1735,7 +1735,7 @@ dependencies = [

 [[package]]
 name = "parity"
-version = "1.7.2"
+version = "1.7.3"
 dependencies = [
 "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1755,7 +1755,7 @@ dependencies = [
 "ethcore-logger 1.7.0",
 "ethcore-secretstore 1.0.0",
 "ethcore-stratum 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethkey 0.2.0",
 "ethsync 1.7.0",
 "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1801,7 +1801,7 @@ dependencies = [
 "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-devtools 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "fetch 0.1.0",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1845,7 +1845,7 @@ name = "parity-hash-fetch"
 version = "1.7.0"
 dependencies = [
 "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "fetch 0.1.0",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1863,7 +1863,7 @@ version = "1.7.0"
 dependencies = [
 "cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
 "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1876,7 +1876,7 @@ version = "0.1.0"
 dependencies = [
 "ethcore 1.7.0",
 "ethcore-io 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethkey 0.2.0",
 "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rlp 0.2.0",
@@ -1906,7 +1906,7 @@ dependencies = [
 "ethcore-ipc 1.7.0",
 "ethcore-light 1.7.0",
 "ethcore-logger 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethcrypto 0.1.0",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
@@ -1948,7 +1948,7 @@ dependencies = [
 name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
 "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
@@ -1998,7 +1998,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git?branch=beta#5f2cbb92c06e0943225e7d7517ab44ccf07ba92a"
+source = "git+https://github.com/paritytech/js-precompiled.git?branch=beta#657a34702890778823bbd0f2aeb6e015b2053744"
 dependencies = [
 "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2011,7 +2011,7 @@ dependencies = [
 "ethcore 1.7.0",
 "ethcore-ipc 1.7.0",
 "ethcore-ipc-codegen 1.7.0",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "ethsync 1.7.0",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-common-types 1.7.0",
@@ -2367,7 +2367,7 @@ name = "rpc-cli"
 version = "1.4.0"
 dependencies = [
 "bigint 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.7.2",
+ "ethcore-util 1.7.3",
 "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-rpc 1.7.0",
 "parity-rpc-client 1.4.0",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.7.2"
+version = "1.7.3"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 use ethcore::basic_account::BasicAccount;
 use ethcore::encoded;
 use ethcore::engines::Engine;
-use ethcore::receipt::Receipt;
+use ethcore::receipt::{Receipt, TransactionOutcome};
 use ethcore::state::{self, ProvedExecution};
 use ethcore::transaction::SignedTransaction;
 use evm::env_info::EnvInfo;
@@ -926,8 +926,7 @@ mod tests {
 	#[test]
 	fn check_receipts() {
 		let receipts = (0..5).map(|_| Receipt {
-			state_root: Some(H256::random()),
-			status_code: None,
+			outcome: TransactionOutcome::StateRoot(H256::random()),
 			gas_used: 21_000u64.into(),
 			log_bloom: Default::default(),
 			logs: Vec::new(),
--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -1859,13 +1859,15 @@ mod tests {

 	#[test]
 	fn receipts_roundtrip() {
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let req = IncompleteReceiptsRequest {
 			hash: Field::Scalar(Default::default()),
 		};

 		let full_req = Request::Receipts(req.clone());
+		let receipt = Receipt::new(TransactionOutcome::Unknown, Default::default(), Vec::new());
 		let res = ReceiptsResponse {
-			receipts: vec![Default::default(), Default::default()],
+			receipts: vec![receipt.clone(), receipt],
 		};
 		let full_res = Response::Receipts(res.clone());

@@ -2020,6 +2022,7 @@ mod tests {

 	#[test]
 	fn responses_vec() {
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let mut stream = RlpStream::new_list(2);
 				stream.begin_list(0).begin_list(0);

@@ -2027,7 +2030,7 @@ mod tests {
 		let reqs = vec![
 			Response::Headers(HeadersResponse { headers: vec![] }),
 			Response::HeaderProof(HeaderProofResponse { proof: vec![], hash: Default::default(), td: 100.into()}),
-			Response::Receipts(ReceiptsResponse { receipts: vec![Default::default()] }),
+			Response::Receipts(ReceiptsResponse { receipts: vec![Receipt::new(TransactionOutcome::Unknown, Default::default(), Vec::new())] }),
 			Response::Body(BodyResponse { body: body }),
 			Response::Account(AccountResponse {
 				proof: vec![],
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -136,7 +136,10 @@
 				"eip160Transition": 2675000,
 				"eip161abcTransition": 2675000,
 				"eip161dTransition": 2675000,
-				"maxCodeSize": 24576
+				"maxCodeSize": 24576,
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": 4370000,
+				"eip649Transition": 4370000
 			}
 		}
 	},
@@ -148,7 +151,11 @@
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip86Transition": "0x7fffffffffffff",
+		"eip140Transition": 4370000,
+		"eip211Transition": 4370000,
+		"eip214Transition": 4370000,
+		"eip658Transition": 4370000
 	},
 	"genesis": {
 		"seal": {
@@ -190,10 +197,10 @@
 		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x7fffffffffffff", "pricing": { "modexp": { "divisor": 100 } } } },
-		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 500, "word": 0 } } } },
-		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
-		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x7fffffffffffff", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 4370000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 4370000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 4370000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 4370000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "1337000000000000000000"
 		},
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -30,7 +30,7 @@ use engines::Engine;
 use error::{Error, BlockError, TransactionError};
 use factory::Factories;
 use header::Header;
-use receipt::Receipt;
+use receipt::{Receipt, TransactionOutcome};
 use state::State;
 use state_db::StateDB;
 use trace::FlatTrace;
@@ -524,7 +524,7 @@ impl LockedBlock {
 	pub fn strip_receipts(self) -> LockedBlock {
 		let mut block = self;
 		for receipt in &mut block.block.receipts {
-			receipt.state_root = None;
+			receipt.outcome = TransactionOutcome::Unknown;
 		}
 		block.block.header.set_receipts_root(ordered_trie_root(block.block.receipts.iter().map(|r| r.rlp_bytes().into_vec())));
 		block
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -1471,7 +1471,7 @@ mod tests {
 	use util::kvdb::KeyValueDB;
 	use util::hash::*;
 	use util::sha3::Hashable;
-	use receipt::Receipt;
+	use receipt::{Receipt, TransactionOutcome};
 	use blockchain::{BlockProvider, BlockChain, Config, ImportRoute};
 	use tests::helpers::*;
 	use blockchain::generator::{ChainGenerator, ChainIterator, BlockFinalizer};
@@ -2038,8 +2038,7 @@ mod tests {
 		let db = new_db();
 		let bc = new_chain(&genesis, db.clone());
 		insert_block(&db, &bc, &b1, vec![Receipt {
-			state_root: Some(H256::default()),
-			status_code: None,
+			outcome: TransactionOutcome::StateRoot(H256::default()),
 			gas_used: 10_000.into(),
 			log_bloom: Default::default(),
 			logs: vec![
@@ -2048,8 +2047,7 @@ mod tests {
 			],
 		},
 		Receipt {
-			state_root: Some(H256::default()),
-			status_code: None,
+			outcome: TransactionOutcome::StateRoot(H256::default()),
 			gas_used: 10_000.into(),
 			log_bloom: Default::default(),
 			logs: vec![
@@ -2058,8 +2056,7 @@ mod tests {
 		}]);
 		insert_block(&db, &bc, &b2, vec![
 			Receipt {
-				state_root: Some(H256::default()),
-				status_code: None,
+				outcome: TransactionOutcome::StateRoot(H256::default()),
 				gas_used: 10_000.into(),
 				log_bloom: Default::default(),
 				logs: vec![
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1978,7 +1978,7 @@ fn transaction_receipt(engine: &Engine, mut tx: LocalizedTransaction, mut receip
 			log_index: no_of_logs + i,
 		}).collect(),
 		log_bloom: receipt.log_bloom,
-		state_root: receipt.state_root,
+		outcome: receipt.outcome,
 	}
 }

@@ -2023,7 +2023,7 @@ mod tests {
 		use super::transaction_receipt;
 		use ethkey::KeyPair;
 		use log_entry::{LogEntry, LocalizedLogEntry};
-		use receipt::{Receipt, LocalizedReceipt};
+		use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
 		use transaction::{Transaction, LocalizedTransaction, Action};
 		use util::Hashable;
 		use tests::helpers::TestEngine;
@@ -2035,7 +2035,7 @@ mod tests {

 		let block_number = 1;
 		let block_hash = 5.into();
-		let state_root = Some(99.into());
+		let state_root = 99.into();
 		let gas_used = 10.into();
 		let raw_tx = Transaction {
 			nonce: 0.into(),
@@ -2063,14 +2063,12 @@ mod tests {
 			data: vec![],
 		}];
 		let receipts = vec![Receipt {
-			state_root: state_root,
-			status_code: None,
+			outcome: TransactionOutcome::StateRoot(state_root),
 			gas_used: 5.into(),
 			log_bloom: Default::default(),
 			logs: vec![logs[0].clone()],
 		}, Receipt {
-			state_root: state_root,
-			status_code: None,
+			outcome: TransactionOutcome::StateRoot(state_root),
 			gas_used: gas_used,
 			log_bloom: Default::default(),
 			logs: logs.clone(),
@@ -2106,7 +2104,7 @@ mod tests {
 				log_index: 2,
 			}],
 			log_bloom: Default::default(),
-			state_root: state_root,
+			outcome: TransactionOutcome::StateRoot(state_root),
 		});
 	}
 }
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -33,7 +33,7 @@ use db::{NUM_COLUMNS, COL_STATE};
 use header::{Header as BlockHeader, BlockNumber};
 use filter::Filter;
 use log_entry::LocalizedLogEntry;
-use receipt::{Receipt, LocalizedReceipt};
+use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
 use blockchain::extras::BlockReceipts;
 use error::{ImportResult, Error as EthcoreError};
 use evm::{Factory as EvmFactory, VMType, Schedule};
@@ -594,8 +594,7 @@ impl BlockChainClient for TestBlockChainClient {
 		// starts with 'f' ?
 		if *hash > H256::from("f000000000000000000000000000000000000000000000000000000000000000") {
 			let receipt = BlockReceipts::new(vec![Receipt::new(
-				Some(H256::zero()),
-				None,
+				TransactionOutcome::StateRoot(H256::zero()),
 				U256::zero(),
 				vec![])]);
 			let mut rlp = RlpStream::new();
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -412,13 +412,19 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {

 			let cost = builtin.cost(data);
 			if cost <= params.gas {
-				if let Err(e) = builtin.execute(data, &mut output) {
+				let mut builtin_out_buffer = Vec::new();
+				let result = {
+					let mut builtin_output = BytesRef::Flexible(&mut builtin_out_buffer);
+					builtin.execute(data, &mut builtin_output)
+				};
+				if let Err(e) = result {
 					self.state.revert_to_checkpoint();
 					let evm_err: evm::evm::Error = e.into();
 					tracer.trace_failed_call(trace_info, vec![], evm_err.clone().into());
 					Err(evm_err)
 				} else {
 					self.state.discard_checkpoint();
+					output.write(0, &builtin_out_buffer);

 					// trace only top level calls to builtins to avoid DDoS attacks
 					if self.depth == 0 {
@@ -435,9 +441,10 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 						);
 					}

+					let out_len = builtin_out_buffer.len();
 					Ok(FinalizationResult {
 						gas_left: params.gas - cost,
-						return_data: ReturnData::new(output.to_owned(), 0, output.len()),
+						return_data: ReturnData::new(builtin_out_buffer, 0, out_len),
 						apply_state: true,
 					})
 				}
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -1078,7 +1078,7 @@ impl MinerService for Miner {
 							},
 							logs: receipt.logs.clone(),
 							log_bloom: receipt.log_bloom,
-							state_root: receipt.state_root,
+							outcome: receipt.outcome.clone(),
 						}
 					})
 			}
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -22,7 +22,7 @@
 use std::cell::{RefCell, RefMut};
 use std::collections::hash_map::Entry;

-use receipt::Receipt;
+use receipt::{Receipt, TransactionOutcome};
 use engines::Engine;
 use evm::env_info::EnvInfo;
 use error::Error;
@@ -655,21 +655,19 @@ impl<B: Backend> State<B> {
 			eip658 ||
 			(env_info.number >= engine.params().eip98_transition && env_info.number >= engine.params().validate_receipts_transition);

-		let state_root = if no_intermediate_commits {
-			None
+		let outcome = if no_intermediate_commits {
+			if eip658 {
+				TransactionOutcome::StatusCode(if e.exception.is_some() { 0 } else { 1 })
+			} else {
+				TransactionOutcome::Unknown
+			}
 		} else {
 			self.commit()?;
-			Some(self.root().clone())
-		};
-
-		let status_byte = if eip658 {
-			Some(if e.exception.is_some() { 0 } else { 1 })
-		} else {
-			None
+			TransactionOutcome::StateRoot(self.root().clone())
 		};

 		let output = e.output;
-		let receipt = Receipt::new(state_root, status_byte, e.cumulative_gas_used, e.logs);
+		let receipt = Receipt::new(outcome, e.cumulative_gas_used, e.logs);
 		trace!(target: "state", "Transaction receipt: {:?}", receipt);

 		Ok(ApplyOutcome {
--- a/ethcore/types/src/receipt.rs
+++ b/ethcore/types/src/receipt.rs
@@ -23,44 +23,56 @@ use rlp::*;
 use {BlockNumber};
 use log_entry::{LogBloom, LogEntry, LocalizedLogEntry};

+/// Transaction outcome store in the receipt.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TransactionOutcome {
+	/// Status and state root are unknown under EIP-98 rules.
+	Unknown,
+	/// State root is known. Pre EIP-98 and EIP-658 rules.
+	StateRoot(H256),
+	/// Status code is known. EIP-658 rules.
+	StatusCode(u8),
+}
+
 /// Information describing execution of a transaction.
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Receipt {
-	/// The state root after executing the transaction. Optional since EIP98
-	pub state_root: Option<H256>,
 	/// The total gas used in the block following execution of the transaction.
 	pub gas_used: U256,
 	/// The OR-wide combination of all logs' blooms for this transaction.
 	pub log_bloom: LogBloom,
 	/// The logs stemming from this transaction.
 	pub logs: Vec<LogEntry>,
-	/// Status byte. Optional before EIP-658.
-	pub status_code: Option<u8>,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }

 impl Receipt {
 	/// Create a new receipt.
-	pub fn new(state_root: Option<H256>, status_code: Option<u8>, gas_used: U256, logs: Vec<LogEntry>) -> Receipt {
+	pub fn new(outcome: TransactionOutcome, gas_used: U256, logs: Vec<LogEntry>) -> Receipt {
 		Receipt {
-			state_root: state_root,
 			gas_used: gas_used,
 			log_bloom: logs.iter().fold(LogBloom::default(), |mut b, l| { b = &b | &l.bloom(); b }), //TODO: use |= operator
 			logs: logs,
-			status_code: status_code,
+			outcome: outcome,
 		}
 	}
 }

 impl Encodable for Receipt {
 	fn rlp_append(&self, s: &mut RlpStream) {
-		if let Some(ref status) = self.status_code {
-			s.begin_list(4);
-			s.append(status);
-		} else if let Some(ref root) = self.state_root {
-			s.begin_list(4);
-			s.append(root);
-		} else {
-			s.begin_list(3);
+		match self.outcome {
+			TransactionOutcome::Unknown => {
+				s.begin_list(3);
+			},
+			TransactionOutcome::StateRoot(ref root) => {
+				s.begin_list(4);
+				s.append(root);
+			},
+			TransactionOutcome::StatusCode(ref status_code) => {
+				s.begin_list(4);
+				s.append(status_code);
+			},
 		}
 		s.append(&self.gas_used);
 		s.append(&self.log_bloom);
@@ -72,28 +84,25 @@ impl Decodable for Receipt {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		if rlp.item_count()? == 3 {
 			Ok(Receipt {
-				state_root: None,
-				status_code: None,
+				outcome: TransactionOutcome::Unknown,
 				gas_used: rlp.val_at(0)?,
 				log_bloom: rlp.val_at(1)?,
 				logs: rlp.list_at(2)?,
 			})
 		} else {
-			let mut receipt = Receipt {
+			Ok(Receipt {
 				gas_used: rlp.val_at(1)?,
 				log_bloom: rlp.val_at(2)?,
 				logs: rlp.list_at(3)?,
-				state_root: None,
-				status_code: None,
-			};
-
-			let first = rlp.at(0)?;
-			if first.is_data() && first.data()?.len() == 1 {
-				receipt.status_code = Some(first.as_val()?);
-			} else {
-				receipt.state_root = Some(first.as_val()?);
-			}
-			Ok(receipt)
+				outcome: {
+					let first = rlp.at(0)?;
+					if first.is_data() && first.data()?.len() <= 1 {
+						TransactionOutcome::StatusCode(first.as_val()?)
+					} else {
+						TransactionOutcome::StateRoot(first.as_val()?)
+					}
+				}
+			})
 		}
 	}
 }
@@ -121,8 +130,8 @@ pub struct RichReceipt {
 	pub logs: Vec<LogEntry>,
 	/// Logs bloom
 	pub log_bloom: LogBloom,
-	/// State root
-	pub state_root: Option<H256>,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }

 /// Receipt with additional info.
@@ -146,21 +155,20 @@ pub struct LocalizedReceipt {
 	pub logs: Vec<LocalizedLogEntry>,
 	/// Logs bloom
 	pub log_bloom: LogBloom,
-	/// State root
-	pub state_root: Option<H256>,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }

 #[cfg(test)]
 mod tests {
-	use super::Receipt;
+	use super::{Receipt, TransactionOutcome};
 	use log_entry::LogEntry;

 	#[test]
 	fn test_no_state_root() {
 		let expected = ::rustc_hex::FromHex::from_hex("f9014183040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
 		let r = Receipt::new(
-			None,
-			None,
+			TransactionOutcome::Unknown,
 			0x40cae.into(),
 			vec![LogEntry {
 				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
@@ -175,8 +183,25 @@ mod tests {
 	fn test_basic() {
 		let expected = ::rustc_hex::FromHex::from_hex("f90162a02f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee83040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
 		let r = Receipt::new(
-			Some("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
-			None,
+			TransactionOutcome::StateRoot("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
+			0x40cae.into(),
+			vec![LogEntry {
+				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
+				topics: vec![],
+				data: vec![0u8; 32]
+			}]
+		);
+		let encoded = ::rlp::encode(&r);
+		assert_eq!(&encoded[..], &expected[..]);
+		let decoded: Receipt = ::rlp::decode(&encoded);
+		assert_eq!(decoded, r);
+	}
+
+	#[test]
+	fn test_status_code() {
+		let expected = ::rustc_hex::FromHex::from_hex("f901428083040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
+		let r = Receipt::new(
+			TransactionOutcome::StatusCode(0),
 			0x40cae.into(),
 			vec![LogEntry {
 				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
--- a/js/package-lock.json
+++ b/js/package-lock.json
@@ -9,6 +9,16 @@
      "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.0.1.tgz",
      "integrity": "sha1-wn5A4as2OKCe1TtKLoHVMbXrWjE="
    },
+    "JSONStream": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+      "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+      "dev": true,
+      "requires": {
+        "jsonparse": "0.0.5",
+        "through": "2.3.8"
+      }
+    },
    "abab": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@@ -7154,16 +7164,6 @@
      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
      "dev": true
    },
-    "JSONStream": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-      "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-      "dev": true,
-      "requires": {
-        "jsonparse": "0.0.5",
-        "through": "2.3.8"
-      }
-    },
    "jsprim": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -11649,14 +11649,6 @@
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
    "string-width": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -11672,6 +11664,14 @@
      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
    "stringify-object": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.0.tgz",
--- a/js/src/modals/CreateAccount/store.js
+++ b/js/src/modals/CreateAccount/store.js
@@ -35,6 +35,7 @@ export default class Store {
  @observable gethAddresses = [];
  @observable gethImported = [];
  @observable isBusy = false;
+  @observable isTest = false;
  @observable isWindowsPhrase = false;
  @observable name = '';
  @observable nameError = ERRORS.noName;
@@ -310,6 +311,10 @@ export default class Store {
    this.stage--;
  }

+  @action setIsTest = isTest => {
+    this.isTest = isTest;
+  }
+
  createAccount = (vaultStore) => {
    if (!this.canCreate) {
      return false;
--- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
+++ b/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
@@ -16,18 +16,21 @@

 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';

 import { Form, TypedInput, Input, AddressSelect, InputAddress } from '~/ui';

 import styles from '../createWallet.css';

-export default class WalletDetails extends Component {
+class WalletDetails extends Component {
  static propTypes = {
    accounts: PropTypes.object.isRequired,
    wallet: PropTypes.object.isRequired,
    errors: PropTypes.object.isRequired,
    onChange: PropTypes.func.isRequired,
-    walletType: PropTypes.string.isRequired
+    walletType: PropTypes.string.isRequired,
+
+    knownAddresses: PropTypes.array
  };

  render () {
@@ -103,7 +106,10 @@ export default class WalletDetails extends Component {
  }

  renderMultisigDetails () {
-    const { accounts, wallet, errors } = this.props;
+    const { accounts, knownAddresses, wallet, errors } = this.props;
+    const allowedOwners = knownAddresses
+      // Exclude sender and already owners of the wallet
+      .filter((address) => !wallet.owners.includes(address) && address !== wallet.account);

    return (
      <Form>
@@ -163,7 +169,7 @@ export default class WalletDetails extends Component {
        />

        <TypedInput
-          accounts={ accounts }
+          allowedValues={ allowedOwners }
          label={
            <FormattedMessage
              id='createWallet.details.ownersMulti.label'
@@ -249,3 +255,21 @@ export default class WalletDetails extends Component {
    this.props.onChange({ daylimit });
  }
 }
+
+function mapStateToProps (initState) {
+  const { accounts, contacts, contracts } = initState.personal;
+  const knownAddresses = [].concat(
+    Object.keys(accounts),
+    Object.keys(contacts),
+    Object.keys(contracts)
+  );
+
+  return () => ({
+    knownAddresses
+  });
+}
+
+export default connect(
+  mapStateToProps,
+  null
+)(WalletDetails);
--- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
+++ b/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
@@ -25,6 +25,22 @@ import { ACCOUNTS } from '../createWallet.test.js';
 let component;
 let onChange;

+function createRedux () {
+  return {
+    dispatch: sinon.stub(),
+    subscribe: sinon.stub(),
+    getState: () => {
+      return {
+        personal: {
+          accounts: {},
+          contacts: {},
+          contracts: {}
+        }
+      };
+    }
+  };
+}
+
 function render (walletType = 'MULTISIG') {
  onChange = sinon.stub();
  component = shallow(
@@ -36,7 +52,12 @@ function render (walletType = 'MULTISIG') {
        owners: []
      } }
      walletType={ walletType }
-    />
+    />,
+    {
+      context: {
+        store: createRedux()
+      }
+    }
  );

  return component;
--- a/js/src/modals/CreateWallet/createWalletStore.js
+++ b/js/src/modals/CreateWallet/createWalletStore.js
@@ -281,6 +281,13 @@ export default class CreateWalletStore {
    const daylimitValidation = validateUint(_wallet.daylimit);
    const nameValidation = validateName(_wallet.name);

+    const owners = _wallet.owners.filter((owner) => !/^(0x)?0*$/.test(owner));
+
+    // Real number of owners is owners + creator
+    if (_wallet.required > owners.length + 1) {
+      requiredValidation.valueError = 'the number of required validators should be lower or equal the number of owners';
+    }
+
    const errors = {
      address: addressValidation.addressError,
      account: accountValidation.addressError,
--- a/js/src/modals/DeployContract/ParametersStep/parametersStep.js
+++ b/js/src/modals/DeployContract/ParametersStep/parametersStep.js
@@ -43,7 +43,6 @@ export default class ParametersStep extends Component {
  };

  static propTypes = {
-    accounts: PropTypes.object.isRequired,
    onParamsChange: PropTypes.func.isRequired,

    inputs: PropTypes.array,
@@ -60,7 +59,7 @@ export default class ParametersStep extends Component {
  }

  renderConstructorInputs () {
-    const { accounts, params, paramsError } = this.props;
+    const { params, paramsError } = this.props;
    const { inputs } = this.props;

    if (!inputs || !inputs.length) {
@@ -78,7 +77,6 @@ export default class ParametersStep extends Component {
      return (
        <div key={ index } className={ styles.funcparams }>
          <TypedInput
-            accounts={ accounts }
            error={ error }
            isEth={ false }
            label={ label }
--- a/js/src/modals/DeployContract/deployContract.js
+++ b/js/src/modals/DeployContract/deployContract.js
@@ -313,7 +313,6 @@ class DeployContract extends Component {
        return (
          <ParametersStep
            { ...this.state }
-            accounts={ accounts }
            onParamsChange={ this.onParamsChange }
            readOnly={ readOnly }
          />
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -177,7 +177,7 @@ export default class DetailsStep extends Component {
  }

  renderParameters () {
-    const { accounts, func, values, valuesError, onValueChange } = this.props;
+    const { func, values, valuesError, onValueChange } = this.props;

    if (!func) {
      return null;
@@ -197,7 +197,6 @@ export default class DetailsStep extends Component {
            value={ values[index] }
            error={ valuesError[index] }
            onChange={ onChange }
-            accounts={ accounts }
            param={ input.type }
            isEth={ false }
          />
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -78,16 +78,23 @@ class FirstRun extends Component {
    hasAccounts: PropTypes.bool.isRequired,
    newError: PropTypes.func.isRequired,
    onClose: PropTypes.func.isRequired,
-    visible: PropTypes.bool.isRequired
+    visible: PropTypes.bool.isRequired,
+    isTest: PropTypes.bool.isRequired
  }

-  createStore = new CreateStore(this.context.api, {}, true, false);
+  createStore = new CreateStore(this.context.api, {}, this.props.isTest, false);

  state = {
    stage: 0,
    hasAcceptedTnc: false
  }

+  componentWillReceiveProps (nextProps) {
+    if (nextProps.isTest !== this.props.isTest) {
+      this.createStore.setIsTest(nextProps.isTest);
+    }
+  }
+
  render () {
    const { visible } = this.props;
    const { stage } = this.state;
@@ -348,9 +355,10 @@ class FirstRun extends Component {

 function mapStateToProps (state) {
  const { hasAccounts } = state.personal;
+  const { isTest } = state.nodeStatus;

  return {
-    hasAccounts
+    hasAccounts, isTest
  };
 }

--- a/js/src/modals/FirstRun/firstRun.spec.js
+++ b/js/src/modals/FirstRun/firstRun.spec.js
@@ -35,6 +35,9 @@ function createRedux () {
      return {
        personal: {
          hasAccounts: false
+        },
+        nodeStatus: {
+          isTest: false
        }
      };
    }
--- a/js/src/modals/WalletSettings/walletSettings.js
+++ b/js/src/modals/WalletSettings/walletSettings.js
@@ -34,7 +34,6 @@ class WalletSettings extends Component {
  };

  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
    wallet: PropTypes.object.isRequired,
    onClose: PropTypes.func.isRequired,
    senders: PropTypes.object.isRequired
@@ -74,7 +73,7 @@ class WalletSettings extends Component {
      default:
      case 'EDIT':
        const { errors, fromString, wallet } = this.store;
-        const { accountsInfo, senders } = this.props;
+        const { senders } = this.props;

        return (
          <Form>
@@ -143,7 +142,6 @@ class WalletSettings extends Component {
                      }
                      value={ wallet.owners.slice() }
                      onChange={ this.store.onOwnersChange }
-                      accounts={ accountsInfo }
                      param='address[]'
                    />

@@ -443,13 +441,13 @@ class WalletSettings extends Component {
 }

 function mapStateToProps (initState, initProps) {
-  const { accountsInfo, accounts } = initState.personal;
+  const { accounts } = initState.personal;
  const { owners } = initProps.wallet;

  const senders = pick(accounts, owners);

  return () => {
-    return { accountsInfo, senders };
+    return { senders };
  };
 }

--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-import { isEqual } from 'lodash';
+import { isEqual, debounce } from 'lodash';

 import { LOG_KEYS, getLogger } from '~/config';
 import UpgradeStore from '~/modals/UpgradeParity/store';
@@ -179,6 +179,12 @@ export default class Status {
      });
  }

+  _updateStatus = debounce(status => {
+    this._store.dispatch(statusCollection(status));
+  }, 2500, {
+    maxWait: 5000
+  });
+
  _subscribeEthSyncing = () => {
    return this._api.pubsub
      .eth
@@ -187,7 +193,7 @@ export default class Status {
          return;
        }

-        this._store.dispatch(statusCollection({ syncing }));
+        this._updateStatus({ syncing });
      });
  }

@@ -198,6 +204,7 @@ export default class Status {
        if (error || !netPeers) {
          return;
        }
+
        this._store.dispatch(statusCollection({ netPeers }));
      });
  }
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

+import { eq } from 'lodash';
 import React, { Component, PropTypes } from 'react';
 import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
@@ -93,6 +94,18 @@ class AddressSelect extends Component {
  }

  componentWillReceiveProps (nextProps) {
+    if (!eq(Object.keys(this.props.accounts), Object.keys(nextProps.accounts))) {
+      return this.setValues(nextProps);
+    }
+
+    if (!eq(Object.keys(this.props.contacts), Object.keys(nextProps.contacts))) {
+      return this.setValues(nextProps);
+    }
+
+    if (!eq(Object.keys(this.props.contracts), Object.keys(nextProps.contracts))) {
+      return this.setValues(nextProps);
+    }
+
    if (this.store.values && this.store.values.length > 0) {
      return;
    }
--- a/js/src/ui/Form/AddressSelect/addressSelectStore.js
+++ b/js/src/ui/Form/AddressSelect/addressSelectStore.js
@@ -165,7 +165,8 @@ export default class AddressSelectStore {
    const contactsN = Object.keys(contacts).length;

    if (accountsN + contractsN + contactsN === 0) {
-      return;
+      this.initValues = [];
+      return this.handleChange();
    }

    this.initValues = [
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -18,6 +18,7 @@ import React, { Component, PropTypes } from 'react';
 import { TextField } from 'material-ui';
 import { noop } from 'lodash';
 import keycode from 'keycode';
+import localStore from 'store';

 import { nodeOrStringProptype } from '~/util/proptypes';
 import { toString } from '~/util/messages';
@@ -223,7 +224,9 @@ export default class Input extends Component {
  }

  onChange = (event, value) => {
-    if (!this.props.allowPaste) {
+    const isDev = localStore.get('allYourBaseAreBelongToUs') || false;
+
+    if (!this.props.allowPaste && !isDev) {
      if (value.length - this.state.value.length > 8) {
        return;
      }
--- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
+++ b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

+import { pick } from 'lodash';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';

@@ -28,6 +29,7 @@ class InputAddressSelect extends Component {
    contracts: PropTypes.object.isRequired,

    allowCopy: PropTypes.bool,
+    allowedValues: PropTypes.array,
    className: PropTypes.string,
    error: nodeOrStringProptype(),
    hint: nodeOrStringProptype(),
@@ -38,16 +40,33 @@ class InputAddressSelect extends Component {
  };

  render () {
-    const { accounts, allowCopy, className, contacts, contracts, label, hint, error, value, onChange, readOnly } = this.props;
+    const { accounts, allowCopy, allowedValues, className, contacts, contracts, label, hint, error, value, onChange, readOnly } = this.props;
+    // Add the currently selected value to the list
+    // of allowed values, if any given
+    const nextAllowedValues = allowedValues
+      ? [].concat(allowedValues, value || [])
+      : null;
+
+    const filteredAccounts = nextAllowedValues
+      ? pick(accounts, nextAllowedValues)
+      : accounts;
+
+    const filteredContacts = nextAllowedValues
+      ? pick(contacts, nextAllowedValues)
+      : accounts;
+
+    const filteredContracts = nextAllowedValues
+      ? pick(contracts, nextAllowedValues)
+      : accounts;

    return (
      <AddressSelect
        allowCopy={ allowCopy }
        allowInput
-        accounts={ accounts }
+        accounts={ filteredAccounts }
        className={ className }
-        contacts={ contacts }
-        contracts={ contracts }
+        contacts={ filteredContacts }
+        contracts={ filteredContracts }
        error={ error }
        hint={ hint }
        label={ label }
--- a/js/src/ui/Form/TypedInput/typedInput.js
+++ b/js/src/ui/Form/TypedInput/typedInput.js
@@ -40,8 +40,8 @@ export default class TypedInput extends Component {
      PropTypes.string
    ]).isRequired,

-    accounts: PropTypes.object,
    allowCopy: PropTypes.bool,
+    allowedValues: PropTypes.array,
    className: PropTypes.string,
    error: PropTypes.any,
    hint: nodeOrStringProptype(),
@@ -97,7 +97,7 @@ export default class TypedInput extends Component {
    const { type } = param;

    if (type === ABI_TYPES.ARRAY) {
-      const { accounts, className, label } = this.props;
+      const { allowedValues, className, label } = this.props;
      const { subtype, length } = param;
      const value = this.getValue() || param.default;

@@ -113,8 +113,8 @@ export default class TypedInput extends Component {

        return (
          <TypedInput
-            accounts={ accounts }
            allowCopy={ allowCopy }
+            allowedValues={ allowedValues }
            className={ className }
            key={ `${subtype.type}_${index}` }
            onChange={ onChange }
@@ -340,13 +340,13 @@ export default class TypedInput extends Component {
  }

  renderAddress () {
-    const { accounts, allowCopy, className, label, error, hint, readOnly } = this.props;
+    const { allowCopy, allowedValues, className, label, error, hint, readOnly } = this.props;
    const value = this.getValue();

    return (
      <InputAddressSelect
        allowCopy={ allowCopy }
-        accounts={ accounts }
+        allowedValues={ allowedValues }
        className={ className }
        error={ error }
        hint={ hint }
--- a/js/src/util/wallets.js
+++ b/js/src/util/wallets.js
@@ -78,13 +78,39 @@ export default class WalletsUtils {
      .delegateCall(api, walletContract.address, 'fetchTransactions', [ walletContract ])
      .then((transactions) => {
        return transactions.sort((txA, txB) => {
-          const comp = txB.blockNumber.comparedTo(txA.blockNumber);
+          const bnA = txA.blockNumber;
+          const bnB = txB.blockNumber;
+
+          if (!bnA) {
+            console.warn('could not find block number in transaction', txA);
+            return 1;
+          }
+
+          if (!bnB) {
+            console.warn('could not find block number in transaction', txB);
+            return -1;
+          }
+
+          const comp = bnA.comparedTo(bnB);

          if (comp !== 0) {
            return comp;
          }

-          return txB.transactionIndex.comparedTo(txA.transactionIndex);
+          const txIdxA = txA.transactionIndex;
+          const txIdxB = txB.transactionIndex;
+
+          if (!txIdxA) {
+            console.warn('could not find transaction index in transaction', txA);
+            return 1;
+          }
+
+          if (!txIdxB) {
+            console.warn('could not find transaction index in transaction', txB);
+            return -1;
+          }
+
+          return txIdxA.comparedTo(txIdxB);
        });
      });
  }
--- a/js/src/util/wallets/consensys-wallet.js
+++ b/js/src/util/wallets/consensys-wallet.js
@@ -212,6 +212,7 @@ export default class ConsensysWalletUtils {

          const transaction = {
            transactionHash: log.transactionHash,
+            transactionIndex: log.transactionIndex,
            blockNumber: log.blockNumber
          };

--- a/js/src/util/wallets/foundation-wallet.js
+++ b/js/src/util/wallets/foundation-wallet.js
@@ -130,27 +130,67 @@ export default class FoundationWalletUtils {
      .ConfirmationNeeded
      .getAllLogs()
      .then((logs) => {
-        return logs.map((log) => ({
-          initiator: log.params.initiator.value,
-          to: log.params.to.value,
-          data: log.params.data.value,
-          value: log.params.value.value,
-          operation: bytesToHex(log.params.operation.value),
-          transactionIndex: log.transactionIndex,
-          transactionHash: log.transactionHash,
-          blockNumber: log.blockNumber,
-          confirmedBy: []
-        }));
+        return logs
+          .filter((log) => {
+            if (!log.blockNumber) {
+              console.warn('got a log without blockNumber', log);
+              return false;
+            }
+
+            if (!log.transactionIndex) {
+              console.warn('got a log without transactionIndex', log);
+              return false;
+            }
+
+            return true;
+          })
+          .map((log) => ({
+            initiator: log.params.initiator.value,
+            to: log.params.to.value,
+            data: log.params.data.value,
+            value: log.params.value.value,
+            operation: bytesToHex(log.params.operation.value),
+            transactionIndex: log.transactionIndex,
+            transactionHash: log.transactionHash,
+            blockNumber: log.blockNumber,
+            confirmedBy: []
+          }));
      })
      .then((logs) => {
        return logs.sort((logA, logB) => {
-          const comp = logA.blockNumber.comparedTo(logB.blockNumber);
+          const bnA = logA.blockNumber;
+          const bnB = logA.blockNumber;
+
+          if (!bnA) {
+            console.warn('could not find block number in log', logA);
+            return 1;
+          }
+
+          if (!bnB) {
+            console.warn('could not find block number in log', logB);
+            return -1;
+          }
+
+          const comp = bnA.comparedTo(bnB);

          if (comp !== 0) {
            return comp;
          }

-          return logA.transactionIndex.comparedTo(logB.transactionIndex);
+          const txIdxA = logA.transactionIndex;
+          const txIdxB = logB.transactionIndex;
+
+          if (!txIdxA) {
+            console.warn('could not find transaction index in log', logA);
+            return 1;
+          }
+
+          if (!txIdxB) {
+            console.warn('could not find transaction index in log', logB);
+            return -1;
+          }
+
+          return txIdxA.comparedTo(txIdxB);
        });
      })
      .then((pendingTxs) => {
@@ -205,40 +245,48 @@ export default class FoundationWalletUtils {
        ] ]
      })
      .then((logs) => {
-        const transactions = logs.map((log) => {
-          const signature = toHex(log.topics[0]);
+        const transactions = logs
+          .map((log) => {
+            const signature = toHex(log.topics[0]);

-          const value = log.params.value.value;
-          const from = signature === WalletSignatures.Deposit
-            ? log.params['_from'].value
-            : walletContract.address;
+            const value = log.params.value.value;
+            const from = signature === WalletSignatures.Deposit
+              ? log.params['_from'].value
+              : walletContract.address;

-          const to = signature === WalletSignatures.Deposit
-            ? walletContract.address
-            : log.params.to.value;
+            const to = signature === WalletSignatures.Deposit
+              ? walletContract.address
+              : log.params.to.value;

-          const transaction = {
-            transactionHash: log.transactionHash,
-            blockNumber: log.blockNumber,
-            from, to, value
-          };
+            const transaction = {
+              transactionHash: log.transactionHash,
+              transactionIndex: log.transactionIndex,
+              blockNumber: log.blockNumber,
+              from, to, value
+            };

-          if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) {
-            transaction.creates = log.params.created.value;
-            delete transaction.to;
-          }
+            if (!transaction.blockNumber) {
+              console.warn('log without block number', log);
+              return null;
+            }

-          if (log.params.operation) {
-            transaction.operation = bytesToHex(log.params.operation.value);
-            checkPendingOperation(api, log, transaction.operation);
-          }
+            if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) {
+              transaction.creates = log.params.created.value;
+              delete transaction.to;
+            }

-          if (log.params.data) {
-            transaction.data = log.params.data.value;
-          }
+            if (log.params.operation) {
+              transaction.operation = bytesToHex(log.params.operation.value);
+              checkPendingOperation(api, log, transaction.operation);
+            }

-          return transaction;
-        });
+            if (log.params.data) {
+              transaction.data = log.params.data.value;
+            }
+
+            return transaction;
+          })
+          .filter((tx) => tx);

        return transactions;
      });
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ b/js/src/views/Contract/Queries/inputQuery.js
@@ -35,7 +35,6 @@ class InputQuery extends Component {
  };

  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
    contract: PropTypes.object.isRequired,
    inputs: arrayOrObjectProptype().isRequired,
    outputs: arrayOrObjectProptype().isRequired,
@@ -122,7 +121,7 @@ class InputQuery extends Component {

  renderResults () {
    const { results, isLoading } = this.state;
-    const { accountsInfo, outputs } = this.props;
+    const { outputs } = this.props;

    if (isLoading) {
      return (
@@ -143,7 +142,6 @@ class InputQuery extends Component {
      .map((out, index) => {
        const input = (
          <TypedInput
-            accounts={ accountsInfo }
            allowCopy
            isEth={ false }
            param={ out.type }
--- a/js/src/views/Contract/Queries/queries.js
+++ b/js/src/views/Contract/Queries/queries.js
@@ -29,7 +29,6 @@ export default class Queries extends Component {
  }

  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
    contract: PropTypes.object,
    values: PropTypes.object
  }
@@ -94,12 +93,11 @@ export default class Queries extends Component {

  renderInputQuery (fn) {
    const { abi, name, signature } = fn;
-    const { accountsInfo, contract } = this.props;
+    const { contract } = this.props;

    return (
      <div className={ styles.container } key={ fn.signature }>
        <InputQuery
-          accountsInfo={ accountsInfo }
          className={ styles.method }
          inputs={ abi.inputs }
          outputs={ abi.outputs }
@@ -144,13 +142,11 @@ export default class Queries extends Component {
      return null;
    }

-    const { accountsInfo } = this.props;
    const { name, type } = output;
    const label = `${name ? `${name}: ` : ''}${type}`;

    return (
      <TypedInput
-        accounts={ accountsInfo }
        allowCopy
        key={ key }
        isEth={ false }
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -45,7 +45,6 @@ class Contract extends Component {
    setVisibleAccounts: PropTypes.func.isRequired,

    accounts: PropTypes.object,
-    accountsInfo: PropTypes.object,
    contracts: PropTypes.object,
    netVersion: PropTypes.string.isRequired,
    params: PropTypes.object
@@ -128,7 +127,7 @@ class Contract extends Component {
  }

  render () {
-    const { accountsInfo, contracts, netVersion, params } = this.props;
+    const { contracts, netVersion, params } = this.props;
    const { allEvents, contract, queryValues, loadingEvents } = this.state;
    const account = contracts[params.address];

@@ -150,7 +149,6 @@ class Contract extends Component {
            { this.renderBlockNumber(account.meta) }
          </Header>
          <Queries
-            accountsInfo={ accountsInfo }
            contract={ contract }
            values={ queryValues }
          />
@@ -530,12 +528,11 @@ class Contract extends Component {
 }

 function mapStateToProps (state) {
-  const { accounts, accountsInfo, contracts } = state.personal;
+  const { accounts, contracts } = state.personal;
  const { netVersion } = state.nodeStatus;

  return {
    accounts,
-    accountsInfo,
    contracts,
    netVersion
  };
--- a/js/src/views/Status/NodeStatus/store.js
+++ b/js/src/views/Status/NodeStatus/store.js
@@ -24,7 +24,7 @@ export default class StatusStore {
  @observable netPort = new BigNumber(0);
  @observable nodeName = '';
  @observable rpcSettings = {};
-
+  @observable blockNumber = new BigNumber(0);
  @observable coinbase = '';
  @observable extraData = '';
  @observable gasFloorTarget = new BigNumber(0);
@@ -46,9 +46,10 @@ export default class StatusStore {
    });
  }

-  @action setStatus ({ hashrate }) {
+  @action setStatus ({ hashrate, blockNumber }) {
    transaction(() => {
      this.hashrate = hashrate;
+      this.blockNumber = blockNumber;
    });
  }

@@ -108,13 +109,14 @@ export default class StatusStore {

    return Promise
      .all([
-        this.api.eth.hashrate()
+        this.api.eth.hashrate(),
+        this.api.eth.blockNumber()
      ])
      .then(([
-        hashrate
+        hashrate, blockNumber
      ]) => {
        this.setStatus({
-          hashrate
+          hashrate, blockNumber
        });
      })
      .catch((error) => {
--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.7.2</string>
+				<string>1.7.3</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 7
-!define VERSIONBUILD 2
+!define VERSIONBUILD 3
 !define ARGS "--warp"
 !define FIRST_START_ARGS "ui --warp --mode=passive"

@@ -116,7 +116,6 @@ section "install"
 	# Firewall exception rules
 	SimpleFC::AdvAddRule "Parity incoming peers (TCP:30303)" ""  6 1 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity" 30303    "" "" ""
 	SimpleFC::AdvAddRule "Parity outgoing peers (TCP:30303)" ""  6 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    "" 30303 "" ""
-	SimpleFC::AdvAddRule       "Parity web queries (TCP:80)" ""  6 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    ""    80 "" ""
 	SimpleFC::AdvAddRule  "Parity UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    "" 30303 "" ""

 	# Registry information for add/remove programs
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -88,6 +88,7 @@ pub struct SyncInfo {
 	last_imported_old_block_number: Option<BlockNumber>,
 	num_peers: usize,
 	max_peers: u32,
+	snapshot_sync: bool,
 }

 pub struct Report {
@@ -150,6 +151,7 @@ impl InformantData for FullNodeInformantData {
 					last_imported_old_block_number: status.last_imported_old_block_number,
 					num_peers: status.num_peers,
 					max_peers: status.current_max_peers(net_config.min_peers, net_config.max_peers),
+					snapshot_sync: status.is_snapshot_syncing(),
 				}))
 			}
 			_ => (is_major_importing(self.sync.as_ref().map(|s| s.status().state), queue_info.clone()), None),
@@ -194,6 +196,7 @@ impl InformantData for LightNodeInformantData {
 			last_imported_old_block_number: None,
 			num_peers: peer_numbers.connected,
 			max_peers: peer_numbers.max as u32,
+			snapshot_sync: false,
 		});

 		Report {
@@ -280,7 +283,7 @@ impl<T: InformantData> Informant<T> {
 				_ => (false, 0, 0),
 			}
 		);
-
+		let snapshot_sync = snapshot_sync && sync_info.as_ref().map_or(false, |s| s.snapshot_sync);
 		if !importing && !snapshot_sync && elapsed < Duration::from_secs(30) {
 			return;
 		}
--- a/rpc/src/v1/tests/helpers/miner_service.rs
+++ b/rpc/src/v1/tests/helpers/miner_service.rs
@@ -257,7 +257,7 @@ impl MinerService for TestMinerService {
 				contract_address: None,
 				logs: r.logs.clone(),
 				log_bloom: r.log_bloom,
-				state_root: r.state_root,
+				outcome: r.outcome.clone(),
 			}
 		)
 	}
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -27,7 +27,7 @@ use ethkey::Secret;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionId};
 use ethcore::log_entry::{LocalizedLogEntry, LogEntry};
-use ethcore::receipt::LocalizedReceipt;
+use ethcore::receipt::{LocalizedReceipt, TransactionOutcome};
 use ethcore::transaction::{Transaction, Action};
 use ethcore::miner::{ExternalMiner, MinerService};
 use ethsync::SyncState;
@@ -1006,7 +1006,7 @@ fn rpc_eth_transaction_receipt() {
 			log_index: 1,
 		}],
 		log_bloom: 0.into(),
-		state_root: Some(0.into()),
+		outcome: TransactionOutcome::StateRoot(0.into()),
 	};

 	let hash = H256::from_str("b903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238").unwrap();
@@ -1019,7 +1019,7 @@ fn rpc_eth_transaction_receipt() {
 		"params": ["0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238"],
 		"id": 1
 	}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","root":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","root":"0x0000000000000000000000000000000000000000000000000000000000000000","status":null,"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;

 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
--- a/rpc/src/v1/types/receipt.rs
+++ b/rpc/src/v1/types/receipt.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use v1::types::{Log, H160, H256, H2048, U256};
-use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt};
+use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt, TransactionOutcome};

 /// Receipt
 #[derive(Debug, Serialize)]
@@ -49,6 +49,25 @@ pub struct Receipt {
 	/// Logs bloom
 	#[serde(rename="logsBloom")]
 	pub logs_bloom: H2048,
+	/// Status code
+	#[serde(rename="status")]
+	pub status_code: Option<u8>,
+}
+
+impl Receipt {
+	fn outcome_to_state_root(outcome: TransactionOutcome) -> Option<H256> {
+		match outcome {
+			TransactionOutcome::Unknown | TransactionOutcome::StatusCode(_) => None,
+			TransactionOutcome::StateRoot(root) => Some(root.into()),
+		}
+	}
+
+	fn outcome_to_status_code(outcome: &TransactionOutcome) -> Option<u8> {
+		match *outcome {
+			TransactionOutcome::Unknown | TransactionOutcome::StateRoot(_) => None,
+			TransactionOutcome::StatusCode(ref code) => Some(*code),
+		}
+	}
 }

 impl From<LocalizedReceipt> for Receipt {
@@ -62,7 +81,8 @@ impl From<LocalizedReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -79,7 +99,8 @@ impl From<RichReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -96,7 +117,8 @@ impl From<EthReceipt> for Receipt {
 			gas_used: None,
 			contract_address: None,
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -109,7 +131,7 @@ mod tests {

 	#[test]
 	fn receipt_serialization() {
-		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f"}"#;
+		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f","status":null}"#;

 		let receipt = Receipt {
 			transaction_hash: Some(0.into()),
@@ -136,6 +158,7 @@ mod tests {
 			}],
 			logs_bloom: 15.into(),
 			state_root: Some(10.into()),
+			status_code: None,
 		};

 		let serialized = serde_json::to_string(&receipt).unwrap();
--- a/scripts/parity.service
+++ b/scripts/parity.service
@@ -3,8 +3,18 @@ Description=Parity Daemon
 After=network.target

 [Service]
-EnvironmentFile=-%h/.parity/parity.conf
-ExecStart=/usr/bin/parity $ARGS
+# run as root, set base_path in config.toml
+ExecStart=/usr/bin/parity --config /etc/parity/config.toml
+# To run as user, comment out above and uncomment below, fill in user and group
+# picks up users default config.toml in $HOME/.local/.share/io.parity.ethereum/
+# User=username
+# Group=groupname
+# ExecStart=/usr/bin/parity
+Restart=on-failure
+
+# Specifies which signal to use when killing a service. Defaults to SIGTERM.
+# SIGHUP gives parity time to exit cleanly before SIGKILL (default 90s)
+KillSignal=SIGHUP

 [Install]
 WantedBy=default.target
--- a/sync/src/block_sync.rs
+++ b/sync/src/block_sync.rs
@@ -29,7 +29,7 @@ use sync_io::SyncIo;
 use blocks::BlockCollection;

 const MAX_HEADERS_TO_REQUEST: usize = 128;
-const MAX_BODIES_TO_REQUEST: usize = 64;
+const MAX_BODIES_TO_REQUEST: usize = 32;
 const MAX_RECEPITS_TO_REQUEST: usize = 128;
 const SUBCHAIN_SIZE: u64 = 256;
 const MAX_ROUND_PARENTS: usize = 16;
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -163,7 +163,7 @@ const MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD: usize = 3;
 const WAIT_PEERS_TIMEOUT_SEC: u64 = 5;
 const STATUS_TIMEOUT_SEC: u64 = 5;
 const HEADERS_TIMEOUT_SEC: u64 = 15;
-const BODIES_TIMEOUT_SEC: u64 = 10;
+const BODIES_TIMEOUT_SEC: u64 = 20;
 const RECEIPTS_TIMEOUT_SEC: u64 = 10;
 const FORK_HEADER_TIMEOUT_SEC: u64 = 3;
 const SNAPSHOT_MANIFEST_TIMEOUT_SEC: u64 = 5;
@@ -688,7 +688,7 @@ impl ChainSync {
 						}
 					} else {
 						trace!(target: "sync", "{}: Fork mismatch", peer_id);
-						io.disconnect_peer(peer_id);
+						io.disable_peer(peer_id);
 						return Ok(());
 					}
 				}
@@ -1146,7 +1146,7 @@ impl ChainSync {
 		trace!(target: "sync", "== Connected {}: {}", peer, io.peer_info(peer));
 		if let Err(e) = self.send_status(io, peer) {
 			debug!(target:"sync", "Error sending status request: {:?}", e);
-			io.disable_peer(peer);
+			io.disconnect_peer(peer);
 		} else {
 			self.handshaking_peers.insert(peer, time::precise_time_ns());
 		}
@@ -1447,7 +1447,7 @@ impl ChainSync {
 			};
 			if let Err(e) = result {
 				debug!(target:"sync", "Error sending request: {:?}", e);
-				sync.disable_peer(peer_id);
+				sync.disconnect_peer(peer_id);
 			}
 		}
 	}
@@ -1456,7 +1456,7 @@ impl ChainSync {
 	fn send_packet(&mut self, sync: &mut SyncIo, peer_id: PeerId, packet_id: PacketId, packet: Bytes) {
 		if let Err(e) = sync.send(peer_id, packet_id, packet) {
 			debug!(target:"sync", "Error sending packet: {:?}", e);
-			sync.disable_peer(peer_id);
+			sync.disconnect_peer(peer_id);
 		}
 	}

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

--- a/util/network/src/session.rs
+++ b/util/network/src/session.rs
@@ -511,6 +511,7 @@ impl Session {
 			i += 1;
 		}
 		debug!(target: "network", "Hello: {} v{} {} {:?}", client_version, protocol, id, caps);
+		let protocol = ::std::cmp::min(protocol, host.protocol_version);
 		self.info.protocol_version = protocol;
 		self.info.client_version = client_version;
 		self.info.capabilities = caps;
Author	SHA1	Message	Date
GitLab Build Bot	d097956ede	js-precompiled 20171009-113503	2017-10-09 16:43:52 +02:00
Arkadiy Paronyan	949d2b7fd0	[beta] Backporting (#6676 ) * Fix wallet view (#6597) * Add safe fail for empty logs * Filter transactions * Add more logging * Fix Wallet Creation and wallet tx list * Remove logs * Prevent selecting twice same wallet owner * Fix tests * Remove unused props * Remove unused props * Disallow pasting recovery phrases on first run (#6602) * Fix disallowing paste of recovery phrase on first run, ref #6581 * Allow the leader of CATS pasting recovery phrases. * Updated systemd files for linux (#6592) Previous version put $BASE directory in root directory. This version clearly explains how to run as root or as specific user. Additional configuration: * send SIGHUP for clean exit, * restart on fail. Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel * Don't expose port 80 for parity anymore (#6633)	2017-10-09 13:20:28 +02:00
Arkadiy Paronyan	2d4f4bdd61	[beta] Backporting (#6675 ) * Required validators >= num owners (#6551) * Debounce sync status. (#6572) * Fixed network protocol version negotiation * Renamed RPC receipt statusCode field to status * Fixed RETURNDATA size for built-ins	2017-10-09 13:07:57 +02:00
Marek Kotewicz	67bd9a33cf	Merge pull request #6661 from paritytech/byzantium-fork-beta [beta] Byzantium fork block number	2017-10-09 11:26:39 +02:00
GitLab Build Bot	109168b990	[ci skip] js-precompiled 20171006-100509	2017-10-06 10:22:08 +00:00
arkpar	e535174604	Byzantium fork block number	2017-10-06 10:02:22 +02:00
Afri Schoedon	ea6d517a87	Fix refreshing block number on status view (#6610 )	2017-10-06 09:11:41 +02:00
Arkadiy Paronyan	965727c5d3	Tweaked block download timeouts (#6595 )	2017-10-03 10:06:42 +02:00
Arkadiy Paronyan	083b69ffb1	[beta] Backports (#6563 ) * Sync progress and error handling fixes (#6560) * Fixed receipt serialization and RPC (#6555) * v1.7.3	2017-09-21 11:42:58 +02:00