update fork time

bitcoin-green · Aug 8, 2019 · c1a9747 · c1a9747
1 parent adbfdee
commit c1a9747
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 2)
+define(_CLIENT_VERSION_BUILD, 3)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([BitGreen Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.bitg.org],[bitgreen])

diff --git a/src/main.cpp b/src/main.cpp
@@ -1728,7 +1728,7 @@ bool CScriptCheck::operator()()
 
 bool ValidOutPoint(const COutPoint out, int nHeight)
 {
-    bool isInvalid = ActiveProtocol() >= MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT && invalid_out::ContainsOutPoint(out);
+    bool isInvalid = nHeight >= SOFT_FORK_VERSION_132 && invalid_out::ContainsOutPoint(out);
     return !isInvalid;
 }
 
@@ -3011,7 +3011,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
                 return state.DoS(100, error("CheckBlock() : more than one coinstake"));
 
         // Additional PoS checks.
-        if (ActiveProtocol() >= MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT) {
+        if (block.nTime > SOFT_FORK_VERSION_132_TIME) {
             // Check for minimum input value.
             CScript payee = block.vtx[1].vout[1].scriptPubKey;
             CAmount totalMinted = 0;

diff --git a/src/version.h b/src/version.h
@@ -27,6 +27,7 @@ static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70915;
 //! fork blocks
 static const int SOFT_FORK_VERSION_120 = 260000;
 static const int SOFT_FORK_VERSION_132 = 798743;
+static const int SOFT_FORK_VERSION_132_TIME = 1565284722;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this