From b0fc6ad97e10f9d99dc6c1016e2ec45716b4b096 Mon Sep 17 00:00:00 2001
From: Shoham Chakraborty <shhmchk@gmail.com>
Date: Thu, 2 Mar 2023 19:18:22 +0800
Subject: [PATCH 1/5] Update help dialogue (#1785)

---
 src/wallet/rpcwallet.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2d52b13108..2520a4653e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1425,6 +1425,10 @@ UniValue listtransactions(const JSONRPCRequest& request)
             "    \"time\": xxx,              (numeric) The transaction time in seconds since epoch (midnight Jan 1 1970 GMT).\n"
             "    \"timereceived\": xxx,      (numeric) The time received in seconds since epoch (midnight Jan 1 1970 GMT).\n"
             "    \"comment\": \"...\",       (string) If a comment is associated with the transaction.\n"
+            "    \"generated\": \"...\",       (boolean) If transaction is a coinbase transaction.\n"
+            "    \"walletconflicts\": [\n"
+            "      \"txid\": \"...\" (string) Conflicting transaction ID\n"
+            "    ],\n"
             "    \"bip125-replaceable\": \"yes|no|unknown\",  (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
             "                                                     may be unknown for unconfirmed transactions not in the mempool\n"
             "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"

From d5b3aaecc7af85ce68e06a7773ee32e8bf257a8f Mon Sep 17 00:00:00 2001
From: Jouzo <15011228+Jouzo@users.noreply.github.com>
Date: Thu, 2 Mar 2023 19:21:19 +0800
Subject: [PATCH 2/5] Cache getblockchaininfo result (#1791)

---
 src/rpc/blockchain.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f0b0e8c1c5..0276457c59 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -23,6 +23,7 @@
 #include <primitives/transaction.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
+#include <rpc/resultcache.h>
 #include <script/descriptor.h>
 #include <streams.h>
 #include <sync.h>
@@ -1298,6 +1299,8 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
                 },
             }.Check(request);
 
+    if (auto res = GetRPCResultCache().TryGet(request)) return *res;
+
     LOCK(cs_main);
 
     const CBlockIndex* tip = ::ChainActive().Tip();
@@ -1354,7 +1357,9 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     obj.pushKV("softforks",             softforks);
 
     obj.pushKV("warnings", GetWarnings("statusbar"));
-    return obj;
+
+    return GetRPCResultCache()
+        .Set(request, obj);
 }
 
 /** Comparison function for sorting the getchaintips heads.  */

