Fixes for import/export.

eth/main.cpp

@@ -116,9 +116,9 @@ void help()
 		<< "    -D,--create-dag <this/next/number>  Create the DAG in preparation for mining on given block and exit." << endl
 		<< "    -e,--ether-price <n>  Set the ether price in the reference unit e.g. ¢ (Default: 30.679)." << endl
 		<< "    -E,--export <file>  Export file as a concatenated series of blocks and exit." << endl
-		<< "    --export-from <n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl
+		<< "    --from <n>  Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl
-		<< "    --export-to <n>  Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl
+		<< "    --to <n>  Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl
-		<< "    --export-only <n>  Equivalent to --export-from n --export-to n." << endl
+		<< "    --only <n>  Equivalent to --export-from n --export-to n." << endl
 		<< "    -f,--force-mining  Mine even when there are no transaction to mine (Default: off)" << endl
 		<< "    -h,--help  Show this help message and exit." << endl
 		<< "    -i,--interactive  Enter interactive mode (default: non-interactive)." << endl
@@ -222,8 +222,18 @@ enum class OperationMode
 	DAGInit
 };
 
+enum class Format
+{
+	Binary,
+	Hex,
+	Human
+};
+
 int main(int argc, char** argv)
 {
+	// Init defaults
+	Defaults::get();
+
 	/// Operating mode.
 	OperationMode mode = OperationMode::Node;
 	string dbPath;
@@ -234,6 +244,7 @@ int main(int argc, char** argv)
 	/// Hashes/numbers for export range.
 	string exportFrom = "1";
 	string exportTo = "latest";
+	Format exportFormat = Format::Binary;
 
 	/// DAG initialisation param.
 	unsigned initDAG;
@@ -263,6 +274,8 @@ int main(int argc, char** argv)
 	int miners = -1;
 	bool forceMining = false;
 	bool turboMining = false;
+	KeyPair us = KeyPair::create();
+	Address coinbase = us.address();
 
 	/// Structured logging params
 	bool structuredLogging = false;
@@ -273,13 +286,6 @@ int main(int argc, char** argv)
 	double etherPrice = 30.679;
 	double blockFees = 15.0;
 
-	// Init defaults
-	Defaults::get();
-
-	// Our address.
-	KeyPair us = KeyPair::create();
-	Address coinbase = us.address();
-
 	string configFile = getDataDir() + "/config.rlp";
 	bytes b = contents(configFile);
 	if (b.size())
@@ -288,12 +294,6 @@ int main(int argc, char** argv)
 		us = KeyPair(config[0].toHash<Secret>());
 		coinbase = config[1].toHash<Address>();
 	}
-	else
-	{
-		RLPStream config(2);
-		config << us.secret() << coinbase;
-		writeFile(configFile, config.out());
-	}
 
 	for (int i = 1; i < argc; ++i)
 	{
@@ -318,6 +318,27 @@ int main(int argc, char** argv)
 			mode = OperationMode::Export;
 			filename = argv[++i];
 		}
+		else if (arg == "--format" && i + 1 < argc)
+		{
+			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 << endl;
+				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 == "-n" || arg == "--upnp") && i + 1 < argc)
 		{
 			string m = argv[++i];
@@ -327,7 +348,7 @@ int main(int argc, char** argv)
 				upnp = false;
 			else
 			{
-				cerr << "Invalid -n/--upnp option: " << m << endl;
+				cerr << "Bad " << arg << " option: " << m << endl;
 				return -1;
 			}
 		}
@@ -344,14 +365,13 @@ int main(int argc, char** argv)
 			}
 			catch (BadHexCharacter& _e)
 			{
-				cwarn << "invalid hex character, coinbase rejected";
+				cerr << "Bad hex in " << arg << " option: " << argv[i] << endl;
-				cwarn << boost::diagnostic_information(_e);
+				return -1;
-				break;
 			}
 			catch (...)
 			{
-				cwarn << "coinbase rejected";
+				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				break;
+				return -1;
 			}
 		else if ((arg == "-s" || arg == "--secret") && i + 1 < argc)
 			us = KeyPair(h256(fromHex(argv[++i])));
@@ -495,6 +515,11 @@ int main(int argc, char** argv)
 		}
 	}
 
+	{
+		RLPStream config(2);
+		config << us.secret() << coinbase;
+		writeFile(configFile, config.out());
+	}
 
 	// Two codepaths is necessary since named block require database, but numbered
 	// blocks are superuseful to have when database is already open in another process.
@@ -504,8 +529,6 @@ int main(int argc, char** argv)
 	if (!clientName.empty())
 		clientName += "/";
 
-	cout << credits();
-
 	StructuredLogger::get().initialize(structuredLogging, structuredLoggingFormat);
 	VMFactory::setKind(jit ? VMKind::JIT : VMKind::Interpreter);
 	auto netPrefs = publicIP.empty() ? NetworkPreferences(listenIP ,listenPort, upnp) : NetworkPreferences(publicIP, listenIP ,listenPort, upnp);
