Merge remote-tracking branch 'remotes/origin/groovy_gluon_7.2RC' into…

… mainnet
BeamMW · Oct 19, 2022 · 0a328ff · 0a328ff
2 parents 4e33ab2 + 34904b4
commit 0a328ff
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 4 deletions.
diff --git a/beam b/beam
diff --git a/ui/model/assets_manager.cpp b/ui/model/assets_manager.cpp
@@ -465,3 +465,9 @@ bool AssetsManager::isVerified(beam::Asset::ID assetId) const
     }
     return false;
 }
+
+bool AssetsManager::isKnownAsset(beam::Asset::ID assetId) const
+{
+    const auto assets = _wallet->getAssetsFull();
+    return assets.find(assetId) != assets.end();
+}
diff --git a/ui/model/assets_manager.h b/ui/model/assets_manager.h
@@ -55,6 +55,7 @@ class AssetsManager: public QObject
     [[nodiscard]] QMap<QString, QVariant> getAssetsMap(const std::set<beam::Asset::ID>& assets);
     [[nodiscard]] bool hasAsset(beam::Asset::ID) const;
     [[nodiscard]] bool isVerified(beam::Asset::ID) const;
+    [[nodiscard]] bool isKnownAsset(beam::Asset::ID) const;
 
 signals:
     void assetInfo(beam::Asset::ID assetId);

diff --git a/ui/model/wallet_model.cpp b/ui/model/wallet_model.cpp
@@ -344,6 +344,11 @@ void WalletModel::onAssetInfo(beam::Asset::ID assetId, const beam::wallet::Walle
     emit assetInfoChanged(assetId, info);
 }
 
+void WalletModel::onFullAssetsListLoaded()
+{
+    emit fullAssetsListLoaded();
+}
+
 beam::Version WalletModel::getLibVersion() const
 {
     beam::Version ver;

diff --git a/ui/model/wallet_model.h b/ui/model/wallet_model.h
@@ -82,6 +82,7 @@ class WalletModel
     void addressChecked(const QString& addr, bool isValid);
     void functionPosted(const std::function<void()>&);
     void txHistoryExportedToCsv(const QString& data);
+    void fullAssetsListLoaded();
 
     #if defined(BEAM_HW_WALLET)
     void showTrezorMessage();
@@ -137,6 +138,7 @@ class WalletModel
     void onNotificationsChanged(beam::wallet::ChangeAction, const std::vector<beam::wallet::Notification>&) override;
     void onPublicAddress(const std::string& publicAddr) override;
     void onAssetInfo(beam::Asset::ID, const beam::wallet::WalletAsset&) override;
+    void onFullAssetsListLoaded() override;
 
     #ifdef BEAM_IPFS_SUPPORT
     virtual void onIPFSStatus(bool running, const std::string& error, unsigned int peercnt) override;

diff --git a/ui/view/assets_swap.qml b/ui/view/assets_swap.qml
@@ -56,7 +56,12 @@ Item {
                     font.pixelSize: 12
 
                     onClicked: {
-                        assetsSwapStackView.push(Qt.createComponent("create_asset_swap.qml"), {"onClosed": assetsSwapLayout.onClosed});
+                        assetsSwapStackView.push(Qt.createComponent("create_asset_swap.qml"), {
+                            "onClosed": function() {
+                                    ordersModel.updateAssets();
+                                    assetsSwapLayout.onClosed();
+                                }
+                            });
                     }
                 }
             }

diff --git a/ui/viewmodel/asset_swap_create_view.cpp b/ui/viewmodel/asset_swap_create_view.cpp
@@ -40,7 +40,7 @@ AssetSwapCreateViewModel::AssetSwapCreateViewModel()
 
     _myCurrenciesList = _amgr->getAssetsList();
     _currenciesList = _amgr->getAssetsListFull();
-    if (_currenciesList.empty())
+    if (_currenciesList.size() <= 1)
     {
         _currenciesList = _myCurrenciesList;
     }

