Merge branch 'develop' of github.com:jedmccaleb/NewCoin into develop

src/cpp/ripple/AcceptedLedger.cpp

@@ -2,7 +2,7 @@
 
 #include <boost/foreach.hpp>
 
-TaggedCache<uint256, AcceptedLedger> AcceptedLedger::ALCache("AcceptedLedger", 4, 60);
+TaggedCache<uint256, AcceptedLedger> AcceptedLedger::ALCache("AcceptedLedger", 8, 120);
 
 ALTransaction::ALTransaction(uint32 seq, SerializerIterator& sit)
 {

src/cpp/ripple/LedgerAcquire.cpp

@@ -107,14 +107,17 @@ LedgerAcquire::LedgerAcquire(const uint256& hash, uint32 seq) : PeerSet(hash, LE
 	tryLocal();
 }
 
-void LedgerAcquire::checkLocal()
+bool LedgerAcquire::checkLocal()
 {
 	boost::recursive_mutex::scoped_lock sl(mLock);
 	if (isDone())
-		return;
+		return false;
 
-	if (tryLocal())
+	if (!tryLocal())
-		done();
+		return false;
+
+	done();
+	return true;
 }
 
 bool LedgerAcquire::tryLocal()
@@ -1064,13 +1067,20 @@ void LedgerAcquireMaster::gotFetchPack(Job&)
 		acquires.reserve(mLedgers.size());
 		typedef std::pair<uint256, LedgerAcquire::pointer> u256_acq_pair;
 		BOOST_FOREACH(const u256_acq_pair& it, mLedgers)
+		{
 			acquires.push_back(it.second);
+		}
 	}
 
+	int completed = 0;
 	BOOST_FOREACH(const LedgerAcquire::pointer& acquire, acquires)
 	{
-		acquire->checkLocal();
+		if (acquire->checkLocal())
+			++completed;
 	}
+
+	if (completed > 0)
+		theApp->getLedgerMaster().resumeAcquiring();
 }
 
 // vim:ts=4

src/cpp/ripple/LedgerAcquire.h

@@ -130,7 +130,7 @@ public:
 	void addPeers();
 	void awaitData();
 	void noAwaitData();
-	void checkLocal();
+	bool checkLocal();
 
 	typedef std::pair<ripple::TMGetObjectByHash::ObjectType, uint256> neededHash_t;
 	std::vector<neededHash_t> getNeededHashes();

src/cpp/ripple/NetworkOPs.cpp

@@ -2131,7 +2131,7 @@ void NetworkOPs::gotFetchPack(bool progress, uint32 seq)
 	mLastFetchPack = 0;
 	mFetchSeq = seq;		// earliest pack we have data on
 	theApp->getJobQueue().addJob(jtLEDGER_DATA, "gotFetchPack",
-		boost::bind(&LedgerAcquireMaster::gotFetchPack, &theApp->getMasterLedgerAcquire(), _1));
+		BIND_TYPE(&LedgerAcquireMaster::gotFetchPack, &theApp->getMasterLedgerAcquire(), P_1));
 }
 
 void NetworkOPs::missingNodeInLedger(uint32 seq)

src/cpp/ripple/RPCHandler.cpp

@@ -3486,7 +3486,7 @@ Json::Value RPCHandler::doCommand(const Json::Value& jvRequest, int iRole, int &
 		{	"path_find",			&RPCHandler::doPathFind,			false,	optCurrent	},
 		{	"ping",					&RPCHandler::doPing,			    false,	optNone		},
 //		{	"profile",				&RPCHandler::doProfile,			    false,	optCurrent	},
-		{	"proof_create",			&RPCHandler::doProofCreate,		    false,	optNone		},
+		{	"proof_create",			&RPCHandler::doProofCreate,		    true,	optNone		},
 		{	"proof_solve",			&RPCHandler::doProofSolve,		    true,	optNone		},
 		{	"proof_verify",			&RPCHandler::doProofVerify,		    true,	optNone		},
 		{	"random",				&RPCHandler::doRandom,				false,	optNone		},

src/cpp/ripple/SHAMap.cpp

@@ -260,7 +260,6 @@ SHAMapTreeNode* SHAMap::getNodePointer(const SHAMapNode& id, const uint256& hash
 	}
 }
 
-
 void SHAMap::returnNode(SHAMapTreeNode::pointer& node, bool modify)
 { // make sure the node is suitable for the intended operation (copy on write)
 	assert(node->isValid());

src/cpp/ripple/SHAMapSync.cpp

@@ -126,7 +126,7 @@ std::vector<uint256> SHAMap::getNeededHashes(int max, SHAMapSyncFilter* filter)
 					try
 					{
 						d = getNodePointer(childID, childHash, filter);
-						if (d->isInner() && !d->isFullBelow())
+						if (d->isInner())
 						{
 							have_all = false;
 							stack.push(d);