This commit is contained in:
UdjinM6 2015-06-19 04:42:25 +03:00
parent 3834e459d9
commit 58c0f150a4
2 changed files with 6 additions and 6 deletions

View File

@ -370,15 +370,15 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
int sessionIDMessage;
bool error;
std::string lastMessage;
vRecv >> sessionIDMessage >> error >> lastMessage;
int errorID;
vRecv >> sessionIDMessage >> error >> errorID;
if(sessionID != sessionIDMessage){
if (fDebug) LogPrintf("dsc - message doesn't match current Darksend session %d %d\n", darkSendPool.sessionID, sessionIDMessage);
return;
}
darkSendPool.CompletedTransaction(error, lastMessage);
darkSendPool.CompletedTransaction(error, errorID);
}
}
@ -1355,7 +1355,7 @@ void CDarksendPool::NewBlock()
}
// Darksend transaction was completed (failed or successful)
void CDarksendPool::CompletedTransaction(bool error, std::string lastMessageNew)
void CDarksendPool::CompletedTransaction(bool error, int errorID)
{
if(fMasterNode) return;
@ -1376,7 +1376,7 @@ void CDarksendPool::CompletedTransaction(bool error, std::string lastMessageNew)
// To avoid race conditions, we'll only let DS run once per block
cachedLastSuccess = chainActive.Tip()->nHeight;
}
lastMessage = lastMessageNew;
lastMessage = GetMessageByID(errorID);
completedTransaction = true;
}

View File

@ -483,7 +483,7 @@ public:
bool GetLastValidBlockHash(uint256& hash, int mod=1, int nBlockHeight=0);
/// Process a new block
void NewBlock();
void CompletedTransaction(bool error, std::string lastMessageNew);
void CompletedTransaction(bool error, int errorID);
void ClearLastMessage();
/// Used for liquidity providers
bool SendRandomPaymentToSelf();