Merge pull request #4 from j00v/master

Revert to the original ZENZO PoS settings + latest checkpoints
ZENZO-Ecosystem · Oct 2, 2018 · 82185e4 · 82185e4
2 parents 3e8b235 + ae7dc89
commit 82185e4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -55,14 +55,16 @@ static void convertSeed6(std::vector<CAddress>& vSeedsOut, const SeedSpec6* data
 static Checkpoints::MapCheckpoints mapCheckpoints =
     boost::assign::map_list_of
     (0, uint256("0000024c78d7d2fb56363f7777bab06de80307ac751b02e843ca7ae62d2310d2"))
-	(100, uint256("000008e8aacb5d6564625bedbb549e62fa8a4a7078ccc48e68d60422fa28ae03"))
-	(200, uint256("5fced416abd6a5f1142a3e4bdd0fd384fabea084982db1cad3f30267a6d3a704"))
-	(300, uint256("17034fd26f06696aa533852d4810229045a5849a82e530feb78ba4726b6ec891"))
-	(400, uint256("fd4b96417ec549692f92ce8e708c546038c08bb1601c77245da41f0da07245cf"));
+	(100, uint256("00000a077be1f0b9850b8321fa847e5eb79fd939217596f51f1ea188b16284ea"))
+	(200, uint256("00000003b64c5a430505a05eb3fcada74ff5663829a2cb39be5678223f2f4e59"))
+	(300, uint256("0000000dbb7ac6312c6bbebd31c4dbf6baae9cd34d7ad5fcbe2e89b1c0681d3a"))
+	(400, uint256("0000000a6551d2f6addaffd58fcfc92f1cdb1f0ed91c4cce2b7c925124c51bdc"))
+	(500, uint256("d95c542234350153f61595a58c486485c9d9e01ea26b71614a1938779b4620ae"))
+	(600, uint256("ae353efb716ed1e28c2c597fe41358a9a79f979178dd3da2a568a02f5f9973c8"));
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,
-    1538400789, // * UNIX timestamp of last checkpoint block
-    733,    // * total number of transactions between genesis and last checkpoint
+    1538504133, // * UNIX timestamp of last checkpoint block
+    825,    // * total number of transactions between genesis and last checkpoint
                 //   (the tx=... number in the SetBestChain debug.log lines)
     2000        // * estimated number of transactions per day after checkpoint
 };
@@ -119,12 +121,12 @@ class CMainParams : public CChainParams
         nMinerThreads = 0;
         nTargetTimespan = 1 * 60; // Zenzo: 1 day
         nTargetSpacing = 1 * 60;  // Zenzo: 1 minute
-        nMaturity = 20;
+        nMaturity = 50;
         nMasternodeCountDrift = 20;
         nMaxMoneyOut = 83000000 * COIN;
 
         /** Height or Time Based Activations **/
-        nLastPOWBlock = 100;
+        nLastPOWBlock = 400;
         nModifierUpdateBlock = 1;
         nZerocoinStartHeight = 101;
         nAccumulatorStartHeight = 50;

diff --git a/src/main.cpp b/src/main.cpp
@@ -80,7 +80,7 @@ bool fVerifyingBlocks = false;
 unsigned int nCoinCacheSize = 5000;
 bool fAlerts = DEFAULT_ALERTS;
 
-unsigned int nStakeMinAge = 3 * 10 * 1;
+unsigned int nStakeMinAge = 3 * 60 * 60;
 int64_t nReserveBalance = 0;
 
 /** Fees smaller than this (in duffs) are considered zero fee (for relaying and mining)
@@ -2128,9 +2128,9 @@ int64_t GetBlockValue(int nHeight)
 
     if (nHeight == 0) {
         nSubsidy = 16800000 * COIN;
-    } else if (nHeight < 100 && nHeight > 0) {
+    } else if (nHeight < 400 && nHeight > 0) {
         nSubsidy = 0.1 * COIN;
-    } else if (nHeight <= 10000 && nHeight >= 100) {
+    } else if (nHeight <= 10000 && nHeight >= 400) {
         nSubsidy = 15 * COIN;
     } else if (nHeight <= 50000 && nHeight >= 10000) {
 		nSubsidy = 13 * COIN;

diff --git a/src/main.h b/src/main.h
@@ -84,7 +84,7 @@ static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB
 /** The pre-allocation chunk size for rev?????.dat files (since 0.8) */
 static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
-static const int COINBASE_MATURITY = 20;
+static const int COINBASE_MATURITY = 50;
 /** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */
 static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov  5 00:53:20 1985 UTC
 /** Maximum number of script-checking threads allowed */

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70003;
+static const int PROTOCOL_VERSION = 70004;
 
 //! 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 = 70003;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70004;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70004;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this