From 4dc64ba23b23ce81b89156dc66986c3663b98b11 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 25 Jul 2015 10:51:40 +0200 Subject: [PATCH] Variety of minor improvements and fixes. --- CMakeLists.txt | 4 ++-- alethzero/MainWin.cpp | 3 ++- libethereum/BlockChain.cpp | 1 + libethereum/BlockChain.h | 1 + libethereum/Client.cpp | 4 +++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d92ee90a..207034a59 100644 --- a/CMakeLists.txt +++ b/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("") diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 9da8840db..181a77467 100644 --- a/alethzero/MainWin.cpp +++ b/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() diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp index 3c798a01f..bd96f6607 100644 --- a/libethereum/BlockChain.cpp +++ b/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 diff --git a/libethereum/BlockChain.h b/libethereum/BlockChain.h index b77ff66eb..847857a64 100644 --- a/libethereum/BlockChain.h +++ b/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; diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index e730308ac..d0445b612 100644 --- a/libethereum/Client.cpp +++ b/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(); }