diff --git a/ui/viewmodel/dex/dex_orders_list.cpp b/ui/viewmodel/dex/dex_orders_list.cpp
@@ -23,6 +23,8 @@ DexOrdersList::DexOrdersList()
     : m_amgr(AppModel::getInstance().getAssets())
     , m_wallet(AppModel::getInstance().getWalletModel())
 {
+    connect(m_wallet.get(), &WalletModel::fullAssetsListLoaded, this, &DexOrdersList::assetsListChanged);
+    m_wallet->getAsync()->loadFullAssetsList();
 }
 
 QHash<int, QByteArray> DexOrdersList::roleNames() const
@@ -121,6 +123,9 @@ QVariant DexOrdersList::data(const QModelIndex &index, int role) const
         }
         case Roles::RCoins:
         {
+            if (!m_amgr->isKnownAsset(order.getSendAssetId()) || !m_amgr->isKnownAsset(order.getReceiveAssetId()))
+                m_wallet->getAsync()->loadFullAssetsList();
+
             QVariantMap res;
             res.insert("sendIcon", m_amgr->getIcon(order.getSendAssetId()));
             res.insert("receiveIcon", m_amgr->getIcon(order.getReceiveAssetId()));
@@ -158,3 +163,8 @@ QVariant DexOrdersList::data(const QModelIndex &index, int role) const
         }
     }
 }
+
+void DexOrdersList::assetsListChanged()
+{
+    emit layoutChanged();
+}
diff --git a/ui/viewmodel/dex/dex_orders_list.h b/ui/viewmodel/dex/dex_orders_list.h
@@ -53,6 +53,9 @@ class DexOrdersList : public ListModel<beam::wallet::DexOrder>
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
     [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
 
+public slots:
+    void assetsListChanged();
+
 private:
     QLocale m_locale; // default
     AssetsManager::Ptr m_amgr;

diff --git a/ui/viewmodel/dex/dex_orders_model.cpp b/ui/viewmodel/dex/dex_orders_model.cpp
@@ -43,6 +43,11 @@ void DexOrdersModel::cancelOrder(QString orderId)
     _walletModel->getAsync()->cancelDexOrder(id);
 }
 
+void DexOrdersModel::updateAssets()
+{
+    _walletModel->getAsync()->loadFullAssetsList();
+}
+
 void DexOrdersModel::onDexOrdersChanged(
     beam::wallet::ChangeAction action, const std::vector<beam::wallet::DexOrder>& orders)
 {

diff --git a/ui/viewmodel/dex/dex_orders_model.h b/ui/viewmodel/dex/dex_orders_model.h
@@ -28,6 +28,7 @@ class DexOrdersModel : public QObject
 
     QAbstractItemModel* getOrders();
     Q_INVOKABLE void cancelOrder(QString orderId);
+    Q_INVOKABLE void updateAssets();
 
 signals:
     void ordersChanged();

diff --git a/ui/viewmodel/main_view.cpp b/ui/viewmodel/main_view.cpp
@@ -174,7 +174,7 @@ QString MainViewModel::getFaucetAppID() const
 
 QString MainViewModel::getEthBridgeAppID() const
 {
-    const std::string appName = "Bridges app";
+    std::string appName = "Bridges app";
     std::string appURL = "";
 
 #if defined(BEAM_TESTNET)
+1 −10		bvm/bvm2.cpp
+2 −4		bvm/bvm2.h
+1 −1		bvm/invoke_data.h
+18 −0		core/block_crypt.cpp
+6 −1		core/block_crypt.h
+45 −8		core/fly_client.cpp
+5 −2		core/fly_client.h
+4 −2		core/proto.h
+25 −7		core/serialization_adapters.h
+30 −10		node/db.cpp
+2 −0		node/db.h
+38 −15		node/node.cpp
+45 −18		node/processor.cpp
+5 −4		node/processor.h
+33 −4		node/unittests/node_test.cpp
+28 −29		wallet/client/wallet_client.cpp
+4 −2		wallet/client/wallet_client.h
+1 −0		wallet/client/wallet_model_async.h
+37 −25		wallet/core/wallet.cpp
+3 −2		wallet/core/wallet.h