From d48988ee4fb7a4e6393934cc86d0e1d11592ffdc Mon Sep 17 00:00:00 2001
From: DeFiDev M <defidev@cakedefi.com>
Date: Wed, 28 Oct 2020 18:10:55 +0700
Subject: [PATCH] core modifications to make tracking account balances changes
 possible; rpc listaccounthistory

---
 src/Makefile.am                     |   2 +
 src/consensus/tx_verify.cpp         |   2 +-
 src/init.cpp                        |   1 +
 src/masternodes/accounts.cpp        |   1 +
 src/masternodes/accountshistory.cpp |  59 +++++++++++++
 src/masternodes/accountshistory.h   |  67 ++++++++++++++
 src/masternodes/balances.h          |   1 -
 src/masternodes/masternodes.h       |   2 +
 src/masternodes/mn_checks.cpp       |   7 +-
 src/masternodes/mn_checks.h         |  32 ++++++-
 src/masternodes/mn_rpc.cpp          | 130 ++++++++++++++++++++++++++++
 src/rpc/client.cpp                  |   2 +
 src/test/storage_tests.cpp          |  71 +++++++++++++++
 src/validation.cpp                  |   5 +-
 test/functional/feature_poolswap.py |  13 ++-
 15 files changed, 383 insertions(+), 12 deletions(-)
 create mode 100644 src/masternodes/accountshistory.cpp
 create mode 100644 src/masternodes/accountshistory.h

diff --git a/src/Makefile.am b/src/Makefile.am
index fcae772511..82d1cba427 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,6 +153,7 @@ DEFI_CORE_H = \
   limitedmap.h \
   logging.h \
   masternodes/accounts.h \
+  masternodes/accountshistory.h \
   masternodes/anchors.h \
   masternodes/balances.h \
   masternodes/communityaccounttypes.h \
@@ -362,6 +363,7 @@ libdefi_server_a_SOURCES = \
   init.cpp \
   dbwrapper.cpp \
   masternodes/accounts.cpp \
+  masternodes/accountshistory.cpp \
   masternodes/anchors.cpp \
   masternodes/criminals.cpp \
   masternodes/govvariables/lp_daily_dfi_reward.cpp \
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
index 36e2b0a437..480328cc74 100644
--- a/src/consensus/tx_verify.cpp
+++ b/src/consensus/tx_verify.cpp
@@ -220,7 +220,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, CValidationState& state, c
     const auto txType = GuessCustomTxType(tx, dummy);
 
     if (NotAllowedToFail(txType)) {
-        auto res = ApplyCustomTx(const_cast<CCustomCSView&>(*mnview), inputs, tx, Params(), nSpendHeight, true); // note for 'isCheck == true' here
+        auto res = ApplyCustomTx(const_cast<CCustomCSView&>(*mnview), inputs, tx, Params(), nSpendHeight, 0, true); // note for 'isCheck == true' here; 'zero' for txn is dummy value
         if (!res.ok && (res.code & CustomTxErrCodes::Fatal)) {
             return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, "bad-txns-customtx", res.msg);
         }
