hush
/
SilentDragon
9
1
Fork 7
Code Issues 75 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

Import / Export private keys

recurring
Aditya Kulkarni 6 years ago
parent
318c4ae973
commit
e8c488e150
9 changed files with 262 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/mainwindow.cpp
  2. 2
      src/mainwindow.h
  3. 15
      src/mainwindow.ui
  4. 78
      src/privkey.ui
  5. 45
      src/rpc.cpp
  6. 6
      src/rpc.h
  7. 11
      src/ui_mainwindow.h
  8. 77
      src/ui_privkey.h
  9. 3
      zec-qt-wallet.pro

56
src/mainwindow.cpp
View File

@ -1,5 +1,6 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "ui_privkey.h"
#include "ui_about.h"
#include "ui_settings.h"
#include "ui_turnstile.h"
@ -38,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) :
QDesktopServices::openUrl(QUrl("https://github.com/adityapk00/zec-qt-wallet/releases"));
});
QObject::connect(ui->actionImport_Private_Keys, &QAction::triggered, this, &MainWindow::importPrivKeys);
QObject::connect(ui->actionImport_Private_Key, &QAction::triggered, this, &MainWindow::importPrivKey);
// Set up about action
QObject::connect(ui->actionAbout, &QAction::triggered, [=] () {
@ -384,26 +385,31 @@ void MainWindow::donate() {
ui->tabWidget->setCurrentIndex(1);
}
void MainWindow::importPrivKeys() {
bool ok;
QString text = QInputDialog::getMultiLineText(
this, "Import Private Keys",
QString() +
"Please paste your private keys (z-Addr or t-Addr) here, one per line.\n" +
"The keys will be imported into your connected zcashd node",
"", &ok);
if (ok && !text.isEmpty()) {
auto keys = text.split("\n");
void MainWindow::importPrivKey() {
QDialog d(this);
Ui_PrivKey pui;
pui.setupUi(&d);
pui.helpLbl->setText(QString() %
"Please paste your private keys (z-Addr or t-Addr) here, one per line.\n" %
"The keys will be imported into your connected zcashd node");
if (d.exec() == QDialog::Accepted && !pui.privKeyTxt->toPlainText().trimmed().isEmpty()) {
auto keys = pui.privKeyTxt->toPlainText().trimmed().split("\n");
for (int i=0; i < keys.length(); i++) {
auto key = keys[i].trimmed();
if (key.startsWith("S") ||
key.startsWith("secret")) { // Z key
rpc->importZPrivKey(key, [=] (auto) {} );
} else { // T Key
rpc->importTPrivKey(key, [=] (auto) {} );
}
}
}
QMessageBox::information(this,
"Imported", "The keys were imported. It may be a while to rescan the blockchain with the new keys.",
QMessageBox::Ok);
}
void MainWindow::setupBalancesTab() {
@ -420,12 +426,34 @@ void MainWindow::setupBalancesTab() {
QMenu menu(this);
menu.addAction("Copy Address", [=] () {
menu.addAction("Copy address", [=] () {
QClipboard *clipboard = QGuiApplication::clipboard();
clipboard->setText(addr);
ui->statusBar->showMessage("Copied to clipboard", 3 * 1000);
});
menu.addAction("Get private key", [=] () {
auto fnCB = [=] (const json& reply) {
auto privKey = QString::fromStdString(reply.get<json::string_t>());
QDialog d(this);
Ui_PrivKey pui;
pui.setupUi(&d);
pui.helpLbl->setText("Private Key:");
pui.privKeyTxt->setPlainText(privKey);
pui.privKeyTxt->setReadOnly(true);
pui.privKeyTxt->selectAll();
pui.buttonBox->button(QDialogButtonBox::Ok)->setVisible(false);
d.exec();
};
if (Settings::getInstance()->isZAddress(addr))
rpc->getZPrivKey(addr, fnCB);
else
rpc->getTPrivKey(addr, fnCB);
});
menu.addAction("Send from " % addr.left(40) % (addr.size() > 40 ? "..." : ""), [=]() {
// Find the inputs combo
for (int i = 0; i < ui->inputsCombo->count(); i++) {

2
src/mainwindow.h
View File

@ -79,7 +79,7 @@ private:
QString doSendTxValidations(Tx tx);
void donate();
void importPrivKeys();
void importPrivKey();
RPC* rpc;

15
src/mainwindow.ui
View File

@ -725,7 +725,7 @@
<property name="title">
<string>File</string>
</property>
<addaction name="actionImport_Private_Keys"/>
<addaction name="actionImport_Private_Key"/>
<addaction name="actionTurnstile_Migration"/>
<addaction name="actionSettings"/>
<addaction name="separator"/>
@ -763,14 +763,6 @@
<string>Donate</string>
</property>
</action>
<action name="actionImport_Private_Keys">
<property name="text">
<string>Import Private Keys</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionCheck_for_Updates">
<property name="text">
<string>Check github.com for Updates</string>
@ -781,6 +773,11 @@
<string>Sapling Turnstile</string>
</property>
</action>
<action name="actionImport_Private_Key">
<property name="text">
<string>Import Private Key</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>

78
src/privkey.ui
View File

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PrivKey</class>
<widget class="QDialog" name="PrivKey">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>461</width>
<height>389</height>
</rect>
</property>
<property name="windowTitle">
<string>Private Key</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QPlainTextEdit" name="privKeyTxt">
<property name="plainText">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="helpLbl">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>PrivKey</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>PrivKey</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

45
src/rpc.cpp
View File

@ -162,6 +162,51 @@ void RPC::newTaddr(const std::function<void(json)>& cb) {
doRPC(payload, cb);
}
void RPC::getZPrivKey(QString addr, const std::function<void(json)>& cb) {
json payload = {
{"jsonrpc", "1.0"},
{"id", "someid"},
{"method", "z_exportkey"},
{"params", { addr.toStdString() }},
};
doRPC(payload, cb);
}
void RPC::getTPrivKey(QString addr, const std::function<void(json)>& cb) {
json payload = {
{"jsonrpc", "1.0"},
{"id", "someid"},
{"method", "dumpprivkey"},
{"params", { addr.toStdString() }},
};
doRPC(payload, cb);
}
void RPC::importZPrivKey(QString addr, const std::function<void(json)>& cb) {
json payload = {
{"jsonrpc", "1.0"},
{"id", "someid"},
{"method", "z_importkey"},
{"params", { addr.toStdString() }},
};
doRPC(payload, cb);
}
void RPC::importTPrivKey(QString addr, const std::function<void(json)>& cb) {
json payload = {
{"jsonrpc", "1.0"},
{"id", "someid"},
{"method", "importprivkey"},
{"params", { addr.toStdString() }},
};
doRPC(payload, cb);
}
void RPC::getBalance(const std::function<void(json)>& cb) {
json payload = {

6
src/rpc.h
View File

@ -50,6 +50,12 @@ public:
void newZaddr(bool sapling, const std::function<void(json)>& cb);
void newTaddr(const std::function<void(json)>& cb);
void getZPrivKey(QString addr, const std::function<void(json)>& cb);
void getTPrivKey(QString addr, const std::function<void(json)>& cb);
void importZPrivKey(QString addr, const std::function<void(json)>& cb);
void importTPrivKey(QString addr, const std::function<void(json)>& cb);
Turnstile* getTurnstile() { return turnstile; }
// Batch method. Note: Because of the template, it has to be in the header file.

11
src/ui_mainwindow.h
View File

@ -45,9 +45,9 @@ public:
QAction *actionAbout;
QAction *actionSettings;
QAction *actionDonate;
QAction *actionImport_Private_Keys;
QAction *actionCheck_for_Updates;
QAction *actionTurnstile_Migration;
QAction *actionImport_Private_Key;
QWidget *centralWidget;
QGridLayout *gridLayout_3;
QTabWidget *tabWidget;
@ -155,13 +155,12 @@ public:
actionSettings->setObjectName(QStringLiteral("actionSettings"));
actionDonate = new QAction(MainWindow);
actionDonate->setObjectName(QStringLiteral("actionDonate"));
actionImport_Private_Keys = new QAction(MainWindow);
actionImport_Private_Keys->setObjectName(QStringLiteral("actionImport_Private_Keys"));
actionImport_Private_Keys->setVisible(false);
actionCheck_for_Updates = new QAction(MainWindow);
actionCheck_for_Updates->setObjectName(QStringLiteral("actionCheck_for_Updates"));
actionTurnstile_Migration = new QAction(MainWindow);
actionTurnstile_Migration->setObjectName(QStringLiteral("actionTurnstile_Migration"));
actionImport_Private_Key = new QAction(MainWindow);
actionImport_Private_Key->setObjectName(QStringLiteral("actionImport_Private_Key"));
centralWidget = new QWidget(MainWindow);
centralWidget->setObjectName(QStringLiteral("centralWidget"));
gridLayout_3 = new QGridLayout(centralWidget);
@ -670,7 +669,7 @@ public:
menuBar->addAction(menuBalance->menuAction());
menuBar->addAction(menuHelp->menuAction());
menuBalance->addAction(actionImport_Private_Keys);
menuBalance->addAction(actionImport_Private_Key);
menuBalance->addAction(actionTurnstile_Migration);
menuBalance->addAction(actionSettings);
menuBalance->addSeparator();
@ -694,9 +693,9 @@ public:
actionAbout->setText(QApplication::translate("MainWindow", "About", nullptr));
actionSettings->setText(QApplication::translate("MainWindow", "Settings", nullptr));
actionDonate->setText(QApplication::translate("MainWindow", "Donate", nullptr));
actionImport_Private_Keys->setText(QApplication::translate("MainWindow", "Import Private Keys", nullptr));
actionCheck_for_Updates->setText(QApplication::translate("MainWindow", "Check github.com for Updates", nullptr));
actionTurnstile_Migration->setText(QApplication::translate("MainWindow", "Sapling Turnstile", nullptr));
actionImport_Private_Key->setText(QApplication::translate("MainWindow", "Import Private Key", nullptr));
groupBox->setTitle(QApplication::translate("MainWindow", "Summary", nullptr));
label->setText(QApplication::translate("MainWindow", "Shielded", nullptr));
balSheilded->setText(QString());

77
src/ui_privkey.h
View File

@ -0,0 +1,77 @@
/********************************************************************************
** Form generated from reading UI file 'privkey.ui'
**
** Created by: Qt User Interface Compiler version 5.11.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_PRIVKEY_H
#define UI_PRIVKEY_H
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPlainTextEdit>
QT_BEGIN_NAMESPACE
class Ui_PrivKey
{
public:
QGridLayout *gridLayout;
QPlainTextEdit *privKeyTxt;
QDialogButtonBox *buttonBox;
QLabel *helpLbl;
void setupUi(QDialog *PrivKey)
{
if (PrivKey->objectName().isEmpty())
PrivKey->setObjectName(QStringLiteral("PrivKey"));
PrivKey->resize(461, 389);
gridLayout = new QGridLayout(PrivKey);
gridLayout->setObjectName(QStringLiteral("gridLayout"));
privKeyTxt = new QPlainTextEdit(PrivKey);
privKeyTxt->setObjectName(QStringLiteral("privKeyTxt"));
gridLayout->addWidget(privKeyTxt, 1, 0, 1, 1);
buttonBox = new QDialogButtonBox(PrivKey);
buttonBox->setObjectName(QStringLiteral("buttonBox"));
buttonBox->setOrientation(Qt::Horizontal);
buttonBox->setStandardButtons(QDialogButtonBox::Close|QDialogButtonBox::Ok);
gridLayout->addWidget(buttonBox, 2, 0, 1, 1);
helpLbl = new QLabel(PrivKey);
helpLbl->setObjectName(QStringLiteral("helpLbl"));
gridLayout->addWidget(helpLbl, 0, 0, 1, 1);
retranslateUi(PrivKey);
QObject::connect(buttonBox, SIGNAL(accepted()), PrivKey, SLOT(accept()));
QObject::connect(buttonBox, SIGNAL(rejected()), PrivKey, SLOT(reject()));
QMetaObject::connectSlotsByName(PrivKey);
} // setupUi
void retranslateUi(QDialog *PrivKey)
{
PrivKey->setWindowTitle(QApplication::translate("PrivKey", "Private Key", nullptr));
privKeyTxt->setPlainText(QString());
helpLbl->setText(QApplication::translate("PrivKey", "TextLabel", nullptr));
} // retranslateUi
};
namespace Ui {
class PrivKey: public Ui_PrivKey {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_PRIVKEY_H

3
zec-qt-wallet.pro
View File

@ -75,7 +75,8 @@ FORMS += \
src/about.ui \
src/confirm.ui \
src/turnstile.ui \
src/turnstileprogress.ui
src/turnstileprogress.ui \
src/privkey.ui
src/memodialog.ui
# Default rules for deployment.

Write Preview
Loading…
Cancel
Save