diff --git a/alethzero/Main.ui b/alethzero/Main.ui index fe3eadb16..52e973fe8 100644 --- a/alethzero/Main.ui +++ b/alethzero/Main.ui @@ -132,7 +132,7 @@ 0 0 1617 - 24 + 22 @@ -162,7 +162,6 @@ - diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 7327f63a5..1fb84dddc 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -1988,83 +1988,6 @@ void Main::keysChanged() onBalancesChange(); } -bool beginsWith(Address _a, bytes const& _b) -{ - for (unsigned i = 0; i < min(20, _b.size()); ++i) - if (_a[i] != _b[i]) - return false; - return true; -} - -void Main::on_newAccount_triggered() -{ - bool ok = true; - enum { NoVanity = 0, DirectICAP, FirstTwo, FirstTwoNextTwo, FirstThree, FirstFour, StringMatch }; - QStringList items = {"No vanity (instant)", "Direct ICAP address", "Two pairs first (a few seconds)", "Two pairs first and second (a few minutes)", "Three pairs first (a few minutes)", "Four pairs first (several hours)", "Specific hex string"}; - unsigned v = items.QList::indexOf(QInputDialog::getItem(this, "Vanity Key?", "Would you a vanity key? This could take several hours.", items, 1, false, &ok)); - if (!ok) - return; - - bytes bs; - if (v == StringMatch) - { - QString s = QInputDialog::getText(this, "Vanity Beginning?", "Enter some hex digits that it should begin with.\nNOTE: The more you enter, the longer generation will take.", QLineEdit::Normal, QString(), &ok); - if (!ok) - return; - bs = fromHex(s.toStdString()); - } - - KeyPair p; - bool keepGoing = true; - unsigned done = 0; - function f = [&]() { - KeyPair lp; - while (keepGoing) - { - done++; - if (done % 1000 == 0) - cnote << "Tried" << done << "keys"; - lp = KeyPair::create(); - auto a = lp.address(); - if (v == NoVanity || - (v == DirectICAP && !a[0]) || - (v == FirstTwo && a[0] == a[1]) || - (v == FirstTwoNextTwo && a[0] == a[1] && a[2] == a[3]) || - (v == FirstThree && a[0] == a[1] && a[1] == a[2]) || - (v == FirstFour && a[0] == a[1] && a[1] == a[2] && a[2] == a[3]) || - (v == StringMatch && beginsWith(lp.address(), bs)) - ) - break; - } - if (keepGoing) - p = lp; - keepGoing = false; - }; - vector ts; - for (unsigned t = 0; t < std::thread::hardware_concurrency() - 1; ++t) - ts.push_back(new std::thread(f)); - f(); - for (std::thread* t: ts) - { - t->join(); - delete t; - } - - QString s = QInputDialog::getText(this, "Create Account", "Enter this account's name"); - if (QMessageBox::question(this, "Create Account", "Would you like to use additional security for this key? This lets you protect it with a different password to other keys, but also means you must re-enter the key's password every time you wish to use the account.", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) - { - bool ok = false; - std::string hint; - std::string password = getPassword("Create Account", "Enter the password you would like to use for this key. Don't forget it!", &hint, &ok); - if (!ok) - return; - m_keyManager.import(p.secret(), s.toStdString(), password, hint); - } - else - m_keyManager.import(p.secret(), s.toStdString()); - keysChanged(); -} - void Main::on_killAccount_triggered() { if (ui->ourAccounts->currentRow() >= 0) diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h index ef4e81056..db9298704 100644 --- a/alethzero/MainWin.h +++ b/alethzero/MainWin.h @@ -151,7 +151,6 @@ private slots: void on_preview_triggered(); // Account management - void on_newAccount_triggered(); void on_killAccount_triggered(); void on_importKey_triggered(); void on_reencryptKey_triggered(); diff --git a/alethzero/plugins/namers/NewAccount.cpp b/alethzero/plugins/namers/NewAccount.cpp new file mode 100644 index 000000000..64a3ea185 --- /dev/null +++ b/alethzero/plugins/namers/NewAccount.cpp @@ -0,0 +1,171 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file NewAccount.h + * @author Marek Kotewicz + * @date 2015 + */ + +#include "NewAccount.h" +#include +#include +#include +#include +#include +#include "ui_NewAccount.h" +using namespace std; +using namespace dev; +using namespace az; +using namespace eth; + +bool beginsWith(Address _a, bytes const& _b) +{ + for (unsigned i = 0; i < min(20, _b.size()); ++i) + if (_a[i] != _b[i]) + return false; + return true; +} + +DEV_AZ_NOTE_PLUGIN(NewAccount); + +NewAccount::NewAccount(MainFace* _m): + Plugin(_m, "NewAccount") +{ + connect(addMenuItem("New Account...", "menuTools", true), SIGNAL(triggered()), SLOT(create())); +} + +NewAccount::~NewAccount() +{ +} + +void NewAccount::create() +{ + QDialog d; + Ui::NewAccount u; + u.setupUi(&d); + d.setWindowTitle("New Account Wallet"); + u.hexText->setEnabled(false); + u.passwordText->setEnabled(false); + u.passwordAgainText->setEnabled(false); + u.hintText->setEnabled(false); + + QStringList items = + { + "No vanity (instant)", + "Direct ICAP address", + "Two pairs first (a few seconds)", + "Two pairs first and second (a few minutes)", + "Three pairs first (a few minutes)", + "Four pairs first (several hours)", + "Specific hex string" + }; + u.typeComboBox->addItems(items); + + void (QComboBox:: *indexChangedSignal)(int) = &QComboBox::currentIndexChanged; + connect(u.typeComboBox, indexChangedSignal, [&](int index) + { + u.hexText->setEnabled(index == StringMatch); + }); + + connect(u.additionalCheckBox, &QCheckBox::clicked, [&]() + { + bool checked = u.additionalCheckBox->checkState() == Qt::CheckState::Checked; + u.passwordText->setEnabled(checked); + u.passwordAgainText->setEnabled(checked); + u.hintText->setEnabled(checked); + }); + + connect(u.create, &QPushButton::clicked, [&]() + { + if (u.additionalCheckBox->checkState() == Qt::CheckState::Checked && !validatePassword(u)) + { + u.passwordAgainLabel->setStyleSheet("QLabel { color : red }"); + u.passwordAgainLabel->setText("Invalid! Please re-enter password correctly:"); + return; + } + + d.accept(); + }); + + if (d.exec() == QDialog::Accepted) + onDialogAccepted(u); + +} + +bool NewAccount::validatePassword(Ui::NewAccount const& _u) +{ + return QString::compare(_u.passwordText->toPlainText(), _u.passwordAgainText->toPlainText()) == 0; +} + +void NewAccount::onDialogAccepted(Ui::NewAccount const& _u) +{ + Type v = (Type)_u.typeComboBox->currentIndex(); + bytes bs = fromHex(_u.hexText->toPlainText().toStdString()); + KeyPair p = newKeyPair(v, bs); + QString s = _u.nameText->toPlainText(); + if (_u.additionalCheckBox->checkState() == Qt::CheckState::Checked) + { + std::string hint = _u.hintText->toPlainText().toStdString(); + std::string password = _u.passwordText->toPlainText().toStdString(); + main()->keyManager().import(p.secret(), s.toStdString(), password, hint); + } + else + main()->keyManager().import(p.secret(), s.toStdString()); + + main()->noteKeysChanged(); +} + +KeyPair NewAccount::newKeyPair(Type _type, bytes const& _prefix) +{ + KeyPair p; + bool keepGoing = true; + unsigned done = 0; + function f = [&]() { + KeyPair lp; + while (keepGoing) + { + done++; + if (done % 1000 == 0) + cnote << "Tried" << done << "keys"; + lp = KeyPair::create(); + auto a = lp.address(); + if (_type == NoVanity || + (_type == DirectICAP && !a[0]) || + (_type == FirstTwo && a[0] == a[1]) || + (_type == FirstTwoNextTwo && a[0] == a[1] && a[2] == a[3]) || + (_type == FirstThree && a[0] == a[1] && a[1] == a[2]) || + (_type == FirstFour && a[0] == a[1] && a[1] == a[2] && a[2] == a[3]) || + (_type == StringMatch && beginsWith(lp.address(), _prefix)) + ) + break; + } + if (keepGoing) + p = lp; + keepGoing = false; + }; + + vector ts; + for (unsigned t = 0; t < std::thread::hardware_concurrency() - 1; ++t) + ts.push_back(new std::thread(f)); + f(); + + for (std::thread* t: ts) + { + t->join(); + delete t; + } + return p; +} diff --git a/alethzero/plugins/namers/NewAccount.h b/alethzero/plugins/namers/NewAccount.h new file mode 100644 index 000000000..b0031e7f1 --- /dev/null +++ b/alethzero/plugins/namers/NewAccount.h @@ -0,0 +1,56 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file NewAccount.h + * @author Marek Kotewicz + * @date 2015 + */ + +#pragma once + +#include "MainFace.h" + + +namespace Ui +{ +class NewAccount; +} + +namespace dev +{ +namespace az +{ + +class NewAccount: public QObject, public Plugin +{ + Q_OBJECT + +public: + NewAccount(MainFace* _m); + ~NewAccount(); + +private slots: + void create(); + +private: + enum Type { NoVanity = 0, DirectICAP, FirstTwo, FirstTwoNextTwo, FirstThree, FirstFour, StringMatch }; + bool validatePassword(Ui::NewAccount const& _u); + void onDialogAccepted(Ui::NewAccount const& _u); + KeyPair newKeyPair(Type _type, bytes const& _prefix); +}; + +} +} diff --git a/alethzero/plugins/namers/NewAccount.ui b/alethzero/plugins/namers/NewAccount.ui new file mode 100644 index 000000000..d793849d8 --- /dev/null +++ b/alethzero/plugins/namers/NewAccount.ui @@ -0,0 +1,260 @@ + + + NewAccount + + + + 0 + 0 + 511 + 600 + + + + Dialog + + + + + + + + + + 16777215 + 50 + + + + <html><head/><body><p><span style=" font-weight:600;">Select new account type:</span></p></body></html> + + + true + + + + + + + + 16777215 + 16777215 + + + + + + + + + 16777215 + 50 + + + + <html><head/><body><p>Enter some hex digits it should begin with.<br/>NOTE: The more you enter, the longer generation will take.</p></body></html> + + + + + + + + 16777215 + 21 + + + + + + + + + 16777215 + 50 + + + + <html><head/><body><p><span style=" font-weight:600;">Enter this account name:</span></p></body></html> + + + + + + + + 16777215 + 21 + + + + + + + + + 16777215 + 100 + + + + <html><head/><body><p><span style=" font-weight:600;">Would you like to add additional security for this key? This lets you protect it with a different password to other keys, but also means that you need to re-enter the key's password every time you wish to use the account.</span></p></body></html> + + + true + + + + + + + Yes + + + false + + + + + + + + 16777215 + 50 + + + + <html><head/><body><p><span style=" font-weight:600;">Enter password:</span></p></body></html> + + + + + + + + 16777215 + 21 + + + + + + + + + 16777215 + 50 + + + + <html><head/><body><p><span style=" font-weight:600;">Enter password again:</span></p></body></html> + + + + + + + + 16777215 + 21 + + + + + + + + <html><head/><body><p><span style=" font-weight:600;">Enter hint:</span></p></body></html> + + + + + + + + 16777215 + 50 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 83 + 16777215 + + + + Qt::LeftToRight + + + Cancel + + + + + + + + 0 + 0 + + + + + 83 + 16777215 + + + + Qt::LeftToRight + + + &Create + + + true + + + + + + + + + + + cancel + clicked() + NewAccount + reject() + + + 381 + 483 + + + 351 + 506 + + + + +