Version 1.2.1 Release init

- Export Keys Function added - Import Keys Function added - Fixed StakeOnly Command via Walletpassphrase - Version Update - Zapwallettxes now as native RPC command
TrezarCoin · Mar 20, 2019 · 2355302 · 2355302
1 parent e36d025
commit 2355302
Show file tree

Hide file tree

Showing 18 changed files with 359 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -52,6 +52,8 @@
         <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
         <file alias="staking_on">res/icons/staking_on.png</file>
         <file alias="staking_off">res/icons/staking_off.png</file>
+        <file alias="key_export">res/icons/key_export.png</file>
+        <file alias="key_import">res/icons/key_import.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -51,6 +51,7 @@
 #include <QDesktopWidget>
 #include <QDir>
 #include <QDragEnterEvent>
+#include <QFileDialog>
 #include <QInputDialog>
 #include <QListWidget>
 #include <QMenuBar>
@@ -146,6 +147,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
     lockWalletAction(0),
     toggleStakingAction(0),
     easysplitAction(0),
+    exportWalletAction(0),
+    importWalletAction(0),
     platformStyle(platformStyle)
 {
     GUIUtil::restoreWindowGeometry("nWindow", QSize(840, 600), this);
@@ -406,9 +409,18 @@ void BitcoinGUI::createActions()
     changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
     signMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/edit"), tr("Sign &message..."), this);
     signMessageAction->setStatusTip(tr("Sign messages with your Trezarcoin addresses to prove you own them"));
+
     verifyMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/verify"), tr("&Verify message..."), this);
     verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Trezarcoin addresses"));
 
+    //Export PrivKeys
+    exportWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/key_export"), tr("&Export keys"), this);
+    exportWalletAction->setStatusTip(tr("Export your PrivateKeys and PublicKeys into a Textfile."));
+
+    //Import PrivKeys
+    importWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/key_import"), tr("&Import keys"), this);
+    importWalletAction->setStatusTip(tr("Import your PrivateKeys and PublicKeys from a Textfile."));
+
     openRPCConsoleAction = new QAction(platformStyle->TextColorIcon(":/icons/debugwindow"), tr("&Debug window"), this);
     openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
     // initially disable the debug window menu item
@@ -448,6 +460,8 @@ void BitcoinGUI::createActions()
         connect(usedSendingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedSendingAddresses()));
         connect(usedReceivingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedReceivingAddresses()));
         connect(openAction, SIGNAL(triggered()), this, SLOT(openClicked()));
+        connect(exportWalletAction, SIGNAL(triggered()), walletFrame, SLOT(exportWallet()));
+        connect(importWalletAction, SIGNAL(triggered()), walletFrame, SLOT(importWallet()));
     }
 #endif // ENABLE_WALLET
 
@@ -476,6 +490,9 @@ void BitcoinGUI::createMenuBar()
         file->addSeparator();
         file->addAction(usedSendingAddressesAction);
         file->addAction(usedReceivingAddressesAction);
+        file->addSeparator();
+        file->addAction(exportWalletAction);
+        file->addAction(importWalletAction);
     }
     file->addAction(quitAction);
 
@@ -625,6 +642,8 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
     usedSendingAddressesAction->setEnabled(enabled);
     usedReceivingAddressesAction->setEnabled(enabled);
     openAction->setEnabled(enabled);
+    exportWalletAction->setEnabled(enabled);
+    importWalletAction->setEnabled(enabled);
 }
 
 void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -126,6 +126,8 @@ class BitcoinGUI : public QMainWindow
     QAction *lockWalletAction;
     QAction *toggleStakingAction;
     QAction *easysplitAction;
+    QAction *exportWalletAction;
+    QAction *importWalletAction;
 
     QSystemTrayIcon *trayIcon;
     QMenu *trayIconMenu;
@@ -160,6 +162,10 @@ class BitcoinGUI : public QMainWindow
     /** Disconnect core signals from GUI client */
     void unsubscribeFromCoreSignals();
 
