Merge branch 'master' of github.com:jedmccaleb/NewCoin

src/Application.cpp

@@ -36,7 +36,7 @@ DatabaseCon::~DatabaseCon()
 }
 
 Application::Application() :
-	mUNL(mIOService),
+	mIOWork(mIOService), mAuxWork(mAuxService), mUNL(mIOService),
 	mNetOps(mIOService, &mMasterLedger), mTempNodeCache(16384, 90), mHashedObjectStore(16384, 300),
 	mSNTPClient(mAuxService), mRpcDB(NULL), mTxnDB(NULL), mLedgerDB(NULL), mWalletDB(NULL),
 	mHashNodeDB(NULL), mNetNodeDB(NULL),
@@ -51,10 +51,10 @@ extern int RpcDBCount, TxnDBCount, LedgerDBCount, WalletDBCount, HashNodeDBCount
 
 void Application::stop()
 {
-	mAuxService.stop();
 	mIOService.stop();
 	mHashedObjectStore.bulkWrite();
 	mValidations.flush();
+	mAuxService.stop();
 
 	Log(lsINFO) << "Stopped: " << mIOService.stopped();
 }

src/Application.h

@@ -39,7 +39,8 @@ public:
 
 class Application
 {
-	boost::asio::io_service	mIOService, mAuxService;
+	boost::asio::io_service			mIOService, mAuxService;
+	boost::asio::io_service::work	mIOWork, mAuxWork;
 
 	Wallet					mWallet;
 	UniqueNodeList			mUNL;

src/LedgerConsensus.cpp

@@ -358,13 +358,18 @@ void LedgerConsensus::takeInitialPosition(Ledger& initialLedger)
 	SHAMap::pointer initialSet = initialLedger.peekTransactionMap()->snapShot(false);
 	uint256 txSet = initialSet->getHash();
 	Log(lsINFO) << "initial position " << txSet;
+	mapComplete(txSet, initialSet, false);
 
 	if (mValidating)
 		mOurPosition = boost::make_shared<LedgerProposal>
 			(mValSeed, initialLedger.getParentHash(), txSet, mCloseTime);
 	else
 		mOurPosition = boost::make_shared<LedgerProposal>(initialLedger.getParentHash(), txSet, mCloseTime);
-	mapComplete(txSet, initialSet, false);
+
+	BOOST_FOREACH(u256_lct_pair& it, mDisputes)
+	{
+		it.second->setOurVote(initialLedger.hasTransaction(it.first));
+	}
 
 	// if any peers have taken a contrary position, process disputes
 	boost::unordered_set<uint256> found;
@@ -372,7 +377,7 @@ void LedgerConsensus::takeInitialPosition(Ledger& initialLedger)
 	{
 		uint256 set = it.second->getCurrentHash();
 		if (found.insert(set).second)
-		{ // OPTIMIZEME: Don't process the same set more than once
+		{
 			boost::unordered_map<uint256, SHAMap::pointer>::iterator iit = mAcquired.find(set);
 			if (iit != mAcquired.end())
 				createDisputes(initialSet, iit->second);
@@ -827,6 +832,16 @@ void LedgerConsensus::addDisputedTransaction(const uint256& txID, const std::vec
 		if (cit != mAcquired.end() && cit->second)
 			txn->setVote(pit.first, cit->second->hasItem(txID));
 	}
+
+	if (!ourVote && theApp->isNew(txID))
+	{
+		newcoin::TMTransaction msg;
+		msg.set_rawtransaction(&(tx.front()), tx.size());
+		msg.set_status(newcoin::tsNEW);
+		msg.set_receivetimestamp(theApp->getOPs().getNetworkTimeNC());
+		PackedMessage::pointer packet = boost::make_shared<PackedMessage>(msg, newcoin::mtTRANSACTION);
+        theApp->getConnectionPool().relayMessage(NULL, packet);
+	}
 }
 
 bool LedgerConsensus::peerPosition(const LedgerProposal::pointer& newPosition)

src/LedgerConsensus.h

@@ -62,6 +62,7 @@ public:
 	const uint256& getTransactionID() const				{ return mTransactionID; }
 	bool getOurVote() const								{ return mOurVote; }
 	Serializer& peekTransaction()						{ return transaction; }
+	void setOurVote(bool o)								{ mOurVote = o; }
 
 	void setVote(const uint160& peer, bool votesYes);
 	void unVote(const uint160& peer);

src/SNTPClient.cpp

@@ -47,16 +47,13 @@ static uint8_t SNTPQueryData[48] =
 SNTPClient::SNTPClient(boost::asio::io_service& service) : mSocket(service), mTimer(service), mResolver(service),
 		mOffset(0), mLastOffsetUpdate((time_t) -1), mReceiveBuffer(256)
 {
-	if (!theConfig.RUN_STANDALONE)
-	{
-		mSocket.open(boost::asio::ip::udp::v4());
-		mSocket.async_receive_from(boost::asio::buffer(mReceiveBuffer, 256), mReceiveEndpoint,
-			boost::bind(&SNTPClient::receivePacket, this, boost::asio::placeholders::error,
-				boost::asio::placeholders::bytes_transferred));
+	mSocket.open(boost::asio::ip::udp::v4());
+	mSocket.async_receive_from(boost::asio::buffer(mReceiveBuffer, 256), mReceiveEndpoint,
+		boost::bind(&SNTPClient::receivePacket, this, boost::asio::placeholders::error,
+			boost::asio::placeholders::bytes_transferred));
 
-		mTimer.expires_from_now(boost::posix_time::seconds(NTP_QUERY_FREQUENCY));
-		mTimer.async_wait(boost::bind(&SNTPClient::timerEntry, this, boost::asio::placeholders::error));
-	}
+	mTimer.expires_from_now(boost::posix_time::seconds(NTP_QUERY_FREQUENCY));
+	mTimer.async_wait(boost::bind(&SNTPClient::timerEntry, this, boost::asio::placeholders::error));
 }
 
 void SNTPClient::resolveComplete(const boost::system::error_code& error, boost::asio::ip::udp::resolver::iterator it)

src/main.cpp

@@ -96,7 +96,7 @@ int main(int argc, char* argv[])
 		("standalone,a", "Run with no peers.")
 		("test,t", "Perform unit tests.")
 		("parameters", po::value< vector<string> >(), "Specify comma separated parameters.")
-		("verbose,v", "Increase log level")
+		("verbose,v", "Increase log level.")
 	;
 
 	// Interpret positional arguments as --parameters.