Ensure ringdb is written after wallet creation [2]

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 735bfe9cd3abfea0be5547e93b7e7b9aa3fb056c..52aba649d2554328dcc101c2e1a64562f7db0396 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ if(DEBUG)
     set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()
 
-set(MONERO_HEAD "4982ac420c101be2afb387138c4ee57b1a5c2f9b")
+set(MONERO_HEAD "9c03081caf20fa95d58ba62ee7cd37cd50d39286")
 set(BUILD_GUI_DEPS ON)
 option(ARCH "Target architecture" "native")
 set(BUILD_64 ON)

diff --git a/monero b/monero
index 4982ac420c101be2afb387138c4ee57b1a5c2f9b..9c03081caf20fa95d58ba62ee7cd37cd50d39286 160000 (submodule)
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit 4982ac420c101be2afb387138c4ee57b1a5c2f9b
+Subproject commit 9c03081caf20fa95d58ba62ee7cd37cd50d39286

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c90cf2ff12454a2c149b5692f225f52f1935250d..2262a2b34bfb8c1ffb44b78e8e85ad17c692e1c3 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -461,6 +461,8 @@ void MainWindow::onWalletOpened() {
     qDebug() << Q_FUNC_INFO;
     m_splashDialog->hide();
 
+    m_ctx->wallet->setRingDatabase(Utils::ringDatabasePath());
+
     m_ctx->updateBalance();
     if (m_ctx->wallet->isHwBacked()) {
         m_statusBtnHwDevice->show();

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 76bc09821541388a2603d115b100338ad9f2b630..a85f5bcaa719a2e79b29f4e3c13ea1855cc65d51 100644 (file)
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -1359,6 +1359,10 @@ bool Wallet::isDeviceConnected() const {
     return m_walletImpl->isDeviceConnected();
 }
 
+bool Wallet::setRingDatabase(const QString &path) {
+    return m_walletImpl->setRingDatabase(path.toStdString());
+}
+
 void Wallet::onPassphraseEntered(const QString &passphrase, bool enter_on_device, bool entry_abort)
 {
     if (m_walletListener != nullptr)

diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 7ead7fa0b712349b3d3d2cfd71da04a80d026e8c..64294bc94fc735f186fc2285c08884367a38b2cc 100644 (file)
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -462,6 +462,8 @@ public:
 
     bool isDeviceConnected() const;
 
+    bool setRingDatabase(const QString &path);
+
     // TODO: setListenter() when it implemented in API
 signals:
     // emitted on every event happened with wallet