More aggressive bad-block policy.

libethereum/BlockChain.cpp

@@ -315,41 +315,44 @@ tuple<h256s, h256s, bool> BlockChain::sync(BlockQueue& _bq, OverlayDB const& _st
 	h256s fresh;
 	h256s dead;
 	h256s badBlocks;
-	for (auto const& block: blocks)
+	for (VerifiedBlock const& block: blocks)
-	{
+		if (!badBlocks.empty())
-		try
-		{
-			// Nonce & uncle nonces already verified in verification thread at this point.
-			ImportRoute r;
-			DEV_TIMED_ABOVE(Block import, 500)
-				r = import(block.verified, _stateDB, ImportRequirements::Default & ~ImportRequirements::ValidNonce & ~ImportRequirements::CheckUncles);
-			fresh += r.first;
-			dead += r.second;
-		}
-		catch (dev::eth::UnknownParent)
-		{
-			cwarn << "ODD: Import queue contains block with unknown parent." << LogTag::Error << boost::current_exception_diagnostic_information();
-			// NOTE: don't reimport since the queue should guarantee everything in the right order.
-			// Can't continue - chain bad.
 			badBlocks.push_back(block.verified.info.hash());
-		}
+		else
-		catch (dev::eth::FutureTime)
-		{
-			cwarn << "ODD: Import queue contains a block with future time." << LogTag::Error << boost::current_exception_diagnostic_information();
-			// NOTE: don't reimport since the queue should guarantee everything in the past.
-			// Can't continue - chain bad.
-			badBlocks.push_back(block.verified.info.hash());
-		}
-		catch (Exception& ex)
 		{
-			cnote << "Exception while importing block. Someone (Jeff? That you?) seems to be giving us dodgy blocks!" << LogTag::Error << diagnostic_information(ex);
+			try
-			if (m_onBad)
+			{
-				m_onBad(ex);
+				// Nonce & uncle nonces already verified in verification thread at this point.
-			// NOTE: don't reimport since the queue should guarantee everything in the right order.
+				ImportRoute r;
-			// Can't continue - chain  bad.
+				DEV_TIMED_ABOVE(Block import, 500)
-			badBlocks.push_back(block.verified.info.hash());
+					r = import(block.verified, _stateDB, ImportRequirements::Default & ~ImportRequirements::ValidNonce & ~ImportRequirements::CheckUncles);
+				fresh += r.first;
+				dead += r.second;
+			}
+			catch (dev::eth::UnknownParent)
+			{
+				cwarn << "ODD: Import queue contains block with unknown parent." << LogTag::Error << boost::current_exception_diagnostic_information();
+				// NOTE: don't reimport since the queue should guarantee everything in the right order.
+				// Can't continue - chain bad.
+				badBlocks.push_back(block.verified.info.hash());
+			}
+			catch (dev::eth::FutureTime)
+			{
+				cwarn << "ODD: Import queue contains a block with future time." << LogTag::Error << boost::current_exception_diagnostic_information();
+				// NOTE: don't reimport since the queue should guarantee everything in the past.
+				// Can't continue - chain bad.
+				badBlocks.push_back(block.verified.info.hash());
+			}
+			catch (Exception& ex)
+			{
+				cnote << "Exception while importing block. Someone (Jeff? That you?) seems to be giving us dodgy blocks!" << LogTag::Error << diagnostic_information(ex);
+				if (m_onBad)
+					m_onBad(ex);
+				// NOTE: don't reimport since the queue should guarantee everything in the right order.
+				// Can't continue - chain  bad.
+				badBlocks.push_back(block.verified.info.hash());
+			}
 		}
-	}
 	return make_tuple(fresh, dead, _bq.doneDrain(badBlocks));
 }
 

libethereum/BlockQueue.cpp

@@ -99,7 +99,7 @@ void BlockQueue::verifierBody()
 					m_verifying.erase(it);
 					goto OK1;
 				}
-			cwarn << "GAA BlockQueue corrupt: job cancelled but cannot be found in m_verifying queue.";
+			cwarn << "BlockQueue missing our job: was there a GM?";
 			OK1:;
 			continue;
 		}
@@ -127,7 +127,7 @@ void BlockQueue::verifierBody()
 						i = move(res);
 						goto OK;
 					}
-				cwarn << "GAA BlockQueue corrupt: job finished but cannot be found in m_verifying queue.";
+				cwarn << "BlockQueue missing our job: was there a GM?";
 				OK:;
 			}
 		}
@@ -229,23 +229,16 @@ bool BlockQueue::doneDrain(h256s const& _bad)
 	DEV_INVARIANT_CHECK;
 	m_drainingSet.clear();
 	if (_bad.size())
-	{
+		// one of them was bad. since they all rely on their parent, all following are bad.
-		vector<VerifiedBlock> old;
 		DEV_GUARDED(m_verification)
-			swap(m_verified, old);
-		for (auto& b: old)
 		{
-			if (m_knownBad.count(b.verified.info.parentHash))
+			m_knownBad += _bad;
-			{
+			m_knownBad += m_readySet;
-				m_knownBad.insert(b.verified.info.hash());
+			m_readySet.clear();
-				m_readySet.erase(b.verified.info.hash());
+			m_verified.clear();
-			}
+			m_verifying.clear();
-			else
+			m_unverified.clear();
-				DEV_GUARDED(m_verification)
-					m_verified.push_back(std::move(b));
 		}
-	}
-	m_knownBad += _bad;
 	return !m_readySet.empty();
 }