diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 7f213596e..0f199ee12 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -56,12 +56,15 @@ public: }; +void komodo_args(); + static bool AppInitRPC(int argc, char* argv[]) { // // Parameters // ParseParameters(argc, argv); + komodo_args(); if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) { std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n"; if (!mapArgs.count("-version")) { diff --git a/src/main.cpp b/src/main.cpp index 00dfce272..f510b6070 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1428,18 +1428,20 @@ extern uint64_t ASSETCHAINS_SUPPLY; CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) { 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 - else - { - return(ASSETCHAINS_SUPPLY * COIN + (ASSETCHAINS_MAGIC & 0xffffff)); - } + else if ( komodo_moneysupply(nHeight) < MAX_MONEY ) + return(3 * COIN); + 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 // The subsidy is ramped up linearly, skipping the middle payout of