From a97fc6c58ec159dcc3499668077d48bc809daebf Mon Sep 17 00:00:00 2001
From: Peter John Bushnell <bushsolo@gmail.com>
Date: Thu, 2 Mar 2023 19:24:07 +0800
Subject: [PATCH 3/5] Add support for batch generation of voting TXs  (#1786)

* Add RPC call to create multiple MNs votes TXs

* Allow multiple proposal votes with different MNs and vote decisions

* Rename votegovmulti to votegovbatch

---------

Co-authored-by: Shoham Chakraborty <shhmchk@gmail.com>
---
 src/masternodes/rpc_proposals.cpp             | 159 ++++++++++++++++++
 ...ature_on_chain_government_govvar_update.py |  23 ++-
 2 files changed, 170 insertions(+), 12 deletions(-)

diff --git a/src/masternodes/rpc_proposals.cpp b/src/masternodes/rpc_proposals.cpp
index e00f25dff1..e08923e84b 100644
--- a/src/masternodes/rpc_proposals.cpp
+++ b/src/masternodes/rpc_proposals.cpp
@@ -581,6 +581,164 @@ UniValue votegov(const JSONRPCRequest &request) {
     return signsend(rawTx, pwallet, optAuthTx)->GetHash().GetHex();
 }
 
+
+UniValue votegovbatch(const JSONRPCRequest &request) {
+    auto pwallet = GetWallet(request);
+
+    RPCHelpMan{
+            "votegovbatch",
+            "\nVote for community proposal with multiple masternodes" + HelpRequiringPassphrase(pwallet) + "\n",
+            {
+                    {"votes", RPCArg::Type::ARR, RPCArg::Optional::NO, "A json array of proposal ID, masternode IDs, operator or owner addresses and vote decision (yes/no/neutral).",
+                     {
+                             {"proposalId", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "The proposal txid"},
+                             {"masternodeId", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "The masternode ID, operator or owner address"},
+                             {"decision", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "The vote decision (yes/no/neutral)"},
+                     }},
+                 },
+            RPCResult{"\"hash\"                  (string) The hex-encoded hash of broadcasted transaction\n"},
+            RPCExamples{HelpExampleCli("votegovbatch", "{{proposalId, masternodeId, yes}...}") +
+                        HelpExampleRpc("votegovbatch", "{{proposalId, masternodeId, yes}...}")},
+    }
+            .Check(request);
+
+    if (pwallet->chain().isInitialBlockDownload()) {
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Cannot vote while still in Initial Block Download");
+    }
+    pwallet->BlockUntilSyncedToCurrentChain();
+
+    RPCTypeCheck(request.params, {UniValue::VARR}, false);
+
+    const auto &keys = request.params[0].get_array();
+    auto neutralVotesAllowed = gArgs.GetBoolArg("-rpc-governance-accept-neutral", DEFAULT_RPC_GOV_NEUTRAL);
+
+    int targetHeight;
+
+    struct MasternodeMultiVote {
+        uint256 propId;
+        uint256 mnId;
+        CTxDestination dest;
+        CProposalVoteType type;
+    };
+
+    std::vector<MasternodeMultiVote> mnMultiVotes;
+    {
+        CCustomCSView view(*pcustomcsview);
+
+        for (size_t i{}; i < keys.size(); ++i) {
+
+            const auto &votes{keys[i].get_array()};
+            if (votes.size() != 3) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Incorrect number of items, three expected, proposal ID, masternode ID and vote expected. %d entries provided.", votes.size()));
+            }
+
+            const auto propId = ParseHashV(votes[0].get_str(), "proposalId");
+            const auto prop = view.GetProposal(propId);
+            if (!prop) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Proposal <%s> does not exist", propId.GetHex()));
+            }
+
+            if (prop->status != CProposalStatusType::Voting) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   strprintf("Proposal <%s> is not in voting period", propId.GetHex()));
+            }
+
+            uint256 mnId;
+            const auto &id = votes[1].get_str();
+
+            if (id.length() == 64) {
+                mnId = ParseHashV(id, "masternodeId");
+            } else {
+                const CTxDestination dest = DecodeDestination(id);
+                if (!IsValidDestination(dest)) {
+                    throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                       strprintf("The masternode id or address is not valid: %s", id));
+                }
+                CKeyID ckeyId;
+                if (dest.index() == PKHashType) {
+                    ckeyId = CKeyID(std::get<PKHash>(dest));
+                } else if (dest.index() == WitV0KeyHashType) {
+                    ckeyId =  CKeyID(std::get<WitnessV0KeyHash>(dest));
+                } else {
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s does not refer to a P2PKH or P2WPKH address", id));
+                }
+                if (auto masterNodeIdByOwner = view.GetMasternodeIdByOwner(ckeyId)) {
+                    mnId = masterNodeIdByOwner.value();
+                } else if (auto masterNodeIdByOperator = view.GetMasternodeIdByOperator(ckeyId)) {
+                    mnId = masterNodeIdByOperator.value();
+                }
+            }
+
+            const auto node = view.GetMasternode(mnId);
+            if (!node) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   strprintf("The masternode does not exist or the address doesn't own a masternode: %s", id));
+            }
+
+            auto vote   = CProposalVoteType::VoteNeutral;
+            auto voteStr = ToLower(votes[2].get_str());
+
+            if (voteStr == "no") {
+                vote = CProposalVoteType::VoteNo;
+            } else if (voteStr == "yes") {
+                vote = CProposalVoteType::VoteYes;
+            } else if (neutralVotesAllowed && voteStr != "neutral") {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "decision supports yes/no/neutral");
+            } else if (!neutralVotesAllowed) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Decision supports yes or no. Neutral is currently disabled because of issue https://github.com/DeFiCh/ain/issues/1704");
+            }
+
+            mnMultiVotes.push_back({
+                propId,
+                mnId,
+                node->ownerType == 1 ? CTxDestination(PKHash(node->ownerAuthAddress)) : CTxDestination(WitnessV0KeyHash(node->ownerAuthAddress)),
+                vote
+            });
+        }
+
+        targetHeight = view.GetLastHeight() + 1;
+    }
+
+    UniValue ret(UniValue::VARR);
+
+    for (const auto& [propId, mnId, ownerDest, vote] : mnMultiVotes) {
+
+        CProposalVoteMessage msg;
+        msg.propId       = propId;
+        msg.masternodeId = mnId;
+        msg.vote         = vote;
+
+        // encode
+        CDataStream metadata(DfTxMarker, SER_NETWORK, PROTOCOL_VERSION);
+        metadata << static_cast<unsigned char>(CustomTxType::Vote) << msg;
+
+        CScript scriptMeta;
+        scriptMeta << OP_RETURN << ToByteVector(metadata);
+
+        const auto txVersion = GetTransactionVersion(targetHeight);
+        CMutableTransaction rawTx(txVersion);
+
+        CTransactionRef optAuthTx;
+        std::set<CScript> auths = {GetScriptForDestination(ownerDest)};
+        rawTx.vin = GetAuthInputsSmart(pwallet, rawTx.nVersion, auths, false /*needFoundersAuth*/, optAuthTx, {});
+        rawTx.vout.emplace_back(0, scriptMeta);
+
+        CCoinControl coinControl;
+        if (IsValidDestination(ownerDest)) {
+            coinControl.destChange = ownerDest;
+        }
+
+        fund(rawTx, pwallet, optAuthTx, &coinControl);
+
+        // check execution
+        execTestTx(CTransaction(rawTx), targetHeight, optAuthTx);
+
+        ret.push_back(signsend(rawTx, pwallet, optAuthTx)->GetHash().GetHex());
+    }
+
+    return ret;
+}
+
 UniValue listgovproposalvotes(const JSONRPCRequest &request) {
     auto pwallet = GetWallet(request);
     RPCHelpMan{
@@ -1192,6 +1350,7 @@ static const CRPCCommand commands[] = {
     {"proposals", "creategovcfp",         &creategovcfp,         {"data", "inputs"}                                  },
     {"proposals", "creategovvoc",         &creategovvoc,         {"data", "inputs"}                                  },
     {"proposals", "votegov",              &votegov,              {"proposalId", "masternodeId", "decision", "inputs"}},
+    {"proposals", "votegovbatch",         &votegovbatch,         {"proposalId", "masternodeIds", "decision"}},
     {"proposals", "listgovproposalvotes", &listgovproposalvotes, {"proposalId", "masternode", "cycle", "pagination"} },
     {"proposals", "getgovproposal",       &getgovproposal,       {"proposalId"}                                      },
     {"proposals", "listgovproposals",     &listgovproposals,     {"type", "status", "cycle", "pagination"}           },
diff --git a/test/functional/feature_on_chain_government_govvar_update.py b/test/functional/feature_on_chain_government_govvar_update.py
index 82bef5eb02..210f8c5086 100755
--- a/test/functional/feature_on_chain_government_govvar_update.py
+++ b/test/functional/feature_on_chain_government_govvar_update.py
@@ -71,24 +71,23 @@ def test_cfp_update_automatic_payout(self):
         self.nodes[0].setgov({"ATTRIBUTES":{'v0/params/feature/gov-payout':'true'}})
         self.nodes[0].generate(1)
 
-        # Vote during second cycle
-        self.nodes[0].votegov(propId, self.mn0, "yes")
+        # Import MN keys into MN0
+        self.nodes[0].importprivkey(self.nodes[1].dumpprivkey(self.nodes[0].getmasternode(self.mn1)[self.mn1]['ownerAuthAddress']))
+        self.nodes[0].importprivkey(self.nodes[2].dumpprivkey(self.nodes[0].getmasternode(self.mn2)[self.mn2]['ownerAuthAddress']))
+        self.nodes[0].importprivkey(self.nodes[3].dumpprivkey(self.nodes[0].getmasternode(self.mn3)[self.mn3]['ownerAuthAddress']))
+
+        # Vote during second cycle using multi-vote
+        self.nodes[0].votegovbatch([[propId, self.mn0, "yes"], [propId, self.mn1, "yes"], [propId, self.mn2, "yes"], [propId, self.mn3, "yes"]])
         self.nodes[0].generate(1)
-        self.sync_blocks(timeout=120)
-        self.nodes[1].votegov(propId, self.mn1, "yes")
-        self.nodes[1].generate(1)
-        self.sync_blocks(timeout=120)
-        self.nodes[2].votegov(propId, self.mn2, "yes")
-        self.nodes[2].generate(1)
-        self.sync_blocks(timeout=120)
-        self.nodes[3].votegov(propId, self.mn3, "yes")
-        self.nodes[3].generate(1)
-        self.sync_blocks(timeout=120)
 
         # End proposal
         self.nodes[0].generate(VOTING_PERIOD)
         self.sync_blocks(timeout=120)
 
+        result = self.nodes[0].getgovproposal(propId)
+        assert_equal(result['currentCycle'], 2)
+        assert_equal(result['votesYes'], 4)
+
         # Automatic payout only for last cycle
         account = self.nodes[0].getaccount(address)
         assert_equal(account, ['100.00000000@DFI'])

From 0f29d5d6a83c9ee2a8b8c3b5f8f6ba0be6e959cb Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 3 Mar 2023 09:47:33 +0800
Subject: [PATCH 4/5] rpc: getburninfo performance improvements (#1788)

* Reverts of Require in Sub/Add Balances

* Revert ifs on Add/Sub

* Fix burninfo concurrency and switch to worker number agnostic queuing

* Remove getburninfo2 used for testing

* Optimize vector reservation

* Readd nodiscard

* Readd const

* Realign vector alloc

* Add fixed buffer to reduce allocations

* Switch to lockfree sync

* Use raw atomic ops

* Remove redundant flush

* Introducing last result cache. Switching paralelization to mutex instead of lock free atomics.

* Fix condition

* Final maintainability touches

* cacheOrDefaultResult to initialResult

---------

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
Co-authored-by: jouzo <jdesclercs@gmail.com>
---
 src/init.cpp                            |   5 +-
 src/masternodes/rpc_accounts.cpp        | 227 +++++++++++++-----------
 src/rpc/resultcache.cpp                 |  43 ++++-
 src/rpc/resultcache.h                   |  30 ++++
 test/functional/feature_consortium.py   |   0
 test/lint/lint-circular-dependencies.sh |   1 +
 6 files changed, 195 insertions(+), 111 deletions(-)
 mode change 100644 => 100755 test/functional/feature_consortium.py

diff --git a/src/init.cpp b/src/init.cpp
index 3621cc805b..7aa21f25db 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -875,6 +875,7 @@ static bool AppInitServers()
         default: return RPCResultCache::RPCCacheMode::None;
     }}();
     GetRPCResultCache().Init(rpcCacheMode);
+    GetMemoizedResultCache().Init(rpcCacheMode);
 
     RPCServer::OnStarted(&OnRPCStarted);
     RPCServer::OnStopped(&OnRPCStopped);
@@ -1480,8 +1481,8 @@ bool AppInitMain(InitInterfaces& interfaces)
         // -par=-n means "leave n cores free" (number of cores - n - 1 script threads)
         script_threads += GetNumCores();
         // DeFiChain specific:
-        // Set this to a max value, since most custom TXs don't utilize this unfortunately 
-        // and is just a waste of resources. 
+        // Set this to a max value, since most custom TXs don't utilize this unfortunately
+        // and is just a waste of resources.
         script_threads = std::min(script_threads, 4);
     }
 
diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index d7998fe3fa..f155cc85e2 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -5,16 +5,6 @@
 #include <masternodes/threadpool.h>
 #include <boost/asio.hpp>
 
-struct BalanceResults {
-    CAmount burntDFI{};
-    CAmount burntFee{};
-    CAmount auctionFee{};
-    CBalances burntTokens;
-    CBalances nonConsortiumTokens;
-    CBalances dexfeeburn;
-    CBalances paybackFee;
-};
-
 std::string tokenAmountString(const CTokenAmount &amount, AmountFormat format = AmountFormat::Symbol) {
     const auto token = pcustomcsview->GetToken(amount.nTokenId);
     const auto amountString = ValueFromAmount(amount.nValue).getValStr();
@@ -1972,19 +1962,14 @@ UniValue getburninfo(const JSONRPCRequest& request) {
     }.Check(request);
 
     if (auto res = GetRPCResultCache().TryGet(request)) return *res;
+    auto initialResult = GetMemoizedResultCache().GetOrDefault(request);
+    auto totalResult = std::get_if<CGetBurnInfoResult>(&initialResult.data);
 
-    CAmount burntDFI{0};
-    CAmount burntFee{0};
-    CAmount auctionFee{0};
     CAmount dfiPaybackFee{0};
     CAmount burnt{0};
 
-    CBalances burntTokens;
     CBalances consortiumTokens;
-    CBalances nonConsortiumTokens;
-    CBalances dexfeeburn;
     CBalances paybackfees;
-    CBalances paybackFee;
     CBalances paybacktokens;
     CBalances dfi2203Tokens;
     CBalances dfipaybacktokens;
@@ -1993,6 +1978,7 @@ UniValue getburninfo(const JSONRPCRequest& request) {
     LOCK(cs_main);
 
     auto height = ::ChainActive().Height();
+    auto hash = ::ChainActive().Tip()->GetBlockHash();
     auto fortCanningHeight = Params().GetConsensus().FortCanningHeight;
     auto burnAddress = Params().GetConsensus().burnAddress;
     auto view = *pcustomcsview;
@@ -2028,109 +2014,133 @@ UniValue getburninfo(const JSONRPCRequest& request) {
         }
     }
 
+    class WorkerResultPool {
+      public:
+        explicit WorkerResultPool(size_t size) {
+            pool.reserve(size);
+            for (auto i = 0; i < size; i++) {
+                pool.push_back(CGetBurnInfoResult{});
+            }
+        }
+
+        std::shared_ptr<CGetBurnInfoResult> Acquire() {
+            LOCK(syncFlag);
+            auto res = std::make_shared<CGetBurnInfoResult>(pool.back());
+            pool.pop_back();
+
+            return res;
+        }
+
+        void Release(std::shared_ptr<CGetBurnInfoResult> res) {
+            LOCK(syncFlag);
+            pool.push_back(*res);
+        }
+
+        std::vector<CGetBurnInfoResult> &GetContainer() {
+            return pool;
+        }
+
+      private:
+        CCriticalSection syncFlag;
+        std::vector<CGetBurnInfoResult> pool;
+    };
+
     auto nWorkers = DfTxTaskPool->GetAvailableThreads();
-    if (static_cast<decltype(nWorkers)>(height) < nWorkers) {
+    if (static_cast<size_t>(height) < nWorkers) {
         nWorkers = height;
     }
 
     const auto chunks = height / nWorkers;
 
     TaskGroup g;
-
-    std::vector<std::shared_ptr<BalanceResults>> workerResults;
-    // Note this creates a massive amount of chunks as we go in mem.
-    // But this is fine for now. Most optimal impl is to return the future val
-    // and add it on receive. It requires a bit more changes, but for now 
-    // this should do.
-    // However reserve in one-go to prevent numerous reallocations
-    workerResults.reserve(chunks + 1);
-
-    for (size_t i = 0; i <= chunks; i++) {
-        auto result = std::make_shared<BalanceResults>();
-        workerResults.push_back(result);
-    }
+    WorkerResultPool resultsPool{nWorkers};
 
     auto &pool = DfTxTaskPool->pool;
-    auto processedHeight = 0;
+    auto processedHeight = initialResult.height;
     auto i               = 0;
     while (processedHeight < height)
     {
-        auto startHeight = (chunks * (i + 1));
-        auto stopHeight  = (chunks * (i));
-        auto result      = workerResults[i];
+        auto startHeight = initialResult.height + (chunks * (i + 1));
+        auto stopHeight  = initialResult.height + (chunks * (i));
 
         g.AddTask();
-        boost::asio::post(pool, [result, startHeight, stopHeight, &g] {
-            pburnHistoryDB->ForEachAccountHistory([result, stopHeight](const AccountHistoryKey &key, const AccountHistoryValue &value) {
+        boost::asio::post(pool, [startHeight, stopHeight, &g, &resultsPool] {
+            auto currentResult = resultsPool.Acquire();
 
-                // Stop on chunk range for worker
-                if (key.blockHeight <= stopHeight) {
-                    return false;
-                }
+            pburnHistoryDB->ForEachAccountHistory(
+                [currentResult, stopHeight](const AccountHistoryKey &key, const AccountHistoryValue &value) {
+                    // Stop on chunk range for worker
+                    if (key.blockHeight <= stopHeight) {
+                        return false;
+                    }
 
-                // UTXO burn
-                if (value.category == uint8_t(CustomTxType::None)) {
-                    for (auto const & diff : value.diff) {
-                        result->burntDFI += diff.second;
+                    // UTXO burn
+                    if (value.category == uint8_t(CustomTxType::None)) {
+                        for (auto const &diff : value.diff) {
+                            currentResult->burntDFI += diff.second;
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // Fee burn
-                if (value.category == uint8_t(CustomTxType::CreateMasternode)
-                    || value.category == uint8_t(CustomTxType::CreateToken)
-                    || value.category == uint8_t(CustomTxType::Vault)
-                    || value.category == uint8_t(CustomTxType::CreateCfp)
-                    || value.category == uint8_t(CustomTxType::CreateVoc)) {
-                    for (auto const & diff : value.diff) {
-                        result->burntFee += diff.second;
+                    // Fee burn
+                    if (value.category == uint8_t(CustomTxType::CreateMasternode) ||
+                        value.category == uint8_t(CustomTxType::CreateToken) ||
+                        value.category == uint8_t(CustomTxType::Vault) ||
+                        value.category == uint8_t(CustomTxType::CreateCfp) ||
+                        value.category == uint8_t(CustomTxType::CreateVoc)) {
+                        for (auto const &diff : value.diff) {
+                            currentResult->burntFee += diff.second;
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // withdraw burn
-                if (value.category == uint8_t(CustomTxType::PaybackLoan)
-                    || value.category == uint8_t(CustomTxType::PaybackLoanV2)
-                    || value.category == uint8_t(CustomTxType::PaybackWithCollateral)) {
-                    for (const auto& [id, amount] : value.diff) {
-                        result->paybackFee.Add({id, amount});
+                    // withdraw burn
+                    if (value.category == uint8_t(CustomTxType::PaybackLoan) ||
+                        value.category == uint8_t(CustomTxType::PaybackLoanV2) ||
+                        value.category == uint8_t(CustomTxType::PaybackWithCollateral)) {
+                        for (const auto &[id, amount] : value.diff) {
+                            currentResult->paybackFee.Add({id, amount});
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // auction burn
-                if (value.category == uint8_t(CustomTxType::AuctionBid)) {
-                    for (auto const & diff : value.diff) {
-                        result->auctionFee += diff.second;
+                    // auction burn
+                    if (value.category == uint8_t(CustomTxType::AuctionBid)) {
+                        for (auto const &diff : value.diff) {
+                            currentResult->auctionFee += diff.second;
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // dex fee burn
-                if (value.category == uint8_t(CustomTxType::PoolSwap)
-                    ||  value.category == uint8_t(CustomTxType::PoolSwapV2)) {
-                    for (auto const & diff : value.diff) {
-                        result->dexfeeburn.Add({diff.first, diff.second});
+                    // dex fee burn
+                    if (value.category == uint8_t(CustomTxType::PoolSwap) ||
+                        value.category == uint8_t(CustomTxType::PoolSwapV2)) {
+                        for (auto const &diff : value.diff) {
+                            currentResult->dexfeeburn.Add({diff.first, diff.second});
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // token burn with burnToken tx
-                if (value.category == uint8_t(CustomTxType::BurnToken))
-                {
-                    for (auto const & diff : value.diff) {
-                        result->nonConsortiumTokens.Add({diff.first, diff.second});
+                    // token burn with burnToken tx
+                    if (value.category == uint8_t(CustomTxType::BurnToken)) {
+                        for (auto const &diff : value.diff) {
+                            currentResult->nonConsortiumTokens.Add({diff.first, diff.second});
+                        }
+                        return true;
                     }
-                    return true;
-                }
 
-                // Token burn
-                for (auto const & diff : value.diff) {
-                    result->burntTokens.Add({diff.first, diff.second});
-                }
+                    // Token burn
+                    for (auto const &diff : value.diff) {
+                        currentResult->burntTokens.Add({diff.first, diff.second});
+                    }
 
-                return true;
-            }, {}, startHeight, std::numeric_limits<uint32_t>::max());
+                    return true;
+                },
+                {},
+                startHeight,
+                std::numeric_limits<uint32_t>::max());
+
+            resultsPool.Release(currentResult);
             g.RemoveTask();
         });
 
@@ -2141,38 +2151,38 @@ UniValue getburninfo(const JSONRPCRequest& request) {
 
     g.WaitForCompletion();
 
-    for (const auto &result : workerResults) {
-        burntDFI += result->burntDFI;
-        burntFee += result->burntFee;
-        auctionFee += result->auctionFee;
-        burntTokens.AddBalances(result->burntTokens.balances);
-        nonConsortiumTokens.AddBalances(result->nonConsortiumTokens.balances);
-        dexfeeburn.AddBalances(result->dexfeeburn.balances);
-        paybackFee.AddBalances(result->paybackFee.balances);
+    for (const auto &r : resultsPool.GetContainer()) {
+        totalResult->burntDFI += r.burntDFI;
+        totalResult->burntFee += r.burntFee;
+        totalResult->auctionFee += r.auctionFee;
+        totalResult->burntTokens.AddBalances(r.burntTokens.balances);
+        totalResult->nonConsortiumTokens.AddBalances(r.nonConsortiumTokens.balances);
+        totalResult->dexfeeburn.AddBalances(r.dexfeeburn.balances);
+        totalResult->paybackFee.AddBalances(r.paybackFee.balances);
     }
 
     CDataStructureV0 liveKey = {AttributeTypes::Live, ParamIDs::Economy, EconomyKeys::ConsortiumMinted};
     auto balances = attributes->GetValue(liveKey, CConsortiumGlobalMinted{});
 
-    for (const auto &token : nonConsortiumTokens.balances) {
+    for (const auto &token : totalResult->nonConsortiumTokens.balances) {
         TAmounts amount;
         amount[token.first] = balances[token.first].burnt;
         consortiumTokens.AddBalances(amount);
     }
 
-    nonConsortiumTokens.SubBalances(consortiumTokens.balances);
-    burntTokens.AddBalances(nonConsortiumTokens.balances);
+    totalResult->nonConsortiumTokens.SubBalances(consortiumTokens.balances);
+    totalResult->burntTokens.AddBalances(totalResult->nonConsortiumTokens.balances);
 
     UniValue result(UniValue::VOBJ);
     result.pushKV("address", ScriptToString(burnAddress));
-    result.pushKV("amount", ValueFromAmount(burntDFI));
+    result.pushKV("amount", ValueFromAmount(totalResult->burntDFI));
 
-    result.pushKV("tokens", AmountsToJSON(burntTokens.balances));
+    result.pushKV("tokens", AmountsToJSON(totalResult->burntTokens.balances));
     result.pushKV("consortiumtokens", AmountsToJSON(consortiumTokens.balances));
-    result.pushKV("feeburn", ValueFromAmount(burntFee));
-    result.pushKV("auctionburn", ValueFromAmount(auctionFee));
-    result.pushKV("paybackburn", AmountsToJSON(paybackFee.balances));
-    result.pushKV("dexfeetokens", AmountsToJSON(dexfeeburn.balances));
+    result.pushKV("feeburn", ValueFromAmount(totalResult->burntFee));
+    result.pushKV("auctionburn", ValueFromAmount(totalResult->auctionFee));
+    result.pushKV("paybackburn", AmountsToJSON(totalResult->paybackFee.balances));
+    result.pushKV("dexfeetokens", AmountsToJSON(totalResult->dexfeeburn.balances));
 
     result.pushKV("dfipaybackfee", ValueFromAmount(dfiPaybackFee));
     result.pushKV("dfipaybacktokens", AmountsToJSON(dfipaybacktokens.balances));
@@ -2184,6 +2194,7 @@ UniValue getburninfo(const JSONRPCRequest& request) {
     result.pushKV("dfip2203", AmountsToJSON(dfi2203Tokens.balances));
     result.pushKV("dfip2206f", AmountsToJSON(dfiToDUSDTokens.balances));
 
+    GetMemoizedResultCache().Set(request, {height, hash, *totalResult});
     return GetRPCResultCache()
         .Set(request, result);
 }
diff --git a/src/rpc/resultcache.cpp b/src/rpc/resultcache.cpp
index 16a9d46622..15cc391c0f 100644
--- a/src/rpc/resultcache.cpp
+++ b/src/rpc/resultcache.cpp
@@ -72,6 +72,47 @@ int GetLastValidatedHeight() {
 
 void SetLastValidatedHeight(int height) {
     LogPrint(BCLog::RPCCACHE, "RPCCache: set height: %d\n", height);
-    g_lastValidatedHeight.store(height, std::memory_order_release); 
+    g_lastValidatedHeight.store(height, std::memory_order_release);
     GetRPCResultCache().InvalidateCaches();
 }
+
+void MemoizedResultCache::Init(RPCResultCache::RPCCacheMode mode) {
+    CLockFreeGuard lock{syncFlag};
+    this->mode = mode;
+}
+
+CMemoizedResultValue MemoizedResultCache::GetOrDefault(const JSONRPCRequest &request) {
+    if (mode == RPCResultCache::RPCCacheMode::None) return {};
+    auto key = GetKey(request);
+    {
+        CLockFreeGuard lock{syncFlag};
+        if (auto res = cacheMap.find(key); res != cacheMap.end()) {
+            if (!::ChainActive().Contains(LookupBlockIndex(res->second.hash)))
+                return {};
+
+            if (LogAcceptCategory(BCLog::RPCCACHE)) {
+                LogPrint(BCLog::RPCCACHE, "RPCCache: hit: key: %d/%s\n", res->second.height, key);
+            }
+            return res->second;
+        }
+    }
+    return {};
+}
+
+void MemoizedResultCache::Set(const JSONRPCRequest &request, const CMemoizedResultValue &value) {
+    auto key = GetKey(request);
+    {
+        CLockFreeGuard lock{syncFlag};
+        if (LogAcceptCategory(BCLog::RPCCACHE)) {
+            LogPrint(BCLog::RPCCACHE, "RPCCache: set: key: %d/%s\n", value.height, key);
+        }
+        cacheMap[key] = value;
+    }
+}
+
+// Note: We initialize all the globals in the init phase. So, it's safe. Otherwise,
+// static init is undefined behavior when multiple threads init them at the same time.
+MemoizedResultCache& GetMemoizedResultCache() {
+    static MemoizedResultCache g_memoizedResultCache;
+    return g_memoizedResultCache;
+}
diff --git a/src/rpc/resultcache.h b/src/rpc/resultcache.h
index c4c7ddedc6..f1a88c850d 100644
--- a/src/rpc/resultcache.h
+++ b/src/rpc/resultcache.h
@@ -8,8 +8,19 @@
 #include <optional>
 #include <memory>
 #include <univalue.h>
+#include <masternodes/mn_rpc.h>
 #include <rpc/request.h>
 
+struct CGetBurnInfoResult {
+    CAmount burntDFI{};
+    CAmount burntFee{};
+    CAmount auctionFee{};
+    CBalances burntTokens;
+    CBalances nonConsortiumTokens;
+    CBalances dexfeeburn;
+    CBalances paybackFee;
+};
+
 class RPCResultCache {
 public:
     enum RPCCacheMode {
@@ -37,4 +48,23 @@ RPCResultCache& GetRPCResultCache();
 int GetLastValidatedHeight();
 void SetLastValidatedHeight(int height);
 
+struct CMemoizedResultValue {
+    int height;
+    uint256 hash;
+    std::variant<CGetBurnInfoResult> data;
+};
+
+class MemoizedResultCache {
+public:
+    void Init(RPCResultCache::RPCCacheMode mode);
+    CMemoizedResultValue GetOrDefault(const JSONRPCRequest &request);
+    void Set(const JSONRPCRequest &request, const CMemoizedResultValue &value);
+private:
+    std::atomic_bool syncFlag{false};
+    std::map<std::string, CMemoizedResultValue> cacheMap{};
+    RPCResultCache::RPCCacheMode mode{RPCResultCache::RPCCacheMode::None};
+};
+
+MemoizedResultCache& GetMemoizedResultCache();
+
 #endif //DEFI_RPC_RESULTCACHE_H
diff --git a/test/functional/feature_consortium.py b/test/functional/feature_consortium.py
old mode 100644
new mode 100755
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 312d5a8c19..2b031571a3 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -62,6 +62,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "masternodes/mn_checks -> txmempool -> masternodes/mn_checks"
     "masternodes/mn_checks -> validation -> masternodes/mn_checks"
     "masternodes/mn_checks -> validation -> wallet/wallet -> masternodes/mn_checks"
+    "masternodes/mn_rpc -> rpc/resultcache -> masternodes/mn_rpc"
     "masternodes/validation -> validation -> masternodes/validation"
     "miner -> wallet/wallet -> policy/fees -> miner"
     "net_processing -> validation -> net_processing"

From 5e3f1c7eab2e1480db3d31247233b53c349d25ff Mon Sep 17 00:00:00 2001
From: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
Date: Fri, 3 Mar 2023 15:09:46 +0800
Subject: [PATCH 5/5] Remove int type warning (#1793)

---
 src/masternodes/rpc_accounts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index f155cc85e2..5a483291c8 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -2018,7 +2018,7 @@ UniValue getburninfo(const JSONRPCRequest& request) {
       public:
         explicit WorkerResultPool(size_t size) {
             pool.reserve(size);
-            for (auto i = 0; i < size; i++) {
+            for (size_t i = 0; i < size; i++) {
                 pool.push_back(CGetBurnInfoResult{});
             }
         }