Release 0.89.4

Author: Ation

BlockSettleHW/ledger/ledgerDevice.cpp

@@ -257,9 +257,12 @@ QPointer<LedgerCommandThread> LedgerDevice::blankCommand(AsyncCallBackCall&& cb
          return;
       }
 
-      caller->isBlocked_ = (info == HWInfoStatus::kPressButton);
+      if (info == HWInfoStatus::kTransaction)
+         caller->isBlocked_ = true;
+      else if (info == HWInfoStatus::kReceiveSignedTx)
+         caller->isBlocked_ = true;
       caller->deviceTxStatusChanged(info);
-   });
+   }, Qt::BlockingQueuedConnection);
    connect(commandThread_, &LedgerCommandThread::error, this, [caller = QPointer<LedgerDevice>(this)](qint32 errorCode) {
       if (!caller) {
          return;
@@ -292,7 +295,7 @@ QPointer<LedgerCommandThread> LedgerDevice::blankCommand(AsyncCallBackCall&& cb
 
       caller->lastError_ = error;
       caller->operationFailed(error);
-   });
+   }, Qt::BlockingQueuedConnection);
    connect(commandThread_, &LedgerCommandThread::finished, commandThread_, &QObject::deleteLater);
 
    return commandThread_;

BlockSettleSigner/Bip39EntryValidator.cpp

@@ -33,19 +33,11 @@ QValidator::State Bip39EntryValidator::validate(QString &input, int &pos) const
       return State::Intermediate;
    }
 
-   std::vector<std::string> words;
-   words.reserve(qWordsList.size());
-   for (auto qWord : qWordsList) {
-      words.push_back(qWord.toStdString());
-   }
-
-   for (const auto& dict : dictionaries_) {
-      if (validate_mnemonic(words, dict)) {
-         return State::Acceptable;
-      }
+   if (!validateMnemonic(input.toStdString(), dictionaries_)) {
+      return State::Invalid;
    }
 
-   return State::Invalid;
+   return State::Acceptable;
 }
 
 bool Bip39EntryValidator::validate(QString input)

BlockSettleSigner/SignerAdapterContainer.h

@@ -65,7 +65,7 @@ class SignAdapterContainer : public WalletSignerContainer
       , const UTXO &, const bs::Address &bsAddr, const SignTxCb &cb = nullptr) override { return 0; }
 
    bs::signer::RequestId resolvePublicSpenders(const bs::core::wallet::TXSignRequest &
-      , const SignTxCb &) override { return 0; }
+      , const SignerStateCb &) override { return 0; }
 
    bs::signer::RequestId updateDialogData(const bs::sync::PasswordDialogData &, uint32_t = 0) override { return 0; }
    bs::signer::RequestId CancelSignTx(const BinaryData &tx) override { return 0; }

BlockSettleSigner/TXInfo.cpp

@@ -43,7 +43,7 @@ TXInfo::TXInfo(const TXInfo &src)
 
 void TXInfo::init()
 {
-   txId_ = QString::fromStdString(txReq_.serializeState().toBinStr());
+   txId_ = QString::fromStdString(txReq_.serializeState().SerializeAsString());
 }
 
 bool TXInfo::containsAddressImpl(const bs::Address &address, bs::core::wallet::Type walletType) const
@@ -134,7 +134,7 @@ bool TXInfo::loadSignedTx(const QString &fileName)
    }
 
    // check signed tx
