From d255eb960b4191eff8e9650c32e0b3db6e136e59 Mon Sep 17 00:00:00 2001
From: Alexandra Drozdova <drsanusha1@mail.ru>
Date: Fri, 8 Dec 2017 16:31:41 +0100
Subject: [PATCH 1/8] Use boost.program_options to handle command line
 arguments in eth and ethkey

---
 eth/CMakeLists.txt    |   2 +-
 eth/MinerAux.h        |   3 +-
 eth/main.cpp          | 978 +++++++++++++++++++++++-------------------
 ethkey/CMakeLists.txt |   2 +-
 ethkey/KeyAux.h       |   3 +-
 ethkey/main.cpp       |  60 +--
 6 files changed, 564 insertions(+), 484 deletions(-)

diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index 8de0dc2b0e0..584dd27445d 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -8,7 +8,7 @@ set(
 add_executable(eth ${sources})
 target_link_libraries(
     eth
-    PRIVATE ethereum ethashseal evm web3jsonrpc webthree devcore
+    PRIVATE ethereum ethashseal evm web3jsonrpc webthree devcore Boost::program_options
 )
 
 target_include_directories(eth PRIVATE ../utils)
diff --git a/eth/MinerAux.h b/eth/MinerAux.h
index d0d72abcd46..f75564a895d 100644
--- a/eth/MinerAux.h
+++ b/eth/MinerAux.h
@@ -101,8 +101,9 @@ class MinerCLI
 		BasicAuthority::init();
 	}
 
-	bool interpretOption(int& i, int argc, char** argv)
+	bool interpretOption(size_t& i, vector<string> const& argv)
 	{
+		size_t argc = argv.size();
 		string arg = argv[i];
 		if (arg == "--benchmark-warmup" && i + 1 < argc)
 			try {
diff --git a/eth/main.cpp b/eth/main.cpp
index 520022475ea..8910963ff88 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -1,16 +1,13 @@
 /*
 	This file is part of cpp-ethereum.
-
 	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	cpp-ethereum is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -30,6 +27,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/program_options.hpp>
+#include <boost/program_options/options_description.hpp>
 
 #include <libdevcore/FileSystem.h>
 #include <libethashseal/EthashAux.h>
@@ -66,100 +65,16 @@ using namespace dev;
 using namespace dev::p2p;
 using namespace dev::eth;
 using namespace boost::algorithm;
+namespace po = boost::program_options;
 namespace fs = boost::filesystem;
 
 static std::atomic<bool> g_silence = {false};
 
-void help()
-{
-	cout
-		<< "Usage eth [OPTIONS]\n"
-		<< "Options:\n\n"
-		<< "Wallet usage:\n";
-	AccountManager::streamAccountHelp(cout);
-	AccountManager::streamWalletHelp(cout);
-	cout
-		<< "\nClient mode (default):\n"
-		<< "    --mainnet  Use the main network protocol.\n"
-		<< "    --ropsten  Use the Ropsten testnet.\n"
-		<< "    --private <name>  Use a private chain.\n"
-		<< "    --test  Testing mode: Disable PoW and provide test rpc interface.\n"
-		<< "    --config <file>  Configure specialised blockchain using given JSON information.\n"
-		<< "    -o,--mode <full/peer>  Start a full node or a peer node (default: full).\n\n"
-		<< "    --ipc  Enable IPC server (default: on).\n"
-		<< "    --ipcpath Set .ipc socket path (default: data directory)\n"
-		<< "    --no-ipc  Disable IPC server.\n"
-		<< "    --admin <password>  Specify admin session key for JSON-RPC (default: auto-generated and printed at start-up).\n"
-		<< "    -K,--kill  Kill the blockchain first.\n"
-		<< "    -R,--rebuild  Rebuild the blockchain from the existing database.\n"
-		<< "    --rescue  Attempt to rescue a corrupt database.\n\n"
-		<< "    --import-presale <file>  Import a pre-sale key; you'll need to specify the password to this key.\n"
-		<< "    -s,--import-secret <secret>  Import a secret key into the key store.\n"
-		<< "    --master <password>  Give the master password for the key store. Use --master \"\" to show a prompt.\n"
-		<< "    --password <password>  Give a password for a private key.\n\n"
-		<< "Client transacting:\n"
-		<< "    --ask <wei>  Set the minimum ask gas price under which no transaction will be mined (default " << toString(DefaultGasPrice) << " ).\n"
-		<< "    --bid <wei>  Set the bid gas price to pay for transactions (default " << toString(DefaultGasPrice) << " ).\n"
-		<< "    --unsafe-transactions  Allow all transactions to proceed without verification. EXTREMELY UNSAFE.\n"
-		<< "Client mining:\n"
-		<< "    -a,--address <addr>  Set the author (mining payout) address to given address (default: auto).\n"
-		<< "    -m,--mining <on/off/number>  Enable mining, optionally for a specified number of blocks (default: off).\n"
-		<< "    -f,--force-mining  Mine even when there are no transactions to mine (default: off).\n"
-		<< "    -C,--cpu  When mining, use the CPU.\n"
-		<< "    -t, --mining-threads <n>  Limit number of CPU/GPU miners to n (default: use everything available on selected platform).\n\n"
-		<< "Client networking:\n"
-		<< "    --client-name <name>  Add a name to your client's version string (default: blank).\n"
-		<< "    --bootstrap  Connect to the default Ethereum peer servers (default unless --no-discovery used).\n"
-		<< "    --no-bootstrap  Do not connect to the default Ethereum peer servers (default only when --no-discovery is used).\n"
-		<< "    -x,--peers <number>  Attempt to connect to a given number of peers (default: 11).\n"
-		<< "    --peer-stretch <number>  Give the accepted connection multiplier (default: 7).\n"
-
-		<< "    --public-ip <ip>  Force advertised public IP to the given IP (default: auto).\n"
-		<< "    --listen-ip <ip>(:<port>)  Listen on the given IP for incoming connections (default: 0.0.0.0).\n"
-		<< "    --listen <port>  Listen on the given port for incoming connections (default: 30303).\n"
-		<< "    -r,--remote <host>(:<port>)  Connect to the given remote host (default: none).\n"
-		<< "    --port <port>  Connect to the given remote port (default: 30303).\n"
-		<< "    --network-id <n>  Only connect to other hosts with this network id.\n"
-		<< "    --upnp <on/off>  Use UPnP for NAT (default: on).\n"
-
-		<< "    --peerset <list>  Space delimited list of peers; element format: type:publickey@ipAddress[:port].\n"
-		<< "        Types:\n"
-		<< "        default		Attempt connection when no other peers are available and pinning is disabled.\n"
-		<< "        required		Keep connected at all times.\n"
-// TODO:
-//		<< "	--trust-peers <filename>  Space delimited list of publickeys." << endl
-
-		<< "    --no-discovery  Disable node discovery, implies --no-bootstrap.\n"
-		<< "    --pin  Only accept or connect to trusted peers.\n"
-		<< "    --hermit  Equivalent to --no-discovery --pin.\n"
-		<< "    --sociable  Force discovery and no pinning.\n\n";
-	MinerCLI::streamHelp(cout);
-	cout
-		<< "Import/export modes:\n"
-		<< "    --from <n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.\n"
-		<< "    --to <n>  Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'.\n"
-		<< "    --only <n>  Equivalent to --export-from n --export-to n.\n"
-		<< "    --dont-check  Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid.\n\n"
-		<< "    --import-snapshot <path>  Import blockchain and state data from the Parity Warp Sync snapshot." << endl
-		<< "General Options:\n"
-		<< "    -d,--db-path,--datadir <path>  Load database from path (default: " << getDataDir() << ").\n"
-#if ETH_EVMJIT
-		<< "    --vm <vm-kind>  Select VM; options are: interpreter, jit or smart (default: interpreter).\n"
-#endif // ETH_EVMJIT
-		<< "    -v,--verbosity <0 - 9>  Set the log verbosity from 0 to 9 (default: 8).\n"
-		<< "    -V,--version  Show the version and exit.\n"
-		<< "    -h,--help  Show this help message and exit.\n\n"
-		<< "Experimental / Proof of Concept:\n"
-		<< "    --shh  Enable Whisper.\n\n";
-		exit(0);
-}
-
 string ethCredits(bool _interactive = false)
 {
 	std::ostringstream cout;
 	if (_interactive)
-		cout
-			<< "Type 'exit' to quit\n\n";
+		cout << "Type 'exit' to quit\n\n";
 	return credits() + cout.str();
 }
 
@@ -179,7 +94,6 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
-
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -389,395 +303,553 @@ int main(int argc, char** argv)
 	bool chainConfigIsSet = false;
 	string configJSON;
 	string genesisJSON;
-	for (int i = 1; i < argc; ++i)
+	po::options_description clientDefaultMode("Client mode (default)");
+	clientDefaultMode.add_options()
+		("format", po::value<string>(), "<binary/hex/human> Set format.")
+		("script", po::value<string>(), "<script> Add script.")
+		("mainnet", "Use the main network protocol.")
+		("ropsten", "Use the Ropsten testnet.")
+		("testnet", "Use the Ropsten testnet.")
+		("gas-floor", po::value<string>(), "Set gasFloor")
+		("private", po::value<string>(), "<name> Use a private chain.")
+		("test", "Testing mode: Disable PoW and provide test rpc interface.")
+		("config", po::value<string>(), "<file> Configure specialised blockchain using given JSON information.")
+		("mode,o", po::value<string>(), "<full/peer>  Start a full node or a peer node (default: full).\n")
+		("ipc", "Enable IPC server (default: on).")
+		("ipcpath", po::value<string>(), "Set .ipc socket path (default: data directory)")
+		("no-ipc", "Disable IPC server.")
+		("admin", po::value<string>(), "<password>  Specify admin session key for JSON-RPC (default: auto-generated and printed at start-up).")
+		("kill,K", "Kill the blockchain first.")
+		("kill-blockchain", "Kill the blockchain first.")
+		("rebuild,R", "Rebuild the blockchain from the existing database.")
+		("rescue", "Attempt to rescue a corrupt database.\n")
+		("import-presale", po::value<string>(), "<file>  Import a pre-sale key; you'll need to specify the password to this key.")
+		("import-secret,s", po::value<string>(), "<secret>  Import a secret key into the key store.")
+		("import-session-secret,S", po::value<string>(), "<secret>  Import a secret session into the key store.")
+		("master", po::value<string>(), "<password>  Give the master password for the key store. Use --master \"\" to show a prompt.")
+		("password", po::value<string>(), "<password>  Give a password for a private key.\n")
+		("extra-data", po::value<string>(), "Set extra data")
+		("genesis", po::value<string>(), "Set genesisJSON")
+		("genesis-json", po::value<string>(), "Set genesisJSON")
+		("json-admin", po::value<string>(), "Set jsonAdmin");
+	po::options_description clientTransacting("Client transactions");
+	clientTransacting.add_options()
+		("ask", po::value<string>(), "See description under.")
+		("bid", po::value<string>(), "See description under.")
+		("unsafe-transactions", "Allow all transactions to proceed without verification. EXTREMELY UNSAFE.");
+	po::options_description clientMining("Client mining");
+	clientMining.add_options()
+		("address,a", po::value<string>(), "<addr>  Set the author (mining payout) address to given address (default: auto).")
+		("author", po::value<string>(), "<addr>  Set the author (mining payout) address to given address (default: auto).")
+		("mining,m", po::value<string>(), "<on/off/number>  Enable mining, optionally for a specified number of blocks (default: off).")
+		("cpu,C", "When mining, use the CPU.")
+		("mining-threads,t", "<n>  Limit number of CPU/GPU miners to n (default: use everything available on selected platform).");
+	po::options_description clientNetworking("Client networking");
+	clientNetworking.add_options()
+		("client-name", po::value<string>(), "<name>  Add a name to your client's version string (default: blank).")
+		("bootstrap,b",  "Connect to the default Ethereum peer servers (default unless --no-discovery used).")
+		("no-bootstrap",  "Do not connect to the default Ethereum peer servers (default only when --no-discovery is used).")
+		("peers,x", po::value<int>(), "<number>  Attempt to connect to a given number of peers (default: 11).")
+		("peer-stretch", po::value<int>(), "<number>  Give the accepted connection multiplier (default: 7).")
+		("public-ip", po::value<string>(), "<ip>  Force advertised public IP to the given IP (default: auto).")
+		("public", po::value<string>(), "<ip>  Force advertised public IP to the given IP (default: auto).")
+		("listen-ip", po::value<string>(), "<ip>(:<port>)  Listen on the given IP for incoming connections (default: 0.0.0.0).")
+		("listen", po::value<short>(), "<port>  Listen on the given port for incoming connections (default: 30303).")
+		("listen-port", po::value<short>(), "<port>  Listen on the given port for incoming connections (default: 30303).")
+		("remote,r", po::value<string>(), "<host>(:<port>)  Connect to the given remote host (default: none).")
+		("port", po::value<short>(), "<port>  Connect to the given remote port (default: 30303).")
+		("network-id", po::value<string>(), "<n>  Only connect to other hosts with this network id.")
+		("upnp", po::value<string>(), "<on/off>  Use UPnP for NAT (default: on).")
+		("peerset", po::value<string>(), "<list>  Space delimited list of peers; element format: type:publickey@ipAddress[:port].\n        Types:\n        default      Attempt connection when no other peers are available and pinning is disabled.\n        required	    Keep connected at all times.\n")
+		// TODO:
+		//		<< "	--trust-peers <filename>  Space delimited list of publickeys." << endl
+		("no-discovery",  "Disable node discovery, implies --no-bootstrap.")
+		("pin",  "Only accept or connect to trusted peers.")
+		("hermit",  "Equivalent to --no-discovery --pin.")
+		("sociable",  "Force discovery and no pinning.\n");
+	po::options_description importExportMode("Import/export mode");
+	importExportMode.add_options()
+		("from", po::value<string>(), "<n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.")
+		("to", po::value<string>(), "<n>  Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'.")
+		("only", po::value<string>(), "<n>  Equivalent to --export-from n --export-to n.")
+		("dont-check", "Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid.\n")
+		("import-snapshot", po::value<string>(), "<path>  Import blockchain and state data from the Parity Warp Sync snapshot.");
+	po::options_description generalOptions("General Options");
+	generalOptions.add_options()
+		("db-path,d", po::value<string>(), "See description under.")
+		("datadir", po::value<string>(), "See description under.")
+		("path", po::value<string>(), "See description under.")
+#if ETH_EVMJIT
+		("vm", "<vm-kind>  Select VM; options are: interpreter, jit or smart (default: interpreter)")
+#endif // ETH_EVMJIT
+		("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+		("version,V",  "Show the version and exit.")
+		("help,h",  "Show this help message and exit.\n");
+	po::options_description experimentalProofOfConcept("Experimental / Proof of Concept");
+	experimentalProofOfConcept.add_options()
+		("shh", "Enable Whisper.\n");
+	po::options_description allowedOptions("Allowed options");
+	allowedOptions.add(clientDefaultMode).add(clientTransacting).add(clientMining).add(clientNetworking).add(importExportMode).add(generalOptions);
+	po::variables_map vm;
+	vector<string> unrecognisedOptions;
+	try
+	{
+			po::parsed_options parsed = po::command_line_parser(argc, argv).options(allowedOptions).allow_unregistered().run();
+			unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+			po::store(parsed, vm);
+			po::notify(vm);
+	}
+	catch (po::error const& e)
 	{
-		string arg = argv[i];
-		if (m.interpretOption(i, argc, argv))
+			cerr << e.what();
+			return -1;
+	}
+	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
+	{
+		string arg = unrecognisedOptions[i];
+		if (m.interpretOption(i, unrecognisedOptions))
 		{
 		}
-		else if (arg == "--listen-ip" && i + 1 < argc)
+		else if ((arg == "-I" || arg == "--import" || arg == "import") && i + 1 < unrecognisedOptions.size())
 		{
-			listenIP = argv[++i];
-			listenSet = true;
+			mode = OperationMode::Import;
+			filename = unrecognisedOptions[++i];
 		}
-		else if ((arg == "--listen" || arg == "--listen-port") && i + 1 < argc)
+		else if ((arg == "-E" || arg == "--export" || arg == "export") && i + 1 < unrecognisedOptions.size())
 		{
-			listenPort = (short)atoi(argv[++i]);
-			listenSet = true;
+			mode = OperationMode::Export;
+			filename = unrecognisedOptions[++i];
 		}
-		else if ((arg == "--public-ip" || arg == "--public") && i + 1 < argc)
+		else
 		{
-			publicIP = argv[++i];
+			cerr << "Invalid argument: " << arg << "\n";
+			exit(-1);
 		}
-		else if ((arg == "-r" || arg == "--remote") && i + 1 < argc)
+	}
+#if ETH_EVMJIT
+	if (vm.count("vm"))
+	{
+		string vmKind = vm["vm"].as<string>();
+		if (vmKind == "interpreter")
+			VMFactory::setKind(VMKind::Interpreter);
+		else if (vmKind == "jit")
+			VMFactory::setKind(VMKind::JIT);
+		else if (vmKind == "smart")
+			VMFactory::setKind(VMKind::Smart);
+		else
 		{
-			string host = argv[++i];
-			string::size_type found = host.find_first_of(':');
-			if (found != std::string::npos)
+			cerr << "Unknown VM kind: " << vmKind << "\n";
+			return -1;
+		}
+	}
+#endif
+	if (vm.count(std::string("import-snapshot")))
+	{
+		mode = OperationMode::ImportSnapshot;
+		filename = vm[std::string("import-snapshot")].as<string>();
+	}
+	if (vm.count("shh"))
+		useWhisper = true;
+	if (vm.count("version"))
+		version();
+	if (vm.count("test"))
+	{
+		testingMode = true;
+		enableDiscovery = false;
+		disableDiscovery = true;
+		noPinning = true;
+		bootstrap = false;
+	}
+	if (vm.count("verbosity"))
+		g_logVerbosity = vm["verbosity"].as<int>();
+	if (vm.count("peers"))
+		peers = vm["peers"].as<int>();
+	if (vm.count("peer-stretch"))
+		peerStretch = vm["peer-stretch"].as<int>();
+	if (vm.count("peerset"))
+	{
+		string peerset = vm["peerset"].as<string>();
+		if (peerset.empty())
+		{
+			cerr << "--peerset argument must not be empty";
+			return -1;
+		}
+
+		vector<string> each;
+		boost::split(each, peerset, boost::is_any_of("\t "));
+		for (auto const& p: each)
+		{
+			string type;
+			string pubk;
+			string hostIP;
+			unsigned short port = c_defaultListenPort;
+
+			// type:key@ip[:port]
+			vector<string> typeAndKeyAtHostAndPort;
+			boost::split(typeAndKeyAtHostAndPort, p, boost::is_any_of(":"));
+			if (typeAndKeyAtHostAndPort.size() < 2 || typeAndKeyAtHostAndPort.size() > 3)
+				continue;
+
+			type = typeAndKeyAtHostAndPort[0];
+			if (typeAndKeyAtHostAndPort.size() == 3)
+				port = (uint16_t)atoi(typeAndKeyAtHostAndPort[2].c_str());
+
+			vector<string> keyAndHost;
+			boost::split(keyAndHost, typeAndKeyAtHostAndPort[1], boost::is_any_of("@"));
+			if (keyAndHost.size() != 2)
+				continue;
+			pubk = keyAndHost[0];
+			if (pubk.size() != 128)
+				continue;
+			hostIP = keyAndHost[1];
+
+			// todo: use Network::resolveHost()
+			if (hostIP.size() < 4 /* g.it */)
+				continue;
+
+			bool required = type == "required";
+			if (!required && type != "default")
+				continue;
+
+			Public publicKey(fromHex(pubk));
+			try
 			{
-				remoteHost = host.substr(0, found);
-				remotePort = (short)atoi(host.substr(found + 1, host.length()).c_str());
+				preferredNodes[publicKey] = make_pair(NodeIPEndpoint(bi::address::from_string(hostIP), port, port), required);
+			}
+			catch (...)
+			{
+				cerr << "Unrecognized peerset: " << peerset << "\n";
+				return -1;
 			}
-			else
-				remoteHost = host;
 		}
