sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-29 13:59:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

added sessions

Browse Source
This commit is contained in:
Evan Duffield 2014-08-05 17:24:59 -07:00
parent 18e279f763
commit 328f9eb48a
5 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/main.cpp
View File

@ -3891,8 +3891,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
return false; return false;
} }
if(darkSendPool.submittedToMasternode != pfrom->addr){
printf("dsc - message doesn't match current masternode - %s != %s\n", darkSendPool.submittedToMasternode.ToString().c_str(), pfrom->addr.ToString().c_str());
return false;
}
int session_id;
CTransaction txNew; CTransaction txNew;
vRecv >> txNew; vRecv >> session_id >> txNew;
if(darkSendPool.session_id != session_id){
printf("dsc - message doesn't match current darksend session\n");
return false;
}
//check to see if input is spent already? (and probably not confirmed) //check to see if input is spent already? (and probably not confirmed)
darkSendPool.SignFinalTransaction(txNew, pfrom); darkSendPool.SignFinalTransaction(txNew, pfrom);
@ -3908,9 +3919,15 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
return false; return false;
} }
int session_id;
bool error; bool error;
std::string lastMessage; std::string lastMessage;
vRecv >> error >> lastMessage; vRecv >> session_id >> error >> lastMessage;
if(darkSendPool.session_id != session_id){
printf("dsc - message doesn't match current darksend session\n");
return false;
}
darkSendPool.CompletedTransaction(error, lastMessage); darkSendPool.CompletedTransaction(error, lastMessage);
} }
@ -3947,7 +3964,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
printf("dsi - non-standard pubkey detected! %s\n", o.scriptPubKey.ToString().c_str()); printf("dsi - non-standard pubkey detected! %s\n", o.scriptPubKey.ToString().c_str());
accepted = 0; accepted = 0;
error = "non-standard pubkey detected"; error = "non-standard pubkey detected";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
return false; return false;
} }
@ -3976,7 +3993,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
printf("dsi -- fees are too low! %"PRI64d"-%"PRI64d"=%"PRI64d" \ntx:%s\n", nValueIn, nValueOut, nFees, tx.ToString().c_str()); printf("dsi -- fees are too low! %"PRI64d"-%"PRI64d"=%"PRI64d" \ntx:%s\n", nValueIn, nValueOut, nFees, tx.ToString().c_str());
accepted = 0; accepted = 0;
error = "transaction fees are too low"; error = "transaction fees are too low";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
return false; return false;
} }
@ -3984,14 +4001,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
printf("dsi -- fees are too high! %s\n", tx.ToString().c_str()); printf("dsi -- fees are too high! %s\n", tx.ToString().c_str());
accepted = 0; accepted = 0;
error = "transaction fees are too high"; error = "transaction fees are too high";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
return false; return false;
} }
} else { } else {
printf("dsi -- missing input tx! %s\n", tx.ToString().c_str()); printf("dsi -- missing input tx! %s\n", tx.ToString().c_str());
accepted = 0; accepted = 0;
error = "missing input tx information"; error = "missing input tx information";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
return false; return false;
} }
@ -4000,19 +4017,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
printf("dsi -- transactione not valid! \n"); printf("dsi -- transactione not valid! \n");
accepted = 0; accepted = 0;
error = "transaction not valid"; error = "transaction not valid";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
return false; return false;
} }
} }
if(darkSendPool.AddEntry(in, nAmount, txCollateral, out, error)){ if(darkSendPool.AddEntry(in, nAmount, txCollateral, out, error)){
accepted = 1; accepted = 1;
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
darkSendPool.Check(); darkSendPool.Check();
RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
} else { } else {
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), accepted, error);
} }
} }
@ -4024,7 +4041,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if(!fMasterNode) return false; if(!fMasterNode) return false;
std::string error = ""; std::string error = "";
pfrom->PushMessage("dssu", darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1, error); pfrom->PushMessage("dssu", darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1, error);
//pfrom->fDisconnect = true; //pfrom->fDisconnect = true;
return true; return true;
} }
@ -4040,13 +4057,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
return false; return false;
} }
int session_id;
int state; int state;
int entriesCount; int entriesCount;
int accepted; int accepted;
std::string error; std::string error;
vRecv >> state >> entriesCount >> accepted >> error; vRecv >> session_id >> state >> entriesCount >> accepted >> error;
darkSendPool.StatusUpdate(state, entriesCount, accepted, error); if(accepted != 1 && darkSendPool.session_id != session_id){
printf("dsc - message doesn't match current darksend session\n");
return false;
}
darkSendPool.StatusUpdate(state, entriesCount, accepted, error, session_id);
printf("DarkSendStatusUpdate - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, error.c_str()); printf("DarkSendStatusUpdate - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, error.c_str());
} }
@ -4073,7 +4096,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if(success){ if(success){
darkSendPool.Check(); darkSendPool.Check();
RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
} }
} }
@ -5958,6 +5981,8 @@ void CDarkSendPool::SetNull(bool clearEverything){
if(clearEverything){ if(clearEverything){
myEntries.clear(); myEntries.clear();
session_id = 1 + (rand() % 999999);
} }
} }
@ -5991,7 +6016,6 @@ void CDarkSendPool::Check()
UpdateState(POOL_STATUS_FINALIZE_TRANSACTION); UpdateState(POOL_STATUS_FINALIZE_TRANSACTION);
} }
// better way to do this?
if(state == POOL_STATUS_FINALIZE_TRANSACTION && finalTransaction.vin.empty() && finalTransaction.vout.empty()) { if(state == POOL_STATUS_FINALIZE_TRANSACTION && finalTransaction.vin.empty() && finalTransaction.vout.empty()) {
if(fDebug) printf("CDarkSendPool::Check() -- FINALIZE TRANSACTIONS\n"); if(fDebug) printf("CDarkSendPool::Check() -- FINALIZE TRANSACTIONS\n");
UpdateState(POOL_STATUS_SIGNING); UpdateState(POOL_STATUS_SIGNING);
@ -6011,7 +6035,7 @@ void CDarkSendPool::Check()
printf("Transaction 1: %s\n", txNew.ToString().c_str()); printf("Transaction 1: %s\n", txNew.ToString().c_str());
SignFinalTransaction(txNew, NULL); SignFinalTransaction(txNew, NULL);
RelayDarkSendFinalTransaction(txNew); RelayDarkSendFinalTransaction(session_id, txNew);
} }
} }
@ -6054,7 +6078,7 @@ void CDarkSendPool::Check()
SetNull(); SetNull();
pwalletMain->Lock(); pwalletMain->Lock();
UpdateState(POOL_STATUS_ACCEPTING_ENTRIES); UpdateState(POOL_STATUS_ACCEPTING_ENTRIES);
RelayDarkSendCompletedTransaction(true, "Transaction not valid, please try again"); RelayDarkSendCompletedTransaction(session_id, true, "Transaction not valid, please try again");
return; return;
} }
@ -6067,7 +6091,7 @@ void CDarkSendPool::Check()
txNew.RelayWalletTransaction(); txNew.RelayWalletTransaction();
RelayDarkSendCompletedTransaction(false, "Transaction Created Successfully"); RelayDarkSendCompletedTransaction(session_id, false, "Transaction Created Successfully");
printf("CDarkSendPool::Check() -- IS MASTER -- TRANSMITTING DARKSEND\n"); printf("CDarkSendPool::Check() -- IS MASTER -- TRANSMITTING DARKSEND\n");
} }
} }
@ -6078,14 +6102,14 @@ void CDarkSendPool::Check()
printf("CDarkSendPool::Check() -- COMPLETED -- RESETTING \n"); printf("CDarkSendPool::Check() -- COMPLETED -- RESETTING \n");
SetNull(true); SetNull(true);
UnlockCoins(); UnlockCoins();
if(fMasterNode) RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); if(fMasterNode) RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
pwalletMain->Lock(); pwalletMain->Lock();
} }
if((state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) && GetTimeMillis()-lastTimeChanged >= 10000) { if((state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) && GetTimeMillis()-lastTimeChanged >= 10000) {
printf("CDarkSendPool::Check() -- RESETTING MESSAGE \n"); printf("CDarkSendPool::Check() -- RESETTING MESSAGE \n");
SetNull(true); SetNull(true);
if(fMasterNode) RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); if(fMasterNode) RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
UnlockCoins(); UnlockCoins();
} }
} }
@ -6136,7 +6160,7 @@ void CDarkSendPool::CheckTimeout(){
printf("CDarkSendPool::CheckTimeout() : REMOVING EXPIRED ENTRY - %d\n", c); printf("CDarkSendPool::CheckTimeout() : REMOVING EXPIRED ENTRY - %d\n", c);
vec->erase(it); vec->erase(it);
if(fMasterNode){ if(fMasterNode){
RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
} }
break; break;
} }
@ -6240,7 +6264,6 @@ bool CDarkSendPool::AddEntry(const std::vector<CTxIn>& newInput, const int64& nA
if(entries.size() >= POOL_MAX_TRANSACTIONS){ if(entries.size() >= POOL_MAX_TRANSACTIONS){
if(fDebug) printf ("CDarkSendPool::AddEntry - entries is full!\n"); if(fDebug) printf ("CDarkSendPool::AddEntry - entries is full!\n");
error = "entries is full"; error = "entries is full";
SetNull(); // not sure how this happens. Just reset for now.
return false; return false;
} }
@ -6379,7 +6402,7 @@ void CDarkSendPool::SendMoney(const CTransaction& collateral, std::vector<CTxIn>
Check(); Check();
} }
bool CDarkSendPool::StatusUpdate(int newState, int newEntriesCount, int newAccepted, std::string& error){ bool CDarkSendPool::StatusUpdate(int newState, int newEntriesCount, int newAccepted, std::string& error, int newSessionID){
if(fMasterNode) return false; if(fMasterNode) return false;
if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) return false; if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) return false;
@ -6393,6 +6416,10 @@ bool CDarkSendPool::StatusUpdate(int newState, int newEntriesCount, int newAccep
UpdateState(POOL_STATUS_ERROR); UpdateState(POOL_STATUS_ERROR);
lastMessage = error; lastMessage = error;
} }
if(newAccepted == 1){
session_id = newSessionID;
printf("CDarkSendPool::StatusUpdate - set session_id to %d\n", session_id);
}
} }
return true; return true;

