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

Merge branch 'v-1.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x

Browse Source
This commit is contained in:
Evan Duffield 2015-03-19 08:04:42 -07:00
commit eb782e1263
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guide-startmany.md
View File

@ -97,7 +97,7 @@ Make note of the hash (which is your collaterla_output) and index.
### Enter your MasterNode details into your masternode.conf file
[From the darkcoin github repo](https://github.com/darkcoin/darkcoin/blob/master/doc/masternode_conf.md)
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percantage").
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage").
```
alias ipaddress:port masternode_private_key collateral_output collateral_output_index donationin_address:donation_percentage

2
doc/masternode_conf.md
View File

@ -6,7 +6,7 @@ The multi masternode config allows to control multiple masternodes from a single
* Mac OS: ~/Library/Application Support/Darkcoin/
* Unix/Linux: ~/.darkcoin/
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id, collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percantage").
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id, collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage").
Example:
```

16
src/darksend.h
View File

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