Prompt for wordlist when creating a new keychain.

Author: CodeShark

src/importbip39dialog.cpp

@@ -22,6 +22,17 @@
 
 ImportBIP39Dialog::ImportBIP39Dialog(QWidget* parent)
     : QDialog(parent)
+{
+    init(); 
+}
+
+ImportBIP39Dialog::ImportBIP39Dialog(const QString& name, QWidget* parent)
+    : QDialog(parent)
+{
+    init(name);
+}
+
+void ImportBIP39Dialog::init(const QString& name)
 {
     setWindowTitle(tr("Import Wordlist"));
 
@@ -34,6 +45,13 @@ ImportBIP39Dialog::ImportBIP39Dialog(QWidget* parent)
 
     QLabel* nameLabel = new QLabel(tr("Name:"));
     m_nameEdit = new QLineEdit();
+
+    if (!name.isEmpty())
+    {
+        m_nameEdit->setText(name);
+        m_nameEdit->setReadOnly(true);
+    }
+
     QHBoxLayout* nameLayout = new QHBoxLayout();
     nameLayout->addWidget(nameLabel);
     nameLayout->addWidget(m_nameEdit);

src/importbip39dialog.h

@@ -22,11 +22,14 @@ class ImportBIP39Dialog : public QDialog
 
 public:
     ImportBIP39Dialog(QWidget* parent = NULL);
+    ImportBIP39Dialog(const QString& name, QWidget* parent = NULL);
 
     QString getName() const;
     secure_bytes_t getSeed() const;
 
 private:
+    void init(const QString& name = QString());
+
     QLineEdit* m_nameEdit;
     QLineEdit* m_wordlistEdit;
 };

src/mainwindow.cpp

@@ -695,10 +695,32 @@ void MainWindow::newKeychain()
 
             {
                 // TODO: Randomize using user input for entropy
+                secure_bytes_t seed = getRandomBytes(32);
+
+                // Prompt user to write down and verify word list
+                ViewBIP39Dialog viewDlg(name, seed, this);
+                viewDlg.exec();
+
+                while (true)
+                {
+                    try
+                    {
+                        ImportBIP39Dialog checkDlg(name, this);
+                        if (!checkDlg.exec()) return; // User canceled out
+
+                        secure_bytes_t seed2 = checkDlg.getSeed();
+                        if (seed == seed2) break;
+                        else throw std::runtime_error("Wordlists do not match.");
+                    }
+                    catch (const exception& e)
+                    {
+                        showError(e.what());
+                    } 
+                }
+
                 CoinDB::VaultLock lock(synchedVault);
                 if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
-                secure_bytes_t entropy = getRandomBytes(32);
-                synchedVault.getVault()->newKeychain(name.toStdString(), entropy);
+                synchedVault.getVault()->newKeychain(name.toStdString(), seed);
             }
 
             keychainModel->update();

src/versioninfo.cpp

@@ -16,7 +16,7 @@
 #include <openssl/opensslv.h>
 
 // Definitions
-const QString VERSIONTEXT("0.9.2 beta");
+const QString VERSIONTEXT("0.9.3 beta");
 
 const QString commitHash(COMMIT_HASH);
 const QString shortCommitHash(QString(COMMIT_HASH).left(7));