From 8de7e1e57dbfe24d6628ff902757fade4a8d4522 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sun, 15 Nov 2020 14:36:41 +0300 Subject: [PATCH 1/4] qt: Fix wallet encryption dialog Do not rely on `checked` status of `encryptWalletAction` --- src/qt/bitcoingui.cpp | 2 +- src/qt/walletframe.cpp | 4 ++-- src/qt/walletframe.h | 2 +- src/qt/walletview.cpp | 4 ++-- src/qt/walletview.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 6e6553d39..6e69976d9 100755 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -575,7 +575,7 @@ void BitcoinGUI::createActions() #ifdef ENABLE_WALLET if(walletFrame) { - connect(encryptWalletAction, SIGNAL(triggered(bool)), walletFrame, SLOT(encryptWallet(bool))); + connect(encryptWalletAction, SIGNAL(triggered()), walletFrame, SLOT(encryptWallet())); connect(backupWalletAction, SIGNAL(triggered()), walletFrame, SLOT(backupWallet())); connect(changePassphraseAction, SIGNAL(triggered()), walletFrame, SLOT(changePassphrase())); connect(unlockWalletAction, SIGNAL(triggered()), walletFrame, SLOT(unlockWallet())); diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 7c5579205..ca1ae0d0a 100755 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -166,11 +166,11 @@ void WalletFrame::gotoVerifyMessageTab(QString addr) walletView->gotoVerifyMessageTab(addr); } -void WalletFrame::encryptWallet(bool status) +void WalletFrame::encryptWallet() { WalletView *walletView = currentWalletView(); if (walletView) - walletView->encryptWallet(status); + walletView->encryptWallet(); } void WalletFrame::backupWallet() diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 02340d102..9f1961d9b 100755 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -79,7 +79,7 @@ public Q_SLOTS: void gotoVerifyMessageTab(QString addr = ""); /** Encrypt the wallet */ - void encryptWallet(bool status); + void encryptWallet(); /** Backup the wallet */ void backupWallet(); /** Change encrypted wallet passphrase */ diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 2bb1a177a..4abf863e1 100755 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -299,11 +299,11 @@ void WalletView::updateEncryptionStatus() Q_EMIT encryptionStatusChanged(walletModel->getEncryptionStatus()); } -void WalletView::encryptWallet(bool status) +void WalletView::encryptWallet() { if(!walletModel) return; - AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt : AskPassphraseDialog::Decrypt, this); + AskPassphraseDialog dlg(AskPassphraseDialog::Encrypt, this); dlg.setModel(walletModel); dlg.exec(); diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 30e0722eb..4d25388c3 100755 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -99,7 +99,7 @@ public Q_SLOTS: */ void processNewTransaction(const QModelIndex& parent, int start, int /*end*/); /** Encrypt the wallet */ - void encryptWallet(bool status); + void encryptWallet(); /** Backup the wallet */ void backupWallet(); /** Change encrypted wallet passphrase */ From 6643ee668cb838fcc2e8a5297161951647fe1661 Mon Sep 17 00:00:00 2001 From: -k Date: Tue, 17 Nov 2020 13:11:31 -0800 Subject: [PATCH 2/4] Version bump --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 04c125a3f..cc3b61e74 100755 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 6) define(_CLIENT_VERSION_REVISION, 1) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) define(_COPYRIGHT_HOLDERS,[The %s developers]) From c2cdb56446e71d3ef84594e0dd6aa90fe502c0b3 Mon Sep 17 00:00:00 2001 From: ddude <32743542+ddude1@users.noreply.github.com> Date: Wed, 18 Nov 2020 00:02:39 -0500 Subject: [PATCH 3/4] manpages --- doc/man/axe-cli.1 | 6 +++--- doc/man/axe-qt.1 | 6 +++--- doc/man/axe-tx.1 | 6 +++--- doc/man/axed.1 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/man/axe-cli.1 b/doc/man/axe-cli.1 index d0f42267a..87a29b5b4 100644 --- a/doc/man/axe-cli.1 +++ b/doc/man/axe-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH AXE-CLI "1" "November 2020" "axe-cli v1.6.1.0" "User Commands" +.TH AXE-CLI "1" "November 2020" "axe-cli v1.6.1.1" "User Commands" .SH NAME -axe-cli \- manual page for axe-cli v1.6.1.0 +axe-cli \- manual page for axe-cli v1.6.1.1 .SH DESCRIPTION -Axe Core RPC client version v1.6.1.0 +Axe Core RPC client version v1.6.1.1 .SS "Usage:" .TP axe\-cli [options] [params] diff --git a/doc/man/axe-qt.1 b/doc/man/axe-qt.1 index 11491d098..5ad4f1c1d 100755 --- a/doc/man/axe-qt.1 +++ b/doc/man/axe-qt.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH AXE-QT "1" "November 2020" "axe-qt v1.6.1.0" "User Commands" +.TH AXE-QT "1" "November 2020" "axe-qt v1.6.1.1" "User Commands" .SH NAME -axe-qt \- manual page for axe-qt v1.6.1.0 +axe-qt \- manual page for axe-qt v1.6.1.1 .SH DESCRIPTION -Axe Core version v1.6.1.0 (64\-bit) +Axe Core version v1.6.1.1 (64\-bit) Usage: .IP axe\-qt [command\-line options] diff --git a/doc/man/axe-tx.1 b/doc/man/axe-tx.1 index 329d71e22..5a5edec3f 100644 --- a/doc/man/axe-tx.1 +++ b/doc/man/axe-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH AXE-TX "1" "November 2020" "axe-tx v1.6.1.0" "User Commands" +.TH AXE-TX "1" "November 2020" "axe-tx v1.6.1.1" "User Commands" .SH NAME -axe-tx \- manual page for axe-tx v1.6.1.0 +axe-tx \- manual page for axe-tx v1.6.1.1 .SH DESCRIPTION -Axe Core axe\-tx utility version v1.6.1.0 +Axe Core axe\-tx utility version v1.6.1.1 .SS "Usage:" .TP axe\-tx [options] [commands] diff --git a/doc/man/axed.1 b/doc/man/axed.1 index 7d77e3f78..b9f8d61e4 100644 --- a/doc/man/axed.1 +++ b/doc/man/axed.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH AXED "1" "November 2020" "axed v1.6.1.0" "User Commands" +.TH AXED "1" "November 2020" "axed v1.6.1.1" "User Commands" .SH NAME -axed \- manual page for axed v1.6.1.0 +axed \- manual page for axed v1.6.1.1 .SH DESCRIPTION -Axe Core Daemon version v1.6.1.0 +Axe Core Daemon version v1.6.1.1 .SS "Usage:" .TP axed [options] From 99b0a5985ee93347d377f036b81b0524dbd810c2 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 19 Nov 2020 20:13:49 -0800 Subject: [PATCH 4/4] Fix clientversion --- src/clientversion.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 7dc59a7a7..6c44d2016 100755 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -41,11 +41,10 @@ const std::string CLIENT_NAME("Axe Core"); #include #endif -//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. -#define GIT_ARCHIVE 1 +//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$ #ifdef GIT_ARCHIVE -#define GIT_COMMIT_ID "8c743968bd7d" -#define GIT_COMMIT_DATE "Fri, 17 May 2019 20:03:37 +0300" +#define GIT_COMMIT_ID "$Format:%h$" +#define GIT_COMMIT_DATE "$Format:%cD$" #endif #define BUILD_DESC_WITH_SUFFIX(maj, min, rev, build, suffix) \