v0.6.0

reefcoin-io · May 17, 2018 · ad7c346 · ad7c346
1 parent 9804f16
commit ad7c346
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 37 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 5)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 6)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/bitcoin.ico
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -118,14 +118,14 @@ class CMainParams : public CChainParams {
         pchMessageStart[3] = 0xd5;
         vAlertPubKey = ParseHex("044513449073a8efe161dc42e7c07c61c4a8f59297dc8ebacbc2f77345084d058399022bc6a0db0719739f183d14b04893fb78c3b9bd9a3f88ecf8ea06adae99fe");
         //changed default port so it wont conflict with reden
-        nDefaultPort = 12058;
+        nDefaultPort = 11058;
         nMaxTipAge = 1.5 * 60 * 60; // ~36 blocks behind -> 2 x fork detection time, was 24 * 60 * 60 in bitcoin
         nPruneAfterHeight = 100000;
 
         //genesis = CreateGenesisBlock(1523764584, 360505, 0x1e0ffff0, 1, 50 * COIN);
 
-        uint32_t nTime = 1526191846;
-        uint32_t nNonce = 4585107;
+        uint32_t nTime = 1526525361;
+        uint32_t nNonce = 5228480;
         uint32_t nBits = 504365040;
         int32_t nVersion = 1;
         //const CAmount& genesisReward = 50 * COIN;
@@ -161,11 +161,11 @@ class CMainParams : public CChainParams {
                     printf("Mainnet block.GetHash = %s\n", genesis.GetHash().GetHex().c_str());
                     printf("Mainnet block.Merkleroot = %s\n", genesis.hashMerkleRoot.ToString().c_str());
             }
-        **/
+         **/
             //printf("block.hashGenesisBlock = %s\n",consensus.hashGenesisBlock.ToString().c_str());
             //printf("block.hashMerkleRoot = %s\n",genesis.hashMerkleRoot.ToString().c_str());
-	    assert(consensus.hashGenesisBlock == uint256S("0x0000010e08cdaff5220e3db48752673b1b05b08129a2c8121e88350d6d5ef0ef"));
-        assert(genesis.hashMerkleRoot == uint256S("0x5441361edd31ed9073d5efc41f2ec32154fbee009d19c7ba32e6f25ff1165a52"));
+	    //assert(consensus.hashGenesisBlock == uint256S("0x0000075bc081ef3fa8600e06432df191124b9f4027489c60a942c3ead2e87612"));
+        //assert(genesis.hashMerkleRoot == uint256S("0x5441361edd31ed9073d5efc41f2ec32154fbee009d19c7ba32e6f25ff1165a52"));
 
 
         vSeeds.push_back(CDNSSeedData("seed1", "seed1.reefcoin.io"));
@@ -217,7 +217,7 @@ class CMainParams : public CChainParams {
         };*/
        checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
-            ( 0, uint256S("0x0000010e08cdaff5220e3db48752673b1b05b08129a2c8121e88350d6d5ef0ef")),
+            ( 0, uint256S("0x0000075bc081ef3fa8600e06432df191124b9f4027489c60a942c3ead2e87612")),
             1526191846, // * UNIX timestamp of last checkpoint block
             0,          // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
@@ -276,11 +276,11 @@ class CTestNetParams : public CChainParams {
         pchMessageStart[2] = 0x7d;
         pchMessageStart[3] = 0xd6;
         vAlertPubKey = ParseHex("04f9e05c65b8cf20e31464d7f35504b62999f845c9242bc6b1bcd1993c643e3ca40527a13de58afa831dccdeacae82b39c01602daf3a7f4151032f5dacefa36932");
-        nDefaultPort = 12717;
+        nDefaultPort = 11717;
         nMaxTipAge = 0x7fffffff; // allow mining on top of old blocks for testnet
         nPruneAfterHeight = 1000;
-        uint32_t nTime = 1526191746;
-        uint32_t nNonce = 6892045;
+        uint32_t nTime = 1526525380;
+        uint32_t nNonce = 6965044;
         uint32_t nBits = 504365040;
         int32_t nVersion = 1;
         //const CAmount& genesisReward = 50 * COIN;
@@ -289,7 +289,7 @@ class CTestNetParams : public CChainParams {
         //genesis = CreateGenesisBlock(1513728000, 21635, 0x1e0ffff0, 1, 50 * COIN);
 
         consensus.hashGenesisBlock = genesis.GetHash();
-        /** if(genesis.GetHash() != uint256S("0x"))
+        /**if(genesis.GetHash() != uint256S("0x"))
              {
                      bool fNegative;
                      bool fOverflow;
@@ -317,9 +317,9 @@ class CTestNetParams : public CChainParams {
                      printf("Testnet block.GetHash = %s\n", genesis.GetHash().GetHex().c_str());
                      printf("Testnet block.Merkleroot = %s\n", genesis.hashMerkleRoot.ToString().c_str());
              }
-         */
+**/
 
-       assert(consensus.hashGenesisBlock == uint256S("0x000000bcc46441623bf58ecd450460e8ad9465c018c0bcbb6f4d1ceef00f8d5c"));
+       assert(consensus.hashGenesisBlock == uint256S("0x00000f044526b959841261d1d6c47a6c9454b6868bc9c59023070b567c1cf225"));
        assert(genesis.hashMerkleRoot == uint256S("0x5441361edd31ed9073d5efc41f2ec32154fbee009d19c7ba32e6f25ff1165a52"));
 
 
@@ -354,7 +354,7 @@ class CTestNetParams : public CChainParams {
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
-            ( 0, uint256S("0x000000bcc46441623bf58ecd450460e8ad9465c018c0bcbb6f4d1ceef00f8d5c")),
+            ( 0, uint256S("0x00000f044526b959841261d1d6c47a6c9454b6868bc9c59023070b567c1cf225")),
             1526191746, // * UNIX timestamp of last checkpoint block
             0,          // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
@@ -412,10 +412,10 @@ class CRegTestParams : public CChainParams {
         pchMessageStart[2] = 0x5e;
         pchMessageStart[3] = 0xd7;
         nMaxTipAge = 6 * 60 * 60; // ~144 blocks behind -> 2 x fork detection time, was 24 * 60 * 60 in bitcoin
-        nDefaultPort = 12617;
+        nDefaultPort = 11617;
         nPruneAfterHeight = 1000;
-        uint32_t nTime = 1526191646;
-        uint32_t nNonce = 824823;
+        uint32_t nTime = 1526525390;
+        uint32_t nNonce = 1396499;
         uint32_t nBits = 504655040;
         int32_t nVersion = 1;
         //const CAmount& genesisReward = 50 * COIN;
@@ -454,7 +454,7 @@ class CRegTestParams : public CChainParams {
              }
 
          */
-        assert(consensus.hashGenesisBlock == uint256S("0x00000f06f0373d435738e2be9b7e042e004718ad9fce41b4f3ec8bf99284925f"));
+        assert(consensus.hashGenesisBlock == uint256S("0x000010da055a05ea13ec93f883731e6a03d7327af258f16cbc8384a39ee21f96"));
         assert(genesis.hashMerkleRoot == uint256S("0x5441361edd31ed9073d5efc41f2ec32154fbee009d19c7ba32e6f25ff1165a52"));
 
         vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds.
@@ -470,7 +470,7 @@ class CRegTestParams : public CChainParams {
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of
-            ( 0, uint256S("0x00000f06f0373d435738e2be9b7e042e004718ad9fce41b4f3ec8bf99284925f")),
+            ( 0, uint256S("0x000010da055a05ea13ec93f883731e6a03d7327af258f16cbc8384a39ee21f96")),
             0,
             0,
             0

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

diff --git a/src/config/reef-config.h b/src/config/reef-config.h
@@ -9,7 +9,7 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Version Build */
-#define CLIENT_VERSION_BUILD 2
+#define CLIENT_VERSION_BUILD 1
 
 /* Version is release */
 #define CLIENT_VERSION_IS_RELEASE true
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 0
 
 /* Minor version */
-#define CLIENT_VERSION_MINOR 5
+#define CLIENT_VERSION_MINOR 6
 
 /* Build revision */
 #define CLIENT_VERSION_REVISION 0
@@ -356,7 +356,7 @@
 #define PACKAGE_NAME "Reef Core"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Reef Core 2.0.0"
+#define PACKAGE_STRING "Reef Core 0.5.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "reefcore"
@@ -365,7 +365,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
+#define PACKAGE_VERSION "0.5.1"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/src/main.cpp b/src/main.cpp
@@ -1763,39 +1763,39 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params&
         nPOW =  5 * COIN;
         nSubsidy = nPOW;
     }
-    if (nPrevHeight > 500 && nPrevHeight < 5001){
+    if (nPrevHeight > 500 && nPrevHeight < 50001){
         nPOW =  5000 * COIN;
         nSubsidy = nPOW;
     }
-    if (nPrevHeight > 5000 && nPrevHeight < 50001){
+    if (nPrevHeight > 50000 && nPrevHeight < 500001){
         nPOW =  4375 * COIN;
         nSubsidy = nPOW * 0.75;
     }
-    if (nPrevHeight > 50000 && nPrevHeight < 100001){
+    if (nPrevHeight > 500000 && nPrevHeight < 1000001){
         nPOW =  3750 * COIN;
         nSubsidy = nPOW * 0.65;
     }
-    if (nPrevHeight > 100000 && nPrevHeight < 350001){
+    if (nPrevHeight > 1000000 && nPrevHeight < 3500001){
         nPOW =  3125 * COIN;
         nSubsidy = nPOW * 0.55;
     }
-    if (nPrevHeight > 350000 && nPrevHeight < 500001){
+    if (nPrevHeight > 3500000 && nPrevHeight < 5000001){
         nPOW =  2500 * COIN;
         nSubsidy = nPOW * 0.45;
     }
-    if (nPrevHeight > 500000 && nPrevHeight < 750001){
+    if (nPrevHeight > 5000000 && nPrevHeight < 7500001){
         nPOW =  1875 * COIN;
         nSubsidy = nPOW * 0.35;
     }
-    if (nPrevHeight > 750000 && nPrevHeight < 1000001){
+    if (nPrevHeight > 7500000 && nPrevHeight < 10000001){
         nPOW =  1250 * COIN;
         nSubsidy = nPOW * 0.25;
     }
-    if (nPrevHeight > 1000000 && nPrevHeight < 1250001){
+    if (nPrevHeight > 10000000 && nPrevHeight < 12500001){
         nPOW =  625 * COIN;
         nSubsidy = nPOW * 0.15;
     }
-    if (nPrevHeight > 1250000){
+    if (nPrevHeight > 12500000){
         nPOW =  625 * COIN;
         nSubsidy = nPOW * 0.05;
     }

diff --git a/src/pow.cpp b/src/pow.cpp
@@ -81,7 +81,7 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const Conse
 }
 
 unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const Consensus::Params& params) {
-    /* current difficulty formula, reef - DarkGravity v3, written by Evan Duffield - evan@reefcoin.io */
+    /* current difficulty formula, reef - DarkGravity v3, written by Evan Duffield*/
     const CBlockIndex *BlockLastSolved = pindexLast;
     const CBlockIndex *BlockReading = pindexLast;
     int64_t nActualTimespan = 0;

diff --git a/src/secp256k1/.DS_Store b/src/secp256k1/.DS_Store
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -625,6 +625,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
         int nMinVersion = 0;
         if (Read((string)"minversion", nMinVersion))
         {
+            LogPrintf("MinVersion %d Client Version %d \n",nMinVersion,CLIENT_VERSION);
             if (nMinVersion > CLIENT_VERSION)
                 return DB_TOO_NEW;
             pwallet->LoadMinVersion(nMinVersion);
@@ -735,6 +736,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash, vec
         int nMinVersion = 0;
         if (Read((string)"minversion", nMinVersion))
         {
+            LogPrintf("MinVersion %d Client Version %d \n",nMinVersion,CLIENT_VERSION);
             if (nMinVersion > CLIENT_VERSION)
                 return DB_TOO_NEW;
             pwallet->LoadMinVersion(nMinVersion);