Swap offers monitor class added

Zeke133 · Zeke133 · commit 17da8b45e995 · 2019-07-26T10:18:16.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ debug/
 release/
 cmake-build-*/
 
+docs
 wallet/unittests/wallet_test
 beam/beam
 beam/unittests/node_test
diff --git a/Doxyfile b/Doxyfile
diff --git a/android/wallet_model.cpp b/android/wallet_model.cpp
@@ -227,9 +227,9 @@ void WalletModel::onAddresses(bool own, const std::vector<WalletAddress>& addres
     env->DeleteLocalRef(addrArray);
 }
 
-void WalletModel::onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers)
+void WalletModel::onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers)
 {
-    LOG_DEBUG() << "onSwapOffers()";
+    LOG_DEBUG() << "onSwapOffersChanged()";
 
     // TODO
 }
diff --git a/android/wallet_model.h b/android/wallet_model.h
@@ -33,7 +33,7 @@ class WalletModel
     void onChangeCalculated(beam::Amount change) override;
     void onAllUtxoChanged(const std::vector<beam::wallet::Coin>& utxos) override;
     void onAddresses(bool own, const std::vector<beam::wallet::WalletAddress>& addrs) override;
-    void onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers) override;
+    void onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers) override;
     void onGeneratedNewAddress(const beam::wallet::WalletAddress& walletAddr) override;
     void onNewAddressFailed() override;
     void onChangeCurrentWalletIDs(beam::wallet::WalletID senderID, beam::wallet::WalletID receiverID) override;
diff --git a/ui/model/wallet_model.cpp b/ui/model/wallet_model.cpp
@@ -134,7 +134,7 @@ void WalletModel::onAddresses(bool own, const std::vector<beam::wallet::WalletAd
     emit addressesChanged(own, addrs);
 }
 
-void WalletModel::onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers)
+void WalletModel::onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers)
 {
     emit swapOffersChanged(offers);
 }
diff --git a/ui/model/wallet_model.h b/ui/model/wallet_model.h
@@ -58,7 +58,7 @@ class WalletModel
     void onChangeCalculated(beam::Amount change) override;
     void onAllUtxoChanged(const std::vector<beam::wallet::Coin>& utxos) override;
     void onAddresses(bool own, const std::vector<beam::wallet::WalletAddress>& addrs) override;
-    void onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers) override;
+    void onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers) override;
     void onGeneratedNewAddress(const beam::wallet::WalletAddress& walletAddr) override;
     void onNewAddressFailed() override;
     void onChangeCurrentWalletIDs(beam::wallet::WalletID senderID, beam::wallet::WalletID receiverID) override;
