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 'master' of https://github.com/darkcoin/darkcoin

Browse Source
This commit is contained in:
Evan Duffield 2015-01-23 07:48:52 -07:00
commit 935ab9e252
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/init.cpp
View File

@ -310,6 +310,24 @@ std::string HelpMessage(HelpMessageMode hmm)
} }
strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n"; strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n";
strUsage += " -testnet " + _("Use the test network") + "\n"; strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -litemode=<n> " + _("Disable all Masternode and Darksend related functionality (0-1, default: 0)") + "\n";
strUsage += "\n" + _("Masternode options:") + "\n";
strUsage += " -masternode=<n> " + _("Enable the client to act as a masternode (0-1, default: 0)") + "\n";
strUsage += " -mnconf=<file> " + _("Specify masternode configuration file (default: masternode.conf)") + "\n";
strUsage += " -masternodeprivkey=<n> " + _("Set the masternode private key") + "\n";
strUsage += " -masternodeaddr=<n> " + _("Set external address:port to get to this masternode (example: address:port)") + "\n";
strUsage += " -masternodeminprotocol=<n> " + _("Ignore masternodes less than version (example: 70050; default : 0)") + "\n";
strUsage += "\n" + _("Darksend options:") + "\n";
strUsage += " -enabledarksend=<n> " + _("Enable use of automated darksend for funds stored in this wallet (0-1, default: 0)") + "\n";
strUsage += " -darksendrounds=<n> " + _("Use N separate masternodes to anonymize funds (2-8, default: 2)") + "\n";
strUsage += " -anonymizedarkcoinamount=<n> " + _("Keep N darkcoin anonymized (default: 0)") + "\n";
strUsage += " -liquidityprovider=<n> " + _("Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: 0, 1=very frequent, high fees, 100=very infrequent, low fees)") + "\n";
strUsage += "\n" + _("InstantX options:") + "\n";
strUsage += " -enableinstantx=<n> " + _("Enable instantx, show confirmations for locked transactions (bool, default: true)") + "\n";
strUsage += " -instantxdepth=<n> " + _("Show N confirmations for a successfully locked transaciton (0-9999, default: 1)") + "\n";
strUsage += "\n" + _("Block creation options:") + "\n"; strUsage += "\n" + _("Block creation options:") + "\n";
strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n"; strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n";
@ -1144,7 +1162,7 @@ bool AppInit2(boost::thread_group& threadGroup)
if(nDarksendRounds > 16) nDarksendRounds = 16; if(nDarksendRounds > 16) nDarksendRounds = 16;
if(nDarksendRounds < 1) nDarksendRounds = 1; if(nDarksendRounds < 1) nDarksendRounds = 1;
nLiquidityProvider = GetArg("-liquidityprovider", 0); //1-100 nLiquidityProvider = GetArg("-liquidityprovider", 0); //0-100
if(nLiquidityProvider != 0) { if(nLiquidityProvider != 0) {
darkSendPool.SetMinBlockSpacing(std::min(nLiquidityProvider,100)*15); darkSendPool.SetMinBlockSpacing(std::min(nLiquidityProvider,100)*15);
fEnableDarksend = true; fEnableDarksend = true;

26
src/main.cpp
View File

@ -1425,19 +1425,19 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue)
if(nHeight > 46000+((576*1)*7)) ret += blockValue / 20; //60% - 2014-10-14 if(nHeight > 46000+((576*1)*7)) ret += blockValue / 20; //60% - 2014-10-14
} }
if(nHeight > 158000) ret += blockValue / 20; //25.0% - 2014-10-23 if(nHeight > 158000) ret += blockValue / 20; // 158000 - 25.0% - 2014-10-24
if(nHeight > 158000+((576*30)*1)) ret += blockValue / 20; //30.0% - 2014-11-23 if(nHeight > 158000+((576*30)* 1)) ret += blockValue / 20; // 175280 - 30.0% - 2014-11-25
if(nHeight > 158000+((576*30)*2)) ret += blockValue / 20; //35.0% - 2014-12-23 if(nHeight > 158000+((576*30)* 2)) ret += blockValue / 20; // 192560 - 35.0% - 2014-12-26
if(nHeight > 158000+((576*30)*3)) ret += blockValue / 40; //37.5% - 2015-01-23 if(nHeight > 158000+((576*30)* 3)) ret += blockValue / 40; // 209840 - 37.5% - 2015-01-26
if(nHeight > 158000+((576*30)*4)) ret += blockValue / 40; //40.0% - 2015-02-23 if(nHeight > 158000+((576*30)* 4)) ret += blockValue / 40; // 227120 - 40.0% - 2015-02-27
if(nHeight > 158000+((576*30)*5)) ret += blockValue / 40; //42.5% - 2015-03-23 if(nHeight > 158000+((576*30)* 5)) ret += blockValue / 40; // 244400 - 42.5% - 2015-03-30
if(nHeight > 158000+((576*30)*6)) ret += blockValue / 40; //45.0% - 2015-04-23 if(nHeight > 158000+((576*30)* 6)) ret += blockValue / 40; // 261680 - 45.0% - 2015-05-01
if(nHeight > 158000+((576*30)*7)) ret += blockValue / 40; //47.5% - 2015-05-23 if(nHeight > 158000+((576*30)* 7)) ret += blockValue / 40; // 278960 - 47.5% - 2015-06-01
if(nHeight > 158000+((576*30)*9)) ret += blockValue / 40; //50.0% - 2015-07-23 if(nHeight > 158000+((576*30)* 9)) ret += blockValue / 40; // 313520 - 50.0% - 2015-08-03
if(nHeight > 158000+((576*30)*11)) ret += blockValue / 40; //52.5% - 2015-09-23 if(nHeight > 158000+((576*30)*11)) ret += blockValue / 40; // 348080 - 52.5% - 2015-10-05
if(nHeight > 158000+((576*30)*13)) ret += blockValue / 40; //55.0% - 2015-11-23 if(nHeight > 158000+((576*30)*13)) ret += blockValue / 40; // 382640 - 55.0% - 2015-12-07
if(nHeight > 158000+((576*30)*15)) ret += blockValue / 40; //57.5% - 2016-01-23 if(nHeight > 158000+((576*30)*15)) ret += blockValue / 40; // 417200 - 57.5% - 2016-02-08
if(nHeight > 158000+((576*30)*17)) ret += blockValue / 40; //60.0% - 2016-03-23 if(nHeight > 158000+((576*30)*17)) ret += blockValue / 40; // 451760 - 60.0% - 2016-04-11
return ret; return ret;
} }

2
src/rpcserver.cpp
View File

@ -271,7 +271,7 @@ static const CRPCCommand vRPCCommands[] =
/* Darkcoin features */ /* Darkcoin features */
{ "darksend", &darksend, false, false, true }, { "darksend", &darksend, false, false, true },
{ "masternode", &masternode, false, false, true }, { "masternode", &masternode, true, false, true },
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
/* Wallet */ /* Wallet */