Release 0.89.5

Author: Ation

BlockSettleSigner/SignerAdapterListener.cpp

@@ -838,8 +838,8 @@ bool SignerAdapterListener::onImportWoWallet(const std::string &data, bs::signer
       }
    }
 
+   const std::string filePath = settings_->getWalletsDir() + "/" + request.filename();
    {
-      const std::string filePath = settings_->getWalletsDir() + "/" + request.filename();
       std::ofstream ofs(filePath, std::ios::out | std::ios::binary | std::ios::trunc);
       if (!ofs.good()) {
          logger_->error("[{}] failed to write to {}", __func__, filePath);
@@ -851,6 +851,7 @@ bool SignerAdapterListener::onImportWoWallet(const std::string &data, bs::signer
    const auto woWallet = walletsMgr_->loadWoWallet(settings_->netType()
       , settings_->getWalletsDir(), request.filename(), app_->controlPassword());
    if (!woWallet) {
+      SystemFileUtils::rmFile(filePath);
       return false;
    }
    walletsListUpdated();

BlockSettleSigner/TXInfo.cpp

@@ -128,7 +128,7 @@ bool TXInfo::loadSignedTx(const QString &fileName)
       SPDLOG_LOGGER_ERROR(logger_, "loading signed offline request failed from '{}'", fileName.toStdString());
       return false;
    }
-   if (loadedTxs.size() != 1 || loadedTxs.front().prevStates.size() != 1) {
+   if (loadedTxs.size() != 1) {
       SPDLOG_LOGGER_ERROR(logger_, "invalid signed offline request in '{}'", fileName.toStdString());
       return false;
    }

BlockSettleSigner/WalletsProxy.cpp

@@ -242,7 +242,7 @@ void WalletsProxy::exportWatchingOnly(const QString &walletId, const QString &fi
 
          if (isHw) {
             try {
-               bs::core::hd::Wallet wallet(filePath.toStdString(), NetworkType::TestNet);
+               bs::core::hd::Wallet wallet(filePath.toStdString(), adapter_->netType());
                wallet.convertHardwareToWo();
             } catch (const std::exception &e) {
                SPDLOG_LOGGER_ERROR(logger_, "converting HW to WO wallet failed: {}", e.what());
@@ -766,6 +766,27 @@ void WalletsProxy::importWoWallet(const QString &walletPath, const QJSValue &jsC
 
    QFileInfo fi(walletPath);
 
+   try {
+      const auto wallet = std::make_shared<bs::core::hd::Wallet>(fi.fileName().toStdString()
+         , adapter_->netType(), fi.path().toStdString(), SecureBinaryData(), logger_);
+      if (wallet->networkType() != adapter_->netType()) {
+         SPDLOG_LOGGER_ERROR(logger_, "invalid net type in WO file: {}, expected: {}"
+            , static_cast<int>(wallet->networkType()), static_cast<int>(adapter_->netType()));
+         if (adapter_->netType() == NetworkType::MainNet) {
+            errWallet.description = "Can not import testnet WO wallet";
+         } else {
+            errWallet.description = "Can not import mainnet WO wallet";
+         }
+         cb(errWallet);
+         return;
+      }
+   } catch (const std::exception &e) {
+      SPDLOG_LOGGER_ERROR(logger_, "loading WO wallet failed: {}", e.what());
+      errWallet.description = fmt::format("Loading WO wallet failed: {}", e.what());
+      cb(errWallet);
+      return;
+   }
+
    adapter_->importWoWallet(fi.fileName().toStdString(), content, cb);
 }
 

BlockSettleSigner/qml/BsDialogs/TxSignSettlementBaseDialog.qml

@@ -61,9 +61,13 @@ CustomTitleDialogWindowWithExpander {
     property alias txDetailsItem: txDetailsContainer.data
 
     readonly property bool acceptable: {
-        if (walletInfo.encType === QPasswordData.Password) return tfPassword.text.length > 0
-        else if (walletInfo.encType === QPasswordData.Unencrypted) return txInfo.isOfflineTxSigned
-        else return true
+        if (walletInfo.encType === QPasswordData.Password) {
+            return tfPassword.text.length > 0
+        }
+        if (walletInfo.encType === QPasswordData.Unencrypted) {
+            return txInfo.isOfflineTxSigned
+        }
+        return true
     }
 
     readonly property int addressRowHeight: 24
@@ -619,7 +623,7 @@ CustomTitleDialogWindowWithExpander {
                             JsHelper.messageBox(BSMessageBox.Type.Warning
                                 , qsTr("Signed Transacton Import")
                                 , qsTr("Error importing signed transaction")
-                                , qsTr("Error while importing signed transaction file.\nComparsion between signed and unsigned transaction failed."))
+                                , qsTr("Error while importing signed transaction file.\nComparison between signed and unsigned transaction failed."))
                         }
                     }
                 }

BlockSettleSigner/qml/BsDialogs/WalletImportDialog.qml

@@ -735,7 +735,7 @@ CustomTitleDialogWindow {
             }
             else {
                 JsHelper.messageBox(BSMessageBox.Type.Critical
-                    , qsTr("Import Failed"), qsTr("Import WO-wallet failed:\n") + msg)
+                    , qsTr("Import Failed"), qsTr("Import WO-wallet failed:\n") + desc)
             }
         }
 

BlockSettleUILib/CreateTransactionDialog.cpp

@@ -144,7 +144,8 @@ void CreateTransactionDialog::updateCreateButtonText()
    const auto walletId = UiUtils::getSelectedWalletId(comboBoxWallets());
 
    auto walletPtr = walletsManager_->getHDWalletById(walletId);
-   if (!walletPtr->isHardwareWallet() && (signContainer_->isOffline() || signContainer_->isWalletOffline(walletId))) {
+   if (walletPtr && !walletPtr->isHardwareWallet() && (signContainer_->isOffline()
+      || signContainer_->isWalletOffline(walletId))) {
       pushButtonCreate()->setText(tr("Export"));
    } else {
       selectedWalletChanged(-1);
@@ -692,15 +693,16 @@ std::vector<bs::core::wallet::TXSignRequest> CreateTransactionDialog::ImportTran
       return {};
    }
 
-#ifdef PRODUCTION_BUILD
-   if (!transactions.at(0).allowBroadcasts) {
+   const auto envConf = static_cast<ApplicationSettings::EnvConfiguration>(applicationSettings_->get<int>(ApplicationSettings::envConfiguration));
+   const bool isProd = (envConf == ApplicationSettings::EnvConfiguration::Production);
+   const bool isTest = (envConf == ApplicationSettings::EnvConfiguration::Test);
+   if ((isProd || isTest) && !transactions.at(0).allowBroadcasts) {
       BSMessageBox errorMessage(BSMessageBox::warning, tr("Warning"), tr("Import failure")
          , tr("You are trying to import a settlement transaction into a BlockSettle Terminal. "
               "Settlement transactions must be imported into a BlockSettle Signer if signed offline."), this);
       errorMessage.exec();
       return {};
    }
-#endif
 
    clear();
    return transactions;