Merge pull request #29 from MNPJason/version/1.2.5/stakeFix

Staking Fix
MasterNodesPro · Feb 26, 2019 · 29bace4 · 29bace4
2 parents de59108 + 491a9eb
commit 29bace4
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 257 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,18 @@
 MNPCOIN Core
 =====================================
-Version: V1.2.4
+Version: V1.2.5
 
 Website: https://mnpcoin.pro
 
 Utility: https://masternodes.pro
 
+#### 02-21-19 V1.2.5
+- Update checkpoints @MNPJason
+- Remove lingering BIP130 Code @MNPJason
+- Update Version to v1.2.5 @MNPJason
+- Update masternode.sh file @MNPJason
+
+
 #### 02-21-19 V1.2.4
 - Remove BIP130 as it was causing a bandwidth issue with local wallets and hosted nodes @MNPJason
 - Update masternode.sh file @MNPJason

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, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_REVISION, 5)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

diff --git a/doc/masternode.sh b/doc/masternode.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PACKAGE='mnpcoin-v1.2.4.tar.gz'
-VERSION='v1.2.4'
+PACKAGE='mnpcoin-v1.2.5.tar.gz'
+VERSION='v1.2.5'
 
 system_motd() {
     clear
@@ -21,7 +21,7 @@ system_motd() {
     echo "            ██║ ╚═╝ ██║██║ ╚═██║██║     ╚██████╗╚██████╔╝██║██║ ╚═██║               "
     echo "            ╚═╝     ╚═╝╚═╝   ╚═╝╚═╝      ╚═════╝ ╚═════╝ ╚═╝╚═╝   ╚═╝               "
     echo ""
-    echo "Updated: 2/21/2019 By: MNP_Jason"
+    echo "Updated: 2/25/2019 By: MNP_Jason"
     echo && echo && echo
     sleep 2
 }

diff --git a/src/chain.cpp b/src/chain.cpp
@@ -54,8 +54,8 @@ CBlockLocator CChain::GetLocator(const CBlockIndex* pindex) const
 
 const CBlockIndex* CChain::FindFork(const CBlockIndex* pindex) const
 {
-    if (!pindex)
-        return nullptr;
+//    if (!pindex)
+//        return nullptr;
 
     if (pindex->nHeight > Height())
         pindex = pindex->GetAncestor(Height());

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -84,12 +84,15 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
                 (       220000, uint256("6d55a17c276ab12b14b6b8d13fb33e733613b25c600c220a457ed6a054c137cf"))
                 (       240000, uint256("85469fe3a2b8130e163f1e0b1c324c405dc84f91a62d001de1cdbf465f056dcd"))
                 (       248000, uint256("b7934ead9db1c2444e591060d46dfcbf1330ccba04524d1b46ef164b991adc9d"))
+                (       260000, uint256("6b6b58124a1686d18aab22ac56efba4ab691da92ebcb2fb4bad9c1237fd76d4e"))
+                (       280000, uint256("ef54192b4db3a50c3958c1f810b14cd29e9d4c625faa9a78ed7a60b641e6f6e6"))
+                (       293650, uint256("e5f257db46a1b89f319f97e90fdf6c8143d8e1fedc60cdf6751fc5a6bbb593f4"))
                 ;
 
 static const Checkpoints::CCheckpointData data = {
         &mapCheckpoints,
-        1548362685, // * UNIX timestamp of last checkpoint block
-        506447,       // * total number of transactions between genesis and last checkpoint
+        1551127482, // * UNIX timestamp of last checkpoint block
+        604487,       // * 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
 };

diff --git a/src/config/mnpcoin-config.h b/src/config/mnpcoin-config.h
@@ -21,7 +21,7 @@
 #define CLIENT_VERSION_MINOR 2
 
 /* Build revision */
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_REVISION 5
 
 /* Version is release */
 #define COPYRIGHT_YEAR 2019
@@ -274,7 +274,7 @@
 #define PACKAGE_NAME "MNPCoin Core"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MNPCoin Core 1.2.4"
+#define PACKAGE_STRING "MNPCoin Core 1.2.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mnpcoin"
@@ -283,7 +283,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.4"
+#define PACKAGE_VERSION "1.2.5"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */