Terminal arch refactor

.gitignore

@@ -126,3 +126,4 @@ build_terminal/
 generated_proto/
 terminal.*/
 BlockSettleHW/ledger/hidapi/*
+GUI/QtWidgets/ui/*

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "Celer"]
-	path = Celer
-	url = ../Celer
 [submodule "common"]
 	path = common
 	url = ../common
-[submodule "AuthAPI"]
-	path = AuthAPI
-	url = https://github.com/autheid/AuthAPI.git

BlockSettleApp/CMakeLists.txt

@@ -47,19 +47,23 @@ ELSE ()
 ENDIF ()
 
 TARGET_LINK_LIBRARIES( ${BLOCKSETTLE_APP_NAME}
+   ${TERMINAL_CORE_NAME}
+   ${TERMINAL_GUI_QT_NAME}
+   ${TERMINAL_GUI_QTQUICK_NAME}
    ${BLOCKSETTLE_UI_LIBRARY_NAME}
    ${BS_NETWORK_LIB_NAME}
    ${CPP_WALLET_LIB_NAME}
    ${CRYPTO_LIB_NAME}
    ${BOTAN_LIB}
-   ${ZMQ_LIB}
    ${QRENCODE_LIB}
    ${QT_LINUX_LIBS}
    ${WS_LIB}
    Qt5::Qml
    Qt5::Core
    Qt5::Widgets
    Qt5::Gui
+   Qt5::QSQLiteDriverPlugin
+   Qt5::Sql
    Qt5::Network
    Qt5::PrintSupport
    Qt5::Core

BlockSettleApp/main.cpp

@@ -1,38 +1,42 @@
 /*
 
 ***********************************************************************************
-* Copyright (C) 2018 - 2020, BlockSettle AB
+* Copyright (C) 2018 - 2021, BlockSettle AB
 * Distributed under the GNU Affero General Public License (AGPL v3)
 * See LICENSE or http://www.gnu.org/licenses/agpl.html
 *
 **********************************************************************************
 
 */
 #include <QApplication>
-#include <QBitmap>
 #include <QCoreApplication>
 #include <QDateTime>
-#include <QDirIterator>
-#include <QFile>
-#include <QFontDatabase>
-#include <QLockFile>
+#include <QDir>
+#include <QFileInfo>
 #include <QScreen>
 #include <QStandardPaths>
-#include <QThread>
 #include <QtPlugin>
-
 #include <memory>
-
 #include "ApplicationSettings.h"
 #include "BSErrorCode.h"
 #include "BSMessageBox.h"
-#include "BSTerminalMainWindow.h"
 #include "BSTerminalSplashScreen.h"
 #include "EncryptionUtils.h"
 
-#include "btc/ecc.h"
-
-#include "AppNap.h"
+#include "Adapters/BlockchainAdapter.h"
+#include "Adapters/WalletsAdapter.h"
+#include "ApiAdapter.h"
+#include "ApiJson.h"
+#include "AssetsAdapter.h"
+#include "BsServerAdapter.h"
+#include "QtGuiAdapter.h"
+#include "QtQuickAdapter.h"
+#include "SettingsAdapter.h"
+#include "SignerAdapter.h"
+#include <spdlog/spdlog.h>
+#include <spdlog/sinks/daily_file_sink.h>
+
+//#include "AppNap.h"
 
 #ifdef USE_QWindowsIntegrationPlugin
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
@@ -49,16 +53,30 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 Q_IMPORT_PLUGIN(QCupsPrinterSupportPlugin)
 #endif // USE_QXcbIntegrationPlugin
 
-#ifdef STATIC_BUILD
 Q_IMPORT_PLUGIN(QSQLiteDriverPlugin)
 Q_IMPORT_PLUGIN(QICOPlugin)
+
+#ifdef STATIC_BUILD
+#if defined (Q_OS_LINUX)
+Q_IMPORT_PLUGIN(QtQuick2PrivateWidgetsPlugin)
+#endif
+
+Q_IMPORT_PLUGIN(QtQuick2Plugin)
+Q_IMPORT_PLUGIN(QtQuick2WindowPlugin)
+Q_IMPORT_PLUGIN(QtQuickControls2Plugin)
+Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin)
+//Q_IMPORT_PLUGIN(QtQuickControls1Plugin)
+Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin)
+Q_IMPORT_PLUGIN(QtQmlModelsPlugin)
+Q_IMPORT_PLUGIN(QmlFolderListModelPlugin)
+Q_IMPORT_PLUGIN(QmlSettingsPlugin)
+//Q_IMPORT_PLUGIN(QtLabsPlatformPlugin)
 #endif // STATIC_BUILD
 
 Q_DECLARE_METATYPE(ArmorySettings)
 Q_DECLARE_METATYPE(AsyncClient::LedgerDelegate)
 Q_DECLARE_METATYPE(BinaryData)
 Q_DECLARE_METATYPE(bs::error::AuthAddressSubmitResult);