diff --git a/src/init.cpp b/src/init.cpp
index ad9b66d17a..35029c2814 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -415,6 +415,7 @@ void SetupServerArgs()
     hidden_args.emplace_back("-sysperms");
 #endif
     gArgs.AddArg("-txindex", strprintf("Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)", DEFAULT_TXINDEX), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    gArgs.AddArg("-acindex", strprintf("Maintain a full account history index, tracking all accounts balances changes. Used by the listaccounthistory rpc call (default: %u)", false), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     gArgs.AddArg("-blockfilterindex=<type>",
                  strprintf("Maintain an index of compact filters by block (default: %s, values: %s).", DEFAULT_BLOCKFILTERINDEX, ListBlockFilterTypes()) +
                  " If <type> is not supplied or if <type> = 1, indexes for all known types are enabled.",
diff --git a/src/masternodes/accounts.cpp b/src/masternodes/accounts.cpp
index f783eb7c40..de3d35347c 100644
--- a/src/masternodes/accounts.cpp
+++ b/src/masternodes/accounts.cpp
@@ -81,3 +81,4 @@ Res CAccountsView::SubBalances(CScript const & owner, CBalances const & balances
     }
     return Res::Ok();
 }
+
diff --git a/src/masternodes/accountshistory.cpp b/src/masternodes/accountshistory.cpp
new file mode 100644
index 0000000000..92dc8abc96
--- /dev/null
+++ b/src/masternodes/accountshistory.cpp
@@ -0,0 +1,59 @@
+// Copyright (c) 2020 DeFi Blockchain Developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <masternodes/accountshistory.h>
+#include <masternodes/accounts.h>
+#include <key_io.h>
+
+/// @attention make sure that it does not overlap with those in masternodes.cpp/tokens.cpp/undos.cpp/accounts.cpp !!!
+const unsigned char CAccountsHistoryView::ByAccountHistoryKey::prefix = 'h'; // don't intersects with CMintedHeadersView::MintedHeaders::prefix due to different DB
+
+void CAccountsHistoryView::ForEachAccountHistory(std::function<bool(CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diffs)> callback, AccountHistoryKey start) const
+{
+    ForEach<ByAccountHistoryKey, AccountHistoryKey, AccountHistoryValue>([&callback] (AccountHistoryKey const & key, AccountHistoryValue const & val) {
+        return callback(key.owner,key.blockHeight, key.txn, val.txid, val.category, val.diff);
+    }, start);
+}
+
+Res CAccountsHistoryView::SetAccountHistory(const CScript & owner, uint32_t height, uint32_t txn, const uint256 & txid, unsigned char category, TAmounts const & diff)
+{
+////  left for debug:
+//    std::string ownerStr;
+//    CTxDestination dest;
+//    if (!ExtractDestination(owner, dest)) {
+//        ownerStr = owner.GetHex();
+//    } else
+//        ownerStr = EncodeDestination(dest);
+//    LogPrintf("DEBUG: SetAccountHistory: owner: %s, ownerStr: %s, block: %i, txn: %d, txid: %s, diffs: %ld\n", owner.GetHex().c_str(), ownerStr.c_str(), height, txn, txid.ToString().c_str(), diff.size());
+
+    WriteBy<ByAccountHistoryKey>(AccountHistoryKey{owner, height, txn}, AccountHistoryValue{txid, category, diff});
+    return Res::Ok();
+}
+
+bool CAccountsHistoryView::TrackAffectedAccounts(CStorageKV const & before, MapKV const & diff, uint32_t height, uint32_t txn, const uint256 & txid, unsigned char category) {
+    if (!gArgs.GetBoolArg("-acindex", false))
+        return false;
+
+    std::map<CScript, TAmounts> balancesDiff;
+    using TKey = std::pair<unsigned char, BalanceKey>;
+
+    for (auto it = diff.lower_bound({CAccountsView::ByBalanceKey::prefix}); it != diff.end() && it->first.at(0) == CAccountsView::ByBalanceKey::prefix; ++it) {
+        CAmount oldAmount = 0, newAmount = 0;
+
+        if (it->second) {
+            BytesToDbType(*it->second, newAmount);
+        }
+        TBytes beforeVal;
+        if (before.Read(it->first, beforeVal)) {
+            BytesToDbType(beforeVal, oldAmount);
+        }
+        TKey balanceKey;
+        BytesToDbType(it->first, balanceKey);
+        balancesDiff[balanceKey.second.owner][balanceKey.second.tokenID] = newAmount - oldAmount;
+    }
+    for (auto const & kv : balancesDiff) {
+        SetAccountHistory(kv.first, height, txn, txid, category, kv.second);
+    }
+    return true;
+}
diff --git a/src/masternodes/accountshistory.h b/src/masternodes/accountshistory.h
new file mode 100644
index 0000000000..6b5514b523
--- /dev/null
+++ b/src/masternodes/accountshistory.h
@@ -0,0 +1,67 @@
+// Copyright (c) 2020 DeFi Blockchain Developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef DEFI_MASTERNODES_ACCOUNTSHISTORY_H
+#define DEFI_MASTERNODES_ACCOUNTSHISTORY_H
+
+#include <flushablestorage.h>
+#include <masternodes/res.h>
+#include <amount.h>
+#include <script/script.h>
+#include <uint256.h>
+
+
+struct AccountHistoryKey {
+    CScript owner;
+    uint32_t blockHeight;
+    uint32_t txn; // for order in block
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(owner);
+
+        if (ser_action.ForRead()) {
+            READWRITE(WrapBigEndian(blockHeight));
+            blockHeight = ~blockHeight;
+            READWRITE(WrapBigEndian(txn));
+            txn = ~txn;
+        }
+        else {
+            uint32_t blockHeight_ = ~blockHeight;
+            READWRITE(WrapBigEndian(blockHeight_));
+            uint32_t txn_ = ~txn;
+            READWRITE(WrapBigEndian(txn_));
+        }
+    }
+};
+
+struct AccountHistoryValue {
+    uint256 txid;
+    unsigned char category;
+    TAmounts diff;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(txid);
+        READWRITE(category);
+        READWRITE(diff);
+    }
+};
+
+class CAccountsHistoryView : public virtual CStorageView
+{
+public:
+    Res SetAccountHistory(CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diff);
+    void ForEachAccountHistory(std::function<bool(CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diff)> callback, AccountHistoryKey start) const;
+    bool TrackAffectedAccounts(CStorageKV const & before, MapKV const & diff, uint32_t height, uint32_t txn, const uint256 & txid, unsigned char category);
+
+    // tags
+    struct ByAccountHistoryKey { static const unsigned char prefix; };
+};
+
+#endif //DEFI_MASTERNODES_ACCOUNTSHISTORY_H
diff --git a/src/masternodes/balances.h b/src/masternodes/balances.h
index b880adc9c9..f048fe94fd 100644
--- a/src/masternodes/balances.h
+++ b/src/masternodes/balances.h
@@ -220,5 +220,4 @@ struct BalanceKey {
         READWRITE(WrapBigEndian(tokenID.v));
     }
 };
