v2.0.3.1

IttriumCore · Dec 3, 2018 · aef705e · aef705e
1 parent a7ee984
commit aef705e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -197,8 +197,9 @@ class CMainParams : public CChainParams
         fHeadersFirstSyncingActive = false;
 
         nPoolMaxTransactions = 3;
-        strSporkKey = "04d37d371dde4335c7f3a80efab4848024b0d782bb5b4a36c21f9a8fd5c620c6a7a09821f77776b77987a947efd3218336d4aa59670a4e309a93a8dc6026ed03d8";
-        strObfuscationPoolDummyAddress = "ifd6BU5MDvKsTW9Vfqyo6SNW3KFjv7YEz";
+ //     strSporkKey = "04d37d371dde4335c7f3a80efab4848024b0d782bb5b4a36c21f9a8fd5c620c6a7a09821f77776b77987a947efd3218336d4aa59670a4e309a93a8dc6026ed03d8";
+        strSporkKey = "0488188b3140c7a07670d7de3b85c6a2eedb0342ddf18e88ae3b8cc89e5606dcf0d5f96053480b545b586edc0eb0657ddab978579a9ef9f97c4ea9aee4ee5f82c0";
+	strObfuscationPoolDummyAddress = "ifd6BU5MDvKsTW9Vfqyo6SNW3KFjv7YEz";
         nStartMasternodePayments = 150; 
 
         /** Zerocoin */

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 3
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/init.cpp b/src/init.cpp
@@ -1372,6 +1372,12 @@ bool AppInit2(boost::thread_group& threadGroup)
                                 listAccCheckpointsNoDB.emplace_back(pindex->nAccumulatorCheckpoint);
                             pindex = chainActive.Next(pindex);
                         }
+
+                        // if we have iterated to the end of the blockchain, then checkpoints should be in sync
+                        if (pindex->nHeight + 1 <= chainActive.Height())
+                            pindex = chainActive[pindex->nHeight + 1];
+                        else
+                            break;
                     }
                 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -2848,7 +2848,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     // two in the chain that violate it. This prevents exploiting the issue against nodes in their
     // initial block download.
     bool fEnforceBIP30 = (!pindex->phashBlock) || // Enforce on CreateNewBlock invocations which don't have a hash.
-                         !((pindex->nHeight == 91842 && pindex->GetBlockHash() == uint256("0x00000000000a4d0a398161ffc163c503763b1f4360639393e0e4c8e300e0caec")) ||
+                         !((pindex->nHeight == 120001 && pindex->GetBlockHash() == uint256("0x00000000000a4d0a398161ffc163c503763b1f4360639393e0e4c8e300e0caec")) ||
                              (pindex->nHeight == 91880 && pindex->GetBlockHash() == uint256("0x00000000000743f190a18c5577a3c2d2a1f610ae9601ac046a38084ccb7cd721")));
     if (fEnforceBIP30) {
         BOOST_FOREACH (const CTransaction& tx, block.vtx) {
@@ -6337,6 +6337,7 @@ int ActiveProtocol()
 {
     if (IsSporkActive(SPORK_19_NEW_PROTOCOL_DYNAMIC))
         return GetSporkValue(SPORK_19_NEW_PROTOCOL_DYNAMIC);
+        return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18;
 
     if (IsSporkActive(SPORK_18_NEW_PROTOCOL_ENFORCEMENT_4))
         return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18;

diff --git a/src/masternodeman.h b/src/masternodeman.h
@@ -146,6 +146,7 @@ class CMasternodeMan
     /// Return the number of (unique) Masternodes
     int size() { return vMasternodes.size(); }
 
+    /// Return the number of Masternodes older than (default) 8000 seconds
     int stable_size ();
 
     std::string ToString() const;

diff --git a/src/protocol.h b/src/protocol.h
@@ -71,7 +71,11 @@ enum {
     // Bitcoin Core nodes used to support this by default, without advertising this bit,
     // but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)
     NODE_BLOOM = (1 << 2),
-    NODE_BLOOM_WITHOUT_MN = (1 << 4),
+
+	// NODE_BLOOM_WITHOUT_MN means the node has the same features as NODE_BLOOM with the only difference
+	// that the node doens't want to receive master nodes messages. (the 1<<3 was not picked as constant because on bitcoin 0.14 is witness and we want that update here )
+
+	 NODE_BLOOM_WITHOUT_MN = (1 << 4),
 
     // Bits 24-31 are reserved for temporary experiments. Just pick a bit that
     // isn't getting used, or one not being used much, and notify the

diff --git a/src/version.h b/src/version.h
@@ -17,13 +17,13 @@ static const int PROTOCOL_VERSION = 70911;
 static const int INIT_PROTO_VERSION = 209;
 
 //! In this version, 'getheaders' was introduced.
-static const int GETHEADERS_VERSION = 70077;
+static const int GETHEADERS_VERSION = 70911;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70900;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70911;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT15 = 70811;
 static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT17 = 70900;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18 = 70910;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT18 = 70911;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this