From 451e7a2a174f7e72d4d0565b70d907ee0a24f730 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Wed, 5 Aug 2020 10:32:33 +0200 Subject: [PATCH 1/4] update lib --- lib/Cargo.lock | 6 +++--- lib/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 20a242e..1ecce55 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1192,7 +1192,7 @@ dependencies = [ "blake3 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=e6ad8d96172b5538112b70daef85ede3bed0dd42)", + "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167)", ] [[package]] @@ -1655,7 +1655,7 @@ dependencies = [ [[package]] name = "silentdragonlitelib" version = "0.1.0" -source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=e6ad8d96172b5538112b70daef85ede3bed0dd42#e6ad8d96172b5538112b70daef85ede3bed0dd42" +source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167#7c65e566c44268954654d9ff3e1c26b1e1d16167" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/MyHush/librustzcash.git?rev=1a0204113d487cdaaf183c2967010e5214ff9e37)", @@ -2671,7 +2671,7 @@ dependencies = [ "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" -"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=e6ad8d96172b5538112b70daef85ede3bed0dd42)" = "" +"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index d5723a9..cd7e67b 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -12,4 +12,4 @@ crate-type = ["staticlib"] libc = "0.2.58" lazy_static = "1.4.0" blake3 = "0.3.4" -silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "e6ad8d96172b5538112b70daef85ede3bed0dd42" } +silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "7c65e566c44268954654d9ff3e1c26b1e1d16167" } From 10d12bda6bbc906a13ff55666f16d80f2a20ce5f Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Fri, 21 Aug 2020 20:25:56 +0200 Subject: [PATCH 2/4] update verify seed ui --- silentdragon-lite.pro | 1 - src/firsttimewizard.cpp | 271 +++++++++++++++++++++++++++++++++++++++- src/verifyseed.ui | 206 ++++++++++++++++++++++++++---- 3 files changed, 451 insertions(+), 27 deletions(-) diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro index 5f31054..a659d07 100644 --- a/silentdragon-lite.pro +++ b/silentdragon-lite.pro @@ -138,7 +138,6 @@ FORMS += \ src/about.ui \ src/confirm.ui \ src/privkey.ui \ - src/memodialog.ui \ src/verifyseed.ui \ src/startupencryption.ui \ src/viewalladdresses.ui \ diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp index 3227dc9..3f7ab90 100644 --- a/src/firsttimewizard.cpp +++ b/src/firsttimewizard.cpp @@ -318,12 +318,279 @@ bool NewSeedPage::validatePage() { verifyseed.setupUi(&dialog); Settings::saveRestore(&dialog); - dialog.exec(); + QString seed = parent->getSeed(); QString birthday = parent->getBirthday(); + QString word1 = seed.split(" ").at(13); + verifyseed.word1->setText(word1); + QString word2 = seed.split(" ").at(23); + verifyseed.word2->setText(word2); + QString word3 = seed.split(" ").at(11); + verifyseed.word3->setText(word3); + QString word4 = seed.split(" ").at(15); + verifyseed.word4->setText(word4); + QString word5 = seed.split(" ").at(20); + verifyseed.word5->setText(word5); + QString word6 = seed.split(" ").at(12); + verifyseed.word6->setText(word6); + QString word7 = seed.split(" ").at(16); + verifyseed.word7->setText(word7); + QString word8 = seed.split(" ").at(19); + verifyseed.word8->setText(word8); + QString word9 = seed.split(" ").at(21); + verifyseed.word9->setText(word9); + QString word10 = seed.split(" ").at(17); + verifyseed.word10->setText(word10); + QString word11 = seed.split(" ").at(14); + verifyseed.word11->setText(word11); + QString word12 = seed.split(" ").at(2); + verifyseed.word12->setText(word12); + QString word13 = seed.split(" ").at(5); + verifyseed.word13->setText(word13); + QString word14 = seed.split(" ").at(0); + verifyseed.word14->setText(word14); + QString word15 = seed.split(" ").at(10); + verifyseed.word15->setText(word15); + QString word16 = seed.split(" ").at(3); + verifyseed.word16->setText(word16); + QString word17 = seed.split(" ").at(6); + verifyseed.word17->setText(word17); + QString word18 = seed.split(" ").at(9); + verifyseed.word18->setText(word18); + QString word19 = seed.split(" ").at(22); + verifyseed.word19->setText(word19); + QString word20 = seed.split(" ").at(7); + verifyseed.word20->setText(word20); + QString word21 = seed.split(" ").at(4); + verifyseed.word21->setText(word21); + QString word22 = seed.split(" ").at(8); + verifyseed.word22->setText(word22); + QString word23 = seed.split(" ").at(18); + verifyseed.word23->setText(word23); + QString word24 = seed.split(" ").at(1); + verifyseed.word24->setText(word24); + + QObject::connect(verifyseed.word1, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word1 + " "); + verifyseed.word1->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word1->font(); + button.setStrikeOut(true); + verifyseed.word1->setFont(button); + verifyseed.word1->setEnabled(false); + }); + QObject::connect(verifyseed.word2, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word2); + verifyseed.word2->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word2->font(); + button.setStrikeOut(true); + verifyseed.word2->setFont(button); + verifyseed.word2->setEnabled(false); + }); + QObject::connect(verifyseed.word3, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word3 + " "); + verifyseed.word3->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word3->font(); + button.setStrikeOut(true); + verifyseed.word3->setFont(button); + verifyseed.word3->setEnabled(false); + }); + QObject::connect(verifyseed.word4, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word4 + " "); + verifyseed.word4->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word4->font(); + button.setStrikeOut(true); + verifyseed.word4->setFont(button); + verifyseed.word4->setEnabled(false); + }); + QObject::connect(verifyseed.word5, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word5 + " "); + verifyseed.word5->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word5->font(); + button.setStrikeOut(true); + verifyseed.word5->setFont(button); + verifyseed.word5->setEnabled(false); + }); + QObject::connect(verifyseed.word6, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word6 + " "); + verifyseed.word6->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word6->font(); + button.setStrikeOut(true); + verifyseed.word6->setFont(button); + verifyseed.word6->setEnabled(false); + }); + QObject::connect(verifyseed.word7, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word7 + " "); + verifyseed.word7->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word7->font(); + button.setStrikeOut(true); + verifyseed.word7->setFont(button); + verifyseed.word7->setEnabled(false); + }); + QObject::connect(verifyseed.word8, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word8 + " "); + verifyseed.word8->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word8->font(); + button.setStrikeOut(true); + verifyseed.word8->setFont(button); + verifyseed.word8->setEnabled(false); + }); + QObject::connect(verifyseed.word9, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word9 + " "); + verifyseed.word9->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word9->font(); + button.setStrikeOut(true); + verifyseed.word9->setFont(button); + verifyseed.word9->setEnabled(false); + }); + QObject::connect(verifyseed.word10, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word10 + " "); + verifyseed.word10->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word10->font(); + button.setStrikeOut(true); + verifyseed.word10->setFont(button); + verifyseed.word10->setEnabled(false); + }); + QObject::connect(verifyseed.word11, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word11 + " "); + verifyseed.word11->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word11->font(); + button.setStrikeOut(true); + verifyseed.word11->setFont(button); + verifyseed.word11->setEnabled(false); + }); + QObject::connect(verifyseed.word12, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word12 + " "); + verifyseed.word12->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word12->font(); + button.setStrikeOut(true); + verifyseed.word12->setFont(button); + verifyseed.word12->setEnabled(false); + }); + QObject::connect(verifyseed.word13, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word13 + " "); + verifyseed.word13->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word13->font(); + button.setStrikeOut(true); + verifyseed.word13->setFont(button); + verifyseed.word13->setEnabled(false); + }); + QObject::connect(verifyseed.word14, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word14 + " "); + verifyseed.word14->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word14->font(); + button.setStrikeOut(true); + verifyseed.word14->setFont(button); + verifyseed.word14->setEnabled(false); + }); + QObject::connect(verifyseed.word15, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word15 + " "); + verifyseed.word15->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word15->font(); + button.setStrikeOut(true); + verifyseed.word15->setFont(button); + verifyseed.word15->setEnabled(false); + }); + QObject::connect(verifyseed.word16, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word16 + " "); + verifyseed.word16->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word16->font(); + button.setStrikeOut(true); + verifyseed.word16->setFont(button); + verifyseed.word16->setEnabled(false); + }); + QObject::connect(verifyseed.word17, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word17 + " "); + verifyseed.word17->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word17->font(); + button.setStrikeOut(true); + verifyseed.word17->setFont(button); + verifyseed.word17->setEnabled(false); + }); + QObject::connect(verifyseed.word18, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word18 + " "); + verifyseed.word18->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word18->font(); + button.setStrikeOut(true); + verifyseed.word18->setFont(button); + verifyseed.word18->setEnabled(false); + }); + QObject::connect(verifyseed.word19, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word19 + " "); + verifyseed.word19->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word19->font(); + button.setStrikeOut(true); + verifyseed.word19->setFont(button); + verifyseed.word19->setEnabled(false); + }); + QObject::connect(verifyseed.word20, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word20 + " "); + verifyseed.word20->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word20->font(); + button.setStrikeOut(true); + verifyseed.word20->setFont(button); + verifyseed.word20->setEnabled(false); + }); + QObject::connect(verifyseed.word21, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word21 + " "); + verifyseed.word21->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word21->font(); + button.setStrikeOut(true); + verifyseed.word21->setFont(button); + verifyseed.word21->setEnabled(false); + }); + QObject::connect(verifyseed.word22, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word22 + " "); + verifyseed.word22->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word22->font(); + button.setStrikeOut(true); + verifyseed.word22->setFont(button); + verifyseed.word22->setEnabled(false); + }); + QObject::connect(verifyseed.word23, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word23 + " "); + verifyseed.word23->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word23->font(); + button.setStrikeOut(true); + verifyseed.word23->setFont(button); + verifyseed.word23->setEnabled(false); + }); + QObject::connect(verifyseed.word24, &QPushButton::clicked, [&] () { + + verifyseed.verify->insertPlainText(word24 + " "); + verifyseed.word24->setStyleSheet("background-color: rgb(182,182,182);"); + QFont button = verifyseed.word24->font(); + button.setStrikeOut(true); + verifyseed.word24->setFont(button); + verifyseed.word24->setEnabled(false); + }); + + dialog.exec(); - if ((verifyseed.verifyText->toPlainText() == seed) && (verifyseed.verifyBirthday->toPlainText() == birthday)) + if ((verifyseed.verify->toPlainText() == seed) && (verifyseed.verifyBirthday->toPlainText() == birthday)) { char* resp = litelib_execute("save", ""); QString reply = litelib_process_response(resp); diff --git a/src/verifyseed.ui b/src/verifyseed.ui index d21167a..3eeb0a7 100644 --- a/src/verifyseed.ui +++ b/src/verifyseed.ui @@ -6,22 +6,18 @@ 0 0 - 458 - 333 + 662 + 359 - Dialog + Please verify, that you have backup your Seed and Birthday - - - - <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Please verify, that you have backup your Seed and Birthday. </span></p></body></html> - - + + - + Please enter your Seed : @@ -29,33 +25,195 @@ - - - - 16777215 - 121 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Please enter the birthday of the Seed : + + + + + + + + - - - - 16777215 - 41 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please enter the birthday of the Seed : + + + + + + + + 16777215 + 41 + + + + + + + Qt::Horizontal From 2ae92a8434c878659594381eb41aa6ed6bf60c0f Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Fri, 21 Aug 2020 20:54:12 +0200 Subject: [PATCH 3/4] create/restore at startup if needed --- src/mainwindow.cpp | 17 ++++++++++++++++- src/startupencryption.ui | 28 ++++++++++++++-------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b598425..2a2fd3f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -633,6 +633,21 @@ void MainWindow::removeWalletEncryptionStartUp() { QDialog d(this); Ui_startup ed; ed.setupUi(&d); + + QObject::connect(ed.new_restore, &QPushButton::clicked, [&] { + + d.close(); + QFile wallet(dirwallet); + QFile walletenc(dirwalletenc); + + wallet.remove(); + walletenc.remove(); + + auto cl = new ConnectionLoader(this, rpc); + cl->loadConnection(); + + + }); if (d.exec() == QDialog::Accepted) { @@ -696,7 +711,7 @@ void MainWindow::removeWalletEncryptionStartUp() { this->doClosePw(); } - + } QString MainWindow::getPassword() diff --git a/src/startupencryption.ui b/src/startupencryption.ui index 963d2f0..a8d0325 100644 --- a/src/startupencryption.ui +++ b/src/startupencryption.ui @@ -7,7 +7,7 @@ 0 0 400 - 177 + 218 @@ -25,13 +25,13 @@ 400 - 177 + 250 SDL Startup Decryption - + @@ -45,21 +45,28 @@ - + + + + Create new Wallet or Restore + + + + Qt::Horizontal - + Encryption Passphrase: - + @@ -72,14 +79,7 @@ - - - - Qt::Horizontal - - - - + Qt::Horizontal From a4c5b9b3f32323974adfe2d2b459bb90bd7791f5 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Sat, 22 Aug 2020 09:47:07 +0200 Subject: [PATCH 4/4] hide seed and birthday while validate --- src/firsttimewizard.cpp | 6 +++++- src/mainwindow.cpp | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/firsttimewizard.cpp b/src/firsttimewizard.cpp index 3f7ab90..7c5e82d 100644 --- a/src/firsttimewizard.cpp +++ b/src/firsttimewizard.cpp @@ -318,7 +318,9 @@ bool NewSeedPage::validatePage() { verifyseed.setupUi(&dialog); Settings::saveRestore(&dialog); - + form.birthday->setVisible(false); + form.txtSeed->setVisible(false); + QString seed = parent->getSeed(); QString birthday = parent->getBirthday(); @@ -616,6 +618,8 @@ bool NewSeedPage::validatePage() { QMessageBox::warning(this, tr("Wrong Seed"), tr("Please try again") + "\n" , QMessageBox::Ok); + form.birthday->setVisible(true); + form.txtSeed->setVisible(true); return false; this->validatePage(); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2a2fd3f..d89fae4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -636,7 +636,7 @@ void MainWindow::removeWalletEncryptionStartUp() { QObject::connect(ed.new_restore, &QPushButton::clicked, [&] { - d.close(); + d.close(); QFile wallet(dirwallet); QFile walletenc(dirwalletenc); @@ -644,9 +644,7 @@ void MainWindow::removeWalletEncryptionStartUp() { walletenc.remove(); auto cl = new ConnectionLoader(this, rpc); - cl->loadConnection(); - - + cl->loadConnection(); }); if (d.exec() == QDialog::Accepted)