Skip to content

V0.11.2.x comments #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2015
Merged

V0.11.2.x comments #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
757128b
v0.11.2.x Updating comments
mkinney Mar 6, 2015
ed3e22d
remove trailing space
mkinney Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/darksend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CActiveMasternode activeMasternode;
int RequestedMasterNodeList = 0;

/* *** BEGIN DARKSEND MAGIC - DARKCOIN **********
Copyright 2014-2015, Darkcoin Developers
Copyright (c) 2014-2015, Darkcoin Developers
eduffield - [email protected]
udjinm6 - [email protected]
*/
Expand Down
53 changes: 32 additions & 21 deletions src/darksend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int GetInputDarksendRounds(CTxIn in, int rounds=0);
class CTxDSIn : public CTxIn
{
public:
bool fHasSig;
bool fHasSig; // flag to indicate if signed

CTxDSIn(const CTxIn& in)
{
Expand All @@ -86,7 +86,7 @@ class CDarkSendEntry
CTransaction collateral;
std::vector<CTxOut> vout;
CTransaction txSupporting;
int64_t addedTime;
int64_t addedTime; // time in UTC milliseconds

CDarkSendEntry()
{
Expand Down Expand Up @@ -133,7 +133,7 @@ class CDarksendQueue
//information used for the anonymous relay system
int nBlockHeight;
std::vector<unsigned char> vchRelaySig;
std::string strSharedKey;
std::string strSharedKey; // shared key

CDarksendQueue()
{
Expand Down Expand Up @@ -173,6 +173,7 @@ class CDarksendQueue
return false;
}

/// Get the protocol version
bool GetProtocolVersion(int &protocolVersion)
{
CMasternode* pmn = mnodeman.Find(vin);
Expand All @@ -184,6 +185,7 @@ class CDarksendQueue
return false;
}

/// Set the 'strSharedKey'
void SetSharedKey(std::string strSharedKey);

/** Sign this Darksend transaction
Expand Down Expand Up @@ -224,9 +226,13 @@ class CDarksendBroadcastTx
class CDarkSendSigner
{
public:
/// Is the inputs associated with this public key? (and there is 1000 DRK - checking if valid masternode)
bool IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey);
/// Set the private/public key values, returns true if successful
bool SetKey(std::string strSecret, std::string& errorMessage, CKey& key, CPubKey& pubkey);
/// Sign the message, returns true if successful
bool SignMessage(std::string strMessage, std::string& errorMessage, std::vector<unsigned char>& vchSig, CKey key);
/// Verify the message, returns true if succcessful
bool VerifyMessage(CPubKey pubkey, std::vector<unsigned char>& vchSig, std::string strMessage, std::string& errorMessage);
};

Expand All @@ -235,18 +241,22 @@ class CDarkSendSigner
class CDSAnonTx
{
public:
std::vector<CTxDSIn> vin;
std::vector<CTxOut> vout;
std::vector<CTxDSIn> vin; // collection of inputs
std::vector<CTxOut> vout; // collection of outputs

/// Is the transaction valid? (TODO: not defined - remove? or code?)
bool IsTransactionValid();
/// Add an output
bool AddOutput(const CTxOut out);
/// Add an input
bool AddInput(const CTxIn in);

/// Add Signature
bool AddSig(const CTxIn in);
/// Count the number of entries in the transaction
int CountEntries() {return (int)vin.size() + (int)vout.size();}
};

/// TODO: not defined - remove?
void ConnectToDarkSendMasterNodeWinner();


Expand All @@ -256,21 +266,17 @@ class CDarksendPool
{
public:

// clients entries
std::vector<CDarkSendEntry> myEntries;
// Masternode entries
std::vector<CDarkSendEntry> entries;
// the finalized transaction ready for signing
CTransaction finalTransaction;
// anonymous inputs/outputs
CDSAnonTx anonTx;
bool fSubmitAnonymousFailed;
int nCountAttempts;

int64_t lastTimeChanged; // time in UTC milliseconds
int64_t lastAutoDenomination; // Note: possibly not used TODO: Delete?

unsigned int state;
std::vector<CDarkSendEntry> myEntries; // clients entries
std::vector<CDarkSendEntry> entries; // Masternode entries
CTransaction finalTransaction; // the finalized transaction ready for signing
CDSAnonTx anonTx; // anonymous inputs/outputs
bool fSubmitAnonymousFailed; // initally false, will change to true if when attempts > 5
int nCountAttempts; // number of submitted attempts

int64_t lastTimeChanged; // last time the 'state' changed, in UTC milliseconds
int64_t lastAutoDenomination; // TODO; not used - Delete?

unsigned int state; // should be one of the POOL_STATUS_XXX values
unsigned int entriesCount;
unsigned int lastEntryAccepted;
unsigned int countEntriesAccepted;
Expand Down Expand Up @@ -390,21 +396,25 @@ class CDarksendPool
}
}

/// Get the time the last entry was accepted (time in UTC milliseconds)
int GetLastEntryAccepted() const
{
return lastEntryAccepted;
}

/// Get the count of the accepted entries
int GetCountEntriesAccepted() const
{
return countEntriesAccepted;
}

/// Get the client's transaction count
int GetMyTransactionCount() const
{
return myEntries.size();
}

// Set the 'state' value, with some logging and capturing when the state changed
void UpdateState(unsigned int newState)
{
if (fMasterNode && (newState == POOL_STATUS_ERROR || newState == POOL_STATUS_SUCCESS)){
Expand All @@ -422,6 +432,7 @@ class CDarksendPool
state = newState;
}

/// Get the maximum number of transactions for the pool
int GetMaxPoolTransactions()
{
//if we're on testnet, just use two transactions per merge
Expand Down