-
 #endif //DEFI_MASTERNODES_BALANCES_H
diff --git a/src/masternodes/masternodes.h b/src/masternodes/masternodes.h
index 7fdc7c7335..8ad1a3024f 100644
--- a/src/masternodes/masternodes.h
+++ b/src/masternodes/masternodes.h
@@ -10,6 +10,7 @@
 #include <pubkey.h>
 #include <serialize.h>
 #include <masternodes/accounts.h>
+#include <masternodes/accountshistory.h>
 #include <masternodes/incentivefunding.h>
 #include <masternodes/tokens.h>
 #include <masternodes/undos.h>
@@ -183,6 +184,7 @@ class CCustomCSView
         , public CAnchorRewardsView
         , public CTokensView
         , public CAccountsView
+        , public CAccountsHistoryView
         , public CCommunityBalancesView
         , public CUndosView
         , public CPoolPairView
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index ebcff075a0..ce7ec172a1 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -115,7 +115,7 @@ bool HasFoundationAuth(CTransaction const & tx, CCoinsViewCache const & coins, C
     return false;
 }
 
-Res ApplyCustomTx(CCustomCSView & base_mnview, CCoinsViewCache const & coins, CTransaction const & tx, Consensus::Params const & consensusParams, uint32_t height, bool isCheck)
+Res ApplyCustomTx(CCustomCSView & base_mnview, CCoinsViewCache const & coins, CTransaction const & tx, Consensus::Params const & consensusParams, uint32_t height, uint32_t txn, bool isCheck)
 {
     Res res = Res::Ok();
 
@@ -124,11 +124,11 @@ Res ApplyCustomTx(CCustomCSView & base_mnview, CCoinsViewCache const & coins, CT
     }
 
     CCustomCSView mnview(base_mnview);
-
+    CustomTxType guess;
     try {
         // Check if it is custom tx with metadata
         std::vector<unsigned char> metadata;
-        CustomTxType guess = GuessCustomTxType(tx, metadata);
+        guess = GuessCustomTxType(tx, metadata);
         switch (guess)
         {
             case CustomTxType::CreateMasternode:
@@ -195,6 +195,7 @@ Res ApplyCustomTx(CCustomCSView & base_mnview, CCoinsViewCache const & coins, CT
 
     // construct undo
     auto& flushable = dynamic_cast<CFlushableStorageKV&>(mnview.GetRaw());
+    mnview.TrackAffectedAccounts(base_mnview.GetRaw(), flushable.GetRaw(), height, txn, tx.GetHash(), (unsigned char) guess);
     auto undo = CUndo::Construct(base_mnview.GetRaw(), flushable.GetRaw());
     // flush changes
     mnview.Flush();
diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
index aea4211092..054f96ccf6 100644
--- a/src/masternodes/mn_checks.h
+++ b/src/masternodes/mn_checks.h
@@ -52,17 +52,43 @@ enum class CustomTxType : unsigned char
     AccountToUtxos     = 'b',
     AccountToAccount  = 'B',
     //set governance variable
-    SetGovVariable       = 'G'
+    SetGovVariable       = 'G',
+
+    // this is not the real tx type (!) but special category for accounts/history tracking
+    NonTxRewards   = '+'
 };
 
 inline CustomTxType CustomTxCodeToType(unsigned char ch) {
-    char const txtypes[] = "CRTMNnpuslrUbBG";
+    char const txtypes[] = "CRTMNnpuslrUbBG+";
     if (memchr(txtypes, ch, strlen(txtypes)))
         return static_cast<CustomTxType>(ch);
     else
         return CustomTxType::None;
 }
 
+inline std::string ToString(CustomTxType type) {
+    switch (type)
+    {
+        case CustomTxType::CreateMasternode:    return "CreateMasternode";
+        case CustomTxType::ResignMasternode:    return "ResignMasternode";
+        case CustomTxType::CreateToken:         return "CreateToken";
+        case CustomTxType::UpdateToken:         return "UpdateToken";
+        case CustomTxType::UpdateTokenAny:      return "UpdateTokenAny";
+        case CustomTxType::MintToken:           return "MintToken";
+        case CustomTxType::CreatePoolPair:      return "CreatePoolPair";
+        case CustomTxType::UpdatePoolPair:      return "UpdatePoolPair";
+        case CustomTxType::PoolSwap:            return "PoolSwap";
+        case CustomTxType::AddPoolLiquidity:    return "AddPoolLiquidity";
+        case CustomTxType::RemovePoolLiquidity: return "RemovePoolLiquidity";
+        case CustomTxType::UtxosToAccount:      return "UtxosToAccount";
+        case CustomTxType::AccountToUtxos:      return "AccountToUtxos";
+        case CustomTxType::AccountToAccount:    return "AccountToAccount";
+        case CustomTxType::SetGovVariable:      return "SetGovVariable";
+        case CustomTxType::NonTxRewards:        return "Rewards";
+        default:                                return "None";
+    }
+}
+
 inline bool NotAllowedToFail(CustomTxType txType) {
     return txType == CustomTxType::MintToken || txType == CustomTxType::AccountToUtxos;
 }
@@ -85,7 +111,7 @@ bool HasAuth(CTransaction const & tx, CKeyID const & auth);
 bool HasAuth(CTransaction const & tx, CCoinsViewCache const & coins, CScript const & auth);
 bool HasCollateralAuth(CTransaction const & tx, CCoinsViewCache const & coins, uint256 const & collateralTx);
 
-Res ApplyCustomTx(CCustomCSView & mnview, CCoinsViewCache const & coins, CTransaction const & tx, const Consensus::Params& consensusParams, uint32_t height, bool isCheck = true);
+Res ApplyCustomTx(CCustomCSView & mnview, CCoinsViewCache const & coins, CTransaction const & tx, const Consensus::Params& consensusParams, uint32_t height, uint32_t txn, bool isCheck = true);
 //! Deep check (and write)
 Res ApplyCreateMasternodeTx(CCustomCSView & mnview, CTransaction const & tx, uint32_t height, std::vector<unsigned char> const & metadata);
 Res ApplyResignMasternodeTx(CCustomCSView & mnview, CCoinsViewCache const & coins, CTransaction const & tx, uint32_t height, std::vector<unsigned char> const & metadata);
diff --git a/src/masternodes/mn_rpc.cpp b/src/masternodes/mn_rpc.cpp
index 88df7fb2c5..1efa3364e9 100644
--- a/src/masternodes/mn_rpc.cpp
+++ b/src/masternodes/mn_rpc.cpp
@@ -2716,6 +2716,135 @@ UniValue listpoolshares(const JSONRPCRequest& request) {
     return ret;
 }
 
+UniValue accounthistoryToJSON(CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diffs) {
+    UniValue obj(UniValue::VOBJ);
+
+    obj.pushKV("owner", ScriptToString(owner));
+    obj.pushKV("blockHeight", (uint64_t) height);
+    obj.pushKV("type", ToString(CustomTxCodeToType(category)));
+    if (!txid.IsNull()) {
+        obj.pushKV("txn", (uint64_t) txn);
+        obj.pushKV("txid", txid.ToString());
+    }
+
+    UniValue diffsObj(UniValue::VARR);
+    for (auto const & diff : diffs) {
+        auto token = pcustomcsview->GetToken(diff.first);
+        std::string const tokenIdStr = token->CreateSymbolKey(diff.first);
+
+        diffsObj.push_back(ValueFromAmount(diff.second).getValStr() + "@" + tokenIdStr);
+    }
+    obj.pushKV("amounts", diffsObj);
+    return obj;
+}
+
+UniValue listaccounthistory(const JSONRPCRequest& request) {
+    CWallet* const pwallet = GetWallet(request);
+    RPCHelpMan{"listaccounthistory",
+               "\nReturns information about account history.\n",
+               {
+                        {"owner", RPCArg::Type::STR, RPCArg::Optional::OMITTED,
+                                    "Single account ID (CScript or address) or reserved words: \"mine\" - to list history for all owned accounts or \"all\" to list whole DB (default = \"mine\")."},
+                        {"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                            {
+                                 {"maxBlockHeight", RPCArg::Type::NUM, RPCArg::Optional::OMITTED,
+                                  "Optional height to iterate from (downto genesis block), (default = chaintip)."},
+                                 {"depth", RPCArg::Type::NUM, RPCArg::Optional::OMITTED,
+                                  "Maximum depth, 100 blocks by default for every account"},
+                            },
+                        },
+               },
+               RPCResult{
+                       "[{},{}...]     (array) Objects with account history information\n"
+               },
+               RPCExamples{
+                       HelpExampleCli("listaccounthistory", "\"all\" {\"maxBlockHeight\":160,\"depth\":10}")
+                       + HelpExampleRpc("listaccounthistory", "\"address\" False")
+               },
+    }.Check(request);
+
+    std::string accounts = "mine";
+    if (request.params.size() > 0) {
+        accounts = request.params[0].getValStr();
+    }
+
+    uint32_t startBlock = std::numeric_limits<uint32_t>::max();
+    uint32_t depth = 100;
+
+    if (request.params.size() > 1) {
+        UniValue optionsObj = request.params[1].get_obj();
+        RPCTypeCheckObj(optionsObj,
+            {
+                {"maxBlockHeight", UniValueType(UniValue::VNUM)},
+                {"depth", UniValueType(UniValue::VNUM)},
+            }, true, true);
+
+        if (!optionsObj["maxBlockHeight"].isNull()) {
+            startBlock = (uint32_t) optionsObj["maxBlockHeight"].get_int64();
+        }
+        if (!optionsObj["depth"].isNull()) {
+            depth = (uint32_t) optionsObj["depth"].get_int64();
+        }
+    }
+
+    pwallet->BlockUntilSyncedToCurrentChain();
+    auto locked_chain = pwallet->chain().lock();
+    LOCK(pwallet->cs_wallet);
+
+    if (startBlock > ::ChainActive().Height()) {
+        startBlock = ::ChainActive().Height();
+    }
+
+    UniValue ret(UniValue::VARR);
+
+    if (accounts == "mine") {
+        // traversing through owned scripts
+        CScript prevOwner{};
+        bool isMine = false;
+        AccountHistoryKey startKey{ prevOwner, startBlock, std::numeric_limits<uint32_t>::max() }; // starting from max txn values
+        pcustomcsview->ForEachAccountHistory([&](CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diffs) {
+            if (height > startKey.blockHeight || (depth <= startKey.blockHeight && (height < startKey.blockHeight - depth)))
+                return true; // continue
+
+            if (prevOwner != owner) {
+                prevOwner = owner;
+                isMine = IsMine(*pwallet, owner) == ISMINE_SPENDABLE;
+            }
+            if (isMine)
+                ret.push_back(accounthistoryToJSON(owner, height, txn, txid, category, diffs));
+
+            return true;
+        }, startKey);
+    }
+    else if (accounts == "all") {
+        // traversing the whole DB, skipping wrong heights
+        AccountHistoryKey startKey{ CScript{}, startBlock, std::numeric_limits<uint32_t>::max() }; // starting from max txn values
+        pcustomcsview->ForEachAccountHistory([&](CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diffs) {
+            if (height > startKey.blockHeight || (depth <= startKey.blockHeight && (height < startKey.blockHeight - depth)))
+                return true; // continue
+
+            ret.push_back(accounthistoryToJSON(owner, height, txn, txid, category, diffs));
+            return true;
+        }, startKey);
+
+    }
+    else {
+        // parse single script/address:
+        CScript const owner = DecodeScript(accounts);
+
+        AccountHistoryKey startKey{ owner, startBlock, std::numeric_limits<uint32_t>::max() }; // starting from max txn values
+        pcustomcsview->ForEachAccountHistory([&](CScript const & owner, uint32_t height, uint32_t txn, uint256 const & txid, unsigned char category, TAmounts const & diffs) {
+            if (owner != startKey.owner || (height > startKey.blockHeight || (depth <= startKey.blockHeight && (height < startKey.blockHeight - depth))))
+                return false;
+
+            ret.push_back(accounthistoryToJSON(owner, height, txn, txid, category, diffs));
+            return true;
+        }, startKey);
+    }
+
+    return ret;
+}
+
 UniValue listcommunitybalances(const JSONRPCRequest& request) {
     RPCHelpMan{"listcommunitybalances",
                "\nReturns information about all community balances.\n",
@@ -2888,6 +3017,7 @@ static const CRPCCommand commands[] =
     {"poolpair",    "updatepoolpair",     &updatepoolpair,     {"metadata", "inputs"}},
     {"poolpair",    "poolswap",           &poolswap,           {"metadata", "inputs"}},
     {"poolpair",    "listpoolshares",     &listpoolshares,     {"pagination", "verbose"}},
+    {"accounts",    "listaccounthistory", &listaccounthistory, {"owner", "options"}},
     {"accounts",    "listcommunitybalances", &listcommunitybalances, {}},
     {"blockchain",  "setgov",             &setgov,             {"variables", "inputs"}},
     {"blockchain",  "getgov",             &getgov,             {"name"}},
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index af5cb4461d..6807f6d33a 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -237,6 +237,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "listpoolshares", 0, "pagination" },
     { "listpoolshares", 1, "verbose" },
 
+    { "listaccounthistory", 1, "options" },
+
     { "setgov", 0, "variables" },
     { "setgov", 1, "inputs" },
 };
diff --git a/src/test/storage_tests.cpp b/src/test/storage_tests.cpp
index bfffe88aa3..15f7d67322 100644
--- a/src/test/storage_tests.cpp
+++ b/src/test/storage_tests.cpp
@@ -260,5 +260,76 @@ BOOST_AUTO_TEST_CASE(tokens)
     BOOST_REQUIRE(GetTokensCount() == 3);
 }
 
+struct TestForward {
+    uint32_t n;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(WrapBigEndian(n));
+    }
+    static const unsigned char prefix;
+};
+const unsigned char TestForward::prefix = 'F';
+
+struct TestBackward {
+    uint32_t n;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        if (ser_action.ForRead()) {
+            READWRITE(WrapBigEndian(n));
+            n = ~n;
+        }
+        else {
+            uint32_t neg = ~n;
+            READWRITE(WrapBigEndian(neg));
+        }
+    }
+    static const unsigned char prefix;
+};
+const unsigned char TestBackward::prefix = 'B';
+
+
+BOOST_AUTO_TEST_CASE(for_each_order)
+{
+    {
+        pcustomcsview->WriteBy<TestForward>(TestForward{0}, 1);
+        pcustomcsview->WriteBy<TestForward>(TestForward{1}, 2);
+        pcustomcsview->WriteBy<TestForward>(TestForward{255}, 3);
+        pcustomcsview->WriteBy<TestForward>(TestForward{256}, 4);
+        pcustomcsview->WriteBy<TestForward>(TestForward{((uint16_t)-1) -1}, 5);
+        pcustomcsview->WriteBy<TestForward>(TestForward{(uint16_t)-1}, 6);
+        pcustomcsview->WriteBy<TestForward>(TestForward{((uint32_t)-1) -1}, 7);
+        pcustomcsview->WriteBy<TestForward>(TestForward{((uint32_t)-1)}, 8);
+
+        int test = 1;
+        pcustomcsview->ForEach<TestForward, TestForward, int>([&] (TestForward const & key, int & value) {
+//            printf("%ld : %d\n", key.n, value);
+            BOOST_CHECK(value == test);
+            ++test;
+            return true;
+        });
+    }
+    {
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{0}, 1);
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{1}, 2);
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{255}, 3);
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{256}, 4);
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{((uint16_t)-1) -1}, 5);
+        pcustomcsview->WriteBy<TestBackward>(TestBackward{(uint16_t)-1}, 6);
+
+        int test = 6;
+        pcustomcsview->ForEach<TestBackward, TestBackward, int>([&] (TestBackward const & key, int & value) {
+//            printf("%ld : %d\n", key.n, value);
+            BOOST_CHECK(value == test);
+            --test;
+            return true;
+        }, TestBackward{ (uint32_t) -1 });
+    }
+}
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/validation.cpp b/src/validation.cpp
index 7759a37ecc..068a3ca3a3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1934,7 +1934,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
             pcustomcsview->CreateDFIToken();
             // init view|db with genesis here
             for (size_t i = 0; i < block.vtx.size(); ++i) {
-                ApplyCustomTx(mnview, view, *block.vtx[i], chainparams.GetConsensus(), pindex->nHeight, fJustCheck);
+                ApplyCustomTx(mnview, view, *block.vtx[i], chainparams.GetConsensus(), pindex->nHeight, i, fJustCheck);
                 AddCoins(view, *block.vtx[i], 0);
             }
         }
