Fix private key wallets (Please re-import)

* Fixed bug to allow private key wallets to function properly - this requires the re-importing of the private key wallet in dagchat v1.2.1+

Author: derfarctor

src/app/components/accounts/structs.rs

@@ -18,15 +18,29 @@ pub struct Account {
 
 impl Account {
     pub fn with_index(wallet: &Wallet, index: u32, prefix: &str) -> Account {
-        let (private_key, public_key) = Account::get_keypair(&wallet.seed, index);
-        Account {
-            index,
-            private_key,
-            public_key,
-            address: get_address(&public_key, Some(prefix)),
-            balance: 0,
-            receivables: vec![],
-            messages: Ok(vec![]),
+        if wallet.mnemonic.is_empty() {
+            // Generate using seed as private key.
+            let public_key = Wallet::get_public_key(&wallet.seed);
+            Account {
+                index,
+                private_key: wallet.seed,
+                public_key,
+                address: get_address(&public_key, Some(prefix)),
+                balance: 0,
+                receivables: vec![],
+                messages: Ok(vec![]),
+            }
+        } else {
+            let (private_key, public_key) = Account::get_keypair(&wallet.seed, index);
+            Account {
+                index,
+                private_key,
+                public_key,
+                address: get_address(&public_key, Some(prefix)),
+                balance: 0,
+                receivables: vec![],
+                messages: Ok(vec![]),
+            }
         }
     }
 

src/app/components/wallets/structs.rs

@@ -30,11 +30,12 @@ impl Wallet {
         wallet
     }
     pub fn new_key(private_key: [u8; 32], name: String, prefix: &str) -> Wallet {
+        // Use seed field for private key for private key wallets.
         let public_key = Wallet::get_public_key(&private_key);
         let mut wallet = Wallet {
             name,
             mnemonic: String::from(""),
-            seed: [0u8; 32],
+            seed: private_key,
             indexes: vec![0],
             accounts: vec![],
             acc_idx: 0,
@@ -51,7 +52,7 @@ impl Wallet {
         wallet
     }
 
-    fn get_public_key(private_key: &[u8; 32]) -> [u8; 32] {
+    pub fn get_public_key(private_key: &[u8; 32]) -> [u8; 32] {
         let dalek = ed25519_dalek::SecretKey::from_bytes(private_key).unwrap();
         let public_key = ed25519_dalek::PublicKey::from(&dalek);
         public_key.to_bytes()

src/app/components/wallets/ui/backup.rs

@@ -65,7 +65,7 @@ pub fn backup_wallet(s: &mut Cursive) {
             );
         });
     } else {
-        let private_key = hex::encode(wallet.accounts[wallet.acc_idx].private_key);
+        let private_key = hex::encode(wallet.seed);
         content.add_button("Private key", move |s| {
             let private_key = private_key.clone();
             s.add_layer(

src/app/constants.rs

@@ -1,4 +1,4 @@
-pub const VERSION: &str = "v1.2.0";
+pub const VERSION: &str = "v1.2.1";
 pub const SHOW_TO_DP: usize = 12;
 pub const AUTHOR: &str = "derfarctor (Author)";
 pub const AUTHOR_ADDR: &str = "_3kpznqbuzs3grswcqkzitd5fwky4s5cmyt76wru7kbenfwza7q9c1f1egzhm";