undo the block reward tier changes i made before, /g/ was right again…

…!; also update client version
fedoracoin · Dec 25, 2013 · da59a37 · da59a37
1 parent cde439e
commit da59a37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -854,43 +854,43 @@ int64 static GetBlockValue(int nHeight, int64 nFees, uint256 prevHash)
         int rand4 = 0;
         int rand5 = 0;
 
-        if(nHeight < 10000)    
+        if(nHeight < 100000)    
         {
                 nSubsidy = (1 + rand) * OLDCOIN;
         }
-        else if(nHeight < 20000)      
+        else if(nHeight < 200000)      
         {
                 cseed_str = prevHash.ToString().substr(7,7);
                 cseed = cseed_str.c_str();
                 seed = hex2long(cseed);
                 rand1 = generateMTRandom(seed, 499999);
                 nSubsidy = (1 + rand1) * OLDCOIN;
         }
-        else if(nHeight < 30000)      
+        else if(nHeight < 300000)      
         {
                 cseed_str = prevHash.ToString().substr(6,7);
                 cseed = cseed_str.c_str();
                 seed = hex2long(cseed);
                 rand2 = generateMTRandom(seed, 249999);
                 nSubsidy = (1 + rand2) * OLDCOIN;
         }
-        else if(nHeight < 40000)      
+        else if(nHeight < 400000)      
         {
                 cseed_str = prevHash.ToString().substr(7,7);
                 cseed = cseed_str.c_str();
                 seed = hex2long(cseed);
                 rand3 = generateMTRandom(seed, 124999);
                 nSubsidy = (1 + rand3) * OLDCOIN;
         }
-        else if(nHeight < 50000)      
+        else if(nHeight < 500000)      
         {
                 cseed_str = prevHash.ToString().substr(7,7);
                 cseed = cseed_str.c_str();
                 seed = hex2long(cseed);
                 rand4 = generateMTRandom(seed, 62499);
                 nSubsidy = (1 + rand4) * OLDCOIN;
         }
-        else if(nHeight < 60000)      
+        else if(nHeight < 600000)      
         {
                 cseed_str = prevHash.ToString().substr(6,7);
                 cseed = cseed_str.c_str();

diff --git a/src/version.h b/src/version.h
@@ -12,10 +12,10 @@
 //
 
 // These need to be macro's, as version.cpp's voodoo requires it
-#define CLIENT_VERSION_MAJOR       0
-#define CLIENT_VERSION_MINOR       6
+#define CLIENT_VERSION_MAJOR       1
+#define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    4
-#define CLIENT_VERSION_BUILD       0
+#define CLIENT_VERSION_BUILD       3
 
 static const int CLIENT_VERSION =
                            1000000 * CLIENT_VERSION_MAJOR