bump version, revert chainwork value, skip overspend fix for now

Hydra-Chain · Aug 9, 2023 · d83e8c3 · d83e8c3
1 parent 6ae1c59
commit d83e8c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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, 20)
-define(_CLIENT_VERSION_REVISION, 14)
+define(_CLIENT_VERSION_REVISION, 15)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -114,7 +114,7 @@ CChainParams::CChainParams()
     consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL;
 
     // The best chain should have at least this much work.
-    consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000002279a0c3b3098082cf2"); // qtum
+    consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000138b138b"); // qtum
 
 
     chainTxData = ChainTxData{

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -771,8 +771,8 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa
             return false;
         if (!fIncludeWitness && it->GetTx().HasWitness())
             return false;
-        if (!CheckTransactionLydraSpending(it->GetTx(), nHeight))
-            return false;
+//if (!CheckTransactionLydraSpending(it->GetTx(), nHeight))
+//           return false;
     }
     return true;
 }