Browse Source

Merge pull request #3 from MyHush/master

sync from upstream
pull/189/head
jahway603 4 years ago
committed by GitHub
parent
commit
f5ae0a4f5f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      lib/Cargo.lock
  2. 2
      lib/Cargo.toml
  3. 1
      silentdragon-lite.pro
  4. 275
      src/firsttimewizard.cpp
  5. 15
      src/mainwindow.cpp
  6. 28
      src/startupencryption.ui
  7. 206
      src/verifyseed.ui

6
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)" = "<none>"
"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=7c65e566c44268954654d9ff3e1c26b1e1d16167)" = "<none>"
"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"

2
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" }

1
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 \

275
src/firsttimewizard.cpp

@ -318,12 +318,281 @@ bool NewSeedPage::validatePage() {
verifyseed.setupUi(&dialog);
Settings::saveRestore(&dialog);
dialog.exec();
form.birthday->setVisible(false);
form.txtSeed->setVisible(false);
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);
@ -349,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();
}

15
src/mainwindow.cpp

@ -633,6 +633,19 @@ 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 +709,7 @@ void MainWindow::removeWalletEncryptionStartUp() {
this->doClosePw();
}
}
QString MainWindow::getPassword()

28
src/startupencryption.ui

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>177</height>
<height>218</height>
</rect>
</property>
<property name="sizePolicy">
@ -25,13 +25,13 @@
<property name="maximumSize">
<size>
<width>400</width>
<height>177</height>
<height>250</height>
</size>
</property>
<property name="windowTitle">
<string>SDL Startup Decryption</string>
</property>
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
@ -45,21 +45,28 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="new_restore">
<property name="text">
<string>Create new Wallet or Restore</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Encryption Passphrase:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="4" column="0">
<widget class="QLineEdit" name="txtPassword">
<property name="minimumSize">
<size>
@ -72,14 +79,7 @@
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="4" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>

206
src/verifyseed.ui

@ -6,22 +6,18 @@
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>333</height>
<width>662</width>
<height>359</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Please verify, that you have backup your Seed and Birthday</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Please verify, that you have backup your Seed and Birthday. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<item row="0" column="0" colspan="6">
<widget class="QTextBrowser" name="verify"/>
</item>
<item row="1" column="0">
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Please enter your Seed :</string>
@ -29,33 +25,195 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QTextEdit" name="verifyText">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>121</height>
</size>
<widget class="QPushButton" name="word1">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="word2">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="word3">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QPushButton" name="word4">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="word5">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="QPushButton" name="word6">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<widget class="QPushButton" name="word7">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="word8">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="word9">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="word10">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QPushButton" name="word11">
<property name="text">
<string>Please enter the birthday of the Seed :</string>
<string/>
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="QPushButton" name="word12">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QTextEdit" name="verifyBirthday">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>41</height>
</size>
<widget class="QPushButton" name="word13">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="word14">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="word15">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QPushButton" name="word16">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="4">
<widget class="QPushButton" name="word17">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="5">
<widget class="QPushButton" name="word18">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="word19">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="word20">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="word21">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QPushButton" name="word22">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="4">
<widget class="QPushButton" name="word23">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="5">
<widget class="QPushButton" name="word24">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0" colspan="6">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Please enter the birthday of the Seed :</string>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="verifyBirthday">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>41</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item row="7" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>

Loading…
Cancel
Save