mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-19 18:41:29 +00:00
add option to change wallet creation height and rescan wallet cache
This commit is contained in:
parent
80a058c954
commit
8f73bac95c
3 changed files with 80 additions and 2 deletions
|
@ -497,9 +497,78 @@ Rectangle {
|
||||||
text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString
|
text: qsTr("Embedded Monero version: ") + Version.GUI_MONERO_VERSION + translationManager.emptyString
|
||||||
}
|
}
|
||||||
TextBlock {
|
TextBlock {
|
||||||
|
id: restoreHeightText
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + currentWallet.walletCreationHeight + translationManager.emptyString
|
textFormat: Text.RichText
|
||||||
|
property var txt: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C}</style>" + qsTr("Wallet creation height: ") + currentWallet.walletCreationHeight + translationManager.emptyString
|
||||||
|
property var linkTxt: qsTr(" <a href='#'>(Click to change)</a>") + 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 {
|
TextBlock {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet log path: ") + currentWallet.walletLogPath + translationManager.emptyString
|
text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet log path: ") + currentWallet.walletLogPath + translationManager.emptyString
|
||||||
|
|
|
@ -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
|
QString Wallet::getDaemonLogPath() const
|
||||||
{
|
{
|
||||||
return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/bitmonero.log";
|
return QString::fromStdString(m_walletImpl->getDefaultDataDir()) + "/bitmonero.log";
|
||||||
|
|
|
@ -47,7 +47,7 @@ class Wallet : public QObject
|
||||||
Q_PROPERTY(QString publicSpendKey READ getPublicSpendKey)
|
Q_PROPERTY(QString publicSpendKey READ getPublicSpendKey)
|
||||||
Q_PROPERTY(QString daemonLogPath READ getDaemonLogPath CONSTANT)
|
Q_PROPERTY(QString daemonLogPath READ getDaemonLogPath CONSTANT)
|
||||||
Q_PROPERTY(QString walletLogPath READ getWalletLogPath 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:
|
public:
|
||||||
|
|
||||||
|
@ -245,6 +245,8 @@ public:
|
||||||
QString getPublicSpendKey() const {return QString::fromStdString(m_walletImpl->publicSpendKey());}
|
QString getPublicSpendKey() const {return QString::fromStdString(m_walletImpl->publicSpendKey());}
|
||||||
|
|
||||||
quint64 getWalletCreationHeight() const {return m_walletImpl->getRefreshFromBlockHeight();}
|
quint64 getWalletCreationHeight() const {return m_walletImpl->getRefreshFromBlockHeight();}
|
||||||
|
void setWalletCreationHeight(quint64 height);
|
||||||
|
|
||||||
QString getDaemonLogPath() const;
|
QString getDaemonLogPath() const;
|
||||||
QString getWalletLogPath() const;
|
QString getWalletLogPath() const;
|
||||||
|
|
||||||
|
@ -263,6 +265,7 @@ signals:
|
||||||
void unconfirmedMoneyReceived(const QString &txId, quint64 amount);
|
void unconfirmedMoneyReceived(const QString &txId, quint64 amount);
|
||||||
void newBlock(quint64 height, quint64 targetHeight);
|
void newBlock(quint64 height, quint64 targetHeight);
|
||||||
void historyModelChanged() const;
|
void historyModelChanged() const;
|
||||||
|
void walletCreationHeightChanged();
|
||||||
|
|
||||||
// emitted when transaction is created async
|
// emitted when transaction is created async
|
||||||
void transactionCreated(PendingTransaction * transaction, QString address, QString paymentId, quint32 mixinCount);
|
void transactionCreated(PendingTransaction * transaction, QString address, QString paymentId, quint32 mixinCount);
|
||||||
|
|
Loading…
Reference in a new issue