Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-10 12:54:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure ringdb is written after wallet creation [2]

Browse source
This commit is contained in:
tobtoht 2022-07-01 13:46:10 +02:00
parent b1c447519e
commit e549438130
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
5 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -33,7 +33,7 @@ if(DEBUG)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
endif() endif()
set(MONERO_HEAD "4982ac420c101be2afb387138c4ee57b1a5c2f9b") set(MONERO_HEAD "9c03081caf20fa95d58ba62ee7cd37cd50d39286")
set(BUILD_GUI_DEPS ON) set(BUILD_GUI_DEPS ON)
option(ARCH "Target architecture" "native") option(ARCH "Target architecture" "native")
set(BUILD_64 ON) set(BUILD_64 ON)

2
monero

@ -1 +1 @@
Subproject commit 4982ac420c101be2afb387138c4ee57b1a5c2f9b Subproject commit 9c03081caf20fa95d58ba62ee7cd37cd50d39286

2
src/MainWindow.cpp
View file

@ -461,6 +461,8 @@ void MainWindow::onWalletOpened() {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
m_splashDialog->hide(); m_splashDialog->hide();
m_ctx->wallet->setRingDatabase(Utils::ringDatabasePath());
m_ctx->updateBalance(); m_ctx->updateBalance();
if (m_ctx->wallet->isHwBacked()) { if (m_ctx->wallet->isHwBacked()) {
m_statusBtnHwDevice->show(); m_statusBtnHwDevice->show();

4
src/libwalletqt/Wallet.cpp
View file

@ -1359,6 +1359,10 @@ bool Wallet::isDeviceConnected() const {
return m_walletImpl->isDeviceConnected(); 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) void Wallet::onPassphraseEntered(const QString &passphrase, bool enter_on_device, bool entry_abort)
{ {
if (m_walletListener != nullptr) if (m_walletListener != nullptr)

2
src/libwalletqt/Wallet.h
View file

@ -462,6 +462,8 @@ public:
bool isDeviceConnected() const; bool isDeviceConnected() const;
bool setRingDatabase(const QString &path);
// TODO: setListenter() when it implemented in API // TODO: setListenter() when it implemented in API
signals: signals:
// emitted on every event happened with wallet // emitted on every event happened with wallet