fix: keychain test

Author: parodyBit

lib/bloc/crypto/api_crypto.dart

@@ -163,12 +163,16 @@ class ApiCrypto {
   }
 
   Future<String?> decodeKeychain(
-      {required String encoded, required String password}) async {
+      {required String xprv,
+      required String encoded,
+      required String password}) async {
     CryptoIsolate cryptoIsolate = Locator.instance.get<CryptoIsolate>();
-    return await cryptoIsolate.send(method: 'decodeKeychain', params: {
+    var resp = await cryptoIsolate.send(method: 'decodeKeychain', params: {
+      'xprv': xprv,
       'encoded': encoded,
       'password': password,
     });
+    return resp;
   }
 
   Future<String> encryptXprv(

lib/bloc/crypto/crypto_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:isolate';
 import 'dart:typed_data';
 import 'package:bloc/bloc.dart';

lib/bloc/crypto/crypto_isolate.dart

@@ -309,6 +309,7 @@ String _encodeKeychain(Map<String, dynamic> params) {
 String? _decodeKeychain(Map<String, dynamic> params) {
   String encoded = params['encoded'];
   String password = params['password'];
+  String xprv = params['xprv'];
   Uint8List dat = Uint8List.fromList(hexToBytes(encoded));
   Uint8List iv = dat.sublist(0, 16);
   Uint8List salt = dat.sublist(16, 48);
@@ -320,7 +321,9 @@ String? _decodeKeychain(Map<String, dynamic> params) {
   String plainText;
   try {
     plainText = utf8.decode(decoded).trim();
-    return plainText;
+    Xprv _xprv = Xprv.fromEncryptedXprv(xprv, json.decode(plainText)['WITNET']);
+    String address = _xprv.address.address;
+    return json.decode(plainText)['WITNET'];
   } catch (e) {
     return null;
   }

lib/shared/api_database.dart

@@ -112,9 +112,9 @@ class ApiDatabase {
     walletStorage.setCurrentAddressList(addressList);
   }
 
-  Future<bool> verifyPassword(String password) async {
+  Future<bool> verifyPassword(String xprv, String password) async {
     try {
-      bool isValidPasssword = await db.verifyPassword(password);
+      bool isValidPasssword = await db.verifyPassword(xprv, password);
       if (isValidPasssword) {
         unlocked = true;
       }
@@ -128,7 +128,8 @@ class ApiDatabase {
   Future<bool> verifyLogin(String password) async {
     try {
       String? key = await getKeychain();
-      var value = await verifyPassword(password);
+      List<Wallet> w = await db.walletRepository.getWallets(db.database);
+      var value = await verifyPassword(w[0].xprv!, password);
       // Avoid validating the password when importing a new wallet and a keychain is already unlocked
       return key != '' ? true : value;
     } catch (e) {
@@ -150,7 +151,8 @@ class ApiDatabase {
 
   Future<bool> setPassword(String newPassword,
       [String? oldPassword = null]) async {
-    return await db.setPassword(newPassword, oldPassword);
+    List<Wallet> w = await db.walletRepository.getWallets(db.database);
+    return await db.setPassword(w[0].xprv!, newPassword, oldPassword);
   }
 
   Future<bool> openDatabase() async {

lib/util/storage/database/database_service.dart

@@ -208,15 +208,15 @@ class DatabaseService {
     return keyExists;
   }
 
-  Future<bool> verifyPassword(String password) async {
+  Future<bool> verifyPassword(String xprv, String password) async {
     try {
       bool keyExists = await masterKeySet();
       if (!keyExists) {
         return false;
       }
 
       String? key = await keyChain.getKey();
-      bool valid = await keyChain.validatePassword(key, password);
+      bool valid = await keyChain.validatePassword(xprv, key, password);
       if (valid) {
         unlocked = true;
       }
@@ -227,9 +227,10 @@ class DatabaseService {
     }
   }
 
-  Future<bool> setPassword(String newPassword, String? oldPassword) async {
+  Future<bool> setPassword(
+      String xprv, String newPassword, String? oldPassword) async {
     try {
-      bool success = await keyChain.setKey(newPassword, oldPassword);
+      bool success = await keyChain.setKey(xprv, newPassword, oldPassword);
       return success;
     } catch (e) {
       return false;

lib/util/storage/database/encrypt/keychain.dart

@@ -18,13 +18,17 @@ class KeyChain {
     return await apiCrypto.encodeKeychain(password: password);
   }
 
-  Future<String?> decode(String encoded, String password) async {
+  Future<String?> decode(String xprv, String encoded, String password) async {
     String encoded = await encode(password);
-    return await apiCrypto.decodeKeychain(encoded: encoded, password: password);
+    String? decoded = await apiCrypto.decodeKeychain(
+        xprv: xprv, encoded: encoded, password: password);
+    return decoded;
   }
 
-  Future<bool> validatePassword(String encoded, String password) async {
-    unlocked = (await decode(encoded, password) == null) ? false : true;
+  Future<bool> validatePassword(
+      String xprv, String encoded, String password) async {
+    String? valid = await decode(xprv, encoded, password);
+    unlocked = valid != null ? true : false;
     return unlocked;
   }
 
@@ -51,12 +55,13 @@ class KeyChain {
     }
   }
 
-  Future<bool> setKey(String newPassword, String? oldPassword) async {
+  Future<bool> setKey(
+      String xprv, String newPassword, String? oldPassword) async {
     bool exists = await keyExists();
     String encodedKey = await encode(newPassword);
     if (exists) {
       String key = await getKey();
-      bool valid = await validatePassword(key, oldPassword!);
+      bool valid = await validatePassword(xprv, key, oldPassword!);
       if (!valid) {
         return false;
       }

lib/widgets/witnet/transactions/value_transfer/modals/unlock_keychain_modal.dart

@@ -39,7 +39,9 @@ Future<String?> unlockKeychainModal(
                 _password = password;
                 try {
                   if (validate) {
-                    bool valid = await apiDatabase.verifyPassword(password);
+                    bool valid = await apiDatabase.verifyPassword(
+                        apiDatabase.walletStorage.currentWallet.xprv!,
+                        password);
                     if (!valid) {
                       setState(() => _passwordInputErrorText =
                           localization.invalidPassword);

test/util/storage/database/encrypt/keychain_test.dart

@@ -1,17 +1,24 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:my_wit_wallet/shared/locator.dart';
 import 'package:test/test.dart';
 import 'package:my_wit_wallet/util/storage/database/encrypt/keychain.dart';
 
 void main() async {
+  await dotenv.load(fileName: ".env");
+  Locator.setup();
+  String sheikahXprv = dotenv.get('SHEIKAH_XPRV');
   test('Password Encryption Test', () async {
     KeyChain keyChain = KeyChain();
     final String password = 'Witnet';
     final String incorrectPassword = 'Witnet1';
 
     var encoded = await keyChain.encode(password);
 
-    expect(await keyChain.validatePassword(encoded, password), true);
-    expect(await keyChain.validatePassword(encoded, incorrectPassword), false);
-    expect(keyChain.decode(encoded, password).runtimeType, String);
-    expect(keyChain.decode(encoded, incorrectPassword).runtimeType, Null);
+    var decoded = await keyChain.decode(sheikahXprv, encoded, password);
+    var decodedIncorrect =
+        await keyChain.decode(sheikahXprv, encoded, incorrectPassword);
+    expect(decoded,
+        'a70cf2d30f83959261e6180437d3e21f6e4c1572894274a89de2d94a598201a1');
+    expect(decoded == decodedIncorrect, false);
   });
 }