+    /* Wallet keys export / import */
+    void exportWallet();
+    void importWallet();
+
 Q_SIGNALS:
     /** Signal raised when a URI was entered or dragged to the GUI */
     void receivedURI(const QString &uri);

diff --git a/src/qt/res/icons/key_export.png b/src/qt/res/icons/key_export.png
diff --git a/src/qt/res/icons/key_import.png b/src/qt/res/icons/key_import.png
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -246,3 +246,17 @@ WalletView *WalletFrame::currentWalletView()
     return qobject_cast<WalletView*>(walletStack->currentWidget());
 }
 
+void WalletFrame::exportWallet()
+{
+    WalletView *walletView = currentWalletView();
+    if (walletView)
+        walletView->exportWallet();
+}
+
+void WalletFrame::importWallet()
+{
+    WalletView *walletView = currentWalletView();
+    if (walletView)
+        walletView->importWallet();
+}
+
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -89,6 +89,10 @@ public Q_SLOTS:
     void usedSendingAddresses();
     /** Show used receiving addresses */
     void usedReceivingAddresses();
+
+    /* Wallet keys export / import */
+    void exportWallet();
+    void importWallet();
 };
 
 #endif // BITCOIN_QT_WALLETFRAME_H
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -469,6 +469,14 @@ bool WalletModel::backupWallet(const QString &filename)
     return wallet->BackupWallet(filename.toLocal8Bit().data());
 }
 
+bool WalletModel::exportWallet(const QString &filename) {
+    return(wallet->ExportWallet(wallet, filename.toLocal8Bit().data()));
+}
+
+bool WalletModel::importWallet(const QString &filename) {
+    return(wallet->ImportWallet(wallet, filename.toLocal8Bit().data()));
+}
+
 void WalletModel::getStakeWeightQuick(const int64_t& nTime, const int64_t& nValue, uint64_t& nWeight) {
    wallet->GetStakeWeightQuick(nTime, nValue, nWeight);
 }

diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -166,6 +166,9 @@ class WalletModel : public QObject
     bool backupWallet(const QString &filename);
     // Stake weight calculation
     void getStakeWeightQuick(const int64_t& nTime, const int64_t& nValue, uint64_t& nWeight);
+    /* Wallet keys export / import */
+    bool exportWallet(const QString &filename);
+    bool importWallet(const QString &filename);
     // RAI object for unlocking wallet, returned by requestUnlock()
     class UnlockContext
     {

diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -279,6 +279,70 @@ void WalletView::backupWallet()
     }
 }
 
+
+void WalletView::exportWallet() {
+
+    if (!walletModel)
+        return;
+    // Unlock wallet when requested by wallet model
+    WalletModel::UnlockContext ctx(walletModel->requestUnlock());
+    if (!ctx.isValid())
+        return;
+
+#if (QT_VERSION < 0x050000)
+    QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+#else
+    QString saveDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+#endif
+
+    QString filename = GUIUtil::getSaveFileName(this, tr("Export Wallet Keys"), saveDir, tr("Wallet Text (*.txt)"), NULL);
+    if (!filename.isEmpty()) {
+        if (walletModel->exportWallet(filename)) {
+            QMessageBox::information(this,
+                tr("Export Complete"),
+                tr("All keys of your wallet have been exported into:<br>%1").arg(filename));
+        }
+        else {
+            QMessageBox::critical(this,
+                tr("Export Failed"),
+                tr("There was an error while exporting your wallet keys."));
+        }
+    }
+    walletModel->setWalletLocked(true);
+}
+
+void WalletView::importWallet() {
+
+    if(!walletModel)
+        return;
+    // Unlock wallet when requested by wallet model
+    WalletModel::UnlockContext ctx(walletModel->requestUnlock());
+    if (!ctx.isValid())
+        return;
+
+#if (QT_VERSION < 0x050000)
+    QString openDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+#else
+    QString openDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+#endif
+
+    QString filename = GUIUtil::getOpenFileName(this, tr("Import Wallet Keys"), openDir, tr("Wallet Text (*.txt)"), NULL);
+    if (!filename.isEmpty()) {
+        if (walletModel->importWallet(filename)) {
+            QMessageBox::information(this,
+                tr("Import Complete"),
+                tr("All keys have been imported into your wallet from:<br>%1").arg(filename));
+
+        }
+        else {
+            QMessageBox::critical(this,
+                tr("Import Failed"),
+                tr("There was an error while importing wallet keys from:<br>%1").arg(filename));
+        }
+    }
+    walletModel->setWalletLocked(true);
+}
+
 void WalletView::changePassphrase()
 {
     AskPassphraseDialog dlg(AskPassphraseDialog::ChangePass, this);

diff --git a/src/qt/walletview.h b/src/qt/walletview.h
@@ -104,6 +104,9 @@ public Q_SLOTS:
     void unlockWallet();
     void unlockWalletStaking();
     void lockWallet();
+    /* Wallet keys export / import */
+    void exportWallet();
+    void importWallet();
 
     /** Show used sending addresses */
     void usedSendingAddresses();

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
@@ -57,6 +57,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "listaccounts", 0 },
     { "listaccounts", 1 },
     { "walletpassphrase", 1 },
