DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2016-10-29 12:38:55 -03:00
parent a5e36fdd9f
commit 9a2f3a4044
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bitcoin-cli.cpp
View File

@@ -56,12 +56,15 @@ public:
}; };
void komodo_args();
static bool AppInitRPC(int argc, char* argv[]) static bool AppInitRPC(int argc, char* argv[])
{ {
// //
// Parameters // Parameters
// //
ParseParameters(argc, argv); ParseParameters(argc, argv);
komodo_args();
if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n"; std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n";
if (!mapArgs.count("-version")) { if (!mapArgs.count("-version")) {

20
src/main.cpp
View File

@@ -1428,18 +1428,20 @@ extern uint64_t ASSETCHAINS_SUPPLY;
CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
{ {
CAmount nSubsidy = 3 * COIN; CAmount nSubsidy = 3 * COIN;
if ( nHeight == 1 ) if ( ASSETCHAINS_SYMBOL[0] == 0 )
{ {
if ( ASSETCHAINS_SYMBOL[0] == 0 ) if ( nHeight == 1 )
return(100000000 * COIN); // ICO allocation return(100000000 * COIN); // ICO allocation
else else if ( komodo_moneysupply(nHeight) < MAX_MONEY )
{ return(3 * COIN);
return(ASSETCHAINS_SUPPLY * COIN + (ASSETCHAINS_MAGIC & 0xffffff)); else return(0);
} }
else
{
if ( nHeight == 1 )
return(ASSETCHAINS_SUPPLY * COIN + (ASSETCHAINS_MAGIC & 0xffffff));
else return(10000);
} }
else if ( komodo_moneysupply(nHeight) < MAX_MONEY )
return(3 * COIN);
else return(0);
/* /*
// Mining slow start // Mining slow start
// The subsidy is ramped up linearly, skipping the middle payout of // The subsidy is ramped up linearly, skipping the middle payout of