Release 0.90.0

Author: Ation

BlockSettleUILib/AuthAddressConfirmDialog.cpp

@@ -20,14 +20,14 @@ namespace {
    constexpr auto UiTimerInterval = std::chrono::milliseconds(250);
 }
 
-AuthAddressConfirmDialog::AuthAddressConfirmDialog(BsClient *bsClient, const bs::Address& address
+AuthAddressConfirmDialog::AuthAddressConfirmDialog(const std::weak_ptr<BsClient> &bsClient, const bs::Address& address
    , const std::shared_ptr<AuthAddressManager>& authManager, const std::shared_ptr<ApplicationSettings> &settings, QWidget* parent)
-  : QDialog(parent)
-  , ui_{new Ui::AuthAddressConfirmDialog()}
-  , address_{address}
-  , authManager_{authManager}
-  , bsClient_{bsClient}
+   : QDialog(parent)
+   , ui_{new Ui::AuthAddressConfirmDialog()}
+   , address_{address}
+   , authManager_{authManager}
    , settings_(settings)
+   , bsClient_(bsClient)
 {
    ui_->setupUi(this);
 
@@ -81,9 +81,12 @@ void AuthAddressConfirmDialog::onCancelPressed()
 void AuthAddressConfirmDialog::reject()
 {
    progressTimer_.stop();
-   if (bsClient_) {
-      bsClient_->cancelActiveSign();
+
+   auto bsClient = bsClient_.lock();
+   if (bsClient) {
+      bsClient->cancelActiveSign();
    }
+
    QDialog::reject();
 }
 

BlockSettleUILib/AuthAddressConfirmDialog.h

@@ -31,7 +31,7 @@ class AuthAddressConfirmDialog : public QDialog
 Q_OBJECT
 
 public:
-   AuthAddressConfirmDialog(BsClient *bsClient,
+   AuthAddressConfirmDialog(const std::weak_ptr<BsClient> &bsClient,
       const bs::Address& address,
       const std::shared_ptr<AuthAddressManager>& authManager,
       const std::shared_ptr<ApplicationSettings> &settings,
@@ -61,7 +61,7 @@ private slots:
    QTimer                                 progressTimer_;
    std::chrono::steady_clock::time_point  startTime_;
 
-   QPointer<BsClient> bsClient_;
+   std::weak_ptr<BsClient> bsClient_;
 };
 
 #endif // AUTH_ADDRESS_CONFIRMATION_DIALOG_H__

BlockSettleUILib/AuthAddressDialog.cpp

@@ -212,7 +212,7 @@ void AuthAddressDialog::setAddressToVerify(const QString &addr)
    }
 }
 
-void AuthAddressDialog::setBsClient(BsClient *bsClient)
+void AuthAddressDialog::setBsClient(const std::weak_ptr<BsClient> &bsClient)
 {
    bsClient_ = bsClient;
 }
@@ -329,6 +329,8 @@ void AuthAddressDialog::revokeSelectedAddress()
 
 void AuthAddressDialog::onAuthAddressConfirmationRequired(float validationAmount)
 {
+   auto bsClient = bsClient_.lock();
+
    const bool testnet = settings_->get<NetworkType>(ApplicationSettings::netType) == NetworkType::TestNet;
    const auto eurBalance = assetManager_->getBalance("EUR");
    if (validationAmount > eurBalance) {
@@ -342,8 +344,8 @@ void AuthAddressDialog::onAuthAddressConfirmationRequired(float validationAmount
       warnFunds.enableRichText();
       warnFunds.exec();
 
-      if (bsClient_) {
-         bsClient_->cancelActiveSign();
+      if (bsClient) {
+         bsClient->cancelActiveSign();
       }
       setLastSubmittedAddress({});
 
@@ -376,16 +378,18 @@ void AuthAddressDialog::onAuthAddressConfirmationRequired(float validationAmount
    if (promptResult == QDialog::Accepted) {
       ConfirmAuthAddressSubmission();
    } else {
-      if (bsClient_) {
-         bsClient_->cancelActiveSign();
+      if (bsClient) {
+         bsClient->cancelActiveSign();
       }
       setLastSubmittedAddress({});
    }
 }
 
 void AuthAddressDialog::ConfirmAuthAddressSubmission()
 {
-   if (!bsClient_) {
+   auto bsClient = bsClient_.lock();
+
+   if (!bsClient) {
       SPDLOG_LOGGER_ERROR(logger_, "bsClient_ in not set");
       return;
    }
@@ -394,7 +398,7 @@ void AuthAddressDialog::ConfirmAuthAddressSubmission()
       return;
    }
 
-   AuthAddressConfirmDialog confirmDlg{bsClient_.data(), lastSubmittedAddress_, authAddressManager_, settings_, this};
+   AuthAddressConfirmDialog confirmDlg{bsClient_, lastSubmittedAddress_, authAddressManager_, settings_, this};
 
    auto result = confirmDlg.exec();
 

BlockSettleUILib/AuthAddressDialog.h

@@ -44,7 +44,7 @@ Q_OBJECT
    ~AuthAddressDialog() override;
 
    void setAddressToVerify(const QString &addr);
-   void setBsClient(BsClient *bsClient);
+   void setBsClient(const std::weak_ptr<BsClient> &bsClient);
 
 signals:
    void askForConfirmation(const QString &address, double txAmount);
@@ -95,7 +95,7 @@ private slots:
    std::shared_ptr<ApplicationSettings>   settings_;
    QPointer<AuthAdressControlProxyModel>  model_;
    bs::Address                            defaultAddr_;
-   QPointer<BsClient>                     bsClient_;
+   std::weak_ptr<BsClient>                bsClient_;
    ValidityFlag                           validityFlag_;
 
    bs::Address                            lastSubmittedAddress_{};

BlockSettleUILib/BSTerminalMainWindow.cpp

@@ -1397,7 +1397,21 @@ void BSTerminalMainWindow::onLoginProceed(const NetworkSettings &networkSettings
       return;
    }
 
-   LoginWindow loginDialog(logMgr_->logger("autheID"), applicationSettings_, &cbApprovePuB_, &cbApproveProxy_, this);
+   auto logger = logMgr_->logger("proxy");
+
+   BsClientParams params;
+   params.connectAddress = networkSettings.proxy.host;
+   params.connectPort = networkSettings.proxy.port;
+   params.context = std::make_shared<ZmqContext>(logger);
+   params.newServerKeyCallback = cbApproveProxy_;
+
+   auto bsClient = std::make_shared<BsClient>(logger, params);
+
+   // Must be connected before loginDialog.exec call (balances could be received before loginDialog.exec returns)!
+   connect(bsClient.get(), &BsClient::balanceLoaded, assetManager_.get(), &AssetManager::fxBalanceLoaded);
+   connect(bsClient.get(), &BsClient::balanceUpdated, assetManager_.get(), &AssetManager::onAccountBalanceLoaded);
+
+   LoginWindow loginDialog(logger, bsClient, applicationSettings_, this);
 
    int rc = loginDialog.exec();
 
@@ -1442,15 +1456,15 @@ void BSTerminalMainWindow::onLoginProceed(const NetworkSettings &networkSettings
 
    currentUserLogin_ = loginDialog.email();
 
-   networkSettingsReceived(loginDialog.networkSettings(), NetworkSettingsClient::MarketData);
+   networkSettingsReceived(networkSettings, NetworkSettingsClient::MarketData);
 
    chatTokenData_ = loginDialog.result()->chatTokenData;
    chatTokenSign_ = loginDialog.result()->chatTokenSign;
    tryLoginIntoChat();
 
-   bsClient_ = loginDialog.getClient();
-   ccFileManager_->setBsClient(bsClient_.get());
-   authAddrDlg_->setBsClient(bsClient_.get());
+   bsClient_ = bsClient;
+   ccFileManager_->setBsClient(bsClient);
+   authAddrDlg_->setBsClient(bsClient);
 
    ccFileManager_->setCcAddressesSigned(loginDialog.result()->ccAddressesSigned);
    authManager_->setAuthAddressesSigned(loginDialog.result()->authAddressesSigned);

BlockSettleUILib/BSTerminalMainWindow.h

@@ -327,7 +327,7 @@ private slots:
    };
    std::unique_ptr<MainWinACT>   act_;
 
-   std::unique_ptr<BsClient> bsClient_;
+   std::shared_ptr<BsClient> bsClient_;
 
    Chat::ChatClientServicePtr chatClientServicePtr_;
 

BlockSettleUILib/LoginWindow.cpp

@@ -35,16 +35,14 @@ namespace {
 }
 
 LoginWindow::LoginWindow(const std::shared_ptr<spdlog::logger> &logger
+   , const std::shared_ptr<BsClient> &bsClient
    , std::shared_ptr<ApplicationSettings> &settings
-   , ZmqBipNewKeyCb *cbApprovePub
-   , ZmqBipNewKeyCb *cbApproveProxy
    , QWidget* parent)
    : QDialog(parent)
    , ui_(new Ui::LoginWindow())
    , logger_(logger)
    , settings_(settings)
-   , cbApprovePub_(cbApprovePub)
-   , cbApproveProxy_(cbApproveProxy)
+   , bsClient_(bsClient)
 {
    ui_->setupUi(this);
    ui_->progressBar->setMaximum(kAutheIdTimeout * 2); // update every 0.5 sec
@@ -95,6 +93,9 @@ LoginWindow::LoginWindow(const std::shared_ptr<spdlog::logger> &logger
    timer_.start();
 
    updateState();
+
+   connect(bsClient_.get(), &BsClient::startLoginDone, this, &LoginWindow::onStartLoginDone);
+   connect(bsClient_.get(), &BsClient::getLoginResultDone, this, &LoginWindow::onGetLoginResultDone);
 }
 
 LoginWindow::~LoginWindow() = default;
@@ -126,16 +127,6 @@ QString LoginWindow::email() const
    return ui_->lineEditUsername->text().toLower();
 }
 
-std::unique_ptr<BsClient> LoginWindow::getClient()
-{
-   return std::move(bsClient_);
-}
-
-const NetworkSettings &LoginWindow::networkSettings() const
-{
-   return networkSettingsLoader_->settings();
-}
-
 void LoginWindow::onStartLoginDone(AutheIDClient::ErrorType errorCode)
 {
    if (errorCode != AutheIDClient::NoError) {
@@ -226,34 +217,12 @@ void LoginWindow::onAuthPressed()
 
    timeLeft_ = kAutheIdTimeout;
 
-   networkSettingsLoader_ = std::make_unique<NetworkSettingsLoader>(logger_
-      , settings_->pubBridgeHost(), settings_->pubBridgePort(), *cbApprovePub_);
-
-   connect(networkSettingsLoader_.get(), &NetworkSettingsLoader::succeed, this, [this] {
-      setState(WaitLoginResult);
-
-      QString login = ui_->lineEditUsername->text().trimmed();
-      ui_->lineEditUsername->setText(login);
-
-      BsClientParams params;
-      params.connectAddress = networkSettingsLoader_->settings().proxy.host;
-      params.connectPort = networkSettingsLoader_->settings().proxy.port;
-      params.context = std::make_shared<ZmqContext>(logger_);
-      params.newServerKeyCallback = *cbApproveProxy_;
-
-      bsClient_ = std::make_unique<BsClient>(logger_, params);
-      connect(bsClient_.get(), &BsClient::startLoginDone, this, &LoginWindow::onStartLoginDone);
-      connect(bsClient_.get(), &BsClient::getLoginResultDone, this, &LoginWindow::onGetLoginResultDone);
-
-      bsClient_->startLogin(login.toStdString());
-   });
+   setState(WaitLoginResult);
 
-   connect(networkSettingsLoader_.get(), &NetworkSettingsLoader::failed, this, [this](const QString &errorMsg) {
-      BSMessageBox(BSMessageBox::critical, tr("Network settings"), errorMsg, this).exec();
-      setState(Idle);
-   });
+   QString login = ui_->lineEditUsername->text().trimmed();
+   ui_->lineEditUsername->setText(login);
 
-   networkSettingsLoader_->loadSettings();
+   bsClient_->startLogin(login.toStdString());
 
    if (ui_->checkBoxRememberUsername->isChecked()) {
       settings_->set(ApplicationSettings::rememberLoginUserName, true);

BlockSettleUILib/LoginWindow.h

@@ -15,7 +15,6 @@
 #include <QDialog>
 #include <memory>
 #include "AutheIDClient.h"
-#include "ZMQ_BIP15X_Helpers.h"
 
 namespace Ui {
     class LoginWindow;
@@ -28,7 +27,6 @@ struct BsClientLoginResult;
 struct NetworkSettings;
 
 class ApplicationSettings;
-class NetworkSettingsLoader;
 class BsClient;
 
 class LoginWindow : public QDialog
@@ -37,9 +35,8 @@ Q_OBJECT
 
 public:
    LoginWindow(const std::shared_ptr<spdlog::logger> &logger
+      , const std::shared_ptr<BsClient> &bsClient
       , std::shared_ptr<ApplicationSettings> &settings
-      , ZmqBipNewKeyCb *cbApprovePub
-      , ZmqBipNewKeyCb *cbApproveProxy
       , QWidget* parent = nullptr);
    ~LoginWindow() override;
 
@@ -51,8 +48,6 @@ Q_OBJECT
 
    QString email() const;
    BsClientLoginResult *result() const { return result_.get(); }
-   std::unique_ptr<BsClient> getClient();
-   const NetworkSettings &networkSettings() const;
 
 private slots:
    void onStartLoginDone(AutheIDClient::ErrorType errorCode);
@@ -73,14 +68,11 @@ private slots:
    std::unique_ptr<Ui::LoginWindow>       ui_;
    std::shared_ptr<spdlog::logger>        logger_;
    std::shared_ptr<ApplicationSettings>   settings_;
-   ZmqBipNewKeyCb                         *cbApprovePub_{};
-   ZmqBipNewKeyCb                         *cbApproveProxy_{};
 
    State       state_{State::Idle};
    QTimer      timer_;
    float       timeLeft_{};
-   std::unique_ptr<BsClient> bsClient_;
-   std::unique_ptr<NetworkSettingsLoader> networkSettingsLoader_;
+   std::shared_ptr<BsClient>   bsClient_;
    std::unique_ptr<BsClientLoginResult> result_;
 };
 

BlockSettleUILib/Trading/RFQDealerReply.cpp

@@ -703,6 +703,7 @@ void RFQDealerReply::submitReply(const bs::network::QuoteReqNotification &qrn, d
          const auto &spendWallet = isSpendCC ? ccWallet : xbtWallet;
          const auto &recvWallet = isSpendCC ? xbtWallet : ccWallet;
 
+         preparingCCRequest_.insert(replyData->qn.quoteRequestId);
          auto recvAddrCb = [this, replyData, qrn, spendWallet, spendVal, isSpendCC, ccWallet, xbtWallets, price](const bs::Address &addr) {
             replyData->qn.receiptAddress = addr.display();
             replyData->qn.reqAuthKey = qrn.requestorRecvAddress;
@@ -733,6 +734,10 @@ void RFQDealerReply::submitReply(const bs::network::QuoteReqNotification &qrn, d
                            signingContainer_->resolvePublicSpenders(txReq, [replyData, this, price, txReq]
                               (bs::error::ErrorCode result, const Codec_SignerState::SignerState &state)
                            {
+                              if (preparingCCRequest_.count(replyData->qn.quoteRequestId) == 0) {
+                                 return;
+                              }
+
                               if (result == bs::error::ErrorCode::NoError) {
                                  replyData->qn.transactionData = BinaryData::fromString(state.SerializeAsString()).toHexStr();
                                  replyData->utxoRes = utxoReservationManager_->makeNewReservation(txReq.inputs, replyData->qn.quoteRequestId);
@@ -742,6 +747,7 @@ void RFQDealerReply::submitReply(const bs::network::QuoteReqNotification &qrn, d
                                  SPDLOG_LOGGER_ERROR(logger_, "error resolving public spenders: {}"
                                     , bs::error::ErrorCodeToString(result).toStdString());
                               }
+                              preparingCCRequest_.erase(replyData->qn.quoteRequestId);
                            });
                         } catch (const std::exception &e) {
                            SPDLOG_LOGGER_ERROR(logger_, "error creating own unsigned half: {}", e.what());
@@ -1089,6 +1095,11 @@ void RFQDealerReply::onAutoSignStateChanged()
    ui_->comboBoxXbtWallet->setEnabled(autoSignQuoteProvider_->autoSignState() == bs::error::ErrorCode::AutoSignDisabled);
 }
 
+void bs::ui::RFQDealerReply::onQuoteCancelled(const std::string &quoteId)
+{
+   preparingCCRequest_.erase(quoteId);
+}
+
 void bs::ui::RFQDealerReply::onUTXOReservationChanged(const std::string& walletId)
 {
    if (walletId.empty()) {

BlockSettleUILib/Trading/RFQDealerReply.h

@@ -130,6 +130,7 @@ namespace bs {
          void onCelerConnected();
          void onCelerDisconnected();
          void onAutoSignStateChanged();
+         void onQuoteCancelled(const std::string &quoteId);
 
       private slots:
          void initUi();
@@ -199,6 +200,8 @@ namespace bs {
          ResetCurrentReservationCb resetCurrentReservationCb_;
          GetLastUTXOReplyCb getLastUTXOReplyCb_;
 
+         std::set<std::string> preparingCCRequest_;
+
       private:
          enum class ReplyType
          {