diff --git a/src/clientversion.h b/src/clientversion.h index dbaf4fc715..00818d5858 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 10 #define CLIENT_VERSION_REVISION 12 -#define CLIENT_VERSION_BUILD 19 +#define CLIENT_VERSION_BUILD 20 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/main.cpp b/src/main.cpp index 42d8de07bb..0a60c1b971 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3963,10 +3963,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) BOOST_FOREACH(CDarksendQueue q, vecDarksendQueue){ if(q.vin == dsq.vin) return true; } + if(dsq.IsExpired()) return true; printf("new darksend queue object - %s\n", addr.ToString().c_str()); vecDarksendQueue.push_back(dsq); dsq.Relay(); + dsq.time = GetTime(); } else if (strCommand == "dsi") { //DarkSend vIn if (pfrom->nVersion != darkSendPool.MIN_PEER_PROTO_VERSION) { @@ -6172,6 +6174,8 @@ void CDarkSendPool::Check() } void CDarkSendPool::ChargeFees(){ + return; //don't charge fees + if(fMasterNode) { int i = 0; // who didn't sign? diff --git a/src/main.h b/src/main.h index 9cfe53f0db..6fac278c3c 100644 --- a/src/main.h +++ b/src/main.h @@ -2601,13 +2601,9 @@ public: void Relay() { - printf("Relay\n"); LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) - { - printf("Relay dsq to peer\n"); pnode->PushMessage("dsq", (*this)); - } } bool IsExpired()