@@ -2176,7 +2176,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
                     tx.GetHash().ToString(), FormatStateMessage(state));
             }
 
-            const auto res = ApplyCustomTx(mnview, view, tx, chainparams.GetConsensus(), pindex->nHeight, fJustCheck);
+            const auto res = ApplyCustomTx(mnview, view, tx, chainparams.GetConsensus(), pindex->nHeight, i, fJustCheck);
             if (!res.ok && (res.code & CustomTxErrCodes::Fatal)) {
                 // we will never fail, but skip, unless transaction mints UTXOs
                 return error("ConnectBlock(): ApplyCustomTx on %s failed with %s",
@@ -2303,6 +2303,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
 
         // construct undo
         auto& flushable = dynamic_cast<CFlushableStorageKV&>(cache.GetRaw());
+        cache.TrackAffectedAccounts(mnview.GetRaw(), flushable.GetRaw(), static_cast<uint32_t>(pindex->nHeight), std::numeric_limits<uint32_t>::max(), uint256(), (unsigned char) CustomTxType::NonTxRewards);
         auto undo = CUndo::Construct(mnview.GetRaw(), flushable.GetRaw());
         // flush changes to underlying view
         cache.Flush();
diff --git a/test/functional/feature_poolswap.py b/test/functional/feature_poolswap.py
index 74d9efb01b..9eb78a73ff 100755
--- a/test/functional/feature_poolswap.py
+++ b/test/functional/feature_poolswap.py
@@ -24,8 +24,8 @@ def set_test_params(self):
         # node2: Non Foundation
         self.setup_clean_chain = True
         self.extra_args = [
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
-            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-acindex=1'],
+            ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-acindex=1'],
             ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50'],
             ['-txnotokens=0', '-amkheight=50', '-bayfrontheight=50']]
 
@@ -212,6 +212,15 @@ def run_test(self):
             errorString = e.error['message']
         assert("Price is higher than indicated." in errorString)
 
+        # Visual test for listaccounthistory
+        print("mine@0:", self.nodes[0].listaccounthistory())
+        print("mine@1:", self.nodes[1].listaccounthistory())
+        print("all@0", self.nodes[0].listaccounthistory("all"))
+        print("accountGN0@0", self.nodes[0].listaccounthistory(accountGN0))
+        print("mine@0, depth=3:", self.nodes[0].listaccounthistory("mine", {"depth":3}))
+        print("mine@0, height=158 depth=2:", self.nodes[0].listaccounthistory("mine", {"maxBlockHeight":158, "depth":2}))
+        print("all@0, height=158 depth=2:", self.nodes[0].listaccounthistory("all", {"maxBlockHeight":158, "depth":2}))
+
         # REVERTING:
         #========================
         print ("Reverting...")