Merge branch 'poc-6' into develop

libethcore/Exceptions.h

@@ -25,7 +25,7 @@ class InvalidBlockHeaderFormat: public dev::Exception { public: InvalidBlockHead
 class InvalidUnclesHash: public dev::Exception {};
 class InvalidUncle: public dev::Exception {};
 class UncleTooOld: public dev::Exception {};
-class UncleInChain: public dev::Exception {};
+class UncleInChain: public dev::Exception { public: UncleInChain(h256Set _uncles, h256 _block): m_uncles(_uncles), m_block(_block) {} h256Set m_uncles; h256 m_block; virtual std::string description() const { return "Uncle in block already mentioned: Uncles " + toString(m_uncles) + " (" + m_block.abridged() + ")"; } };
 class DuplicateUncleNonce: public dev::Exception {};
 class InvalidStateRoot: public dev::Exception {};
 class InvalidTransactionsHash: public dev::Exception { public: InvalidTransactionsHash(h256 _head, h256 _real): m_head(_head), m_real(_real) {} h256 m_head; h256 m_real; virtual std::string description() const { return "Invalid transactions hash:  header says: " + toHex(m_head.ref()) + " block is:" + toHex(m_real.ref()); } };

libethereum/DownloadMan.h

@@ -101,6 +101,17 @@ public:
 		m_blocksGot = RangeMask<unsigned>(0, m_chain.size());
 	}
 
+	void reset()
+	{
+		{
+			ReadGuard l(x_subs);
+			for (auto i: m_subs)
+				i->resetFetch();
+		}
+		m_chain.clear();
+		m_blocksGot.clear();
+	}
+
 	RangeMask<unsigned> taken(bool _desperate = false) const
 	{
 		auto ret = m_blocksGot;

libethereum/EthereumHost.cpp

@@ -149,6 +149,7 @@ void EthereumHost::noteDoneBlocks(EthereumPeer* _who)
 		// Done our chain-get.
 		clog(NetNote) << "Chain download complete.";
 		updateGrabbing(Grabbing::Nothing);
+		m_man.reset();
 	}
 	if (_who->m_grabbing == Grabbing::Chain)
 	{
@@ -156,6 +157,7 @@ void EthereumHost::noteDoneBlocks(EthereumPeer* _who)
 		clog(NetNote) << "Chain download failed. Peer with blocks didn't have them all. This peer is bad and should be punished.";
 		// TODO: note that peer is BADBADBAD!
 		updateGrabbing(Grabbing::Nothing);
+		m_man.reset();
 	}
 }
 

libethereum/EthereumPeer.cpp

@@ -246,6 +246,7 @@ bool EthereumPeer::interpret(RLP const& _r)
 			// Couldn't get any from last batch - probably got to this peer's latest block - just give up.
 			m_sub.doneFetch();
 			giveUpOnFetch();
+			break;
 		}
 
 		unsigned used = 0;

libethereum/State.cpp

@@ -577,6 +577,9 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 	set<h256> knownUncles = _bc ? _bc->allUnclesFrom(m_currentBlock.parentHash) : set<h256>();
 	for (auto const& i: RLP(_block)[2])
 	{
+		if (knownUncles.count(sha3(i.data())))
+			throw UncleInChain(knownUncles, sha3(i.data()));
+
 		BlockInfo uncle = BlockInfo::fromHeader(i.data());
 		if (nonces.count(uncle.nonce))
 			throw DuplicateUncleNonce();
@@ -585,8 +588,6 @@ u256 State::enact(bytesConstRef _block, BlockChain const* _bc, bool _checkNonce)
 			BlockInfo uncleParent(_bc->block(uncle.parentHash));
 			if ((bigint)uncleParent.number < (bigint)m_currentBlock.number - 6)
 				throw UncleTooOld();
-			if (knownUncles.count(sha3(i.data())))
-				throw UncleInChain();
 			uncle.verifyParent(uncleParent);
 		}
 
@@ -725,7 +726,7 @@ void State::commitToMine(BlockChain const& _bc)
 			auto us = _bc.details(p).children;
 			assert(us.size() >= 1);	// must be at least 1 child of our grandparent - it's our own parent!
 			for (auto const& u: us)
-				if (!knownUncles.count(BlockInfo::headerHash(_bc.block(u))))	// ignore any uncles/mainline blocks that we know about. We use header-hash for this.
+				if (!knownUncles.count(u))	// ignore any uncles/mainline blocks that we know about.
 				{
 					BlockInfo ubi(_bc.block(u));
 					ubi.fillStream(unclesData, true);