diff --git a/ui/view/offers.qml b/ui/view/offers.qml
@@ -116,43 +116,15 @@ ColumnLayout {
             title: qsTrId("general-status")
             width: 200 * parent.width / 800
             movable: false
-            resizable: false
-            delegate: Item {
-                id: delegate_id
-                width: parent.width
-                height: tableView.rowHeight
-                readonly property var lineSeparator: "\n"
-                property var texts: styleData.value
-                property color secondLineColor: Style.content_secondary
-
-                ColumnLayout {
-                    anchors.right: parent.right
-                    anchors.left: parent.left
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    SFLabel {
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        Layout.topMargin: 20
-                        elide: Text.ElideRight
-                        text: delegate_id.texts[0] // add check for NULL
-                        textFormat: Text.StyledText
-                        font.italic: true
-                        font.pixelSize: 14
-                    }
-                }
-            }
         }
         
         rowDelegate: Item {
             height: tableView.rowHeight
-
             anchors.left: parent.left
             anchors.right: parent.right
 
             Rectangle {
                 anchors.fill: parent
-
                 color: Style.background_row_even
                 visible: styleData.alternate
             }
diff --git a/wallet/swaps/offers/swap_offers_monitor.h b/wallet/swaps/offers/swap_offers_monitor.h
@@ -0,0 +1,120 @@
+// Copyright 2019 The Beam Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "wallet/common.h"
+#include "core/fly_client.h"
+#include "wallet/wallet.h"
+#include "utility/logger.h"
+
+#include <unordered_map>
+
+namespace beam::wallet
+{
+    using namespace beam::proto;
+
+    class SwapOffersMonitor : public FlyClient::IBbsReceiver
+    {
+
+    public:
+        SwapOffersMonitor(FlyClient::INetwork& network, IWalletObserver& observer)
+            : m_observer(observer)
+        {
+            network.BbsSubscribe(OffersBbsChannel, m_lastTimestamp, this);
+
+            // test on dummy data
+            for (int i = 0; i < 10; ++i) {
+
+                TxID id {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,i};
+                TxDescription txDesc;
+
+                txDesc.m_txId = id;
+                txDesc.m_txType = wallet::TxType::Simple;
+                txDesc.m_amount = i*11;
+                txDesc.m_fee=0;
+                txDesc.m_change=0;
+                txDesc.m_minHeight=0;
+                txDesc.m_peerId = Zero;
+                txDesc.m_myId = Zero;
+                txDesc.m_message = {'m','e','s','s','a','g','e'};
+                txDesc.m_createTime=0;
+                txDesc.m_modifyTime=0;
+                txDesc.m_sender=false;
+                txDesc.m_selfTx = false;
+                txDesc.m_status=TxStatus::Pending;
+                txDesc.m_kernelID = Zero;
+                txDesc.m_failureReason = TxFailureReason::Unknown;
+
+                m_offersCache.emplace(std::make_pair(id,txDesc));
+            };
+            
+        };
+
+        virtual void OnMsg(proto::BbsMsg&& msg) override
+        {
+            if (msg.m_Message.empty())
+                return;
+
+            Blob blob;
+
+            uint8_t* pMsg = &msg.m_Message.front();
+            uint32_t nSize = static_cast<uint32_t>(msg.m_Message.size());
+
+            // SetTxParameter deserializedObj;
+            TxDescription deserializedObj;
+            bool bValid = false;
+
+            try
+            {
+                Deserializer der;
+                der.reset(pMsg, nSize);
+                der& deserializedObj;
+                bValid = true;
+            }
+            catch (const std::exception&)
+            {
+                LOG_WARNING() << "not crypted BBS deserialization failed";
+            }
+
+            m_offersCache[deserializedObj.m_txId] = deserializedObj;
+
+            m_observer.onSwapOffersChanged(ChangeAction::Added, std::vector<TxDescription>{deserializedObj});
+        }
+
+        auto getOffersList() const -> std::vector<TxDescription>
+        {
+            std::vector<TxDescription> offers;
+
+            for (auto offer : m_offersCache)
+            {
+                offers.push_back(offer.second);
+            }
+
+            return offers;
+        }
+
+        // implement smart cache to prevent load of all mesages each time
+
+    private:
+        static constexpr BbsChannel OffersBbsChannel = proto::Bbs::s_MaxChannels - 1;
+        Timestamp m_lastTimestamp = 0;  /// for test
+
+        IWalletObserver& m_observer;
+
+        std::unordered_map<TxID, TxDescription> m_offersCache;
+
+    };
+
+} // namespace beam::wallet
diff --git a/wallet/wallet.h b/wallet/wallet.h
@@ -52,6 +52,7 @@ namespace beam::wallet
         // @param done - number of done tasks
         // @param total - number of total tasks
         virtual void onSyncProgress(int done, int total) = 0;
+        virtual void onSwapOffersChanged(ChangeAction action, std::vector<TxDescription>&& offers) = 0;
     };
 
     // Wallet base class. 
diff --git a/wallet/wallet_client.cpp b/wallet/wallet_client.cpp
@@ -239,16 +239,6 @@ namespace beam::wallet
         , m_isConnected(false)
         , m_nodeAddrStr(nodeAddr)
     {
-        // test on dummy data
-        TxDescription tr1, tr2, tr3, tr4;
-        tr1.m_amount = 1;
-        tr2.m_amount = 2;
-        tr3.m_amount = 3;
-        tr4.m_amount = 4;
-        dummySwapOffers.push_back(tr1);
-        dummySwapOffers.push_back(tr2);
-        dummySwapOffers.push_back(tr3);
-        dummySwapOffers.push_back(tr4);
     }
 
     WalletClient::~WalletClient()
@@ -296,7 +286,6 @@ namespace beam::wallet
 
                     onStatus(getStatus());
                     onTxStatus(ChangeAction::Reset, m_walletDB->getTxHistory());
