Merge pull request #20 from jl777/FSM

merge latest jl777-FSM
2018-10-03 11:38:09 -04:00
parent 99dad8d238 35cb5f61d9
commit 05f99c1b93
17 changed files with 716 additions and 248 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1877,9 +1877,11 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
    {
        if ( nHeight == 1 )
            return(100000000 * COIN); // ICO allocation
-        else if ( nHeight < KOMODO_ENDOFERA ) //komodo_moneysupply(nHeight) < MAX_MONEY )
+        else if ( nHeight < KOMODO_ENDOFERA )
            return(3 * COIN);
-        else return(0);
+        else if ( nHeight < 2*KOMODO_ENDOFERA )
+            return(2 * COIN);
+        else return(COIN);
    }
    else
    {