increasing ds timeouts

This commit is contained in:
Evan Duffield 2015-03-18 10:19:13 -07:00
parent a1ac7ca8d3
commit e82c88ecbd

View File

@ -38,9 +38,9 @@ class CActiveMasternode;
#define MASTERNODE_REJECTED 0 #define MASTERNODE_REJECTED 0
#define MASTERNODE_RESET -1 #define MASTERNODE_RESET -1
#define DARKSEND_QUEUE_TIMEOUT 120 // in seconds #define DARKSEND_QUEUE_TIMEOUT 180 // in seconds
#define DARKSEND_SIGNING_TIMEOUT 30 // in seconds #define DARKSEND_SIGNING_TIMEOUT 30 // in seconds
#define DARKSEND_DOWNGRADE_TIMEOUT 30 // in seconds #define DARKSEND_DOWNGRADE_TIMEOUT 60 // in seconds
// used for anonymous relaying of inputs/outputs/sigs // used for anonymous relaying of inputs/outputs/sigs
#define DARKSEND_RELAY_IN 1 #define DARKSEND_RELAY_IN 1
@ -63,7 +63,7 @@ class CTxDSIn : public CTxIn
{ {
public: public:
bool fHasSig; // flag to indicate if signed bool fHasSig; // flag to indicate if signed
int nSentTimes; //times we've sent this anonymously int nSentTimes; //times we've sent this anonymously
CTxDSIn(const CTxIn& in) CTxDSIn(const CTxIn& in)
{ {
@ -80,7 +80,7 @@ public:
class CTxDSOut : public CTxOut class CTxDSOut : public CTxOut
{ {
public: public:
int nSentTimes; //times we've sent this anonymously int nSentTimes; //times we've sent this anonymously
CTxDSOut(const CTxOut& out) CTxDSOut(const CTxOut& out)
{ {
@ -206,7 +206,7 @@ public:
return false; return false;
} }
/// Set the 'strSharedKey' /// Set the 'strSharedKey'
void SetSharedKey(std::string strSharedKey); void SetSharedKey(std::string strSharedKey);
/** Sign this Darksend transaction /** Sign this Darksend transaction
@ -269,7 +269,7 @@ public:
bool IsTransactionValid(); bool IsTransactionValid();
/// Add an output /// Add an output
bool AddOutput(const CTxOut out); bool AddOutput(const CTxOut out);
/// Add an input /// Add an input
bool AddInput(const CTxIn in); bool AddInput(const CTxIn in);
/// Clear Signatures /// Clear Signatures
bool ClearSigs(); bool ClearSigs();
@ -523,11 +523,11 @@ public:
void ClearLastMessage(); void ClearLastMessage();
/// Used for liquidity providers /// Used for liquidity providers
bool SendRandomPaymentToSelf(); bool SendRandomPaymentToSelf();
/// Split up large inputs or make fee sized inputs /// Split up large inputs or make fee sized inputs
bool MakeCollateralAmounts(); bool MakeCollateralAmounts();
bool CreateDenominated(int64_t nTotalValue); bool CreateDenominated(int64_t nTotalValue);
/// Get the denominations for a list of outputs (returns a bitshifted integer) /// Get the denominations for a list of outputs (returns a bitshifted integer)
int GetDenominations(const std::vector<CTxOut>& vout); int GetDenominations(const std::vector<CTxOut>& vout);
int GetDenominations(const std::vector<CTxDSOut>& vout); int GetDenominations(const std::vector<CTxDSOut>& vout);