Merge pull request #325 from NeblioTeam/v3.2.0

V3.2.0
NeblioTeam · Jan 31, 2021 · 5f11d65 · 5f11d65
2 parents 82ccfbb + 3b039fa
commit 5f11d65
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/wallet/chainparams.cpp b/wallet/chainparams.cpp
@@ -96,7 +96,7 @@ class CMainParams : public CChainParams
             // RetargetV3 upgrade. Approx June 15 2019
             {NetworkFork::NETFORK__4_RETARGET_CORRECTION, 1003125},
             // Enable cold-staking - unset placeholder
-            {NetworkFork::NETFORK__5_COLD_STAKING, 1000000000}}));
+            {NetworkFork::NETFORK__5_COLD_STAKING, 2730450}}));
 
         consensus.nCoinbaseMaturityV1 = 30;
         consensus.nCoinbaseMaturityV2 = 10;
@@ -217,7 +217,8 @@ class CMainParams : public CChainParams
             {2300000, uint256{"0x575ca59268e10b92cfedca6059a388043882f95442b7290012bf8a333ce889c4"}},
             {2400000, uint256{"0xdd8ed2992b0df4422d1fc950350c82f84d9a0862f93582f9404d5c3bb4b3a625"}},
             {2500000, uint256{"0x07ad693d84ef66eaa81f96db7ad901e871ca02a76b1fabb72c1e300580dd2c71"}},
-            {2560000, uint256{"0x0df2f2cf5c196b44ee47d4cd0ad9e2b608dbca49c1b45656731393d2c333a789"}}});
+            {2600000, uint256{"0x8d1855390705044b515907cc2096cd2bb4979cb18d6bf1edd26983da60387502"}},
+            {2687000, uint256{"0x6d2097fce84bd83b066f2a63512b8a44225314cd5f2561eac471071eae291d9a"}}});
         // clang-format on
 
         mapStakeModifierCheckpoints = MapStakeModifierCheckpoints{{0, 0xfd11f4e7},   // genesis
@@ -354,7 +355,8 @@ class CTestNetParams : public CChainParams
             {1600000, uint256{"0x8510acea950aa7e2da8d287bacc66cca6056bf89f5f0d70109fd92adaf1023d9"}},
             {1700000, uint256{"0x65738a87a454cfe97b8200149cd4be7199d1ceff30b18778bd79d222203962ce"}},
             {1801000, uint256{"0x406fc58723c11eae128c85174e81b5b6b333eaf683ff4f6ca34bbd8cee3b24f5"}},
-            {2521000, uint256{"0xd3dc0dd25f4850fa8a607620620959e1970e7bcfe9b36ffd8df3bda1004e5cab"}}});
+            {2521000, uint256{"0xd3dc0dd25f4850fa8a607620620959e1970e7bcfe9b36ffd8df3bda1004e5cab"}},
+            {2581300, uint256{"0xe90b2a55da410f834e047a1f2c1d1901f6beeba2a366a6ce05b01112e9973432"}}});
         // clang-format on
 
         // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet)

diff --git a/wallet/clientversion.h b/wallet/clientversion.h
@@ -7,8 +7,8 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       3
-#define CLIENT_VERSION_MINOR       1
-#define CLIENT_VERSION_REVISION    9
+#define CLIENT_VERSION_MINOR       2
+#define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/wallet/globals.h b/wallet/globals.h
@@ -59,9 +59,8 @@ static const unsigned int MAX_SUBVERSION_LENGTH = 256;
 static const int64_t COIN_YEAR_REWARD = 10 * CENT; // 10%
 
 /** The maximum allowed Peer Protocol Version */
-static const unsigned int MIN_PEER_PROTO_VERSION     = 60303; // v3.0.3+
+static const unsigned int MIN_PEER_PROTO_VERSION     = 60320; // v3.2.0+
 static const unsigned int OLD_MIN_PEER_PROTO_VERSION = 60210; // v2.1+
-
 extern boost::atomic<int64_t> NodeIDCounter;
 
 /** Subversion as sent to the P2P network in `version` messages */

diff --git a/wallet/stakemaker.cpp b/wallet/stakemaker.cpp
@@ -567,6 +567,6 @@ void StakeMaker::resetLastCoinStakeSearchInterval() { nLastCoinStakeSearchInterv
 
 bool StakeMaker::IsStakingActive()
 {
-    // returns true if we have weight and we tried to stake in the last 30 seconds
-    return cachedStakeWeight.load().value_or(0) > 0 && (nLastCoinStakeSearchTime + 30) >= GetAdjustedTime();
+    // returns true if we have weight and we tried to stake in the last 120 seconds
+    return cachedStakeWeight.load().value_or(0) > 0 && (nLastCoinStakeSearchTime + 120) >= GetAdjustedTime();
 }
diff --git a/wallet/version.cpp b/wallet/version.cpp
@@ -14,7 +14,7 @@ const std::string CLIENT_NAME("Satoshi");
 #ifdef NEBLIO_REST
 #define CLIENT_VERSION_SUFFIX   "-REST-Enabled"
 #else
-#define CLIENT_VERSION_SUFFIX   "-RC1"
+#define CLIENT_VERSION_SUFFIX   ""
 #endif
 
 // The following part of the code determines the CLIENT_BUILD variable.

diff --git a/wallet/version.h b/wallet/version.h
@@ -32,7 +32,7 @@ static const int DATABASE_VERSION = 70516;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 60319;
+static const int PROTOCOL_VERSION = 60320;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;