From 8f73bac95c56ea1e887b87fa1d5865effa36b856 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Mon, 23 Oct 2017 18:33:10 +0200 Subject: [PATCH] add option to change wallet creation height and rescan wallet cache --- pages/Settings.qml | 71 +++++++++++++++++++++++++++++++++++++- src/libwalletqt/Wallet.cpp | 6 ++++ src/libwalletqt/Wallet.h | 5 ++- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/pages/Settings.qml b/pages/Settings.qml index 8173aba5..b5b960c8 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -497,9 +497,78 @@ Rectangle { text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString } TextBlock { + id: restoreHeightText Layout.fillWidth: true - text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + currentWallet.walletCreationHeight + translationManager.emptyString + textFormat: Text.RichText + property var txt: "" + qsTr("Wallet creation height: ") + currentWallet.walletCreationHeight + translationManager.emptyString + property var linkTxt: qsTr(" (Click to change)") + translationManager.emptyString + text: (typeof currentWallet == "undefined") ? "" : txt + linkTxt + + onLinkActivated: { + restoreHeightRow.visible = true; + text = txt + } + } + + RowLayout { + id: restoreHeightRow + visible: false + LineEdit { + id: restoreHeight + Layout.preferredWidth: 80 + Layout.fillWidth: true + text: currentWallet.walletCreationHeight + validator: IntValidator { + bottom:0 + } + } + + StandardButton { + id: restoreHeightSave + Layout.fillWidth: false + Layout.leftMargin: 30 + text: qsTr("Save") + translationManager.emptyString + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + + onClicked: { + currentWallet.walletCreationHeight = restoreHeight.text + // Restore height is saved in .keys file. Set password to trigger rewrite. + currentWallet.setPassword(appWindow.password) + restoreHeightText.text = restoreHeightText.txt + restoreHeightText.linkTxt + restoreHeightRow.visible = false + + // Show confirmation dialog + confirmationDialog.title = qsTr("Rescan wallet cache") + translationManager.emptyString; + confirmationDialog.text = qsTr("Are you sure you want to rebuild the wallet cache?\n" + + "The following information will be deleted\n" + + "- Recipient addresses\n" + + "- Tx keys\n" + + "- Tx descriptions\n\n" + + "The old wallet cache file will be renamed and can be restored later.\n" + ); + confirmationDialog.icon = StandardIcon.Question + confirmationDialog.cancelText = qsTr("Cancel") + confirmationDialog.onAcceptedCallback = function() { + walletManager.closeWallet(); + walletManager.clearWalletCache(persistentSettings.wallet_path); + walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password, + persistentSettings.testnet); + } + + confirmationDialog.onRejectedCallback = null; + + confirmationDialog.open() + + } + } + } + + + TextBlock { Layout.fillWidth: true text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet log path: ") + currentWallet.walletLogPath + translationManager.emptyString diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 5a71debf..4238940a 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -599,6 +599,12 @@ bool Wallet::useForkRules(quint8 required_version, quint64 earlyBlocks) const } } +void Wallet::setWalletCreationHeight(quint64 height) +{ + m_walletImpl->setRefreshFromBlockHeight(height); + emit walletCreationHeightChanged(); +} + QString Wallet::getDaemonLogPath() const { return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/bitmonero.log"; diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 3fcc057f..adc7d338 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -47,7 +47,7 @@ class Wallet : public QObject Q_PROPERTY(QString publicSpendKey READ getPublicSpendKey) Q_PROPERTY(QString daemonLogPath READ getDaemonLogPath CONSTANT) Q_PROPERTY(QString walletLogPath READ getWalletLogPath CONSTANT) - Q_PROPERTY(quint64 walletCreationHeight READ getWalletCreationHeight CONSTANT) + Q_PROPERTY(quint64 walletCreationHeight READ getWalletCreationHeight WRITE setWalletCreationHeight NOTIFY walletCreationHeightChanged) public: @@ -245,6 +245,8 @@ public: QString getPublicSpendKey() const {return QString::fromStdString(m_walletImpl->publicSpendKey());} quint64 getWalletCreationHeight() const {return m_walletImpl->getRefreshFromBlockHeight();} + void setWalletCreationHeight(quint64 height); + QString getDaemonLogPath() const; QString getWalletLogPath() const; @@ -263,6 +265,7 @@ signals: void unconfirmedMoneyReceived(const QString &txId, quint64 amount); void newBlock(quint64 height, quint64 targetHeight); void historyModelChanged() const; + void walletCreationHeightChanged(); // emitted when transaction is created async void transactionCreated(PendingTransaction * transaction, QString address, QString paymentId, quint32 mixinCount);