Merge pull request #59 from RzeroD/master

Version 15.2
heliumchain · Oct 5, 2018 · d6a452f · d6a452f
2 parents a3ae166 + 906d947
commit d6a452f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 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, 0)
 define(_CLIENT_VERSION_MINOR, 15)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -61,7 +61,8 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
     (    0, uint256("0000033346b0b31697bcd178789fe1d6d10f96a7fd46d74fbf647d5ea3757348"))
     (30000, uint256("8c65cf5033aa6b6ea4254c830c4c77c4de30875e6ba5ee619b31350bc314b7cf"))
     (31331, uint256("f88c7264a05c05033a98c92088613880cd4d210aab12367eb48d5fe3a0189672"))
-    (32848, uint256("5eaab0c098683f82895c71711775947eaf51783a889f4f5aa10e8f2a16ffc8bf"));
+    (32848, uint256("352431d65a69b3425ce508cfbbff077c8fdc2833a84e6e239f0ba8e7300e9744"))
+    (31562, uint256("7738a178f95139b2cd6b2120b19584cc17a2a28a00962b5d28978cd199427821"));
 
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,
@@ -202,8 +203,12 @@ class CMainParams : public CChainParams
         // Mainnet --- nonce: 6846 time: 1535104494 hash: 0x0000033346b0b31697bcd178789fe1d6d10f96a7fd46d74fbf647d5ea3757348 merklehash: 0xedee755717c4de66ce52056e36ae0f6e9f0269667fd8a06e3c5367588cbfadbd
 
         vSeeds.push_back(CDNSSeedData("knout", "dnsseed.helium.cl"));
-        vSeeds.push_back(CDNSSeedData("Kserv", "149.28.242.177"));
-
+        vSeeds.push_back(CDNSSeedData("seed1", "s1.heliumcoin.info"));
+	vSeeds.push_back(CDNSSeedData("seed2", "s2.heliumcoin.info"));
+	vSeeds.push_back(CDNSSeedData("seed3", "s3.heliumcoin.info"));
+	vSeeds.push_back(CDNSSeedData("seed4", "s4.heliumcoin.info"));
+        vSeeds.push_back(CDNSSeedData("seed5", "s5.heliumcoin.info"));
+
         // Helium addresses start with 'S'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,63);
         // Helium script addresses start with '3'

diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
@@ -8,9 +8,10 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3f,0x53,0x29}, 9009},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xed,0x41}, 9009},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0x3a,0x08}, 9009}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0xb4,0xf1}, 9009},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x2d,0x06}, 9009},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x51,0xd2}, 9009},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0x61,0x31}, 9009}
 };
 
 static SeedSpec6 pnSeed6_test[] = {};

diff --git a/src/spork.h b/src/spork.h
@@ -55,7 +55,7 @@ using namespace boost;
 #define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT 4070908800            //OFF
 #define SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT 4070908800      //OFF
 #define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT 4070908800    //OFF
-#define SPORK_16_ZEROCOIN_MAINTENANCE_MODE_DEFAULT 4070908800     //OFF
+#define SPORK_16_ZEROCOIN_MAINTENANCE_MODE_DEFAULT 978307200     //OFF
 
 class CSporkMessage;
 class CSporkManager;

diff --git a/src/version.h b/src/version.h
@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 71028;
+static const int PROTOCOL_VERSION = 71029;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -20,8 +20,8 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71027;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71028;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71028;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71029;
 
 //! masternodes older than this proto version use old strMessage format for mnannounce
 static const int MIN_PEER_MNANNOUNCE = 71027;