6
src/main.h
View File

@ -2620,6 +2620,8 @@ public:
bool unitTest; bool unitTest;
CService submittedToMasternode; CService submittedToMasternode;
int session_id;
CDarkSendPool() CDarkSendPool()
{ {
//printf("CDarkSendPool::INIT()\n"); //printf("CDarkSendPool::INIT()\n");
@ -2696,7 +2698,7 @@ public:
if(state != newState){ if(state != newState){
lastTimeChanged = GetTimeMillis(); lastTimeChanged = GetTimeMillis();
if(fMasterNode) { if(fMasterNode) {
RelayDarkSendStatus(darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1); RelayDarkSendStatus(darkSendPool.session_id, darkSendPool.GetState(), darkSendPool.GetEntriesCount(), -1);
} }
} }
state = newState; state = newState;
@ -2727,7 +2729,7 @@ public:
bool AddScriptSig(const CTxIn& newVin); bool AddScriptSig(const CTxIn& newVin);
bool SignaturesComplete(); bool SignaturesComplete();
void SendMoney(const CTransaction& collateral, std::vector<CTxIn>& vin, std::vector<CTxOut>& vout, int64& fee, int64 amount, std::vector<int64> reservedKeysIn); void SendMoney(const CTransaction& collateral, std::vector<CTxIn>& vin, std::vector<CTxOut>& vout, int64& fee, int64 amount, std::vector<int64> reservedKeysIn);
bool StatusUpdate(int newState, int newEntriesCount, int newAccepted, std::string& error); bool StatusUpdate(int newState, int newEntriesCount, int newAccepted, std::string& error, int newSessionID=0);
bool SignFinalTransaction(CTransaction& finalTransactionNew, CNode* node); bool SignFinalTransaction(CTransaction& finalTransactionNew, CNode* node);

12
src/net.cpp
View File

@ -1912,12 +1912,12 @@ void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataSt
} }
} }
void RelayDarkSendFinalTransaction(const CTransaction& txNew) void RelayDarkSendFinalTransaction(const int session_id, const CTransaction& txNew)
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
{ {
pnode->PushMessage("dsf", txNew); pnode->PushMessage("dsf", session_id, txNew);
} }
} }
@ -1936,12 +1936,12 @@ void RelayDarkSendIn(const std::vector<CTxIn>& in, const int64& nAmount, const C
} }
} }
void RelayDarkSendStatus(const int newState, const int newEntriesCount, const int newAccepted, const std::string error) void RelayDarkSendStatus(const int session_id, const int newState, const int newEntriesCount, const int newAccepted, const std::string error)
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
{ {
pnode->PushMessage("dssu", newState, newEntriesCount, newAccepted, error); pnode->PushMessage("dssu", session_id, newState, newEntriesCount, newAccepted, error);
} }
} }
@ -1964,12 +1964,12 @@ void RelayDarkSendElectionEntryPing(const CTxIn vin, const std::vector<unsigned
} }
void RelayDarkSendCompletedTransaction(const bool error, const std::string errorMessage) void RelayDarkSendCompletedTransaction(const int session_id, const bool error, const std::string errorMessage)
{ {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
{ {
pnode->PushMessage("dsc", error, errorMessage); pnode->PushMessage("dsc", session_id, error, errorMessage);
} }
} }