+    { "walletpassphrase", 2 },
     { "getblocktemplate", 0 },
     { "listsinceblock", 1 },
     { "listsinceblock", 2 },

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -60,7 +60,7 @@ std::string static EncodeDumpString(const std::string &str) {
     return ret.str();
 }
 
-std::string DecodeDumpString(const std::string &str) {
+std::string DecodeDumpString_one(const std::string &str) {
     std::stringstream ret;
     for (unsigned int pos = 0; pos < str.length(); pos++) {
         unsigned char c = str[pos];
@@ -480,7 +480,7 @@ UniValue importwallet(const UniValue& params, bool fHelp)
             if (vstr[nStr] == "reserve=1")
                 fLabel = false;
             if (boost::algorithm::starts_with(vstr[nStr], "label=")) {
-                strLabel = DecodeDumpString(vstr[nStr].substr(6));
+                strLabel = DecodeDumpString_one(vstr[nStr].substr(6));
                 fLabel = true;
             }
         }

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -1930,7 +1930,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
-    if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
+    if (pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 3))
         throw runtime_error(
             "walletpassphrase \"passphrase\" timeout [mintonly]\n"
             "\nStores the wallet decryption key in memory for 'timeout' seconds.\n"
@@ -1984,10 +1984,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
 
     /* Disables some wallet functionality if unlocked for staking only */
     if (params.size() > 2)
-    {
-        if ((params[2].get_str() == "true") || (params[2].get_str() == "True"))
-            fWalletUnlockStakingOnly = true;
-    }
+        fWalletUnlockStakingOnly = params[2].get_bool();
     else
         fWalletUnlockStakingOnly = false;
 
@@ -2786,6 +2783,20 @@ UniValue getstakereport(const UniValue& params, bool fHelp)
 
     return  result;
 }
+// zapwallettxes: rescanning the whole blockchain for missing Tx
+UniValue zapwallettxes(const UniValue& params, bool fHelp)
+{
+    if ((params.size()>0) || (fHelp))
+        throw runtime_error(
+            "zapwallettxes\n"
+            "Runs a rescan to find missing Tx.\n");
+
+    pwalletMain->MarkDirty();
+    pwalletMain->nTimeFirstKey = 1;
+    pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
+
+    return NullUniValue;
+}
 
 extern UniValue dumpprivkey(const UniValue& params, bool fHelp); // in rpcdump.cpp
 extern UniValue importprivkey(const UniValue& params, bool fHelp);
@@ -2852,6 +2863,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true  },
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true  },
     { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
+    { "wallet",             "zapwallettxes",            &zapwallettxes,            true  },
 };
 
 void RegisterWalletRPCCommands(CRPCTable &tableRPC)