Merge pull request #726 from AXErunners/v1.6.x

Release 1.6.1.1
AXErunners · Nov 20, 2020 · 53f14e8 · 53f14e8
2 parents 1fbb032 + 1cbb369
commit 53f14e8
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 24 deletions.
diff --git 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])

diff --git 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] <command> [params]

diff --git 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
@@ -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] <hex\-tx> [commands]

diff --git 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]

diff --git a/src/clientversion.cpp b/src/clientversion.cpp
@@ -41,11 +41,10 @@ const std::string CLIENT_NAME("Axe Core");
 #include <obj/build.h>
 #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) \

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 */