6
src/net.h
View File

@ -657,12 +657,12 @@ class CTxOut;
void RelayTransaction(const CTransaction& tx, const uint256& hash); void RelayTransaction(const CTransaction& tx, const uint256& hash);
void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataStream& ss); void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataStream& ss);
void RelayDarkSendFinalTransaction(const CTransaction& txNew); void RelayDarkSendFinalTransaction(const int session_id, const CTransaction& txNew);
void RelayDarkSendIn(const std::vector<CTxIn>& in, const int64& nAmount, const CTransaction& txCollateral, const std::vector<CTxOut>& out); void RelayDarkSendIn(const std::vector<CTxIn>& in, const int64& nAmount, const CTransaction& txCollateral, const std::vector<CTxOut>& out);
void RelayDarkSendStatus(const int newState, const int newEntriesCount, const int newAccepted, const std::string error=""); void RelayDarkSendStatus(const int session_id, const int newState, const int newEntriesCount, const int newAccepted, const std::string error="");
void RelayDarkSendElectionEntry(const CTxIn vin, const CService addr, const std::vector<unsigned char> vchSig, const int64 nNow, const CPubKey pubkey, const CPubKey pubkey2, const int count, const int current, const int64 lastUpdated); void RelayDarkSendElectionEntry(const CTxIn vin, const CService addr, const std::vector<unsigned char> vchSig, const int64 nNow, const CPubKey pubkey, const CPubKey pubkey2, const int count, const int current, const int64 lastUpdated);
void RelayDarkSendElectionEntryPing(const CTxIn vin, const std::vector<unsigned char> vchSig, const int64 nNow, const bool stop); void RelayDarkSendElectionEntryPing(const CTxIn vin, const std::vector<unsigned char> vchSig, const int64 nNow, const bool stop);
void RelayDarkSendCompletedTransaction(const bool error, const std::string errorMessage); void RelayDarkSendCompletedTransaction(const int session_id, const bool error, const std::string errorMessage);
void RelayDarkSendMasterNodeConsessusVote(const CTxIn inWinningMasternode, const CTxIn inFromMasternode, const int64 nBlockHeight, const std::vector<unsigned char>& vchSig); void RelayDarkSendMasterNodeConsessusVote(const CTxIn inWinningMasternode, const CTxIn inFromMasternode, const int64 nBlockHeight, const std::vector<unsigned char>& vchSig);
void RelayDarkDeclareWinner(); void RelayDarkDeclareWinner();
void RelayDarkSendMasterNodeContestant(); void RelayDarkSendMasterNodeContestant();

2
src/qt/sendcoinsdialog.cpp
View File

@ -325,6 +325,8 @@ void SendCoinsDialog::darkSendStatusButton()
if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) darkSendPool.Check(); if(state == POOL_STATUS_ERROR || state == POOL_STATUS_SUCCESS) darkSendPool.Check();
printf("%s\n", convert.str().c_str());
QString s(convert.str().c_str()); QString s(convert.str().c_str());
ui->darkSendStatusButton->setText(s); ui->darkSendStatusButton->setText(s);