sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12: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 ### 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) [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 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/ * Mac OS: ~/Library/Application Support/Darkcoin/
* Unix/Linux: ~/.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: Example:
``` ```

4
src/darksend.h
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