-                    onSwapOffers(dummySwapOffers);
 
                     static const unsigned LOG_ROTATION_PERIOD_SEC = 3 * 3600; // 3 hours
                     static const unsigned LOG_CLEANUP_PERIOD_SEC = 120 * 3600; // 5 days
@@ -384,6 +373,9 @@ namespace beam::wallet
 
                     wallet_subscriber = make_unique<WalletSubscriber>(static_cast<IWalletObserver*>(this), wallet);
 
+                    auto offersMonitor = make_shared<SwapOffersMonitor>(nodeNetwork,static_cast<IWalletObserver&>(*this));
+                    m_offersMonitor = offersMonitor;
+
                     nodeNetwork->tryToConnect();
                     m_reactor->run_ex([&wallet, &nodeNetwork](){
                         wallet->CleanupNetwork();
@@ -576,7 +568,6 @@ namespace beam::wallet
         onStatus(getStatus());
         onTxStatus(ChangeAction::Reset, m_walletDB->getTxHistory());
         onAddresses(false, m_walletDB->getAddresses(false));
-        onSwapOffers(dummySwapOffers);
     }
 
     void WalletClient::getUtxosStatus()
@@ -592,7 +583,7 @@ namespace beam::wallet
 
     void WalletClient::getSwapOffers()
     {
-        onSwapOffers(dummySwapOffers);
+        onSwapOffersChanged(ChangeAction::Reset, ...);
     }
 
     void WalletClient::cancelTx(const TxID& id)
diff --git a/wallet/wallet_client.h b/wallet/wallet_client.h
@@ -19,6 +19,7 @@
 #include "wallet_db.h"
 #include "wallet_network.h"
 #include "wallet_model_async.h"
+#include "swap_offers_monitor.h"
 
 #include <thread>
 #include <atomic>
@@ -69,7 +70,7 @@ namespace beam::wallet
         virtual void onChangeCalculated(Amount change) = 0;
         virtual void onAllUtxoChanged(const std::vector<Coin>& utxos) = 0;
         virtual void onAddresses(bool own, const std::vector<WalletAddress>& addresses) = 0;
-        virtual void onSwapOffers(const std::vector<TxDescription>& offers) = 0;
+        virtual void onSwapOffersChanged(ChangeAction action, const std::vector<TxDescription>& offers) = 0;
         virtual void onGeneratedNewAddress(const WalletAddress& walletAddr) = 0;
         virtual void onNewAddressFailed() = 0;
         virtual void onChangeCurrentWalletIDs(WalletID senderID, WalletID receiverID) = 0;
@@ -127,9 +128,9 @@ namespace beam::wallet
         std::weak_ptr<proto::FlyClient::INetwork> m_nodeNetwork;
         std::weak_ptr<IWalletMessageEndpoint> m_walletNetwork;
         std::weak_ptr<Wallet> m_wallet;
+        std::weak_ptr<SwapOffersMonitor> m_offersMonitor;
         bool m_isConnected;
         boost::optional<ErrorType> m_walletError;
         std::string m_nodeAddrStr;
-        std::vector<TxDescription> dummySwapOffers;
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -227,9 +227,9 @@ void WalletModel::onAddresses(bool own, const std::vector<WalletAddress>& addres`
`227`	`227`	`env->DeleteLocalRef(addrArray);`
`228`	`228`	`}`
`229`	`229`
`230`		`-void WalletModel::onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers)`
	`230`	`+void WalletModel::onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers)`
`231`	`231`	`{`
`232`		`- LOG_DEBUG() << "onSwapOffers()";`
	`232`	`+ LOG_DEBUG() << "onSwapOffersChanged()";`
`233`	`233`
`234`	`234`	`// TODO`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void WalletModel::onAddresses(bool own, const std::vector<beam::wallet::WalletAd`
`134`	`134`	`emit addressesChanged(own, addrs);`
`135`	`135`	`}`
`136`	`136`
`137`		`-void WalletModel::onSwapOffers(const std::vector<beam::wallet::TxDescription>& offers)`
	`137`	`+void WalletModel::onSwapOffersChanged(ChangeAction action, const std::vector<beam::wallet::TxDescription>& offers)`
`138`	`138`	`{`
`139`	`139`	`emit swapOffersChanged(offers);`
`140`	`140`	`}`