Backporting to beta (#3149)

* The front-end for each hard-fork, also EIP-160.

* Address EIP161 a/c

* Include EIP-161b

* EIP-161 part d.

* Fix test build.

* Fix one test, add another.

* Fix use of bloom & renaming.

* Fixed tests

* Initial groundwork for EIP-155

* Fix minor bug.

* Fix all tests finally.

* Rest of EIP-155.

* Add tests for EIP-155 algorithm.

Update transaction tests validation.

* Address grumbles.

* Remove unused code.

* Resolve IPC issues

* Fixed tests

* ipc backports

* Fixing random test failures (#2577)

* Fix SUICIDE gas mechanism and add consensus tests.

* Remove commented code.

* Set Frontier hardfork block number

* Transaction tests,

* Fixed tests

* Removed banning queue

parity/cli.rs

@@ -329,7 +329,7 @@ pub struct Args {
 	pub flag_keys_iterations: u32,
 	pub flag_no_import_keys: bool,
 	pub flag_bootnodes: Option<String>,
-	pub flag_network_id: Option<String>,
+	pub flag_network_id: Option<usize>,
 	pub flag_pruning: String,
 	pub flag_pruning_history: u64,
 	pub flag_tracing: String,
@@ -415,7 +415,7 @@ pub struct Args {
 	pub flag_rpccorsdomain: Option<String>,
 	pub flag_rpcapi: Option<String>,
 	pub flag_testnet: bool,
-	pub flag_networkid: Option<String>,
+	pub flag_networkid: Option<usize>,
 	pub flag_ipcdisable: bool,
 	pub flag_ipc_off: bool,
 	pub flag_jsonrpc_off: bool,

parity/configuration.rs

@@ -81,7 +81,7 @@ impl Configuration {
 		let http_conf = try!(self.http_config());
 		let ipc_conf = try!(self.ipc_config());
 		let net_conf = try!(self.net_config());
-		let network_id = try!(self.network_id());
+		let network_id = self.network_id();
 		let cache_config = self.cache_config();
 		let spec = try!(self.chain().parse());
 		let tracing = try!(self.args.flag_tracing.parse());
@@ -465,12 +465,8 @@ impl Configuration {
 		Ok(ret)
 	}
 
-	fn network_id(&self) -> Result<Option<U256>, String> {
-		let net_id = self.args.flag_network_id.as_ref().or(self.args.flag_networkid.as_ref());
-		match net_id {
-			Some(id) => Ok(Some(try!(to_u256(id)))),
-			None => Ok(None),
-		}
+	fn network_id(&self) -> Option<usize> {
+		self.args.flag_network_id.or(self.args.flag_networkid)
 	}
 
 	fn rpc_apis(&self) -> String {

parity/main.rs

@@ -81,7 +81,6 @@ mod account;
 mod blockchain;
 mod presale;
 mod run;
-mod sync;
 mod snapshot;
 
 use std::{process, env};
@@ -119,11 +118,6 @@ fn start() -> Result<String, String> {
 fn main() {
 	// Always print backtrace on panic.
 	::std::env::set_var("RUST_BACKTRACE", "1");
-	// just redirect to the sync::main()
-	if std::env::args().nth(1).map_or(false, |arg| arg == "sync") {
-		sync::main();
-		return;
-	}
 
 	match start() {
 		Ok(result) => {

parity/modules.rs

@@ -25,10 +25,6 @@ use self::ipc_deps::*;
 use ethcore_logger::Config as LogConfig;
 
 pub mod service_urls {
-	pub const CLIENT: &'static str = "ipc:///tmp/parity-chain.ipc";
-	pub const SYNC: &'static str = "ipc:///tmp/parity-sync.ipc";
-	pub const SYNC_NOTIFY: &'static str = "ipc:///tmp/parity-sync-notify.ipc";
-	pub const NETWORK_MANAGER: &'static str = "ipc:///tmp/parity-manage-net.ipc";
 }
 
 #[cfg(not(feature="ipc"))]

parity/run.rs

@@ -22,7 +22,7 @@ use fdlimit::raise_fd_limit;
 use ethcore_logger::{Config as LogConfig, setup_log};
 use ethcore_rpc::NetworkSettings;
 use ethsync::NetworkConfiguration;
-use util::{Colour, version, U256};
+use util::{Colour, version};
 use io::{MayPanic, ForwardPanic, PanicHandler};
 use ethcore::client::{Mode, Switch, DatabaseCompactionProfile, VMType, ChainNotify};
 use ethcore::service::ClientService;
@@ -60,7 +60,7 @@ pub struct RunCmd {
 	pub http_conf: HttpConfiguration,
 	pub ipc_conf: IpcConfiguration,
 	pub net_conf: NetworkConfiguration,
-	pub network_id: Option<U256>,
+	pub network_id: Option<usize>,
 	pub acc_conf: AccountsConfig,
 	pub gas_pricer: GasPricerConfig,
 	pub miner_extras: MinerExtras,