wallets cache, bc : update last transactions in wallets cache when remove last block from trx index

Author: SychevS

csnode/include/csnode/walletscache.hpp

@@ -4,6 +4,7 @@
 #include <list>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include <cscrypto/cscrypto.hpp>
 #include <csdb/address.hpp>
@@ -107,6 +108,8 @@ class WalletsCache::Updater {
     void rollbackExceededTimeoutContract(const csdb::Transaction&, const WalletsCache::RefContractCall&, const csdb::Amount& execFee = 0);
     void smartSourceTransactionReleased(const csdb::Transaction& smartSourceTrx, const csdb::Transaction& initTrx);
 
+    void updateLastTransactions(const std::vector<std::pair<PublicKey, csdb::TransactionID>>&);
+
     PublicKey toPublicKey(const csdb::Address&) const;
 
 private:

csnode/src/blockchain.cpp

@@ -465,10 +465,28 @@ csdb::Address BlockChain::getAddressFromKey(const std::string& key) {
 
 void BlockChain::removeLastBlockFromTrxIndex(const csdb::Pool& pool) {
     std::set<csdb::Address> uniqueAddresses;
+    std::vector<std::pair<cs::PublicKey, csdb::TransactionID>> updates;
 
-    auto lbd = [&uniqueAddresses, this](const csdb::Address& addr, cs::Sequence sq) {
+    auto lbd = [&updates, &uniqueAddresses, this](const csdb::Address& addr, cs::Sequence sq) {
         auto key = getAddressByType(addr, AddressType::PublicKey);
+
         if (uniqueAddresses.insert(key).second) {
+            auto it = TransactionsIterator(*this, addr);
+            it.next();
+            bool found = false;
+
+            for (; it.isValid(); it.next()) {
+                if (it->id().pool_seq() < sq) {
+                    updates.push_back(std::make_pair(key.public_key(), it->id()));
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                updates.push_back(std::make_pair(key.public_key(),
+                                                 csdb::TransactionID(kWrongSequence, kWrongSequence)));
+            }
+
             std::lock_guard<decltype(dbLock_)> l(dbLock_);
             storage_.remove_last_from_trx_index(key, sq);
         }
@@ -485,6 +503,11 @@ void BlockChain::removeLastBlockFromTrxIndex(const csdb::Pool& pool) {
         lastNonEmptyBlock_ = previousNonEmpty_[lastNonEmptyBlock_.poolSeq];
         previousNonEmpty_.erase(pool.sequence());
     }
+
+    if (updates.size()) {
+        std::lock_guard l(cacheMutex_);
+        walletsCacheUpdater_->updateLastTransactions(updates);
+    }
 }
 
 void BlockChain::removeWalletsInPoolFromCache(const csdb::Pool& pool) {

csnode/src/walletscache.cpp

@@ -360,6 +360,16 @@ void WalletsCache::Updater::loadTrxForTarget(const csdb::Transaction& tr) {
     wallData.lastTransaction_ = tr.id();
 }
 
+void WalletsCache::Updater::updateLastTransactions(const std::vector<std::pair<PublicKey, csdb::TransactionID>>& updates) {
+    for (const auto& u : updates) {
+        auto it = std::find_if(data_.wallets_.begin(), data_.wallets_.end(), [&u](auto& wall) {
+                               return wall.first == u.first; });
+        if (it != data_.wallets_.end()) {
+            it->second.lastTransaction_ = u.second;
+        }
+    }
+}
+
 void WalletsCache::iterateOverWallets(const std::function<bool(const PublicKey&, const WalletData&)> func) {
     for (const auto& wallet : wallets_) {
         if (!func(wallet.first, wallet.second)) {