@@ -541,34 +564,66 @@ int main(int argc, char** argv)
 
 	if (mode == OperationMode::Export)
 	{
-		ofstream fout;
+		ofstream fout(filename, std::ofstream::binary);
-		fout.open(filename);
+		ostream& out = (filename.empty() || filename == "--") ? cout : fout;
+
 		unsigned last = toNumber(exportTo);
 		for (unsigned i = toNumber(exportFrom); i <= last; ++i)
 		{
 			bytes block = web3.ethereum()->blockChain().block(web3.ethereum()->blockChain().numberHash(i));
-			fout.write((char const*)block.data(), block.size());
+			switch (exportFormat)
+			{
+			case Format::Binary: out.write((char const*)block.data(), block.size()); break;
+			case Format::Hex: out << toHex(block) << endl; break;
+			case Format::Human: out << RLP(block) << endl; break;
+			default:;
+			}
 		}
 		return 0;
 	}
 
 	if (mode == OperationMode::Import)
 	{
-		ifstream fin;
+		ifstream fin(filename, std::ifstream::binary);
-		fin.open(filename);
+		istream& in = (filename.empty() || filename == "--") ? cin : fin;
-
+		unsigned alreadyHave = 0;
-		while (fin)
+		unsigned good = 0;
+		unsigned futureTime = 0;
+		unsigned unknownParent = 0;
+		unsigned bad = 0;
+		while (in.peek() != -1)
 		{
 			bytes block(8);
-			fin.read((char*)block.data(), 8);
+			in.read((char*)block.data(), 8);
-			unsigned remaining = RLP(block, RLP::LaisezFaire).actualSize() - 8;
+			block.resize(RLP(block, RLP::LaisezFaire).actualSize());
-			block.resize(remaining);
+			in.read((char*)block.data() + 8, block.size() - 8);
-			fin.read((char*)block.data() + 8, remaining);
+			try
-			web3.ethereum()->injectBlock(block);
+			{
+				web3.ethereum()->injectBlock(block);
+				good++;
+			}
+			catch (AlreadyHaveBlock const&)
+			{
+				alreadyHave++;
+			}
+			catch (UnknownParent const&)
+			{
+				unknownParent++;
+			}
+			catch (FutureTime const&)
+			{
+				futureTime++;
+			}
+			catch (...)
+			{
+				bad++;
+			}
 		}
+		cout << (good + bad + futureTime + unknownParent + alreadyHave) << " total: " << good << " ok, " << alreadyHave << " got, " << futureTime << " future, " << unknownParent << " unknown parent, " << bad << " malformed." << endl;
 		return 0;
 	}
 
+	cout << credits();
 	web3.setIdealPeerCount(peers);
 	std::shared_ptr<eth::BasicGasPricer> gasPricer = make_shared<eth::BasicGasPricer>(u256(double(ether / 1000) / etherPrice), u256(blockFees * 1000));
 	eth::Client* c = nodeMode == NodeMode::Full ? web3.ethereum() : nullptr;
@@ -645,10 +700,9 @@ int main(int argc, char** argv)
 			}
 			else if (cmd == "connect")
 			{
-				string addr;
+				string addrPort;
-				unsigned port;
+				iss >> addrPort;
-				iss >> addr >> port;
+				web3.addNode(p2p::NodeId(), addrPort);
-				web3.addNode(p2p::NodeId(), addr + ":" + toString(port ? port : p2p::c_defaultIPPort));
 			}
 			else if (cmd == "netstop")
 			{

libdevcore/Log.cpp

@@ -43,7 +43,7 @@ void dev::simpleDebugOut(std::string const& _s, char const*)
 	static Mutex s_lock;
 	Guard l(s_lock);
 
-	cout << _s << endl << flush;
+	cerr << _s << endl << flush;
 
 	// helpful to use OutputDebugString on windows
 	#ifdef _WIN32

libdevcore/Worker.cpp

@@ -29,11 +29,11 @@ using namespace dev;
 
 void Worker::startWorking()
 {
-	cdebug << "startWorking for thread" << m_name;
+	cnote << "startWorking for thread" << m_name;
 	Guard l(x_work);
 	if (m_work)
 		return;
-	cdebug << "Spawning" << m_name;
+	cnote << "Spawning" << m_name;
 	m_stop = false;
 	m_work.reset(new thread([&]()
 	{
@@ -45,21 +45,21 @@ void Worker::startWorking()
 				this_thread::sleep_for(chrono::milliseconds(m_idleWaitMs));
 			doWork();
 		}
-		cdebug << "Finishing up worker thread";
+		cnote << "Finishing up worker thread";
 		doneWorking();
 	}));
 }
 
 void Worker::stopWorking()
 {
-	cdebug << "stopWorking for thread" << m_name;
+	cnote << "stopWorking for thread" << m_name;
 	Guard l(x_work);
 	if (!m_work)
 		return;
-	cdebug << "Stopping" << m_name;
+	cnote << "Stopping" << m_name;
 	m_stop = true;
 	m_work->join();
 	m_work.reset();
-	cdebug << "Stopped" << m_name;
+	cnote << "Stopped" << m_name;
 }