Fix getmasternodeblocks depth filtering

configure.ac

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

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)));
@@ -127,6 +127,7 @@ class CMainParams : public CChainParams {
         consensus.EunosKampungHeight = 895743;
         consensus.EunosPayaHeight = 1072000; // Aug 05, 2021.
         consensus.FortCanningHeight = 1367000; // Nov 15, 2021.
+        consensus.FortCanningMuseumHeight = 1430640;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -346,6 +347,7 @@ class CTestNetParams : public CChainParams {
         consensus.EunosKampungHeight = consensus.EunosHeight;
         consensus.EunosPayaHeight = 463300;
         consensus.FortCanningHeight = 686200;
+        consensus.FortCanningMuseumHeight = 724000;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -527,6 +529,7 @@ class CDevNetParams : public CChainParams {
         consensus.EunosKampungHeight = consensus.EunosHeight;
         consensus.EunosPayaHeight = 300;
         consensus.FortCanningHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningMuseumHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 5 * 60; // 5 min == 10 blocks
@@ -700,6 +703,7 @@ class CRegTestParams : public CChainParams {
         consensus.EunosKampungHeight = 10000000;
         consensus.EunosPayaHeight = 10000000;
         consensus.FortCanningHeight = 10000000;
+        consensus.FortCanningMuseumHeight = 10000000;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -912,6 +916,7 @@ void CRegTestParams::UpdateActivationParametersFromArgs(const ArgsManager& args)
     }
     UpdateHeightValidation("Eunos Paya", "-eunospayaheight", consensus.EunosPayaHeight);
     UpdateHeightValidation("Fork canning", "-fortcanningheight", consensus.FortCanningHeight);
+    UpdateHeightValidation("Fork canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
 
     if (!args.IsArgSet("-vbparams")) return;
 

src/consensus/params.h

@@ -90,6 +90,7 @@ struct Params {
     int EunosKampungHeight;
     int EunosPayaHeight;
     int FortCanningHeight;
+    int FortCanningMuseumHeight;
 
     /** Foundation share after AMK, normalized to COIN = 100% */
     CAmount foundationShareDFIP1;

src/init.cpp

@@ -472,6 +472,7 @@ void SetupServerArgs()
     gArgs.AddArg("-eunosheight", "Eunos fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     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("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #ifdef USE_UPNP
 #if USE_UPNP

src/masternodes/loan.cpp

@@ -200,12 +200,18 @@ boost::optional<CInterestRate> CLoanView::GetInterestRate(const CVaultId& vaultI
     return ReadBy<LoanInterestByVault, CInterestRate>(std::make_pair(vaultId, id));
 }
 
-CAmount InterestPerBlock(CAmount amount, CAmount tokenInterest, CAmount schemeInterest)
+inline CAmount InterestPerBlock(CAmount amount, CAmount tokenInterest, CAmount schemeInterest)
 {
     auto netInterest = (tokenInterest + schemeInterest) / 100; // in %
     return MultiplyAmounts(netInterest, amount) / (365 * Params().GetConsensus().blocksPerDay());
 }
 
+inline float InterestPerBlockFloat(CAmount amount, CAmount tokenInterest, CAmount schemeInterest)
+{
+    auto netInterest = (tokenInterest + schemeInterest) / 100; // in %
+    return MultiplyAmounts(netInterest, amount) / (365.f * Params().GetConsensus().blocksPerDay());
+}
+
 CAmount TotalInterest(const CInterestRate& rate, uint32_t height)
 {
     CAmount interest = rate.interestToHeight + ((height - rate.height) * rate.interestPerBlock);
@@ -235,8 +241,13 @@ Res CLoanView::StoreInterest(uint32_t height, const CVaultId& vaultId, const std
         LogPrint(BCLog::LOAN,"%s():\n", __func__);
         rate.interestToHeight = TotalInterest(rate, height);
     }
+
+    if (int(height) >= Params().GetConsensus().FortCanningMuseumHeight) {
+        rate.interestPerBlock += std::ceil(InterestPerBlockFloat(loanIncreased, token->interest, scheme->rate));
+    } else {
+        rate.interestPerBlock += InterestPerBlock(loanIncreased, token->interest, scheme->rate);
+    }
     rate.height = height;
-    rate.interestPerBlock += InterestPerBlock(loanIncreased, token->interest, scheme->rate);
 
     WriteBy<LoanInterestByVault>(std::make_pair(vaultId, id), rate);
     return Res::Ok();
@@ -264,8 +275,13 @@ Res CLoanView::EraseInterest(uint32_t height, const CVaultId& vaultId, const std
     }
     LogPrint(BCLog::LOAN,"%s():\n", __func__);
     rate.interestToHeight = std::max(CAmount{0}, TotalInterest(rate, height) - interestDecreased);
+
     rate.height = height;
-    rate.interestPerBlock = std::max(CAmount{0}, rate.interestPerBlock - InterestPerBlock(loanDecreased, token->interest, scheme->rate));
+    if (int(height) >= Params().GetConsensus().FortCanningMuseumHeight) {
+        rate.interestPerBlock = std::max(CAmount{0}, rate.interestPerBlock - CAmount(std::ceil(InterestPerBlockFloat(loanDecreased, token->interest, scheme->rate))));
+    } else {
+        rate.interestPerBlock = std::max(CAmount{0}, rate.interestPerBlock - InterestPerBlock(loanDecreased, token->interest, scheme->rate));
+    }
 
     WriteBy<LoanInterestByVault>(std::make_pair(vaultId, id), rate);
     return Res::Ok();

src/masternodes/loan.h

@@ -223,7 +223,6 @@ struct CInterestRate
     }
 };
 
-CAmount InterestPerBlock(const CInterestRate& rate);
 CAmount TotalInterest(const CInterestRate& rate, uint32_t height);
 
 class CLoanTakeLoanMessage

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

src/masternodes/mn_checks.cpp

@@ -257,7 +257,7 @@ class CCustomMetadataParseVisitor : public boost::static_visitor<Res>
     Res operator()(CUpdateMasterNodeMessage& obj) const {
         // Temporarily disabled for 2.2
         return Res::Err("updatemasternode is disabled for Fort Canning");
-        
+
         auto res = isPostFortCanningFork();
         return !res ? res : serialize(obj);
     }
@@ -955,7 +955,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
     Res operator()(const CUpdateMasterNodeMessage& obj) const {
         // Temporarily disabled for 2.2
         return Res::Err("updatemasternode is disabled for Fort Canning");
-        
+
         auto res = HasCollateralAuth(obj.mnId);
         return !res ? res : mnview.UpdateMasternode(obj.mnId, obj.operatorType, obj.operatorAuthAddress, height);
     }
@@ -2682,6 +2682,16 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
             if (!res)
                 return res;
 
+            if (static_cast<int>(height) >= consensus.FortCanningMuseumHeight && subLoan < it->second)
+            {
+                auto newRate = mnview.GetInterestRate(obj.vaultId, tokenId);
+                if (!newRate)
+                    return Res::Err("Cannot get interest rate for this token (%s)!", loanToken->symbol);
+
+                if (newRate->interestPerBlock == 0)
+                        return Res::Err("Cannot payback this amount of loan for %s, either payback full amount or less than this amount!", loanToken->symbol);
+            }
+
             res = mnview.SubMintedTokens(loanToken->creationTx, subLoan);
             if (!res)
                 return res;
@@ -2739,10 +2749,19 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
             auto amount = MultiplyAmounts(batch->loanAmount.nValue, COIN + data->liquidationPenalty);
             if (amount > obj.amount.nValue)
                 return Res::Err("First bid should include liquidation penalty of %d%%", data->liquidationPenalty * 100 / COIN);
+
+            if (static_cast<int>(height) >= consensus.FortCanningMuseumHeight
+            && data->liquidationPenalty && obj.amount.nValue == batch->loanAmount.nValue)
+                return Res::Err("First bid should be higher than batch one");
         } else {
             auto amount = MultiplyAmounts(bid->second.nValue, COIN + (COIN / 100));
             if (amount > obj.amount.nValue)
                 return Res::Err("Bid override should be at least 1%% higher than current one");
+
+            if (static_cast<int>(height) >= consensus.FortCanningMuseumHeight
+            && obj.amount.nValue == bid->second.nValue)
+                return Res::Err("Bid override should be higher than last one");
+
             // immediate refund previous bid
             CalculateOwnerRewards(bid->first);
             mnview.AddBalance(bid->first, bid->second);
@@ -3567,7 +3586,7 @@ Res  SwapToDFIOverUSD(CCustomCSView & mnview, DCT_ID tokenId, CAmount amount, CS
     if (!token)
         return Res::Err("Cannot find token with id %s!", tokenId.ToString());
 
-    // TODO: Optimize double look up later when first token is DUSD. 
+    // TODO: Optimize double look up later when first token is DUSD.
     auto dUsdToken = mnview.GetToken("DUSD");
     if (!dUsdToken)
         return Res::Err("Cannot find token DUSD");

src/masternodes/rpc_accounts.cpp

@@ -83,7 +83,7 @@ UniValue outputEntryToJSON(COutputEntry const & entry, CBlockIndex const * index
     UniValue obj(UniValue::VOBJ);
 
     obj.pushKV("owner", EncodeDestination(entry.destination));
-    obj.pushKV("blockHeight", index->height);
+    obj.pushKV("blockHeight", index->nHeight);
     obj.pushKV("blockHash", index->GetBlockHash().GetHex());
     obj.pushKV("blockTime", index->GetBlockTime());
     if (pwtx->IsCoinBase()) {
@@ -155,7 +155,7 @@ static void searchInWallet(CWallet const * pwallet,
         auto* pwtx = &(*it);
 
         auto index = LookupBlockIndex(pwtx->hashBlock);
-        if (!index || index->height == 0) { // skip genesis block
+        if (!index || index->nHeight == 0) { // skip genesis block
             continue;
         }
 
@@ -1180,10 +1180,10 @@ UniValue listaccounthistory(const JSONRPCRequest& request) {
         count = limit;
         searchInWallet(pwallet, account, filter,
             [&](CBlockIndex const * index, CWalletTx const * pwtx) {
-                return txs.count(pwtx->GetHash()) || startBlock > index->height || index->height > maxBlockHeight;
+                return txs.count(pwtx->GetHash()) || startBlock > index->nHeight || index->nHeight > maxBlockHeight;
             },
             [&](COutputEntry const & entry, CBlockIndex const * index, CWalletTx const * pwtx) {
-                auto& array = ret.emplace(index->height, UniValue::VARR).first->second;
+                auto& array = ret.emplace(index->nHeight, UniValue::VARR).first->second;
                 array.push_back(outputEntryToJSON(entry, index, pwtx));
                 return --count != 0;
             }
@@ -1509,7 +1509,7 @@ UniValue accounthistorycount(const JSONRPCRequest& request) {
     if (shouldSearchInWallet) {
         searchInWallet(pwallet, owner, filter,
             [&](CBlockIndex const * index, CWalletTx const * pwtx) {
-                return txs.count(pwtx->GetHash()) || index->height > currentHeight;
+                return txs.count(pwtx->GetHash()) || index->nHeight > currentHeight;
             },
             [&count](COutputEntry const &, CBlockIndex const *, CWalletTx const *) {
                 ++count;