-Q_DECLARE_METATYPE(CelerAPI::CelerMessageType);
 Q_DECLARE_METATYPE(SecureBinaryData)
 Q_DECLARE_METATYPE(std::shared_ptr<std::promise<bool>>)
 Q_DECLARE_METATYPE(std::string)
@@ -109,12 +127,11 @@ static void checkStyleSheet(QApplication &app)
 
    QFileInfo info = QFileInfo(QLatin1String(styleSheetFileName));
 
-   static QDateTime lastTimestamp = info.lastModified();
+   static auto lastTimestamp = info.lastModified();
 
    if (lastTimestamp == info.lastModified()) {
       return;
    }
-
    lastTimestamp = info.lastModified();
 
    QFile stylesheetFile(styleSheetFileName);
@@ -125,7 +142,7 @@ static void checkStyleSheet(QApplication &app)
    app.setStyleSheet(QString::fromLatin1(stylesheetFile.readAll()));
 }
 
-QScreen *getDisplay(QPoint position)
+static QScreen *getDisplay(QPoint position)
 {
    for (auto currentScreen : QGuiApplication::screens()) {
       if (currentScreen->availableGeometry().contains(position, false)) {
@@ -136,163 +153,79 @@ QScreen *getDisplay(QPoint position)
    return QGuiApplication::primaryScreen();
 }
 
-static int runUnchecked(QApplication *app, const std::shared_ptr<ApplicationSettings> &settings
-   , BSTerminalSplashScreen &splashScreen, QLockFile &lockFile)
-{
-   BSTerminalMainWindow mainWindow(settings, splashScreen, lockFile);
-
-#if defined (Q_OS_MAC)
-   MacOsApp *macApp = (MacOsApp*)(app);
-
-   QObject::connect(macApp, &MacOsApp::reactivateTerminal, &mainWindow, &BSTerminalMainWindow::onReactivate);
-#endif
-
-   if (!settings->get<bool>(ApplicationSettings::launchToTray)) {
-      mainWindow.loadPositionAndShow();
-   }
-
-   mainWindow.postSplashscreenActions();
-
-   bs::disableAppNap();
-
-   return app->exec();
-}
-
-static int runChecked(QApplication *app, const std::shared_ptr<ApplicationSettings> &settings
-   , BSTerminalSplashScreen &splashScreen, QLockFile &lockFile)
-{
-   try {
-      return runUnchecked(app, settings, splashScreen, lockFile);
-   }
-   catch (const std::exception &e) {
-      std::cerr << "Failed to start BlockSettle Terminal: " << e.what() << std::endl;
-      BSMessageBox(BSMessageBox::critical, app->tr("BlockSettle Terminal")
-         , app->tr("Unhandled exception detected: %1").arg(QLatin1String(e.what()))).exec();
-      return EXIT_FAILURE;
-   }
-}
-
-static int GuiApp(int &argc, char** argv)
-{
-   Q_INIT_RESOURCE(armory);
-   Q_INIT_RESOURCE(tradinghelp);
-   Q_INIT_RESOURCE(wallethelp);
-
-   QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
-   QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
-#if defined (Q_OS_MAC)
-   MacOsApp app(argc, argv);
-#else
-   QApplication app(argc, argv);
-#endif
-
-
-   QApplication::setQuitOnLastWindowClosed(false);
-
-   QFileInfo localStyleSheetFile(QLatin1String("stylesheet.css"));
-
-   QFile stylesheetFile(localStyleSheetFile.exists()
-                        ? localStyleSheetFile.fileName()
-                        : QLatin1String(":/STYLESHEET"));
-
-   if (stylesheetFile.open(QFile::ReadOnly)) {
-      app.setStyleSheet(QString::fromLatin1(stylesheetFile.readAll()));
-      QPalette p = QApplication::palette();
-      p.setColor(QPalette::Disabled, QPalette::Light, QColor(10,22,25));
-      QApplication::setPalette(p);
-   }
-
-#ifndef NDEBUG
-   // Start monitoring to update stylesheet live when file is changed on the disk
-   QTimer timer;
-   QObject::connect(&timer, &QTimer::timeout, &app, [&app] {
-      checkStyleSheet(app);
-   });
-   timer.start(100);
-#endif
-
-   QDirIterator it(QLatin1String(":/resources/Raleway/"));
-   while (it.hasNext()) {
-      QFontDatabase::addApplicationFont(it.next());
-   }
-
-   QString location = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
-#ifndef NDEBUG
-   QString userName = QDir::home().dirName();
-   QString lockFilePath = location + QLatin1String("/blocksettle-") + userName + QLatin1String(".lock");
-#else
-   QString lockFilePath = location + QLatin1String("/blocksettle.lock");
-#endif
-   QLockFile lockFile(lockFilePath);
-   lockFile.setStaleLockTime(0);
-
-   if (!lockFile.tryLock()) {
-      BSMessageBox box(BSMessageBox::info, app.tr("BlockSettle Terminal")
-         , app.tr("BlockSettle Terminal is already running")
-         , app.tr("Stop the other BlockSettle Terminal instance. If no other " \
-         "instance is running, delete the lockfile (%1).").arg(lockFilePath));
-      return box.exec();
-   }
-
-   qRegisterMetaType<ArmorySettings>();
-   qRegisterMetaType<AsyncClient::LedgerDelegate>();
-   qRegisterMetaType<BinaryData>();
-   qRegisterMetaType<bs::error::AuthAddressSubmitResult>();
-   qRegisterMetaType<bs::network::UserType>();
-   qRegisterMetaType<CelerAPI::CelerMessageType>();
-   qRegisterMetaType<QVector<int>>();
-   qRegisterMetaType<SecureBinaryData>();
-   qRegisterMetaType<std::shared_ptr<std::promise<bool>>>();
-   qRegisterMetaType<std::string>();
-   qRegisterMetaType<std::vector<BinaryData>>();
-   qRegisterMetaType<std::vector<UTXO>>();
-   qRegisterMetaType<UTXO>();
-
-   // load settings
-   auto settings = std::make_shared<ApplicationSettings>();
-   if (!settings->LoadApplicationSettings(app.arguments())) {
-      BSMessageBox errorMessage(BSMessageBox::critical, app.tr("Error")
-         , app.tr("Failed to parse command line arguments")
-         , settings->ErrorText());
-      errorMessage.exec();
-      return EXIT_FAILURE;
-   }
-
-   QString logoIcon;
-   logoIcon = QLatin1String(":/SPLASH_LOGO");
-
-   QPixmap splashLogo(logoIcon);
-   const int splashScreenWidth = 400;
-   BSTerminalSplashScreen splashScreen(splashLogo.scaledToWidth(splashScreenWidth, Qt::SmoothTransformation));
-
-   auto mainGeometry = settings->get<QRect>(ApplicationSettings::GUI_main_geometry);
-   auto currentDisplay = getDisplay(mainGeometry.center());
-   auto splashGeometry = splashScreen.geometry();
-   splashGeometry.moveCenter(currentDisplay->geometry().center());
-   splashScreen.setGeometry(splashGeometry);
-
-   app.processEvents();
-
-#ifdef NDEBUG
-   return runChecked(&app, settings, splashScreen, lockFile);
-#else
-   return runUnchecked(&app, settings, splashScreen, lockFile);
-#endif
-}
-
 int main(int argc, char** argv)
 {
    srand(std::time(nullptr));
 
    // Initialize libbtc, BIP 150, and BIP 151. 150 uses the proprietary "public"
    // Armory setting designed to allow the ArmoryDB server to not have to verify
    // clients. Prevents us from having to import tons of keys into the server.
-   btc_ecc_start();
+   CryptoECDSA::setupContext();
    startupBIP151CTX();
    startupBIP150CTX(4);
 
-   return GuiApp(argc, argv);
+   QStringList args;
+   for (int i = 0; i < argc; ++i) {
+      args << QLatin1String(argv[i]);
+   }
+#ifdef NDEBUG
+   try {
+#endif   //NDEBUG
+      const auto &settings = std::make_shared<ApplicationSettings>(QLatin1Literal("BlockSettle Terminal")
+         , QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
+            + QDir::separator() + ApplicationSettings::appSubDir());
+      const auto &adSettings = std::make_shared<SettingsAdapter>(settings, args);
+      const auto &logMgr = adSettings->logManager();
+      spdlog::set_default_logger(logMgr->logger());
+
+      bs::message::TerminalInprocBus inprocBus(logMgr->logger());
+      inprocBus.addAdapter(adSettings);
+
+      const auto &apiAdapter = std::make_shared<ApiAdapter>(logMgr->logger("API"));
+      std::shared_ptr<ApiBusAdapter> guiAdapter;
+      if (adSettings->guiMode() == "qtwidgets") {
+         guiAdapter = std::make_shared<QtGuiAdapter>(logMgr->logger("ui"));
+      }
+      else if (adSettings->guiMode() == "qtquick") {
+         guiAdapter = std::make_shared<QtQuickAdapter>(logMgr->logger("ui"));
+      }
+      else {
+         throw std::runtime_error("unknown GUI mode " + adSettings->guiMode());
+      }
+      apiAdapter->add(guiAdapter);
+      apiAdapter->add(std::make_shared<ApiJsonAdapter>(logMgr->logger("json")));
+      inprocBus.addAdapter(apiAdapter);
+
+      const auto &signAdapter = std::make_shared<SignerAdapter>(logMgr->logger());
+      inprocBus.addAdapterWithQueue(signAdapter, "signer");
+
+      const auto& userBlockchain = bs::message::UserTerminal::create(bs::message::TerminalUsers::Blockchain);
+      const auto& userWallets = bs::message::UserTerminal::create(bs::message::TerminalUsers::Wallets);
+      //inprocBus.addAdapter(std::make_shared<AssetsAdapter>(logMgr->logger()));
+      inprocBus.addAdapterWithQueue(std::make_shared<WalletsAdapter>(logMgr->logger()
+         , userWallets, signAdapter->createClient(), userBlockchain), "wallets");
+      inprocBus.addAdapter(std::make_shared<BsServerAdapter>(logMgr->logger("bscon")));
+      //inprocBus.addAdapter(std::make_shared<MatchingAdapter>(logMgr->logger("match")));
+      //inprocBus.addAdapter(std::make_shared<SettlementAdapter>(logMgr->logger("settl")));
+      //inprocBus.addAdapter(std::make_shared<MktDataAdapter>(logMgr->logger("md")));
+      //inprocBus.addAdapter(std::make_shared<MDHistAdapter>(logMgr->logger("mdh")));
+      //inprocBus.addAdapter(std::make_shared<ChatAdapter>(logMgr->logger("chat")));
+      inprocBus.addAdapterWithQueue(std::make_shared<BlockchainAdapter>(logMgr->logger()
+         , userBlockchain), /*"blkchain_conn"*/"signer");
+
+      if (!inprocBus.run(argc, argv)) {
+         logMgr->logger()->error("No runnable adapter found on main inproc bus");
+         return EXIT_FAILURE;
+      }
+#ifdef NDEBUG
+   }
+   catch (const std::exception &e) {
+      std::cerr << "Failed to start BlockSettle Terminal: " << e.what() << std::endl;
+      BSMessageBox(BSMessageBox::critical, QObject::tr("BlockSettle Terminal")
+         , QObject::tr("Unhandled exception detected: %1").arg(QLatin1String(e.what()))).exec();
+      return EXIT_FAILURE;
+   }
+#endif   //NDEBUG
 }
 
 #include "main.moc"

BlockSettleHW/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #
 # ***********************************************************************************
-# * Copyright (C) 2020 - 2020, BlockSettle AB
+# * Copyright (C) 2020 - 2021, BlockSettle AB
 # * Distributed under the GNU Affero General Public License (AGPL v3)
 # * See LICENSE or http://www.gnu.org/licenses/agpl.html
 # *

BlockSettleHW/hwcommonstructure.cpp

@@ -1,7 +1,7 @@
 /*
 
 ***********************************************************************************
-* Copyright (C) 2020 - 2020, BlockSettle AB
+* Copyright (C) 2020 - 2021, BlockSettle AB
 * Distributed under the GNU Affero General Public License (AGPL v3)
 * See LICENSE or http://www.gnu.org/licenses/agpl.html
 *