Handle a few odd cases, including the case where a peer proposes a ledger

that is internally inconsistent.

src/LedgerConsensus.cpp

@@ -1,6 +1,9 @@
 
 #include "LedgerConsensus.h"
 
+#include "Application.h"
+#include "NetworkOPs.h"
+
 TransactionAcquire::TransactionAcquire(const uint256& hash) : PeerSet(hash, 1), mHaveRoot(false)
 {
 	mMap = boost::make_shared<SHAMap>();
@@ -9,8 +12,10 @@ TransactionAcquire::TransactionAcquire(const uint256& hash) : PeerSet(hash, 1),
 
 void TransactionAcquire::done()
 {
-	// insert SHAMap in finished set (as valid or invalid), remove ourselves from current set
-	// WRITEME
+	if (mFailed)
+		theApp->getOPs().mapComplete(mHash, SHAMap::pointer());
+	else
+		theApp->getOPs().mapComplete(mHash, mMap);
 }
 
 boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast()
@@ -131,12 +136,19 @@ void LedgerConsensus::closeTime(Ledger::pointer& current)
 	current->updateHash();
 	uint256 txSet = current->getTransHash();
 	mOurPosition = boost::make_shared<LedgerProposal>(nodePrivKey, current->getParentHash(), txSet);
-	mapComplete(current->peekTransactionMap()->snapShot());
-	// WRITME: Broadcast an IHAVE for this set
+	mapComplete(txSet, current->peekTransactionMap()->snapShot());
 }
 
-void LedgerConsensus::mapComplete(SHAMap::pointer map)
+void LedgerConsensus::mapComplete(const uint256& hash, SHAMap::pointer map)
 {
+	if (!map)
+	{ // this is an invalid/corrupt map
+		mComplete[hash] = map;
+		return;
+	}
+
+	mAcquiring.erase(hash);
+
 	boost::unordered_map<uint256, SHAMap::pointer>::iterator it = mComplete.find(map->getHash());
 	if (it != mComplete.end()) return; // we already have this map
 
@@ -165,6 +177,8 @@ void LedgerConsensus::mapComplete(SHAMap::pointer map)
 	}
 	if (!peers.empty())
 		adjustCount(map, peers);
+
+	// WRITEME: broadcast an IHAVE for this set
 }
 
 void LedgerConsensus::adjustCount(SHAMap::pointer map, const std::vector<uint256>& peers)
@@ -257,7 +271,7 @@ void LedgerConsensus::addDisputedTransaction(const uint256& txID)
 	{
 		boost::unordered_map<uint256, SHAMap::pointer>::const_iterator cit =
 			mComplete.find(pit->second->getCurrentHash());
-		if (cit != mComplete.end())
+		if (cit != mComplete.end() && cit->second)
 			txn->setVote(pit->first, cit->second->hasItem(txID));
 	}
 }

src/LedgerConsensus.h

@@ -94,7 +94,6 @@ protected:
 	void startAcquiring(TransactionAcquire::pointer);
 	SHAMap::pointer find(const uint256& hash);
 
-	void mapComplete(SHAMap::pointer map);
 	void addDisputedTransaction(const uint256&);
 	void adjustCount(SHAMap::pointer map, const std::vector<uint256>& peers);
 
@@ -112,7 +111,7 @@ public:
 
 	SHAMap::pointer getTransactionTree(const uint256& hash, bool doAcquire);
 	TransactionAcquire::pointer getAcquiring(const uint256& hash);
-	void acquireComplete(const uint256& hash);
+	void mapComplete(const uint256& hash, SHAMap::pointer map);
 
 	void abort();
 	int timerEntry(void);

src/NetworkOPs.cpp

@@ -434,3 +434,9 @@ bool NetworkOPs::hasTXSet(boost::shared_ptr<Peer> peer, const std::vector<uint25
 	if (!mConsensus) return false;
 	return mConsensus->peerHasSet(peer, sets);
 }
+
+void NetworkOPs::mapComplete(const uint256& hash, SHAMap::pointer map)
+{
+	if (mConsensus)
+		mConsensus->mapComplete(hash, map);
+}

src/NetworkOPs.h

@@ -77,6 +77,7 @@ public:
 		const std::list<SHAMapNode>& nodeIDs, const std::list< std::vector<unsigned char> >& nodeData);
 	SHAMap::pointer getTXMap(const uint256& hash);
 	bool hasTXSet(boost::shared_ptr<Peer> peer, const std::vector<uint256>& sets);
+	void mapComplete(const uint256& hash, SHAMap::pointer map);
 
 	// network state machine
 	void checkState(const boost::system::error_code& result);