@diego/v3

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 4)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

src/bench/checkblock.cpp

@@ -45,7 +45,7 @@ static void DeserializeAndCheckBlockTest(benchmark::State& state)
         CValidationState validationState;
         CheckContextState ctxState;
 
-        bool checked = CheckBlock(block, validationState, chainParams->GetConsensus(), ctxState, false);
+        bool checked = CheckBlock(block, validationState, chainParams->GetConsensus(), ctxState, false, 413567);
         assert(checked);
     }
 }

src/bench/duplicate_inputs.cpp

@@ -61,7 +61,7 @@ static void DuplicateInputs(benchmark::State& state)
     while (state.KeepRunning()) {
         CValidationState cvstate{};
         CheckContextState ctxState;
-        assert(!CheckBlock(block, cvstate, chainparams.GetConsensus(), ctxState, false, false));
+        assert(!CheckBlock(block, cvstate, chainparams.GetConsensus(), ctxState, false, nHeight, false));
         assert(cvstate.GetRejectReason() == "bad-txns-inputs-duplicate");
     }
 }

src/blockencodings.cpp

@@ -174,7 +174,7 @@ bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
     return txn_available[index] != nullptr;
 }
 
-ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing) {
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing, const int height) {
     assert(!header.IsNull());
     uint256 hash = header.GetHash();
     block = header;
@@ -200,7 +200,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
     CValidationState state;
     CheckContextState ctxState;
 
-    if (!CheckBlock(block, state, Params().GetConsensus(), ctxState, false)) {
+    if (!CheckBlock(block, state, Params().GetConsensus(), ctxState, false, height)) {
         // TODO: We really want to just check merkle tree manually here,
         // but that is expensive, and CheckBlock caches a block's
         // "checked-status" (in the CBlock?). CBlock should be able to

src/blockencodings.h

@@ -206,7 +206,7 @@ class PartiallyDownloadedBlock {
     // extra_txn is a list of extra transactions to look at, in <witness hash, reference> form
     ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn);
     bool IsTxAvailable(size_t index) const;
-    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
+    ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing, const int height);
 };
 
 #endif // DEFI_BLOCKENCODINGS_H

src/chain.h

@@ -187,7 +187,7 @@ class CBlockIndex
     uint32_t nBits;
 
     // proof-of-stake specific fields
-    uint64_t height;
+    uint64_t deprecatedHeight;
     uint64_t mintedBlocks;
     uint256 stakeModifier; // hash modifier for proof-of-stake
     std::vector<unsigned char> sig;
@@ -222,7 +222,7 @@ class CBlockIndex
         nTime          = 0;
         nBits          = 0;
         stakeModifier  = uint256{};
-        height         = 0;
+        deprecatedHeight = 0;
         mintedBlocks   = 0;
         sig            = {};
         minterKeyID    = {};
@@ -241,7 +241,7 @@ class CBlockIndex
         hashMerkleRoot = block.hashMerkleRoot;
         nTime          = block.nTime;
         nBits          = block.nBits;
-        height         = block.height;
+        deprecatedHeight = block.deprecatedHeight;
         mintedBlocks   = block.mintedBlocks;
         stakeModifier  = block.stakeModifier;
         sig            = block.sig;
@@ -276,7 +276,7 @@ class CBlockIndex
         block.nTime          = nTime;
         block.nBits          = nBits;
         block.stakeModifier   = stakeModifier;
-        block.height         = height;
+        block.deprecatedHeight = deprecatedHeight;
         block.mintedBlocks   = mintedBlocks;
         block.sig            = sig;
         return block;
@@ -330,7 +330,7 @@ class CBlockIndex
         std::sort(pbegin, pend);
 
         // Only after FC and when we have a full set of times.
-        if (height >= Params().GetConsensus().FortCanningHeight && pend - pbegin == nMedianTimeSpan) {
+        if (nHeight >= Params().GetConsensus().FortCanningHeight && pend - pbegin == nMedianTimeSpan) {
             // Take the median of the top five.
             return pbegin[8];
         }
@@ -424,7 +424,7 @@ class CDiskBlockIndex : public CBlockIndex
         READWRITE(nTime);
         READWRITE(nBits);
         READWRITE(stakeModifier);
-        READWRITE(height);
+        READWRITE(deprecatedHeight);
         READWRITE(mintedBlocks);
         READWRITE(sig);
     }
@@ -438,7 +438,7 @@ class CDiskBlockIndex : public CBlockIndex
         block.nTime           = nTime;
         block.nBits           = nBits;
         block.stakeModifier   = stakeModifier;
-        block.height          = height;
+        block.deprecatedHeight = deprecatedHeight;
         block.mintedBlocks    = mintedBlocks;
         block.sig             = sig;
 

src/chainparams.cpp

@@ -65,7 +65,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, uint32_t nTime, uint3
     genesis.nTime           = nTime;
     genesis.nBits           = nBits;
     genesis.nVersion        = nVersion;
-    genesis.height          = 0;
+    genesis.deprecatedHeight = 0;
     genesis.stakeModifier   = uint256S("0");
     genesis.mintedBlocks    = 0;
     genesis.vtx.push_back(MakeTransactionRef(std::move(txNew)));
@@ -128,6 +128,8 @@ class CMainParams : public CChainParams {
         consensus.EunosPayaHeight = 1072000; // Aug 05, 2021.
         consensus.FortCanningHeight = 1367000; // Nov 15, 2021.
         consensus.FortCanningMuseumHeight = 1430640;
+        consensus.FortCanningParkHeight = 1503143;
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
         consensus.GreatWorldHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
@@ -308,6 +310,7 @@ class CMainParams : public CChainParams {
                 {850000, uint256S("2d7d58ae18a74f73b9836a8fffd3f65ce409536e654a6c644ce735215238a004")},
                 {875000, uint256S("44d3b3ba8e920cef86b7ec096ab0a2e608d9fedc14a59611a76a5e40aa53145e")},
                 {895741, uint256S("61bc1d73c720990dde43a3fec1f703a222ec5c265e6d491efd60eeec1bdb6dc3")},
+                {1505965,uint256S("f7474c805de4f05673df2103bd5d8b8dea09b0d22f808ee957a9ceefc0720609")},
             }
         };
 
@@ -349,6 +352,8 @@ class CTestNetParams : public CChainParams {
         consensus.EunosPayaHeight = 463300;
         consensus.FortCanningHeight = 686200;
         consensus.FortCanningMuseumHeight = 724000;
+        consensus.FortCanningParkHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
         consensus.GreatWorldHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
@@ -532,6 +537,8 @@ class CDevNetParams : public CChainParams {
         consensus.EunosPayaHeight = 300;
         consensus.FortCanningHeight = std::numeric_limits<int>::max();
         consensus.FortCanningMuseumHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningParkHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
         consensus.GreatWorldHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
@@ -707,6 +714,8 @@ class CRegTestParams : public CChainParams {
         consensus.EunosPayaHeight = 10000000;
         consensus.FortCanningHeight = 10000000;
         consensus.FortCanningMuseumHeight = 10000000;
+        consensus.FortCanningParkHeight = 10000000;
+        consensus.FortCanningHillHeight = 10000000;
         consensus.GreatWorldHeight = 10000000;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
@@ -919,8 +928,10 @@ void CRegTestParams::UpdateActivationParametersFromArgs(const ArgsManager& args)
         consensus.EunosKampungHeight = static_cast<int>(eunosHeight.value());
     }
     UpdateHeightValidation("Eunos Paya", "-eunospayaheight", consensus.EunosPayaHeight);
-    UpdateHeightValidation("Fork canning", "-fortcanningheight", consensus.FortCanningHeight);
-    UpdateHeightValidation("Fork canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning", "-fortcanningheight", consensus.FortCanningHeight);
+    UpdateHeightValidation("Fort canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning park", "-fortcanningparkheight", consensus.FortCanningParkHeight);
+    UpdateHeightValidation("Fort canning hill", "-fortcanninghillheight", consensus.FortCanningHillHeight);
     UpdateHeightValidation("Great World", "-greatworldheight", consensus.GreatWorldHeight);
 
     if (!args.IsArgSet("-vbparams")) return;

src/consensus/params.h

@@ -91,6 +91,8 @@ struct Params {
     int EunosPayaHeight;
     int FortCanningHeight;
     int FortCanningMuseumHeight;
+    int FortCanningParkHeight;
+    int FortCanningHillHeight;
     int GreatWorldHeight;
 
     /** Foundation share after AMK, normalized to COIN = 100% */

src/init.cpp

@@ -471,6 +471,8 @@ void SetupServerArgs()
     gArgs.AddArg("-eunospayaheight", "EunosPaya fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningheight", "Fort Canning fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningmuseumheight", "Fort Canning Museum fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-fortcanningparkheight", "Fort Canning Park fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-fortcanninghillheight", "Fort Canning Hill fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-greatworldheight", "Great World fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #ifdef USE_UPNP

src/masternodes/masternodes.cpp

@@ -785,7 +785,7 @@ void CCustomCSView::CalcAnchoringTeams(const uint256 & stakeModifier, const CBlo
     std::map<arith_uint256, CKeyID, std::less<arith_uint256>> authMN;
     std::map<arith_uint256, CKeyID, std::less<arith_uint256>> confirmMN;
     ForEachMasternode([&] (uint256 const & id, CMasternode node) {
-        if(!node.IsActive(pindexNew->height))
+        if(!node.IsActive(pindexNew->nHeight))
             return true;
 
         // Not in our list of MNs from last week, skip.
@@ -820,7 +820,7 @@ void CCustomCSView::CalcAnchoringTeams(const uint256 & stakeModifier, const CBlo
 
     {
         LOCK(cs_main);
-        SetAnchorTeams(authTeam, confirmTeam, pindexNew->height);
+        SetAnchorTeams(authTeam, confirmTeam, pindexNew->nHeight);
     }
 
     // Debug logging