Skip to content

Commit d83e8c3

Browse files
committed
bump version, revert chainwork value, skip overspend fix for now
1 parent 6ae1c59 commit d83e8c3

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 0)
44
define(_CLIENT_VERSION_MINOR, 20)
5-
define(_CLIENT_VERSION_REVISION, 14)
5+
define(_CLIENT_VERSION_REVISION, 15)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_RC, 0)
88
define(_CLIENT_VERSION_IS_RELEASE, true)

src/chainparams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ CChainParams::CChainParams()
114114
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL;
115115

116116
// The best chain should have at least this much work.
117-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000002279a0c3b3098082cf2"); // qtum
117+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000138b138b"); // qtum
118118

119119

120120
chainTxData = ChainTxData{

src/miner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa
771771
return false;
772772
if (!fIncludeWitness && it->GetTx().HasWitness())
773773
return false;
774-
if (!CheckTransactionLydraSpending(it->GetTx(), nHeight))
775-
return false;
774+
//if (!CheckTransactionLydraSpending(it->GetTx(), nHeight))
775+
// return false;
776776
}
777777
return true;
778778
}

0 commit comments

Comments
 (0)