Update to latest daemon sources

* (MacOS) Replace mentions of "CryptoNote" with "Talleo" in bundle properties
* (Windows) Silence Winsock related warnings and add manifest to disable compatibility mode
* (Windows) Automatically update copyright years in resource file
* Add "Repair wallet" to "File" menu
* Only try to send optimization transactions if there is something to optimize, create them until no more optimizable outputs or node rejects due to exceeding limit
* Show path of currently opened wallet file in window title
* Use proper directory separators depending on operating system on "Recent wallets" menu and window title

CMakeLists.txt

@@ -192,7 +192,8 @@ file(GLOB_RECURSE FORMS src/Gui/*/*.ui)
 
 if(MSVC)
   include_directories(Platform/Windows)
-  set(SOURCES ${SOURCES} ${CMAKE_SOURCE_DIR}/Platform/Windows/ApplicationEventHandler.cpp)
+  configure_file(${CMAKE_SOURCE_DIR}/src/TalleoWallet.manifest.in ${CMAKE_BINARY_DIR}/TalleoWallet.manifest @ONLY)
+  set(SOURCES ${SOURCES} ${CMAKE_SOURCE_DIR}/Platform/Windows/ApplicationEventHandler.cpp ${CMAKE_BINARY_DIR}/TalleoWallet.manifest)
 elseif(APPLE)
   include_directories(Platform/OSX)
   include_directories(Platform/Posix)
@@ -216,7 +217,7 @@ if (WIN32)
     message(FATAL_ERROR "Only MSVC is supported on this platform")
   endif ()
 
-  add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600 /DSTATICLIB)
+  add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_WINSOCK_DEPRECATED_NO_WARNINGS /D_WIN32_WINNT=0x0600 /DSTATICLIB)
   include_directories(cryptonote/src/Platform/msc)
 
   set(PLATFORM_DIR Windows)
@@ -231,9 +232,9 @@ elseif (UNIX)
     file(GLOB_RECURSE OBJC_SOURCES src/*.mm)
     set(SOURCES ${SOURCES} ${OBJC_SOURCES})
     set(PLATFORM_DIR OSX)
-    set(MACOSX_BUNDLE_INFO_STRING "Cryptonote GUI wallet")
+    set(MACOSX_BUNDLE_INFO_STRING "Talleo GUI wallet")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
-    set(MACOSX_BUNDLE_BUNDLE_NAME CryptonoteWallet)
+    set(MACOSX_BUNDLE_BUNDLE_NAME TalleoWallet)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
     set(MACOSX_BUNDLE_BUNDLE_VERSION "$${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
 

CryptoNoteWallet.cmake

@@ -5,5 +5,6 @@ set(CN_URI_SCHEME_NAME "talleo")
 set(CN_VERSION_MAJOR "2")
 set(CN_VERSION_MINOR "0")
 set(CN_VERSION_REVISION "10")
-set(CN_VERSION_BUILD "2")
+set(CN_VERSION_BUILD "3")
 set(CN_VERSION "${CN_VERSION_MAJOR}.${CN_VERSION_MINOR}.${CN_VERSION_REVISION}")
+string(TIMESTAMP CN_BUILD_YEAR "%Y")

include/IWalletAdapter.h

@@ -1,4 +1,5 @@
 // Copyright (c) 2015-2017, The Bytecoin developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -46,6 +47,7 @@ class IWalletAdapterObserver {
   virtual ~IWalletAdapterObserver() {}
   virtual void walletOpened() = 0;
   virtual void walletOpenError(int _initStatus) = 0;
+  virtual void walletRepairStarted() = 0;
   virtual void walletClosed() = 0;
   virtual void passwordChanged() = 0;
   virtual void synchronizationProgressUpdated(quint32 _current, quint32 _total) = 0;
@@ -82,6 +84,7 @@ class IWalletAdapter {
   virtual WalletSaveStatus save(CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) = 0;
   virtual WalletSaveStatus exportWallet(const QString& _path, bool _encrypt, CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) = 0;
   virtual PasswordStatus changePassword(const QString& _oldPassword, const QString& _newPassword) = 0;
+  virtual void repair() = 0;
   virtual void close() = 0;
 
   virtual bool isOpen() const = 0;

src/Application/AddressBookManager.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -394,6 +395,10 @@ void AddressBookManager::walletOpenError(int _initStatus) {
   // Do nothing
 }
 
+void AddressBookManager::walletRepairStarted() {
+  // Do nothing
+}
+
 void AddressBookManager::walletClosed() {
   m_addressIndexes.clear();
   m_labelIndexes.clear();

src/Application/AddressBookManager.h

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -71,6 +72,7 @@ class AddressBookManager : public QObject, public IAddressBookManager, public ID
   // IWalletAdapterObserver
   Q_SLOT virtual void walletOpened() override;
   Q_SLOT virtual void walletOpenError(int _initStatus) override;
+  Q_SLOT virtual void walletRepairStarted() override;
   Q_SLOT virtual void walletClosed() override;
   Q_SLOT virtual void passwordChanged() override;
   Q_SLOT virtual void synchronizationProgressUpdated(quint32 _current, quint32 _total) override;

src/Application/OptimizationManager.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -17,6 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Bytecoin.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <QApplication>
 #include <QTime>
 #include <QTimerEvent>
 
@@ -130,6 +132,10 @@ void OptimizationManager::walletOpenError(int _initStatus) {
   // Do nothing
 }
 
+void OptimizationManager::walletRepairStarted() {
+  // Do nothing
+}
+
 void OptimizationManager::walletClosed() {
   if (m_checkTimerId != -1) {
     killTimer(m_checkTimerId);
@@ -223,8 +229,11 @@ void OptimizationManager::optimize() {
     return;
   }
 
-  walletAdapter->createFusionTransaction(Settings::instance().getOptimizationThreshold(),
-    Settings::instance().getOptimizationMixin(), walletAdapter->getAddress(0));
+  quint64 threshold = Settings::instance().getOptimizationThreshold();
+  while ((walletAdapter->getOutputsToOptimizeCount(threshold) > 0) &&
+         walletAdapter->createFusionTransaction(threshold, Settings::instance().getOptimizationMixin(), walletAdapter->getAddress(0))) {
+    qApp->processEvents();
+  }
 }
 
 void OptimizationManager::ensureStarted() {

src/Application/OptimizationManager.h

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -61,6 +62,7 @@ class OptimizationManager : public QObject, public IOptimizationManager, public
   // IWalletAdapterObserver
   Q_SLOT virtual void walletOpened() override;
   Q_SLOT virtual void walletOpenError(int _initStatus) override;
+  Q_SLOT virtual void walletRepairStarted() override;
   Q_SLOT virtual void walletClosed() override;
   Q_SLOT virtual void passwordChanged() override;
   Q_SLOT virtual void synchronizationProgressUpdated(quint32 _current, quint32 _total) override;

src/CryptoNoteWalletVersion.h.in

@@ -4,7 +4,7 @@
 #define PROJECT_NAME "@CN_CURRENCY_DISPLAY_NAME@ Wallet"
 #define PROJECT_COMPANY "Talleo Project"
 #define PROJECT_SITE "https://talleo.org/"
-#define PROJECT_COPYRIGHT "Copyright 2019-2020, The Talleo Developers"
+#define PROJECT_COPYRIGHT "Copyright 2019-@CN_BUILD_YEAR@, The Talleo Developers"
 #define APP_VER_MAJOR @CN_VERSION_MAJOR@
 #define APP_VER_MINOR @CN_VERSION_MINOR@
 #define APP_VER_REV @CN_VERSION_REVISION@

src/CryptoNoteWrapper/WalletGreenAdapter.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -89,6 +90,13 @@ IWalletAdapter::PasswordStatus WalletGreenAdapter::changePassword(const QString&
   return m_worker->changePassword(_oldPassword, _newPassword);
 }
 
+
+void WalletGreenAdapter::repair() {
+  Q_ASSERT(m_worker != nullptr);
+  Q_EMIT walletRepairStarted();
+  m_worker->repair();
+}
+
 void WalletGreenAdapter::close() {
   m_worker->removeObserver(this);
   deleteWorker();
@@ -193,6 +201,7 @@ void WalletGreenAdapter::addObserver(IWalletAdapterObserver* _observer) {
   QObject* observerObject = dynamic_cast<QObject*>(_observer);
   connect(this, SIGNAL(walletOpenedSignal()), observerObject, SLOT(walletOpened()));
   connect(this, SIGNAL(walletOpenErrorSignal(int)), observerObject, SLOT(walletOpenError(int)));
+  connect(this, SIGNAL(walletRepairStartedSignal()), observerObject, SLOT(walletRepairStarted()));
   connect(this, SIGNAL(walletClosedSignal()), observerObject, SLOT(walletClosed()));
   connect(this, SIGNAL(passwordChangedSignal()), observerObject, SLOT(passwordChanged()));
   connect(this, SIGNAL(synchronizationProgressUpdatedSignal(quint32, quint32)), observerObject,
@@ -209,6 +218,7 @@ void WalletGreenAdapter::removeObserver(IWalletAdapterObserver* _observer) {
   QObject* observerObject = dynamic_cast<QObject*>(_observer);
   disconnect(this, SIGNAL(walletOpenedSignal()), observerObject, SLOT(walletOpened()));
   disconnect(this, SIGNAL(walletOpenErrorSignal(int)), observerObject, SLOT(walletOpenError(int)));
+  disconnect(this, SIGNAL(walletRepairStartedSignal()), observerObject, SLOT(walletRepairStarted()));
   disconnect(this, SIGNAL(walletClosedSignal()), observerObject, SLOT(walletClosed()));
   disconnect(this, SIGNAL(passwordChangedSignal()), observerObject, SLOT(passwordChanged()));
   disconnect(this, SIGNAL(synchronizationProgressUpdatedSignal(quint32, quint32)), observerObject,
@@ -229,6 +239,10 @@ void WalletGreenAdapter::walletOpenError(int _initStatus) {
   Q_EMIT walletOpenErrorSignal(_initStatus);
 }
 
+void WalletGreenAdapter::walletRepairStarted() {
+  Q_EMIT walletRepairStartedSignal();
+}
+
 void WalletGreenAdapter::walletClosed() {
   Q_EMIT walletClosedSignal();
 }

src/CryptoNoteWrapper/WalletGreenAdapter.h

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -48,6 +49,7 @@ class WalletGreenAdapter : public QObject, public IWalletAdapter, public IWallet
   virtual WalletSaveStatus save(CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) override;
   virtual WalletSaveStatus exportWallet(const QString& _path, bool _encrypt, CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) override;
   virtual PasswordStatus changePassword(const QString& _oldPassword, const QString& _newPassword) override;
+  virtual void repair() override;
   virtual void close() override;
 
   virtual bool isOpen() const override;
@@ -77,6 +79,7 @@ class WalletGreenAdapter : public QObject, public IWalletAdapter, public IWallet
   // IWalletAdapterObserver
   Q_SLOT virtual void walletOpened() override;
   Q_SLOT virtual void walletOpenError(int _initStatus) override;
+  Q_SLOT virtual void walletRepairStarted() override;
   Q_SLOT virtual void walletClosed() override;
   Q_SLOT virtual void passwordChanged() override;
   Q_SLOT virtual void synchronizationProgressUpdated(quint32 _current, quint32 _total) override;
@@ -99,6 +102,7 @@ class WalletGreenAdapter : public QObject, public IWalletAdapter, public IWallet
 Q_SIGNALS:
   void walletOpenedSignal();
   void walletOpenErrorSignal(int _initStatus);
+  void walletRepairStartedSignal();
   void walletClosedSignal();
   void passwordChangedSignal();
   void synchronizationProgressUpdatedSignal(quint32 _current, quint32 _total);

src/CryptoNoteWrapper/WalletGreenWorker.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
-// Copyright (c) 2021, The Talleo developers
+// Copyright (c) 2021-2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -379,6 +379,14 @@ IWalletAdapter::PasswordStatus WalletGreenWorker::changePassword(const QString&
   return getPasswordStatus(errorCode);
 }
 
+void WalletGreenWorker::repair() {
+  Q_ASSERT(!m_wallet.isNull());
+  SemaphoreLocker locker(m_walletSemaphore);
+  Q_EMIT walletRepairStartedSignal();
+  m_wallet->repair();
+  WalletLogger::info(tr("[Wallet] Wallet repair finished"));
+}
+
 void WalletGreenWorker::close() {
   Q_ASSERT(!m_wallet.isNull());
   SemaphoreLocker locker(m_walletSemaphore);
@@ -703,6 +711,7 @@ void WalletGreenWorker::addObserver(IWalletAdapterObserver* _observer) {
   QObject* observerObject = dynamic_cast<QObject*>(_observer);
   m_observerConnections[_observer] << connect(this, SIGNAL(walletOpenedSignal()), observerObject, SLOT(walletOpened()), Qt::QueuedConnection);
   m_observerConnections[_observer] << connect(this, SIGNAL(walletOpenErrorSignal(int)), observerObject, SLOT(walletOpenError(int)), Qt::QueuedConnection);
+  m_observerConnections[_observer] << connect(this, SIGNAL(walletRepairStartedSignal()), observerObject, SLOT(walletRepairStarted()), Qt::QueuedConnection);
   m_observerConnections[_observer] << connect(this, SIGNAL(walletClosedSignal()), observerObject, SLOT(walletClosed()), Qt::QueuedConnection);
   m_observerConnections[_observer] << connect(this, SIGNAL(passwordChangedSignal()), observerObject, SLOT(passwordChanged()), Qt::QueuedConnection);
   m_observerConnections[_observer] << connect(this, SIGNAL(synchronizationProgressUpdatedSignal(quint32, quint32)), observerObject,

src/CryptoNoteWrapper/WalletGreenWorker.h

@@ -1,6 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
+// Copyright (c) 2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -60,6 +61,7 @@ class WalletGreenWorker : public QObject, public IWalletAdapter {
   virtual WalletSaveStatus save(CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) override;
   virtual WalletSaveStatus exportWallet(const QString& _path, bool _encrypt, CryptoNote::WalletSaveLevel _saveLevel, bool _saveUserData) override;
   virtual PasswordStatus changePassword(const QString& _oldPassword, const QString& _newPassword) override;
+  virtual void repair() override;
   virtual void close() override;
 
   virtual bool isOpen() const override;
@@ -113,6 +115,7 @@ class WalletGreenWorker : public QObject, public IWalletAdapter {
 Q_SIGNALS:
   void walletOpenedSignal();
   void walletOpenErrorSignal(int _initStatus);
+  void walletRepairStartedSignal();
   void walletClosedSignal();
   void passwordChangedSignal();
   void synchronizationProgressUpdatedSignal(quint32 _current, quint32 _total);

src/Gui/MainWindow/MainWindow.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-2018, The Bytecoin developers
 // Copyright (c) 2018, The PinkstarcoinV2 developers
 // Copyright (c) 2018, The Bittorium developers
-// Copyright (c) 2019-2020, The Talleo developers
+// Copyright (c) 2019-2023, The Talleo developers
 //
 // This file is part of Bytecoin.
 //
@@ -253,6 +253,10 @@ void MainWindow::walletOpenError(int _initStatus) {
   }
 }
 
+void MainWindow::walletRepairStarted() {
+  // Do nothing
+}
+
 void MainWindow::walletClosed() {
   setClosedState();
 }
@@ -364,6 +368,7 @@ void MainWindow::closeEvent(QCloseEvent* _event) {
 }
 
 void MainWindow::setOpenedState() {
+  setWindowTitle(tr("Talleo Wallet %1 - %2").arg(Settings::instance().getVersion()).arg(QDir::toNativeSeparators(Settings::instance().getWalletFile())));
 
   QList<QAbstractButton*> toolButtons = m_ui->m_toolButtonGroup->buttons();
   for (const auto& button : toolButtons) {
@@ -374,6 +379,7 @@ void MainWindow::setOpenedState() {
   IWalletAdapter* walletAdapter = m_cryptoNoteAdapter->getNodeAdapter()->getWalletAdapter();
   m_ui->m_backupWalletAction->setEnabled(true);
   m_ui->m_resetAction->setEnabled(true);
+  m_ui->m_repairAction->setEnabled(true);
   m_ui->m_exportTrackingKeyAction->setEnabled(true);
   m_ui->m_encryptWalletAction->setEnabled(!walletAdapter->isEncrypted());
   m_ui->m_changePasswordAction->setEnabled(walletAdapter->isEncrypted());
@@ -386,6 +392,8 @@ void MainWindow::setOpenedState() {
 }
 
 void MainWindow::setClosedState() {
+  setWindowTitle(tr("Talleo Wallet %1").arg(Settings::instance().getVersion()));
+
   QList<QAbstractButton*> toolButtons = m_ui->m_toolButtonGroup->buttons();
   for (const auto& button : toolButtons) {
     button->setChecked(false);
@@ -394,6 +402,7 @@ void MainWindow::setClosedState() {
 
   m_ui->m_backupWalletAction->setEnabled(false);
   m_ui->m_resetAction->setEnabled(false);
+  m_ui->m_repairAction->setEnabled(false);
   m_ui->m_exportTrackingKeyAction->setEnabled(false);
   m_ui->m_encryptWalletAction->setEnabled(false);
   m_ui->m_changePasswordAction->setEnabled(false);
@@ -462,7 +471,7 @@ void MainWindow::updateRecentWalletActions() {
   QStringList recentWallets = Settings::instance().getRecentWalletList();
   int recentWalletCount = qMin(recentWallets.size(), MAX_RECENT_WALLET_COUNT);
   for (int i = 0; i < recentWalletCount; ++i) {
-    m_recentWalletsActionList[i]->setText(recentWallets[i]);
+    m_recentWalletsActionList[i]->setText(QDir::toNativeSeparators(recentWallets[i]));
     m_recentWalletsActionList[i]->setData(recentWallets[i]);
     m_recentWalletsActionList[i]->setVisible(true);
   }
@@ -634,6 +643,18 @@ void MainWindow::saveWalletKeys() {
   }
 }
 
+void MainWindow::repairWallet() {
+  qApp->processEvents(); // Make sure GUI redraws once before repair starts
+  IWalletAdapter* walletAdapter = m_cryptoNoteAdapter->getNodeAdapter()->getWalletAdapter();
+  Q_ASSERT(walletAdapter->isOpen());
+  walletAdapter->repair();
+  walletAdapter->save(CryptoNote::WalletSaveLevel::SAVE_ALL, true);
+  walletAdapter->removeObserver(this);
+  walletAdapter->close();
+  walletAdapter->addObserver(this);
+  m_ui->m_noWalletFrame->openWallet(Settings::instance().getWalletFile(), QString());
+}
+
 void MainWindow::resetWallet() {
   QuestionDialog dlg(tr("Reset wallet?"), tr("Reset wallet to re-synchronise its transactions and balance based\n"
     "on the blockchain data. This operation can take some time.\n"
@@ -645,8 +666,8 @@ void MainWindow::resetWallet() {
   IWalletAdapter* walletAdapter = m_cryptoNoteAdapter->getNodeAdapter()->getWalletAdapter();
   Q_ASSERT(walletAdapter->isOpen());
   QString fileName = Settings::instance().getWalletFile();
-  QDateTime currenctDateTime = QDateTime::currentDateTime();
-  fileName.append(QString(".%1.backup").arg(currenctDateTime.toString("yyyyMMddHHMMss")));
+  QDateTime _currentDateTime = QDateTime::currentDateTime();
+  fileName.append(QString(".%1.backup").arg(_currentDateTime.toString("yyyyMMddHHMMss")));
 
   walletAdapter->save(CryptoNote::WalletSaveLevel::SAVE_KEYS_ONLY, true);
   walletAdapter->removeObserver(this);