Variety of minor improvements and fixes.

CMakeLists.txt

@@ -329,9 +329,9 @@ message("-- SOLIDITY         Build Solidity language components       ${SOLIDITY
 message("-- SERPENT          Build Serpent language components        ${SERPENT}")
 message("-- GUI              Build GUI components                     ${GUI}")
 message("-- TESTS            Build tests                              ${TESTS}")
-message("-- ETHASHCL         Build OpenCL components (experimental!)  ${ETHASHCL}")
+message("-- ETHASHCL         Build OpenCL components                  ${ETHASHCL}")
 message("-- JSCONSOLE        Build with javascript console            ${JSCONSOLE}")
-message("-- EVMJIT           Build LLVM-based JIT EVM (experimental!) ${EVMJIT}")
+message("-- EVMJIT           Build LLVM-based JIT EVM                 ${EVMJIT}")
 message("------------------------------------------------------------------------")
 message("")
 

alethzero/MainWin.cpp

@@ -423,6 +423,7 @@ void Main::installWatches()
 {
 	auto newBlockId = installWatch(ChainChangedFilter, [=](LocalisedLogEntries const&){
 		onNewBlock();
+		onNewPending();
 	});
 	auto newPendingId = installWatch(PendingChangedFilter, [=](LocalisedLogEntries const&){
 		onNewPending();
@@ -1353,7 +1354,7 @@ void Main::refreshBlockCount()
 		syncStatus += QString(": %1/%2").arg(sync.blocksReceived).arg(sync.blocksTotal);
 	ui->syncStatus->setText(syncStatus);
 	ui->chainStatus->setText(QString("%3 importing %4 ready %5 verifying %6 unverified %7 future %8 unknown %9 bad  %1 #%2")
-		.arg(m_privateChain.size() ? "[" + m_privateChain + "] " : "testnet").arg(d.number).arg(b.importing).arg(b.verified).arg(b.verifying).arg(b.unverified).arg(b.future).arg(b.unknown).arg(b.bad));
+		.arg(m_privateChain.size() ? "[" + m_privateChain + "] " : c_network == eth::Network::Olympic ? "Olympic" : "Frontier").arg(d.number).arg(b.importing).arg(b.verified).arg(b.verifying).arg(b.unverified).arg(b.future).arg(b.unknown).arg(b.bad));
 }
 
 void Main::on_turboMining_triggered()

libethereum/BlockChain.cpp

@@ -620,6 +620,7 @@ ImportRoute BlockChain::import(VerifiedBlockRef const& _block, OverlayDB const&
 	{
 		ex << errinfo_now(time(0));
 		ex << errinfo_block(_block.block.toBytes());
+		ex << errinfo_extraData(_block.info.extraData());
 		throw;
 	}
 #endif

libethereum/BlockChain.h

@@ -463,6 +463,7 @@ public:
 					ex << errinfo_transactionIndex(i);
 					ex << errinfo_transaction(d.toBytes());
 					ex << errinfo_block(_block.toBytes());
+					ex << errinfo_extraData(h.extraData());
 					if (_onBad)
 						_onBad(ex);
 					throw;

libethereum/Client.cpp

@@ -464,7 +464,9 @@ void Client::setShouldPrecomputeDAG(bool _precompute)
 void Client::setTurboMining(bool _enable)
 {
 	m_turboMining = _enable;
-	sealEngine()->setSealer("opencl");
+#if ETH_ETHASHCL || !ETH_TRUE
+	sealEngine()->setSealer(_enable ? "opencl" : "cpu");
+#endif
 	if (isMining())
 		startMining();
 }