update 1210

condominium · Jun 28, 2018 · 7b47f38 · 7b47f38
1 parent 16aeef8
commit 7b47f38
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 35 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2017)

diff --git a/share/genbuild.sh b/share/genbuild.sh
@@ -13,9 +13,9 @@ else
     exit 1
 fi
 
-DESC="375bd1e"
-SUFFIX="1.2.0.0"
-LAST_COMMIT_DATE="2018-06-03 02:26:30 +0200"
+DESC="1.2.1.0"
+SUFFIX=""
+LAST_COMMIT_DATE=""
 if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -118,7 +118,7 @@ class CMainParams : public CChainParams
         nTargetSpacing = 1 * 60;  // Condominium: 60 Seconds
         nMaturity = 49;
         nMasternodeCountDrift = 20;
-        nMaxMoneyOut = 62000000 * COIN;
+        nMaxMoneyOut = 3500000000 * COIN;
 
         /** Height or Time Based Activations **/
         nLastPOWBlock = 600;

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 //! These need to be macros, as clientversion.cpp's and condominium*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/main.cpp b/src/main.cpp
@@ -2142,32 +2142,40 @@ int64_t GetBlockValue(int nHeight)
           nSubsidy = 1000 * COIN;
       } else if (nHeight <= 30500 && nHeight > 25000) {
           nSubsidy = 2500 * COIN;
-      } else if (nHeight <= 35000 && nHeight > 30500) {  // fork happens
+      } else if (nHeight <= 35000 && nHeight > 30500) {  // fork happened
           nSubsidy = 2 * COIN;
-      } else if (nHeight <= 45000 && nHeight > 35000) {
-          nSubsidy = 500 * COIN;
-      } else if (nHeight <= 52000 && nHeight > 45000) {
-          nSubsidy = 2 * COIN;
-      } else if (nHeight <= 75000 && nHeight > 52000) {
-          nSubsidy = 250 * COIN;
-      } else if (nHeight <= 100000 && nHeight > 75000) {
-          nSubsidy = 2 * COIN;
-      } else if (nHeight <= 500000 && nHeight > 100000) {
-          nSubsidy = 20 * COIN;
+      } else if (nHeight <= 50000 && nHeight > 35000) {  // another fork will happen at 35k
+          nSubsidy = 2000 * COIN;
+      } else if (nHeight <= 75000 && nHeight > 50000) {
+          nSubsidy = 3000 * COIN;
+      } else if (nHeight <= 150000 && nHeight > 75000) {
+          nSubsidy = 4000 * COIN;
+      } else if (nHeight <= 300000 && nHeight > 150000) {
+          nSubsidy = 5000 * COIN;
+      } else if (nHeight <= 500000 && nHeight > 300000) {
+          nSubsidy = 6000 * COIN;
       } else if (nHeight <= 1000000 && nHeight > 500000) {
-          nSubsidy = 4 * COIN;
+          nSubsidy = 500 * COIN;
       } else if (nHeight <= 2000000 && nHeight > 1000000) {
-          nSubsidy = 3 * COIN;
+          nSubsidy = 250 * COIN;
       } else if (nHeight <= 5000000 && nHeight > 2000000) {
-          nSubsidy = 2 * COIN;
+          nSubsidy = 100 * COIN;
       } else if (nHeight <= 10000000 && nHeight > 5000000) {
+          nSubsidy = 50 * COIN;
+      } else if (nHeight <= 15000000 && nHeight > 10000000) {
           nSubsidy = 1 * COIN;
-      } else if (nHeight <= 20000000 && nHeight > 10000000) {
-          nSubsidy = 0.5 * COIN;
       } else {
           nSubsidy = 0.1 * COIN;
-    }
+      }
+
+      // Check if we reached the coin max supply.
+  	int64_t nMoneySupply = chainActive.Tip()->nMoneySupply;
+
+    if (nMoneySupply + nSubsidy >= Params().MaxMoneyOut())
+  		nSubsidy = Params().MaxMoneyOut() - nMoneySupply;
 
+  	if (nMoneySupply >= Params().MaxMoneyOut())
+  		nSubsidy = 0;
 
   	return nSubsidy;
 

diff --git a/src/main.h b/src/main.h
@@ -88,37 +88,49 @@ inline int64_t GetMstrNodCollateral(int nHeight){
       {
         return 25000;
       }
-      else if(nHeight >= 30500 && nHeight < 45000)
+      else if(nHeight >= 30500 && nHeight < 35000) // fork will happen at 35k
       {
         return 30000;
       }
-      else if(nHeight >= 45000 && nHeight < 75000)
+      else if(nHeight >= 35000 && nHeight < 50000)
       {
-        return 35000;
+        return 30000;
       }
-      else if(nHeight >= 75000 && nHeight < 500000)
+      else if(nHeight >= 50000 && nHeight < 75000)
       {
         return 40000;
       }
-      else if(nHeight >= 500000 && nHeight < 1000000)
+      else if(nHeight >= 75000 && nHeight < 150000)
       {
         return 50000;
       }
+      else if(nHeight >= 150000 && nHeight < 300000)
+      {
+        return 100000;
+      }
+      else if(nHeight >= 300000 && nHeight < 500000)
+      {
+        return 250000;
+      }
+      else if(nHeight >= 500000 && nHeight < 1000000)
+      {
+        return 300000;
+      }
       else if(nHeight >= 1000000 && nHeight < 2000000)
       {
-        return 55000;
+        return 400000;
       }
       else if(nHeight >= 2000000 && nHeight < 5000000)
       {
-        return 60000;
+        return 500000;
       }
       else if(nHeight >= 5000000 && nHeight < 10000000)
       {
-        return 65000;
+        return 750000;
       }
       else
       {
-        return 70000;
+        return 1000000;
       }
 
 }

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70004;
+static const int PROTOCOL_VERSION = 70005;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,8 +21,8 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70000;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70003;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70004;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70004;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70005;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this