-   if (!txReq_.isSourceOfTx(Tx(loadedTxs.front().prevStates.front()))) {
+   if (!txReq_.isSourceOfTx(Tx(loadedTxs.front().serializedTx))) {
       SPDLOG_LOGGER_ERROR(logger_, "sign request not equal to signed tx in '{}'", fileName.toStdString());
       return false;
    }
@@ -154,11 +154,10 @@ QString TXInfo::getSaveOfflineTxFileName()
 
 SecureBinaryData TXInfo::getSignedTx()
 {
-   if (txReqSigned_.prevStates.empty()) {
-      SPDLOG_LOGGER_ERROR(logger_, "missing signed offline request prevStates[1]");
-      return {};
+   if (txReqSigned_.serializedTx.empty()) {
+      SPDLOG_LOGGER_ERROR(logger_, "missing signed offline TX in request");
    }
-   return txReqSigned_.prevStates.front();
+   return txReqSigned_.serializedTx;
 }
 
 QStringList TXInfo::inputs(bs::core::wallet::Type leafType) const

BlockSettleSigner/interfaces/GUI_QML/QMLApp.cpp

@@ -304,6 +304,14 @@ QString QMLAppObj::getUrlPath(const QUrl &url)
    return path;
 }
 
+QString QMLAppObj::getUrlPathWithoutExtention(const QUrl &url)
+{
+   QString filePath = getUrlPath(url);
+   QFileInfo fileInfo(filePath);
+
+   return QDir(fileInfo.path()).absoluteFilePath(fileInfo.baseName());
+}
+
 void QMLAppObj::onSysTrayMsgClicked()
 {
    logger_->debug("Systray message clicked");

BlockSettleSigner/interfaces/GUI_QML/QMLApp.h

@@ -61,6 +61,7 @@ class QMLAppObj : public QObject
    void hideQmlWindow();
 
    Q_INVOKABLE QString getUrlPath(const QUrl &url);
+   Q_INVOKABLE QString getUrlPathWithoutExtention(const QUrl &url);
 
 signals:
    void cancelSignTx(const QString &txId);

BlockSettleSigner/qml/BsDialogs/TxSignSettlementBaseDialog.qml

@@ -84,7 +84,7 @@ CustomTitleDialogWindowWithExpander {
     property string validationTitle
 
     id: root
-    title: isExpanded ? passwordDialogData.Title : ""
+    title: passwordDialogData.Title
     rejectable: true
     width: 500
 

BlockSettleSigner/qml/BsDialogs/WalletBackupDialog.qml

@@ -30,15 +30,18 @@ CustomTitleDialogWindow {
     property AuthSignWalletObject authSign: AuthSignWalletObject {}
     property WalletInfo walletInfo: WalletInfo {}
 
-    property string targetFile: qmlAppObj.getUrlPath(StandardPaths.writableLocation(StandardPaths.DocumentsLocation) + "/" + backupFileName)
+    property string userSelection: ""
+    property string targetFile: userSelection.length === 0
+        ? qmlAppObj.getUrlPath(StandardPaths.writableLocation(StandardPaths.DocumentsLocation) + "/" + backupFileName)
+        : userSelection + backupFileExt
 
-    property string backupFileExt: "." + (isPrintable ? "pdf" : "wdb")
+    property string backupFileExt: "." + (fullBackupMode ? (isPrintable ? "pdf" : "wdb") : "lmdb")
     property string netTypeStr: signerSettings.testNet ? "testnet" : "mainnet";
 
     // suggested new file names
     property string backupFileName: fullBackupMode
                                     ? "BlockSettle_" + netTypeStr + "_" + walletInfo.walletId + backupFileExt
-                                    : "BlockSettle_" + netTypeStr + "_" + walletInfo.walletId + "_WatchingOnly.lmdb"
+                                    : "BlockSettle_" + netTypeStr + "_" + walletInfo.walletId + "_WatchingOnly" + backupFileExt
 
     property bool   isPrintable: false
     property bool   acceptable: (walletInfo.encType === QPasswordData.Unencrypted)
@@ -193,7 +196,7 @@ CustomTitleDialogWindow {
                     fileMode: FileDialog.SaveFile
 
                     onAccepted: {
-                        targetFile = qmlAppObj.getUrlPath(file)
+                        userSelection = qmlAppObj.getUrlPathWithoutExtention(file)
                     }
                 }
 

BlockSettleSigner/qml/BsDialogs/WalletImportDialog.qml

@@ -65,7 +65,7 @@ CustomTitleDialogWindow {
     property bool authNoticeShown: false
 
     title: qsTr("Import Wallet")
-    width: 460
+    width: 540
     abortConfirmation: true
     abortBoxType: BSAbortBox.AbortType.WalletImport
 
@@ -158,7 +158,7 @@ CustomTitleDialogWindow {
 
                     ColumnLayout {
                         id: fullImportLayout
-
+                        Layout.fillWidth: true
                         RowLayout {
                             id: radioButtonsParent
 

BlockSettleSigner/qml/BsStyles/BSStyle.qml

@@ -69,5 +69,8 @@ QtObject {
     readonly property color comboBoxItemTextColor: textColor
     readonly property color comboBoxItemTextHighlightedColor: textColor
 
-    readonly property color testNetColor: "#fe9727"
+    readonly property color mainnetColor: "#fe9727"
+    readonly property color testnetColor: "#22c064"
+    readonly property color mainnetTextColor: "white"
+    readonly property color testnetTextColor: "black"
 }