-		else if (arg == "--port" && i + 1 < argc)
+	}
+	if (vm.count("mode"))
+	{
+		string m = vm["mode"].as<string>();
+		if (m == "full")
+			nodeMode = NodeMode::Full;
+		else if (m == "peer")
+			nodeMode = NodeMode::PeerServer;
+		else
 		{
-			remotePort = (short)atoi(argv[++i]);
+			cerr << "Unknown mode: " << m << "\n";
+			return -1;
 		}
-		else if (arg == "--password" && i + 1 < argc)
-			passwordsToNote.push_back(argv[++i]);
-		else if (arg == "--master" && i + 1 < argc)
+	}
+	if (vm.count("import-presale"))
+		presaleImports.push_back(vm["import-presale"].as<string>());
+	if (vm.count("json-admin"))
+		jsonAdmin = vm["json-admin"].as<string>();
+	if (vm.count("ipc"))
+		ipc = true;
+	if (vm.count("no-ipc"))
+		ipc = false;
+	if (vm.count("mining"))
+	{
+		string m = vm["mining"].as<string>();
+		if (isTrue(m))
+			mining = ~(unsigned)0;
+		else if (isFalse(m))
+			mining = 0;
+		else
+			try
+			{
+				mining = stoi(m);
+			}
+			catch (...) {
+				cerr << "Unknown --mining option: " << m << "\n";
+				return -1;
+			}
+	}
+	if (vm.count("bootstrap"))
+		bootstrap = true;
+	if (vm.count("no-bootstrap"))
+		bootstrap = false;
+	if (vm.count("no-discovery"))
+	{
+		disableDiscovery = true;
+		bootstrap = false;
+	}
+	if (vm.count("pin"))
+		pinning = true;
+	if (vm.count("hermit"))
+		pinning = disableDiscovery = true;
+	if (vm.count("sociable"))
+		noPinning = enableDiscovery = true;
+	if (vm.count("unsafe-transactions"))
+		alwaysConfirm = false;
+	if (vm.count("path"))
+		setDataDir(vm["path"].as<string>());
+	if (vm.count("db-path"))
+		setDataDir(vm["db-path"].as<string>());
+	if (vm.count("datadir"))
+		setDataDir(vm["datadir"].as<string>());
+	if (vm.count("ipcpath"))
+		setIpcPath(vm["ipcpath"].as<string>());
+	if (vm.count("genesis"))
+	{
+		try
 		{
-			masterPassword = argv[++i];
-			masterSet = true;
+			genesisJSON = contentsString(vm["genesis"].as<string>());
 		}
-		else if ((arg == "-I" || arg == "--import" || arg == "import") && i + 1 < argc)
+		catch (...)
 		{
-			mode = OperationMode::Import;
-			filename = argv[++i];
+			cerr << "Bad --genesis option: " << vm["genesis"].as<string>() << "\n";
+			return -1;
 		}
-		else if (arg == "--dont-check")
-			safeImport = true;
-		else if ((arg == "-E" || arg == "--export" || arg == "export") && i + 1 < argc)
+	}
+	if (vm.count("genesis-json"))
+	{
+		try
 		{
-			mode = OperationMode::Export;
-			filename = argv[++i];
+			genesisJSON = contentsString(vm["genesis-json"].as<string>());
 		}
-		else if (arg == "--script" && i + 1 < argc)
-			scripts.push_back(argv[++i]);
-		else if (arg == "--format" && i + 1 < argc)
+		catch (...)
 		{
-			string m = argv[++i];
-			if (m == "binary")
-				exportFormat = Format::Binary;
-			else if (m == "hex")
-				exportFormat = Format::Hex;
-			else if (m == "human")
-				exportFormat = Format::Human;
-			else
-			{
-				cerr << "Bad " << arg << " option: " << m << "\n";
-				return -1;
-			}
+			cerr << "Bad --genesis-json option: " << vm["genesis-json"].as<string>() << "\n";
+			return -1;
 		}
-		else if (arg == "--to" && i + 1 < argc)
-			exportTo = argv[++i];
-		else if (arg == "--from" && i + 1 < argc)
-			exportFrom = argv[++i];
-		else if (arg == "--only" && i + 1 < argc)
-			exportTo = exportFrom = argv[++i];
-		else if (arg == "--upnp" && i + 1 < argc)
+	}
+	if (vm.count("config"))
+	{
+		try
 		{
-			string m = argv[++i];
-			if (isTrue(m))
-				upnp = true;
-			else if (isFalse(m))
-				upnp = false;
-			else
-			{
-				cerr << "Bad " << arg << " option: " << m << "\n";
-				return -1;
-			}
+			configJSON = contentsString(vm["config"].as<string>());
 		}
-		else if (arg == "--network-id" && i + 1 < argc)
-			try {
-				networkID = stol(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
-		else if (arg == "--private" && i + 1 < argc)
-			try {
-				privateChain = argv[++i];
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
-		else if (arg == "--independent" && i + 1 < argc)
-			try {
-				privateChain = argv[++i];
-				noPinning = enableDiscovery = true;
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
-		else if (arg == "-K" || arg == "--kill-blockchain" || arg == "--kill")
-			withExisting = WithExisting::Kill;
-		else if (arg == "-R" || arg == "--rebuild")
-			withExisting = WithExisting::Verify;
-		else if (arg == "-R" || arg == "--rescue")
-			withExisting = WithExisting::Rescue;
-		else if (arg == "--client-name" && i + 1 < argc)
-			clientName = argv[++i];
-		else if ((arg == "-a" || arg == "--address" || arg == "--author") && i + 1 < argc)
-			try {
-				author = h160(fromHex(argv[++i], WhenError::Throw));
-			}
-			catch (BadHexCharacter&)
-			{
-				cerr << "Bad hex in " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
-		else if ((arg == "-s" || arg == "--import-secret") && i + 1 < argc)
+		catch (...)
 		{
-			Secret s(fromHex(argv[++i]));
-			toImport.emplace_back(s);
+			cerr << "Bad --config option: " << vm["config"].as<string>() << "\n";
+			return -1;
 		}
-		else if ((arg == "-S" || arg == "--import-session-secret") && i + 1 < argc)
+	}
+	if (vm.count("extra-data"))
+	{
+		try
 		{
-			Secret s(fromHex(argv[++i]));
-			toImport.emplace_back(s);
+			extraData = fromHex(vm["extra-data"].as<string>());
 		}
-		else if ((arg == "-d" || arg == "--path" || arg == "--db-path" || arg == "--datadir") && i + 1 < argc)
-			setDataDir(argv[++i]);
-		else if (arg == "--ipcpath" && i + 1 < argc )
-			setIpcPath(argv[++i]);
-		else if ((arg == "--genesis-json" || arg == "--genesis") && i + 1 < argc)
+		catch (...)
 		{
-			try
-			{
-				genesisJSON = contentsString(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
+			cerr << "Bad " << "--extra-data" << " option: " << vm["extra-data"].as<string>() << "\n";
+			return -1;
+		}
+	}
+	if (vm.count("gas-floor"))
+		gasFloor = u256(vm["gas-floor"].as<string>());
+	if (vm.count("mainnet"))
+	{
+		chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
+		chainConfigIsSet = true;
+	}
+	if (vm.count("ropsten") || vm.count("testnet"))
+	{
+		chainParams = ChainParams(genesisInfo(eth::Network::Ropsten), genesisStateRoot(eth::Network::Ropsten));
+		chainConfigIsSet = true;
+	}
+	if (vm.count("ask"))
+	{
+		try
+		{
+			askPrice = u256(vm["ask"].as<string>());
 		}
-		else if (arg == "--config" && i + 1 < argc)
+		catch (...)
 		{
-			try
-			{
-				configJSON = contentsString(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
+			cerr << "Bad --ask option: " << vm["ask"].as<string>() << "\n";
+			return -1;
 		}
-		else if (arg == "--extra-data" && i + 1 < argc)
+	}
+	if (vm.count("bid"))
+	{
+		try
 		{
-			try
-			{
-				extraData = fromHex(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
+			bidPrice = u256(vm["bid"].as<string>());
 		}
-		else if (arg == "--gas-floor" && i + 1 < argc)
-			gasFloor = u256(argv[++i]);
-		else if (arg == "--mainnet")
+		catch (...)
 		{
-			chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
-			chainConfigIsSet = true;
+			cerr << "Bad --bid option: " << vm["bid"].as<string>() << "\n";
+			return -1;
 		}
-		else if (arg == "--ropsten" || arg == "--testnet")
+	}
+	if (vm.count("listen-ip"))
+	{
+		listenIP = vm["listen-ip"].as<string>();
+		listenSet = true;
+	}
+	if (vm.count("listen")) {
+		listenPort = vm["listen"].as<short>();
+		listenSet = true;
+	}
+	if (vm.count("listen-port")) {
+		listenPort = vm["listen-port"].as<short>();
+		listenSet = true;
+	}
+	if (vm.count("public-ip")) {
+		publicIP = vm["public-ip"].as<string>();
+	}
+	if (vm.count("public")) {
+		publicIP = vm["public"].as<string>();
+	}
+	if (vm.count("remote"))
+	{
+		string host = vm["remote"].as<string>();
+		string::size_type found = host.find_first_of(':');
+		if (found != std::string::npos)
 		{
-			chainParams = ChainParams(genesisInfo(eth::Network::Ropsten), genesisStateRoot(eth::Network::Ropsten));
-			chainConfigIsSet = true;
+			remoteHost = host.substr(0, found);
+			remotePort = (short)atoi(host.substr(found + 1, host.length()).c_str());
 		}
-		else if (arg == "--ask" && i + 1 < argc)
+		else
+			remoteHost = host;
+	}
+	if (vm.count("port"))
+	{
+		remotePort = vm["port"].as<short>();
+	}
+	if (vm.count("password"))
+		passwordsToNote.push_back(vm["password"].as<string>());
+	if (vm.count("master"))
+	{
+		masterPassword = vm["master"].as<string>();
+		masterSet = true;
+	}
+	if (vm.count("dont-check"))
+		safeImport = true;
+	if (vm.count("script"))
+		scripts.push_back(vm["script"].as<string>());
+	if (vm.count("format"))
+	{
+		string m = vm["format"].as<string>();
+		if (m == "binary")
+			exportFormat = Format::Binary;
+		else if (m == "hex")
+			exportFormat = Format::Hex;
+		else if (m == "human")
+			exportFormat = Format::Human;
+		else
 		{
-			try
-			{
-				askPrice = u256(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
+			cerr << "Bad " << "--format" << " option: " << m << "\n";
+			return -1;
 		}
-		else if (arg == "--bid" && i + 1 < argc)
+	}
+	if (vm.count("to"))
+		exportTo = vm["to"].as<string>();
+	if (vm.count("from"))
+		exportFrom = vm["from"].as<string>();
+	if (vm.count("only"))
+		exportTo = exportFrom = vm["only"].as<string>();
+	if (vm.count("upnp"))
+	{
+		string m = vm["upnp"].as<string>();
+		if (isTrue(m))
+			upnp = true;
+		else if (isFalse(m))
+			upnp = false;
+		else
 		{
-			try
-			{
-				bidPrice = u256(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << "\n";
-				return -1;
-			}
+			cerr << "Bad " << "--upnp" << " option: " << m << "\n";
+			return -1;
 		}
-		else if ((arg == "-m" || arg == "--mining") && i + 1 < argc)
+	}
+	if (vm.count("network-id"))
+		try
 		{
-			string m = argv[++i];
-			if (isTrue(m))
-				mining = ~(unsigned)0;
-			else if (isFalse(m))
-				mining = 0;
-			else
-				try {
-					mining = stoi(m);
-				}
-				catch (...) {
-					cerr << "Unknown " << arg << " option: " << m << "\n";
-					return -1;
-				}
+			networkID = stol(vm["network-id"].as<string>());
+		}
+		catch (...)
+		{
+			cerr << "Bad " << "--network-id" << " option: " << vm["network-id"].as<string>() << "\n";
+			return -1;
+		}
+	if (vm.count("private"))
+		try
+		{
+			privateChain = vm["private"].as<string>();
 		}
-		else if (arg == "-b" || arg == "--bootstrap")
-			bootstrap = true;
-		else if (arg == "--no-bootstrap")
-			bootstrap = false;
-		else if (arg == "--no-discovery")
+		catch (...)
 		{
-			disableDiscovery = true;
-			bootstrap = false;
+			cerr << "Bad " << "--private" << " option: " << vm["private"].as<string>() << "\n";
+			return -1;
 		}
-		else if (arg == "--pin")
-			pinning = true;
-		else if (arg == "--hermit")
-			pinning = disableDiscovery = true;
-		else if (arg == "--sociable")
+	if (vm.count("independent"))
+		try
+		{
+			privateChain = vm["independent"].as<string>();
 			noPinning = enableDiscovery = true;
-		else if (arg == "--unsafe-transactions")
-			alwaysConfirm = false;
-		else if (arg == "--import-presale" && i + 1 < argc)
-			presaleImports.push_back(argv[++i]);
-
-		else if (arg == "--json-admin" && i + 1 < argc)
-			jsonAdmin = argv[++i];
-		else if (arg == "--ipc")
-			ipc = true;
-		else if (arg == "--no-ipc")
-			ipc = false;
-
-		else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
-			g_logVerbosity = atoi(argv[++i]);
-		else if ((arg == "-x" || arg == "--peers") && i + 1 < argc)
-			peers = atoi(argv[++i]);
-		else if (arg == "--peer-stretch" && i + 1 < argc)
-			peerStretch = atoi(argv[++i]);
-		else if (arg == "--peerset" && i + 1 < argc)
+		}
+		catch (...)
 		{
-			string peerset = argv[++i];
-			if (peerset.empty())
-			{
-				cerr << "--peerset argument must not be empty";
-				return -1;
-			}
-
-			vector<string> each;
-			boost::split(each, peerset, boost::is_any_of("\t "));
-			for (auto const& p: each)
-			{
-				string type;
-				string pubk;
-				string hostIP;
-				unsigned short port = c_defaultListenPort;
-
-				// type:key@ip[:port]
-				vector<string> typeAndKeyAtHostAndPort;
-				boost::split(typeAndKeyAtHostAndPort, p, boost::is_any_of(":"));
-				if (typeAndKeyAtHostAndPort.size() < 2 || typeAndKeyAtHostAndPort.size() > 3)
-					continue;
-
-				type = typeAndKeyAtHostAndPort[0];
-				if (typeAndKeyAtHostAndPort.size() == 3)
-					port = (uint16_t)atoi(typeAndKeyAtHostAndPort[2].c_str());
-
-				vector<string> keyAndHost;
-				boost::split(keyAndHost, typeAndKeyAtHostAndPort[1], boost::is_any_of("@"));
-				if (keyAndHost.size() != 2)
-					continue;
-				pubk = keyAndHost[0];
-				if (pubk.size() != 128)
-					continue;
-				hostIP = keyAndHost[1];
-
-				// todo: use Network::resolveHost()
-				if (hostIP.size() < 4 /* g.it */)
-					continue;
-
-				bool required = type == "required";
-				if (!required && type != "default")
-					continue;
-
-				Public publicKey(fromHex(pubk));
-				try
-				{
-					preferredNodes[publicKey] = make_pair(NodeIPEndpoint(bi::address::from_string(hostIP), port, port), required);
-				}
-				catch (...)
-				{
-					cerr << "Unrecognized peerset: " << peerset << "\n";
-					return -1;
-				}
-			}
+			cerr << "Bad " << "--independent" << " option: " << vm["independent"].as<string>() << "\n";
+			return -1;
 		}
-		else if ((arg == "-o" || arg == "--mode") && i + 1 < argc)
+	if (vm.count("kill") || vm.count("kill-blockchain"))
+		withExisting = WithExisting::Kill;
+	if (vm.count("rebuild"))
+		withExisting = WithExisting::Verify;
+	if (vm.count("rescue"))
+		withExisting = WithExisting::Rescue;
+	if (vm.count("client-name"))
+		clientName = vm["client-name"].as<string>();
+	if (vm.count("address"))
+		try
 		{
-			string m = argv[++i];
-			if (m == "full")
-				nodeMode = NodeMode::Full;
-			else if (m == "peer")
-				nodeMode = NodeMode::PeerServer;
-			else
-			{
-				cerr << "Unknown mode: " << m << "\n";
-				return -1;
-			}
+			author = h160(fromHex(vm["address"].as<string>(), WhenError::Throw));
 		}
-#if ETH_EVMJIT
-		else if (arg == "--vm" && i + 1 < argc)
+		catch (BadHexCharacter&)
 		{
-			string vmKind = argv[++i];
-			if (vmKind == "interpreter")
-				VMFactory::setKind(VMKind::Interpreter);
-			else if (vmKind == "jit")
-				VMFactory::setKind(VMKind::JIT);
-			else if (vmKind == "smart")
-				VMFactory::setKind(VMKind::Smart);
-			else
-			{
-				cerr << "Unknown VM kind: " << vmKind << "\n";
-				return -1;
-			}
+			cerr << "Bad hex in " << "--adress" << " option: " << vm["address"].as<string>() << "\n";
+			return -1;
 		}
-#endif
-		else if (arg == "--shh")
-			useWhisper = true;
-		else if (arg == "-h" || arg == "--help")
-			help();
-		else if (arg == "-V" || arg == "--version")
-			version();
-		else if (arg == "--test")
+		catch (...)
+		{
+			cerr << "Bad " << "--adress" << " option: " << vm["address"].as<string>() << "\n";
+			return -1;
+		}
+	if (vm.count("author"))
+		try
 		{
-			testingMode = true;
-			enableDiscovery = false;
-			disableDiscovery = true;
-			noPinning = true;
-			bootstrap = false;
+			author = h160(fromHex(vm["author"].as<string>(), WhenError::Throw));
 		}
-		else if ((arg == std::string("--import-snapshot")) && i + 1 < argc)
+		catch (BadHexCharacter&)
 		{
-			mode = OperationMode::ImportSnapshot;
-			filename = argv[++i];
+			cerr << "Bad hex in " << "--author" << " option: " << vm["author"].as<string>() << "\n";
+			return -1;
 		}
-		else
+		catch (...)
 		{
-			cerr << "Invalid argument: " << arg << "\n";
-			exit(-1);
+			cerr << "Bad " << "--author" << " option: " << vm["author"].as<string>() << "\n";
+			return -1;
 		}
+	if ((vm.count("import-secret")))
+	{
+		Secret s(fromHex(vm["import-secret"].as<string>()));
+		toImport.emplace_back(s);
+	}
+	if (vm.count("import-session-secret"))
+	{
+		Secret s(fromHex(vm["import-session-secret"].as<string>()));
+		toImport.emplace_back(s);
+	}
+	if (vm.count("help"))
+	{
+		cout << "\n\n\n\n\n";
+		cout
+				<< "Usage eth [OPTIONS]\n"
+				<< "Options:\n\n"
+				<< "Wallet usage:\n";
+		AccountManager::streamAccountHelp(cout);
+		AccountManager::streamWalletHelp(cout);
+		cout << clientDefaultMode;
+		cout << clientTransacting;
+		cout << "  --ask                  <wei>  Set the minimum ask gas price under which no transaction will be mined\n                         (default" << toString(DefaultGasPrice) << ").\n";
+		cout << "  --bid                  <wei>  Set the bid gas price to pay for transactions\n                         (default " << toString(DefaultGasPrice) << ").\n";
+		cout << clientMining << clientNetworking;
+		MinerCLI::streamHelp(cout);
+		cout << importExportMode << generalOptions << "  -d[--db-path,--path,--datadir] <path>  Load database from path\n                          (default: " << getDataDir() << ").\n";
+		cout << experimentalProofOfConcept;
+		exit(0);
 	}
 
+
 	if (!configJSON.empty())
 	{
 		try
@@ -805,7 +877,7 @@ int main(int argc, char** argv)
 		{
 			cerr << "provided genesis block description is not well formatted\n";
 			string genesisSample =
-			R"E(
+					R"E(
 			{
 				"nonce": "0x0000000000000042",
 				"difficulty": "0x400000000",
@@ -920,7 +992,8 @@ int main(int argc, char** argv)
 			return web3.ethereum()->number();
 		if (s.size() == 64 || (s.size() == 66 && s.substr(0, 2) == "0x"))
 			return web3.ethereum()->blockChain().number(h256(s));
-		try {
+		try
+		{
 			return stol(s);
 		}
 		catch (...)
@@ -941,10 +1014,10 @@ int main(int argc, char** argv)
 			bytes block = web3.ethereum()->blockChain().block(web3.ethereum()->blockChain().numberHash(i));
 			switch (exportFormat)
 			{
-			case Format::Binary: out.write((char const*)block.data(), block.size()); break;
-			case Format::Hex: out << toHex(block) << "\n"; break;
-			case Format::Human: out << RLP(block) << "\n"; break;
-			default:;
+				case Format::Binary: out.write((char const*)block.data(), block.size()); break;
+				case Format::Hex: out << toHex(block) << "\n"; break;
+				case Format::Human: out << RLP(block) << "\n"; break;
+				default:;
 			}
 		}
 		return 0;
@@ -972,12 +1045,12 @@ int main(int argc, char** argv)
 
 			switch (web3.ethereum()->queueBlock(block, safeImport))
 			{
-			case ImportResult::Success: good++; break;
-			case ImportResult::AlreadyKnown: alreadyHave++; break;
-			case ImportResult::UnknownParent: unknownParent++; break;
-			case ImportResult::FutureTimeUnknown: unknownParent++; futureTime++; break;
-			case ImportResult::FutureTimeKnown: futureTime++; break;
-			default: bad++; break;
+				case ImportResult::Success: good++; break;
+				case ImportResult::AlreadyKnown: alreadyHave++; break;
+				case ImportResult::UnknownParent: unknownParent++; break;
+				case ImportResult::FutureTimeUnknown: unknownParent++; futureTime++; break;
+				case ImportResult::FutureTimeKnown: futureTime++; break;
+				default: bad++; break;
 			}
 
 			// sync chain with queue
@@ -1052,7 +1125,7 @@ int main(int argc, char** argv)
 			auto stateImporter = web3.ethereum()->createStateImporter();
 			auto blockChainImporter = web3.ethereum()->createBlockChainImporter();
 			SnapshotImporter importer(*stateImporter, *blockChainImporter);
-			
+
 			auto snapshotStorage(createSnapshotStorage(filename));
 			importer.import(*snapshotStorage);
 			// continue with regular sync from the snapshot block
@@ -1112,14 +1185,14 @@ int main(int argc, char** argv)
 				return true;
 
 			string r = getResponse(_t.userReadable(isProxy,
-				[&](TransactionSkeleton const& _t) -> pair<bool, string>
-				{
-					h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
-					if (contractCodeHash == EmptySHA3)
-						return std::make_pair(false, std::string());
-					// TODO: actually figure out the natspec. we'll need the natspec database here though.
-					return std::make_pair(true, std::string());
-				}, [&](Address const& _a) { return _a.hex(); }
+					[&](TransactionSkeleton const& _t) -> pair<bool, string>
+					{
+							h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
+							if (contractCodeHash == EmptySHA3)
+									return std::make_pair(false, std::string());
+							// TODO: actually figure out the natspec. we'll need the natspec database here though.
+							return std::make_pair(true, std::string());
+					}, [&](Address const& _a) { return _a.hex(); }
 			) + "\nEnter yes/no/always (always to this address): ", {"yes", "n", "N", "no", "NO", "always"});
 			if (r == "always")
 				allowedDestinations.insert(_t.to);
@@ -1144,18 +1217,21 @@ int main(int argc, char** argv)
 		if (testingMode)
 			testEth = new rpc::Test(*web3.ethereum());
 
-		jsonrpcIpcServer.reset(new FullServer(
-			ethFace, new rpc::Net(web3),
-			new rpc::Web3(web3.clientVersion()), new rpc::Personal(keyManager, *accountHolder, *web3.ethereum()),
-			new rpc::AdminEth(*web3.ethereum(), *gasPricer.get(), keyManager, *sessionManager.get()),
-			new rpc::AdminNet(web3, *sessionManager.get()),
-			new rpc::Debug(*web3.ethereum()),
-			testEth
-		));
-		auto ipcConnector = new IpcServer("geth");
-		jsonrpcIpcServer->addConnector(ipcConnector);
-		ipcConnector->StartListening();
-
+		if (ipc)
+		{
+			jsonrpcIpcServer.reset(new FullServer(
+					ethFace, new rpc::Whisper(web3, {}), new rpc::Net(web3),
+					new rpc::Web3(web3.clientVersion()), new rpc::Personal(keyManager, *accountHolder, *web3.ethereum()),
+					new rpc::AdminEth(*web3.ethereum(), *gasPricer.get(), keyManager, *sessionManager.get()),
+					new rpc::AdminNet(web3, *sessionManager.get()),
+					new rpc::AdminUtils(*sessionManager.get()),
+					new rpc::Debug(*web3.ethereum()),
+					testEth
+			));
+			auto ipcConnector = new IpcServer("geth");
+			jsonrpcIpcServer->addConnector(ipcConnector);
+			ipcConnector->StartListening();
+		}
 
 		if (jsonAdmin.empty())
 			jsonAdmin = sessionManager->newSession(rpc::SessionPermissions{{rpc::Privilege::Admin}});
@@ -1201,4 +1277,4 @@ int main(int argc, char** argv)
 	if (!netData.empty())
 		writeFile(getDataDir() / fs::path("network.rlp"), netData);
 	return 0;
-}
+}
\ No newline at end of file
diff --git a/ethkey/CMakeLists.txt b/ethkey/CMakeLists.txt
index 43629dd2a7a..c65a7ed8fab 100644
--- a/ethkey/CMakeLists.txt
+++ b/ethkey/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(ethkey KeyAux.h main.cpp)
-target_link_libraries(ethkey PRIVATE ethcore devcore)
+target_link_libraries(ethkey PRIVATE ethcore devcore Boost::program_options)
diff --git a/ethkey/KeyAux.h b/ethkey/KeyAux.h
index 0017f95f519..7d61d289cd8 100644
--- a/ethkey/KeyAux.h
+++ b/ethkey/KeyAux.h
@@ -107,8 +107,9 @@ class KeyCLI
 
 	KeyCLI(OperationMode _mode = OperationMode::None): m_mode(_mode) {}
 
-	bool interpretOption(int& i, int argc, char** argv)
+	bool interpretOption(size_t& i, vector<string> const& argv)
 	{
+		size_t argc = argv.size();
 		string arg = argv[i];
 		if (arg == "--wallet-path" && i + 1 < argc)
 			m_walletPath = argv[++i];
diff --git a/ethkey/main.cpp b/ethkey/main.cpp
index e6353e30424..d630274dbf6 100644
--- a/ethkey/main.cpp
+++ b/ethkey/main.cpp
@@ -1,16 +1,13 @@
 /*
 	This file is part of cpp-ethereum.
-
 	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	cpp-ethereum is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -26,26 +23,15 @@
 #include <libdevcore/FileSystem.h>
 #include <libdevcore/Log.h>
 #include <libethcore/KeyManager.h>
+#include <boost/program_options.hpp>
+#include <boost/program_options/options_description.hpp>
 #include "BuildInfo.h"
 #include "KeyAux.h"
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-void help()
-{
-	cout
-		<< "Usage ethkey [OPTIONS]" << endl
-		<< "Options:" << endl << endl;
-	KeyCLI::streamHelp(cout);
-	cout
-		<< "General Options:" << endl
-		<< "    -v,--verbosity <0 - 9>  Set the log verbosity from 0 to 9 (default: 8)." << endl
-		<< "    -V,--version  Show the version and exit." << endl
-		<< "    -h,--help  Show this help message and exit." << endl
-		;
-	exit(0);
-}
+namespace po = boost::program_options;
 
 void version()
 {
@@ -61,7 +47,6 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
-
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -82,25 +67,42 @@ int main(int argc, char** argv)
 	setDefaultOrCLocale();
 	KeyCLI m(KeyCLI::OperationMode::ListBare);
 	g_logVerbosity = 0;
-
-	for (int i = 1; i < argc; ++i)
+	po::options_description generalOptions("General Options");
+	generalOptions.add_options()
+			("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+			("version,V", "Show the version and exit.")
+			("help,h",  "Show this help message and exit.");
+	po::parsed_options parsed = po::command_line_parser(argc, argv).options(generalOptions).allow_unregistered().run();
+	vector<string> unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
 	{
-		string arg = argv[i];
-		if (m.interpretOption(i, argc, argv)) {}
-		else if ((arg == "-v" || arg == "--verbosity") && i + 1 < argc)
-			g_logVerbosity = atoi(argv[++i]);
-		else if (arg == "-h" || arg == "--help")
-			help();
-		else if (arg == "-V" || arg == "--version")
-			version();
+		string arg = unrecognisedOptions[i];
+		//cout << arg << " ";
+		if (m.interpretOption(i, unrecognisedOptions)) {}
 		else
 		{
 			cerr << "Invalid argument: " << arg << endl;
 			exit(-1);
 		}
 	}
+	po::variables_map vm;
+	po::store(parsed, vm);
+	po::notify(vm);
+	if (vm.count("help"))
+	{
+		cout
+				<< "Usage ethkey [OPTIONS]" << endl
+				<< "Options:" << endl << endl;
+		KeyCLI::streamHelp(cout);
+		cout << generalOptions;
+		exit(0);
+	}
+	if (vm.count("version"))
+		version();
+	if (vm.count("verbosity"))
+		g_logVerbosity = vm["verbosity"].as<int>();
 
 	m.execute();
 
 	return 0;
-}
+}
\ No newline at end of file

From d645a785e5cba0a1b65c69befea600fdeb2dc4d5 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Fri, 8 Dec 2017 16:53:06 +0100
Subject: [PATCH 2/8] Fix formatting

---
 eth/main.cpp | 92 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index 8910963ff88..f62e7499a70 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -1,13 +1,16 @@
 /*
 	This file is part of cpp-ethereum.
+
 	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
+
 	cpp-ethereum is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
+
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -74,7 +77,8 @@ string ethCredits(bool _interactive = false)
 {
 	std::ostringstream cout;
 	if (_interactive)
-		cout << "Type 'exit' to quit\n\n";
+		cout
+			<< "Type 'exit' to quit\n\n";
 	return credits() + cout.str();
 }
 
@@ -94,6 +98,7 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
+
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -303,6 +308,7 @@ int main(int argc, char** argv)
 	bool chainConfigIsSet = false;
 	string configJSON;
 	string genesisJSON;
+	
 	po::options_description clientDefaultMode("Client mode (default)");
 	clientDefaultMode.add_options()
 		("format", po::value<string>(), "<binary/hex/human> Set format.")
@@ -332,11 +338,13 @@ int main(int argc, char** argv)
 		("genesis", po::value<string>(), "Set genesisJSON")
 		("genesis-json", po::value<string>(), "Set genesisJSON")
 		("json-admin", po::value<string>(), "Set jsonAdmin");
+	
 	po::options_description clientTransacting("Client transactions");
 	clientTransacting.add_options()
 		("ask", po::value<string>(), "See description under.")
 		("bid", po::value<string>(), "See description under.")
 		("unsafe-transactions", "Allow all transactions to proceed without verification. EXTREMELY UNSAFE.");
+	
 	po::options_description clientMining("Client mining");
 	clientMining.add_options()
 		("address,a", po::value<string>(), "<addr>  Set the author (mining payout) address to given address (default: auto).")
@@ -344,6 +352,7 @@ int main(int argc, char** argv)
 		("mining,m", po::value<string>(), "<on/off/number>  Enable mining, optionally for a specified number of blocks (default: off).")
 		("cpu,C", "When mining, use the CPU.")
 		("mining-threads,t", "<n>  Limit number of CPU/GPU miners to n (default: use everything available on selected platform).");
+	
 	po::options_description clientNetworking("Client networking");
 	clientNetworking.add_options()
 		("client-name", po::value<string>(), "<name>  Add a name to your client's version string (default: blank).")
@@ -367,6 +376,7 @@ int main(int argc, char** argv)
 		("pin",  "Only accept or connect to trusted peers.")
 		("hermit",  "Equivalent to --no-discovery --pin.")
 		("sociable",  "Force discovery and no pinning.\n");
+	
 	po::options_description importExportMode("Import/export mode");
 	importExportMode.add_options()
 		("from", po::value<string>(), "<n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.")
@@ -374,6 +384,7 @@ int main(int argc, char** argv)
 		("only", po::value<string>(), "<n>  Equivalent to --export-from n --export-to n.")
 		("dont-check", "Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid.\n")
 		("import-snapshot", po::value<string>(), "<path>  Import blockchain and state data from the Parity Warp Sync snapshot.");
+	
 	po::options_description generalOptions("General Options");
 	generalOptions.add_options()
 		("db-path,d", po::value<string>(), "See description under.")
@@ -385,24 +396,27 @@ int main(int argc, char** argv)
 		("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
 		("version,V",  "Show the version and exit.")
 		("help,h",  "Show this help message and exit.\n");
+	
 	po::options_description experimentalProofOfConcept("Experimental / Proof of Concept");
 	experimentalProofOfConcept.add_options()
 		("shh", "Enable Whisper.\n");
+	
 	po::options_description allowedOptions("Allowed options");
 	allowedOptions.add(clientDefaultMode).add(clientTransacting).add(clientMining).add(clientNetworking).add(importExportMode).add(generalOptions);
+	
 	po::variables_map vm;
 	vector<string> unrecognisedOptions;
 	try
 	{
-			po::parsed_options parsed = po::command_line_parser(argc, argv).options(allowedOptions).allow_unregistered().run();
-			unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
-			po::store(parsed, vm);
-			po::notify(vm);
+		po::parsed_options parsed = po::command_line_parser(argc, argv).options(allowedOptions).allow_unregistered().run();
+		unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+		po::store(parsed, vm);
+		po::notify(vm);
 	}
 	catch (po::error const& e)
 	{
-			cerr << e.what();
-			return -1;
+		cerr << e.what();
+		return -1;
 	}
 	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
 	{
@@ -877,7 +891,7 @@ int main(int argc, char** argv)
 		{
 			cerr << "provided genesis block description is not well formatted\n";
 			string genesisSample =
-					R"E(
+			R"E(
 			{
 				"nonce": "0x0000000000000042",
 				"difficulty": "0x400000000",
@@ -1014,10 +1028,10 @@ int main(int argc, char** argv)
 			bytes block = web3.ethereum()->blockChain().block(web3.ethereum()->blockChain().numberHash(i));
 			switch (exportFormat)
 			{
-				case Format::Binary: out.write((char const*)block.data(), block.size()); break;
-				case Format::Hex: out << toHex(block) << "\n"; break;
-				case Format::Human: out << RLP(block) << "\n"; break;
-				default:;
+			case Format::Binary: out.write((char const*)block.data(), block.size()); break;
+			case Format::Hex: out << toHex(block) << "\n"; break;
+			case Format::Human: out << RLP(block) << "\n"; break;
+			default:;
 			}
 		}
 		return 0;
@@ -1045,12 +1059,12 @@ int main(int argc, char** argv)
 
 			switch (web3.ethereum()->queueBlock(block, safeImport))
 			{
-				case ImportResult::Success: good++; break;
-				case ImportResult::AlreadyKnown: alreadyHave++; break;
-				case ImportResult::UnknownParent: unknownParent++; break;
-				case ImportResult::FutureTimeUnknown: unknownParent++; futureTime++; break;
-				case ImportResult::FutureTimeKnown: futureTime++; break;
-				default: bad++; break;
+			case ImportResult::Success: good++; break;
+			case ImportResult::AlreadyKnown: alreadyHave++; break;
+			case ImportResult::UnknownParent: unknownParent++; break;
+			case ImportResult::FutureTimeUnknown: unknownParent++; futureTime++; break;
+			case ImportResult::FutureTimeKnown: futureTime++; break;
+			default: bad++; break;
 			}
 
 			// sync chain with queue
@@ -1185,14 +1199,14 @@ int main(int argc, char** argv)
 				return true;
 
 			string r = getResponse(_t.userReadable(isProxy,
-					[&](TransactionSkeleton const& _t) -> pair<bool, string>
-					{
-							h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
-							if (contractCodeHash == EmptySHA3)
-									return std::make_pair(false, std::string());
-							// TODO: actually figure out the natspec. we'll need the natspec database here though.
-							return std::make_pair(true, std::string());
-					}, [&](Address const& _a) { return _a.hex(); }
+				[&](TransactionSkeleton const& _t) -> pair<bool, string>
+				{
+					h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
+					if (contractCodeHash == EmptySHA3)
+						return std::make_pair(false, std::string());
+					// TODO: actually figure out the natspec. we'll need the natspec database here though.
+					return std::make_pair(true, std::string());
+				}, [&](Address const& _a) { return _a.hex(); }
 			) + "\nEnter yes/no/always (always to this address): ", {"yes", "n", "N", "no", "NO", "always"});
 			if (r == "always")
 				allowedDestinations.insert(_t.to);
@@ -1217,21 +1231,17 @@ int main(int argc, char** argv)
 		if (testingMode)
 			testEth = new rpc::Test(*web3.ethereum());
 
-		if (ipc)
-		{
-			jsonrpcIpcServer.reset(new FullServer(
-					ethFace, new rpc::Whisper(web3, {}), new rpc::Net(web3),
-					new rpc::Web3(web3.clientVersion()), new rpc::Personal(keyManager, *accountHolder, *web3.ethereum()),
-					new rpc::AdminEth(*web3.ethereum(), *gasPricer.get(), keyManager, *sessionManager.get()),
-					new rpc::AdminNet(web3, *sessionManager.get()),
-					new rpc::AdminUtils(*sessionManager.get()),
-					new rpc::Debug(*web3.ethereum()),
-					testEth
-			));
-			auto ipcConnector = new IpcServer("geth");
-			jsonrpcIpcServer->addConnector(ipcConnector);
-			ipcConnector->StartListening();
-		}
+		jsonrpcIpcServer.reset(new FullServer(
+			ethFace, new rpc::Net(web3),
+			new rpc::Web3(web3.clientVersion()), new rpc::Personal(keyManager, *accountHolder, *web3.ethereum()),
+			new rpc::AdminEth(*web3.ethereum(), *gasPricer.get(), keyManager, *sessionManager.get()),
+			new rpc::AdminNet(web3, *sessionManager.get()),
+			new rpc::Debug(*web3.ethereum()),
+			testEth
+		));
+		auto ipcConnector = new IpcServer("geth");
+		jsonrpcIpcServer->addConnector(ipcConnector);
+		ipcConnector->StartListening();
 
 		if (jsonAdmin.empty())
 			jsonAdmin = sessionManager->newSession(rpc::SessionPermissions{{rpc::Privilege::Admin}});

From 48da1c8a4494639b0adf49747194c0018d3e48e1 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Mon, 11 Dec 2017 12:24:58 +0100
Subject: [PATCH 3/8] Catch exceptions from boost.program_options; user return
 from main instead of exit()

---
 ethkey/main.cpp | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/ethkey/main.cpp b/ethkey/main.cpp
index d630274dbf6..1d77fb6e890 100644
--- a/ethkey/main.cpp
+++ b/ethkey/main.cpp
@@ -1,5 +1,6 @@
 /*
 	This file is part of cpp-ethereum.
+
 	cpp-ethereum is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
@@ -8,6 +9,7 @@
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
+
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -69,33 +71,43 @@ int main(int argc, char** argv)
 	g_logVerbosity = 0;
 	po::options_description generalOptions("General Options");
 	generalOptions.add_options()
-			("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
-			("version,V", "Show the version and exit.")
-			("help,h",  "Show this help message and exit.");
-	po::parsed_options parsed = po::command_line_parser(argc, argv).options(generalOptions).allow_unregistered().run();
-	vector<string> unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+		("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+		("version,V", "Show the version and exit.")
+		("help,h",  "Show this help message and exit.");
+
+	po::variables_map vm;
+	vector<string> unrecognisedOptions;
+	try
+	{
+		po::parsed_options parsed = po::command_line_parser(argc, argv).options(generalOptions).allow_unregistered().run();
+		unrecognisedOptions = collect_unrecognized(parsed.options, po::include_positional);
+		po::store(parsed, vm);
+		po::notify(vm);
+	}
+	catch (po::error const& e)
+	{
+		cerr << e.what();
+		return -1;
+	}
+
 	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
 	{
 		string arg = unrecognisedOptions[i];
-		//cout << arg << " ";
-		if (m.interpretOption(i, unrecognisedOptions)) {}
-		else
+		if (!m.interpretOption(i, unrecognisedOptions))
 		{
 			cerr << "Invalid argument: " << arg << endl;
-			exit(-1);
+			return -1;
 		}
 	}
-	po::variables_map vm;
-	po::store(parsed, vm);
-	po::notify(vm);
+
 	if (vm.count("help"))
 	{
 		cout
-				<< "Usage ethkey [OPTIONS]" << endl
-				<< "Options:" << endl << endl;
+			<< "Usage ethkey [OPTIONS]" << endl
+			<< "Options:" << endl << endl;
 		KeyCLI::streamHelp(cout);
 		cout << generalOptions;
-		exit(0);
+		return 0;
 	}
 	if (vm.count("version"))
 		version();

From 4ba824f329f4d5d98db964b2b9a5ba19bc4573e7 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Mon, 11 Dec 2017 19:37:13 +0100
Subject: [PATCH 4/8] Remove some deprecated options. Remove multiletter option
 aliases as boost.program_options doesn't support them. Help output
 improvements.

---
 eth/main.cpp    | 198 ++++++++++++++++--------------------------------
 ethkey/main.cpp |   8 +-
 2 files changed, 67 insertions(+), 139 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index f62e7499a70..1d852041659 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -71,7 +71,11 @@ using namespace boost::algorithm;
 namespace po = boost::program_options;
 namespace fs = boost::filesystem;
 
-static std::atomic<bool> g_silence = {false};
+namespace
+{
+
+std::atomic<bool> g_silence = {false};
+unsigned const c_lineWidth = 160;
 
 string ethCredits(bool _interactive = false)
 {
@@ -197,6 +201,8 @@ class ExitHandler
 
 bool ExitHandler::s_shouldExit = false;
 
+}
+
 int main(int argc, char** argv)
 {
 	setDefaultOrCLocale();
@@ -213,9 +219,6 @@ int main(int argc, char** argv)
 
 	/// Operating mode.
 	OperationMode mode = OperationMode::Node;
-//	unsigned prime = 0;
-//	bool yesIReallyKnowWhatImDoing = false;
-	strings scripts;
 
 	/// File name for import/export.
 	string filename;
@@ -233,14 +236,12 @@ int main(int argc, char** argv)
 
 	string jsonAdmin;
 	ChainParams chainParams;
-	u256 gasFloor = Invalid256;
 	string privateChain;
 
 	bool upnp = true;
 	WithExisting withExisting = WithExisting::Trust;
 
 	/// Networking params.
-	string clientName;
 	string listenIP;
 	unsigned short listenPort = 30303;
 	string publicIP;
@@ -309,98 +310,79 @@ int main(int argc, char** argv)
 	string configJSON;
 	string genesisJSON;
 	
-	po::options_description clientDefaultMode("Client mode (default)");
+	po::options_description clientDefaultMode("Client mode (default)", c_lineWidth);
 	clientDefaultMode.add_options()
-		("format", po::value<string>(), "<binary/hex/human> Set format.")
-		("script", po::value<string>(), "<script> Add script.")
 		("mainnet", "Use the main network protocol.")
 		("ropsten", "Use the Ropsten testnet.")
-		("testnet", "Use the Ropsten testnet.")
-		("gas-floor", po::value<string>(), "Set gasFloor")
-		("private", po::value<string>(), "<name> Use a private chain.")
+		("private", po::value<string>()->value_name("<name>"), "Use a private chain.")
 		("test", "Testing mode: Disable PoW and provide test rpc interface.")
-		("config", po::value<string>(), "<file> Configure specialised blockchain using given JSON information.")
-		("mode,o", po::value<string>(), "<full/peer>  Start a full node or a peer node (default: full).\n")
+		("config", po::value<string>()->value_name("<file>"), "Configure specialised blockchain using given JSON information.\n")
+		("genesis", po::value<string>()->value_name("<file>"), "Set genesis JSON file.")
+		("mode,o", po::value<string>()->value_name("<full/peer>"), "Start a full node or a peer node (default: full).\n")
 		("ipc", "Enable IPC server (default: on).")
-		("ipcpath", po::value<string>(), "Set .ipc socket path (default: data directory)")
+		("ipcpath", po::value<string>()->value_name("<path>"), "Set .ipc socket path (default: data directory)")
 		("no-ipc", "Disable IPC server.")
-		("admin", po::value<string>(), "<password>  Specify admin session key for JSON-RPC (default: auto-generated and printed at start-up).")
+		("admin", po::value<string>()->value_name("<password>"), "Specify admin session key for JSON-RPC (default: auto-generated and printed at start-up).")
 		("kill,K", "Kill the blockchain first.")
-		("kill-blockchain", "Kill the blockchain first.")
 		("rebuild,R", "Rebuild the blockchain from the existing database.")
 		("rescue", "Attempt to rescue a corrupt database.\n")
-		("import-presale", po::value<string>(), "<file>  Import a pre-sale key; you'll need to specify the password to this key.")
-		("import-secret,s", po::value<string>(), "<secret>  Import a secret key into the key store.")
-		("import-session-secret,S", po::value<string>(), "<secret>  Import a secret session into the key store.")
-		("master", po::value<string>(), "<password>  Give the master password for the key store. Use --master \"\" to show a prompt.")
-		("password", po::value<string>(), "<password>  Give a password for a private key.\n")
-		("extra-data", po::value<string>(), "Set extra data")
-		("genesis", po::value<string>(), "Set genesisJSON")
-		("genesis-json", po::value<string>(), "Set genesisJSON")
-		("json-admin", po::value<string>(), "Set jsonAdmin");
+		("import-presale", po::value<string>()->value_name("<file>"), "Import a pre-sale key; you'll need to specify the password to this key.")
+		("import-secret,s", po::value<string>()->value_name("<secret>"), "Import a secret key into the key store.")
+		("import-session-secret,S", po::value<string>()->value_name("<secret>"), "Import a secret session into the key store.")
+		("master", po::value<string>()->value_name("<password>"), "Give the master password for the key store. Use --master \"\" to show a prompt.")
+		("password", po::value<string>()->value_name("<password>"), "Give a password for a private key.\n");
 	
-	po::options_description clientTransacting("Client transactions");
+	po::options_description clientTransacting("Client transacting", c_lineWidth);
 	clientTransacting.add_options()
-		("ask", po::value<string>(), "See description under.")
-		("bid", po::value<string>(), "See description under.")
-		("unsafe-transactions", "Allow all transactions to proceed without verification. EXTREMELY UNSAFE.");
+		("ask", po::value<u256>()->value_name("<wei>"), ("Set the minimum ask gas price under which no transaction will be mined\n(default " + toString(DefaultGasPrice) + ").").c_str())
+		("bid", po::value<u256>()->value_name("<wei>"), ("Set the bid gas price to pay for transactions\n(default " + toString(DefaultGasPrice) + ").").c_str())
+		("unsafe-transactions", "Allow all transactions to proceed without verification. EXTREMELY UNSAFE.\n");
 	
-	po::options_description clientMining("Client mining");
+	po::options_description clientMining("Client mining", c_lineWidth);
 	clientMining.add_options()
-		("address,a", po::value<string>(), "<addr>  Set the author (mining payout) address to given address (default: auto).")
-		("author", po::value<string>(), "<addr>  Set the author (mining payout) address to given address (default: auto).")
-		("mining,m", po::value<string>(), "<on/off/number>  Enable mining, optionally for a specified number of blocks (default: off).")
-		("cpu,C", "When mining, use the CPU.")
-		("mining-threads,t", "<n>  Limit number of CPU/GPU miners to n (default: use everything available on selected platform).");
-	
-	po::options_description clientNetworking("Client networking");
+		("address,a", po::value<Address>()->value_name("<addr>"), "Set the author (mining payout) address to given address (default: auto).")
+		("mining,m", po::value<string>()->value_name("<on/off/number>"), "Enable mining, optionally for a specified number of blocks (default: off).")
+		("extra-data", po::value<string>(), "Set extra data for the sealed blocks.\n");
+
+	po::options_description clientNetworking("Client networking", c_lineWidth);
 	clientNetworking.add_options()
-		("client-name", po::value<string>(), "<name>  Add a name to your client's version string (default: blank).")
 		("bootstrap,b",  "Connect to the default Ethereum peer servers (default unless --no-discovery used).")
 		("no-bootstrap",  "Do not connect to the default Ethereum peer servers (default only when --no-discovery is used).")
-		("peers,x", po::value<int>(), "<number>  Attempt to connect to a given number of peers (default: 11).")
-		("peer-stretch", po::value<int>(), "<number>  Give the accepted connection multiplier (default: 7).")
-		("public-ip", po::value<string>(), "<ip>  Force advertised public IP to the given IP (default: auto).")
-		("public", po::value<string>(), "<ip>  Force advertised public IP to the given IP (default: auto).")
-		("listen-ip", po::value<string>(), "<ip>(:<port>)  Listen on the given IP for incoming connections (default: 0.0.0.0).")
-		("listen", po::value<short>(), "<port>  Listen on the given port for incoming connections (default: 30303).")
-		("listen-port", po::value<short>(), "<port>  Listen on the given port for incoming connections (default: 30303).")
-		("remote,r", po::value<string>(), "<host>(:<port>)  Connect to the given remote host (default: none).")
-		("port", po::value<short>(), "<port>  Connect to the given remote port (default: 30303).")
-		("network-id", po::value<string>(), "<n>  Only connect to other hosts with this network id.")
-		("upnp", po::value<string>(), "<on/off>  Use UPnP for NAT (default: on).")
-		("peerset", po::value<string>(), "<list>  Space delimited list of peers; element format: type:publickey@ipAddress[:port].\n        Types:\n        default      Attempt connection when no other peers are available and pinning is disabled.\n        required	    Keep connected at all times.\n")
-		// TODO:
-		//		<< "	--trust-peers <filename>  Space delimited list of publickeys." << endl
+		("peers,x", po::value<int>()->value_name("<number>"), "Attempt to connect to a given number of peers (default: 11).")
+		("peer-stretch", po::value<int>()->value_name("<number>"), "Give the accepted connection multiplier (default: 7).")
+		("public-ip", po::value<string>()->value_name("<ip>"), "Force advertised public IP to the given IP (default: auto).")
+		("listen-ip", po::value<string>()->value_name("<ip>(:<port>)"), "Listen on the given IP for incoming connections (default: 0.0.0.0).")
+		("listen", po::value<unsigned short>()->value_name("<port>"), "Listen on the given port for incoming connections (default: 30303).")
+		("remote,r", po::value<string>()->value_name("<host>(:<port>)"), "Connect to the given remote host (default: none).")
+		("port", po::value<short>()->value_name("<port>"), "Connect to the given remote port (default: 30303).")
+		("network-id", po::value<unsigned>()->value_name("<n>"), "Only connect to other hosts with this network id.")
+		("upnp", po::value<string>()->value_name("<on/off>"), "Use UPnP for NAT (default: on).")
+		("peerset", po::value<string>()->value_name("<list>"), "Space delimited list of peers; element format: type:publickey@ipAddress[:port].\n        Types:\n        default     Attempt connection when no other peers are available and pinning is disabled.\n        required	    Keep connected at all times.\n")
 		("no-discovery",  "Disable node discovery, implies --no-bootstrap.")
 		("pin",  "Only accept or connect to trusted peers.")
 		("hermit",  "Equivalent to --no-discovery --pin.")
 		("sociable",  "Force discovery and no pinning.\n");
 	
-	po::options_description importExportMode("Import/export mode");
+	po::options_description importExportMode("Import/export modes", c_lineWidth);
 	importExportMode.add_options()
-		("from", po::value<string>(), "<n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.")
-		("to", po::value<string>(), "<n>  Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'.")
-		("only", po::value<string>(), "<n>  Equivalent to --export-from n --export-to n.")
-		("dont-check", "Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid.\n")
-		("import-snapshot", po::value<string>(), "<path>  Import blockchain and state data from the Parity Warp Sync snapshot.");
+		("from", po::value<string>()->value_name("<n>"), "Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.")
+		("to", po::value<string>()->value_name("<n>"), "Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'.")
+		("only", po::value<string>()->value_name("<n>"), "Equivalent to --export-from n --export-to n.")
+		("format", po::value<string>()->value_name("<binary/hex/human>"), "Set export format.")
+		("dont-check", "Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid.")
+		("import-snapshot", po::value<string>()->value_name("<path>"), "Import blockchain and state data from the Parity Warp Sync snapshot.\n");
 	
-	po::options_description generalOptions("General Options");
+	po::options_description generalOptions("General Options", c_lineWidth);
 	generalOptions.add_options()
-		("db-path,d", po::value<string>(), "See description under.")
-		("datadir", po::value<string>(), "See description under.")
-		("path", po::value<string>(), "See description under.")
+		("db-path,d", po::value<string>()->value_name("<path>"), ("Load database from path\n(default: " + getDataDir().string() + ").\n").c_str())
 #if ETH_EVMJIT
 		("vm", "<vm-kind>  Select VM; options are: interpreter, jit or smart (default: interpreter)")
 #endif // ETH_EVMJIT
-		("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+		("verbosity,v", po::value<int>()->value_name("<0 - 9>"), "Set the log verbosity from 0 to 9 (default: 8).")
 		("version,V",  "Show the version and exit.")
 		("help,h",  "Show this help message and exit.\n");
 	
-	po::options_description experimentalProofOfConcept("Experimental / Proof of Concept");
-	experimentalProofOfConcept.add_options()
-		("shh", "Enable Whisper.\n");
-	
+
 	po::options_description allowedOptions("Allowed options");
 	allowedOptions.add(clientDefaultMode).add(clientTransacting).add(clientMining).add(clientNetworking).add(importExportMode).add(generalOptions);
 	
@@ -552,8 +534,8 @@ int main(int argc, char** argv)
 	}
 	if (vm.count("import-presale"))
 		presaleImports.push_back(vm["import-presale"].as<string>());
-	if (vm.count("json-admin"))
-		jsonAdmin = vm["json-admin"].as<string>();
+	if (vm.count("admin"))
+		jsonAdmin = vm["admin"].as<string>();
 	if (vm.count("ipc"))
 		ipc = true;
 	if (vm.count("no-ipc"))
@@ -612,18 +594,6 @@ int main(int argc, char** argv)
 			return -1;
 		}
 	}
-	if (vm.count("genesis-json"))
-	{
-		try
-		{
-			genesisJSON = contentsString(vm["genesis-json"].as<string>());
-		}
-		catch (...)
-		{
-			cerr << "Bad --genesis-json option: " << vm["genesis-json"].as<string>() << "\n";
-			return -1;
-		}
-	}
 	if (vm.count("config"))
 	{
 		try
@@ -648,14 +618,12 @@ int main(int argc, char** argv)
 			return -1;
 		}
 	}
-	if (vm.count("gas-floor"))
-		gasFloor = u256(vm["gas-floor"].as<string>());
 	if (vm.count("mainnet"))
 	{
 		chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
 		chainConfigIsSet = true;
 	}
-	if (vm.count("ropsten") || vm.count("testnet"))
+	if (vm.count("ropsten"))
 	{
 		chainParams = ChainParams(genesisInfo(eth::Network::Ropsten), genesisStateRoot(eth::Network::Ropsten));
 		chainConfigIsSet = true;
@@ -664,7 +632,7 @@ int main(int argc, char** argv)
 	{
 		try
 		{
-			askPrice = u256(vm["ask"].as<string>());
+			askPrice = vm["ask"].as<u256>();
 		}
 		catch (...)
 		{
@@ -676,7 +644,7 @@ int main(int argc, char** argv)
 	{
 		try
 		{
-			bidPrice = u256(vm["bid"].as<string>());
+			bidPrice = vm["bid"].as<u256>();
 		}
 		catch (...)
 		{
@@ -690,19 +658,12 @@ int main(int argc, char** argv)
 		listenSet = true;
 	}
 	if (vm.count("listen")) {
-		listenPort = vm["listen"].as<short>();
-		listenSet = true;
-	}
-	if (vm.count("listen-port")) {
-		listenPort = vm["listen-port"].as<short>();
+		listenPort = vm["listen"].as<unsigned short>();
 		listenSet = true;
 	}
 	if (vm.count("public-ip")) {
 		publicIP = vm["public-ip"].as<string>();
 	}
-	if (vm.count("public")) {
-		publicIP = vm["public"].as<string>();
-	}
 	if (vm.count("remote"))
 	{
 		string host = vm["remote"].as<string>();
@@ -728,8 +689,6 @@ int main(int argc, char** argv)
 	}
 	if (vm.count("dont-check"))
 		safeImport = true;
-	if (vm.count("script"))
-		scripts.push_back(vm["script"].as<string>());
 	if (vm.count("format"))
 	{
 		string m = vm["format"].as<string>();
@@ -767,7 +726,7 @@ int main(int argc, char** argv)
 	if (vm.count("network-id"))
 		try
 		{
-			networkID = stol(vm["network-id"].as<string>());
+			networkID = vm["network-id"].as<unsigned>();
 		}
 		catch (...)
 		{
@@ -795,42 +754,25 @@ int main(int argc, char** argv)
 			cerr << "Bad " << "--independent" << " option: " << vm["independent"].as<string>() << "\n";
 			return -1;
 		}
-	if (vm.count("kill") || vm.count("kill-blockchain"))
+	if (vm.count("kill"))
 		withExisting = WithExisting::Kill;
 	if (vm.count("rebuild"))
 		withExisting = WithExisting::Verify;
 	if (vm.count("rescue"))
 		withExisting = WithExisting::Rescue;
-	if (vm.count("client-name"))
-		clientName = vm["client-name"].as<string>();
 	if (vm.count("address"))
 		try
 		{
-			author = h160(fromHex(vm["address"].as<string>(), WhenError::Throw));
-		}
-		catch (BadHexCharacter&)
-		{
-			cerr << "Bad hex in " << "--adress" << " option: " << vm["address"].as<string>() << "\n";
-			return -1;
-		}
-		catch (...)
-		{
-			cerr << "Bad " << "--adress" << " option: " << vm["address"].as<string>() << "\n";
-			return -1;
-		}
-	if (vm.count("author"))
-		try
-		{
-			author = h160(fromHex(vm["author"].as<string>(), WhenError::Throw));
+			author = vm["address"].as<Address>();
 		}
 		catch (BadHexCharacter&)
 		{
-			cerr << "Bad hex in " << "--author" << " option: " << vm["author"].as<string>() << "\n";
+			cerr << "Bad hex in " << "--address" << " option: " << vm["address"].as<string>() << "\n";
 			return -1;
 		}
 		catch (...)
 		{
-			cerr << "Bad " << "--author" << " option: " << vm["author"].as<string>() << "\n";
+			cerr << "Bad " << "--address" << " option: " << vm["address"].as<string>() << "\n";
 			return -1;
 		}
 	if ((vm.count("import-secret")))
@@ -845,21 +787,15 @@ int main(int argc, char** argv)
 	}
 	if (vm.count("help"))
 	{
-		cout << "\n\n\n\n\n";
 		cout
 				<< "Usage eth [OPTIONS]\n"
 				<< "Options:\n\n"
 				<< "Wallet usage:\n";
 		AccountManager::streamAccountHelp(cout);
 		AccountManager::streamWalletHelp(cout);
-		cout << clientDefaultMode;
-		cout << clientTransacting;
-		cout << "  --ask                  <wei>  Set the minimum ask gas price under which no transaction will be mined\n                         (default" << toString(DefaultGasPrice) << ").\n";
-		cout << "  --bid                  <wei>  Set the bid gas price to pay for transactions\n                         (default " << toString(DefaultGasPrice) << ").\n";
-		cout << clientMining << clientNetworking;
+		cout << clientDefaultMode << clientTransacting << clientMining << clientNetworking;
 		MinerCLI::streamHelp(cout);
-		cout << importExportMode << generalOptions << "  -d[--db-path,--path,--datadir] <path>  Load database from path\n                          (default: " << getDataDir() << ").\n";
-		cout << experimentalProofOfConcept;
+		cout << importExportMode << generalOptions;
 		exit(0);
 	}
 
@@ -915,12 +851,9 @@ int main(int argc, char** argv)
 		chainParams.difficulty = chainParams.minimumDifficulty;
 		chainParams.gasLimit = u256(1) << 32;
 	}
-	// TODO: Open some other API path
-//	if (gasFloor != Invalid256)
-//		c_gasFloorTarget = gasFloor;
 
 	if (!chainConfigIsSet)
-		// default to mainnet if not already set with any of `--mainnet`, `--testnet`, `--genesis`, `--config`
+		// default to mainnet if not already set with any of `--mainnet`, `--ropsten`, `--genesis`, `--config`
 		chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
 
 	if (g_logVerbosity > 0)
@@ -940,9 +873,6 @@ int main(int argc, char** argv)
 	// the first value is deprecated (never used)
 	writeFile(configFile, rlpList(author, author));
 
-	if (!clientName.empty())
-		clientName += "/";
-
 	string logbuf;
 	std::string additional;
 
diff --git a/ethkey/main.cpp b/ethkey/main.cpp
index 1d77fb6e890..7c06fac2d41 100644
--- a/ethkey/main.cpp
+++ b/ethkey/main.cpp
@@ -49,6 +49,7 @@ to set locale to fail, so there are only two possible actions, the first is to
 throw a runtime exception and cause the program to quit (default behaviour),
 or the second is to modify the environment to something sensible (least
 surprising behaviour).
+
 The follow code produces the least surprising behaviour. It will use the user
 specified default locale if it is valid, and if not then it will modify the
 environment the process is running in to use a sensible default. This also means
@@ -71,7 +72,7 @@ int main(int argc, char** argv)
 	g_logVerbosity = 0;
 	po::options_description generalOptions("General Options");
 	generalOptions.add_options()
-		("verbosity,v", po::value<int>(), "<0 - 9>  Set the log verbosity from 0 to 9 (default: 8).")
+		("verbosity,v", po::value<int>()->value_name("<0 - 9>"), "Set the log verbosity from 0 to 9 (default: 8).")
 		("version,V", "Show the version and exit.")
 		("help,h",  "Show this help message and exit.");
 
@@ -91,14 +92,11 @@ int main(int argc, char** argv)
 	}
 
 	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
-	{
-		string arg = unrecognisedOptions[i];
 		if (!m.interpretOption(i, unrecognisedOptions))
 		{
-			cerr << "Invalid argument: " << arg << endl;
+			cerr << "Invalid argument: " << unrecognisedOptions[i] << endl;
 			return -1;
 		}
-	}
 
 	if (vm.count("help"))
 	{

From cf5a78876142d4c84fc383f2689a283cb28374a7 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Mon, 11 Dec 2017 19:50:23 +0100
Subject: [PATCH 5/8] Remove unused functions.

---
 eth/main.cpp | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index 1d852041659..a5f49c5ce40 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -124,33 +124,6 @@ void importPresale(KeyManager& _km, string const& _file, function<string()> _pas
 	_km.import(k.secret(), "Presale wallet" + _file + " (insecure)");
 }
 
-Address c_config = Address("ccdeac59d35627b7de09332e819d5159e7bb7250");
-string pretty(h160 _a, dev::eth::State const& _st)
-{
-	string ns;
-	h256 n;
-	if (h160 nameReg = (u160)_st.storage(c_config, 0))
-		n = _st.storage(nameReg, (u160)(_a));
-	if (n)
-	{
-		std::string s((char const*)n.data(), 32);
-		if (s.find_first_of('\0') != string::npos)
-			s.resize(s.find_first_of('\0'));
-		ns = " " + s;
-	}
-	return ns;
-}
-
-inline bool isPrime(unsigned _number)
-{
-	if (((!(_number & 1)) && _number != 2 ) || (_number < 2) || (_number % 3 == 0 && _number != 3))
-		return false;
-	for(unsigned k = 1; 36 * k * k - 12 * k < _number; ++k)
-		if ((_number % (6 * k + 1) == 0) || (_number % (6 * k - 1) == 0))
-			return false;
-	return true;
-}
-
 enum class NodeMode
 {
 	PeerServer,

From 68be8c2b5cb2b9c811c8a8f1774bc60a9493c132 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Tue, 12 Dec 2017 17:57:02 +0100
Subject: [PATCH 6/8] Remove "import" and "export" options (without dashes) and
 handle "--import" and ""--export" as other regular options

---
 eth/main.cpp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index a5f49c5ce40..0eac568b0b9 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -338,6 +338,8 @@ int main(int argc, char** argv)
 	
 	po::options_description importExportMode("Import/export modes", c_lineWidth);
 	importExportMode.add_options()
+		("import,I", po::value<string>()->value_name("<file>"), "Import blocks from file.")
+		("export,E", po::value<string>()->value_name("<file>"), "Export blocks to file.")
 		("from", po::value<string>()->value_name("<n>"), "Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'.")
 		("to", po::value<string>()->value_name("<n>"), "Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'.")
 		("only", po::value<string>()->value_name("<n>"), "Equivalent to --export-from n --export-to n.")
@@ -374,27 +376,12 @@ int main(int argc, char** argv)
 		return -1;
 	}
 	for (size_t i = 0; i < unrecognisedOptions.size(); ++i)
-	{
-		string arg = unrecognisedOptions[i];
-		if (m.interpretOption(i, unrecognisedOptions))
-		{
-		}
-		else if ((arg == "-I" || arg == "--import" || arg == "import") && i + 1 < unrecognisedOptions.size())
-		{
-			mode = OperationMode::Import;
-			filename = unrecognisedOptions[++i];
-		}
-		else if ((arg == "-E" || arg == "--export" || arg == "export") && i + 1 < unrecognisedOptions.size())
-		{
-			mode = OperationMode::Export;
-			filename = unrecognisedOptions[++i];
-		}
-		else
+		if (!m.interpretOption(i, unrecognisedOptions))
 		{
-			cerr << "Invalid argument: " << arg << "\n";
+			cerr << "Invalid argument: " << unrecognisedOptions[i] << "\n";
 			exit(-1);
 		}
-	}
+
 #if ETH_EVMJIT
 	if (vm.count("vm"))
 	{
@@ -653,6 +640,16 @@ int main(int argc, char** argv)
 	{
 		remotePort = vm["port"].as<short>();
 	}
+	if (vm.count("import"))
+	{
+		mode = OperationMode::Import;
+		filename = vm["import"].as<string>();
+	}
+	if (vm.count("export"))
+	{
+		mode = OperationMode::Export;
+		filename = vm["export"].as<string>();
+	}
 	if (vm.count("password"))
 		passwordsToNote.push_back(vm["password"].as<string>());
 	if (vm.count("master"))

From 2a537ab8fe094da4cde771f8fcaf9f22a63c0aec Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Tue, 12 Dec 2017 18:32:27 +0100
Subject: [PATCH 7/8] Remove some more unused stuff

---
 eth/main.cpp | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index 0eac568b0b9..0a8a9159cbe 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -251,7 +251,6 @@ int main(int argc, char** argv)
 	bool masterSet = false;
 
 	/// Whisper
-	bool useWhisper = false;
 	bool testingMode = false;
 
 	fs::path configFile = getDataDir() / fs::path("config.rlp");
@@ -399,13 +398,11 @@ int main(int argc, char** argv)
 		}
 	}
 #endif
-	if (vm.count(std::string("import-snapshot")))
+	if (vm.count("import-snapshot"))
 	{
 		mode = OperationMode::ImportSnapshot;
-		filename = vm[std::string("import-snapshot")].as<string>();
+		filename = vm["import-snapshot"].as<string>();
 	}
-	if (vm.count("shh"))
-		useWhisper = true;
 	if (vm.count("version"))
 		version();
 	if (vm.count("test"))
@@ -534,12 +531,8 @@ int main(int argc, char** argv)
 		noPinning = enableDiscovery = true;
 	if (vm.count("unsafe-transactions"))
 		alwaysConfirm = false;
-	if (vm.count("path"))
-		setDataDir(vm["path"].as<string>());
 	if (vm.count("db-path"))
 		setDataDir(vm["db-path"].as<string>());
-	if (vm.count("datadir"))
-		setDataDir(vm["datadir"].as<string>());
 	if (vm.count("ipcpath"))
 		setIpcPath(vm["ipcpath"].as<string>());
 	if (vm.count("genesis"))
@@ -713,17 +706,6 @@ int main(int argc, char** argv)
 			cerr << "Bad " << "--private" << " option: " << vm["private"].as<string>() << "\n";
 			return -1;
 		}
-	if (vm.count("independent"))
-		try
-		{
-			privateChain = vm["independent"].as<string>();
-			noPinning = enableDiscovery = true;
-		}
-		catch (...)
-		{
-			cerr << "Bad " << "--independent" << " option: " << vm["independent"].as<string>() << "\n";
-			return -1;
-		}
 	if (vm.count("kill"))
 		withExisting = WithExisting::Kill;
 	if (vm.count("rebuild"))
@@ -879,7 +861,7 @@ int main(int argc, char** argv)
 	netPrefs.pin = (pinning || !privateChain.empty()) && !noPinning;
 
 	auto nodesState = contents(getDataDir() / fs::path("network.rlp"));
-	auto caps = useWhisper ? set<string>{"eth", "shh"} : set<string>{"eth"};
+	auto caps = set<string>{"eth"};
 
 	if (testingMode)
 	{

From 4b0bb1ccf49df89fe165ad1b4ea5870b468dfbda Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Tue, 12 Dec 2017 19:53:30 +0100
Subject: [PATCH 8/8] Replace exit() calls with return from main.

---
 eth/main.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eth/main.cpp b/eth/main.cpp
index 0a8a9159cbe..3de2477ced4 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -92,7 +92,6 @@ void version()
 	cout << "eth network protocol version: " << dev::eth::c_protocolVersion << "\n";
 	cout << "Client database version: " << dev::eth::c_databaseVersion << "\n";
 	cout << "Build: " << DEV_QUOTED(ETH_BUILD_PLATFORM) << "/" << DEV_QUOTED(ETH_BUILD_TYPE) << "\n";
-	exit(0);
 }
 
 /*
@@ -378,7 +377,7 @@ int main(int argc, char** argv)
 		if (!m.interpretOption(i, unrecognisedOptions))
 		{
 			cerr << "Invalid argument: " << unrecognisedOptions[i] << "\n";
-			exit(-1);
+			return -1;
 		}
 
 #if ETH_EVMJIT
@@ -404,7 +403,10 @@ int main(int argc, char** argv)
 		filename = vm["import-snapshot"].as<string>();
 	}
 	if (vm.count("version"))
+	{
 		version();
+		return 0;
+	}
 	if (vm.count("test"))
 	{
 		testingMode = true;
@@ -748,7 +750,7 @@ int main(int argc, char** argv)
 		cout << clientDefaultMode << clientTransacting << clientMining << clientNetworking;
 		MinerCLI::streamHelp(cout);
 		cout << importExportMode << generalOptions;
-		exit(0);
+		return 0;
 	}
 
 
@@ -895,7 +897,7 @@ int main(int argc, char** argv)
 		catch (...)
 		{
 			cerr << "Bad block number/hash option: " << s << "\n";
-			exit(-1);
+			return -1;
 		}
 	};