Merge branch 'main' of https://github.com/cake-tech/cake_wallet into Integrate-Seed-Verification-Flow-To-Integration-Tests

Author: Blazebrain

.github/pull_request_template.md

@@ -11,3 +11,4 @@ Please include a summary of the changes and which issue is fixed / feature is ad
 - [ ] Format code
 - [ ] Look for code duplication
 - [ ] Clear naming for variables and methods
+- [ ] Manual tests in accessibility mode (TalkBack on Android) passed 

.github/workflows/pr_test_build_linux.yml

@@ -284,6 +284,9 @@ jobs:
           xmessage -timeout 30 "restore_wallet_through_seeds_flow_test" &
           rm -rf ~/.local/share/com.example.cake_wallet/ ~/Documents/cake_wallet/ ~/cake_wallet
           exec timeout --signal=SIGKILL 900 flutter drive --driver=test_driver/integration_test.dart --target=integration_test/test_suites/restore_wallet_through_seeds_flow_test.dart
+      - name: Test [cw_monero]
+        timeout-minutes: 2
+        run: cd cw_monero && flutter test
       - name: Stop screen recording, encrypt and upload
         if: always()
         run: |

android/app/build.gradle

@@ -74,9 +74,6 @@ android {
        release {
             signingConfig signingConfigs.release
 
-            shrinkResources false
-            minifyEnabled false
-
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        debug {

android/app/proguard-rules.pro

@@ -5,4 +5,5 @@
 -keep class io.flutter.view.**  { *; }
 -keep class io.flutter.**  { *; }
 -keep class io.flutter.plugins.**  { *; }
--dontwarn io.flutter.embedding.**
+-dontwarn io.flutter.embedding.**
+-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication

assets/text/Monerocom_Release_Notes.txt

@@ -1,3 +1,6 @@
-UI/UX enhancements
-Performance improvements
+Monero 12-word seed support (Wallet Groups support as well)
+Integrate DFX's OpenCryptoPay
+Exchange flow enhancements
+Hardware Wallets flow enhancements
+Minor UI enhancements
 Bug fixes

assets/text/Release_Notes.txt

@@ -1,4 +1,6 @@
-New App Logo
-UI/UX enhancements
-Performance improvements
+Monero 12-word seed support (Wallet Groups support as well)
+Integrate DFX's OpenCryptoPay
+Exchange flow enhancements
+Hardware Wallets flow enhancements
+Minor UI enhancements
 Bug fixes

cw_bitcoin/lib/litecoin_wallet.dart

@@ -329,7 +329,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
       try {
         await subscribeForUpdates();
       } catch (e) {
-        printV("failed to subcribe for updates: $e");
+        printV("failed to subscribe for updates: $e");
       }
       updateFeeRates();
       _feeRatesTimer?.cancel();
@@ -601,7 +601,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
     }
     _utxoStream = responseStream.listen(
       (Utxo sUtxo) async {
-        // we're processing utxos, so our balance could still be innacurate:
+        // we're processing utxos, so our balance could still be inaccurate:
         if (mwebSyncStatus is! SyncronizingSyncStatus && mwebSyncStatus is! SyncingSyncStatus) {
           mwebSyncStatus = SyncronizingSyncStatus();
           processingUtxos = true;

cw_core/lib/monero_wallet_utils.dart

@@ -19,15 +19,15 @@ Future<void> backupWalletFiles(String name) async {
   final newKeysFilePath = backupFileName(keysFile.path);
   final newAddressListFilePath = backupFileName(addressListFile.path);
 
-  if (cacheFile.existsSync()) {
+  if (cacheFile.existsSync() && !File(newCacheFilePath).existsSync()) {
     await cacheFile.copy(newCacheFilePath);
   }
 
-  if (keysFile.existsSync()) {
+  if (keysFile.existsSync() && !File(newKeysFilePath).existsSync()) {
     await keysFile.copy(newKeysFilePath);
   }
 
-  if (addressListFile.existsSync()) {
+  if (addressListFile.existsSync() && !File(newAddressListFilePath).existsSync()) {
     await addressListFile.copy(newAddressListFilePath);
   }
 }
@@ -83,18 +83,22 @@ Future<bool> backupWalletFilesExists(String name) async {
 Future<void> removeCache(String name) async {
   final path = await pathForWallet(name: name, type: WalletType.monero);
   final cacheFile = File(path);
-
+  final backgroundCacheFile = File(path + ".background");
   if (cacheFile.existsSync()) {
     cacheFile.deleteSync();
   }
+  if (backgroundCacheFile.existsSync()) {
+    backgroundCacheFile.deleteSync();
+  }
 }
 
 Future<void> restoreOrResetWalletFiles(String name) async {
   final backupsExists = await backupWalletFilesExists(name);
 
   if (backupsExists) {
     await removeCache(name);
-
+    // TODO(mrcyjanek): is this needed?
+    // If we remove cache then wallet should be restored from .keys file.
     await restoreWalletFiles(name);
   }
 }

cw_core/lib/wallet_type.dart

@@ -247,3 +247,38 @@ CryptoCurrency walletTypeToCryptoCurrency(WalletType type, {bool isTestnet = fal
           'Unexpected wallet type: ${type.toString()} for CryptoCurrency walletTypeToCryptoCurrency');
   }
 }
+
+WalletType? cryptoCurrencyToWalletType(CryptoCurrency type) {
+  switch (type) {
+    case CryptoCurrency.xmr:
+      return WalletType.monero;
+    case CryptoCurrency.btc:
+      return WalletType.bitcoin;
+    case CryptoCurrency.ltc:
+      return WalletType.litecoin;
+    case CryptoCurrency.xhv:
+      return WalletType.haven;
+    case CryptoCurrency.eth:
+      return WalletType.ethereum;
+    case CryptoCurrency.bch:
+      return WalletType.bitcoinCash;
+    case CryptoCurrency.nano:
+      return WalletType.nano;
+    case CryptoCurrency.banano:
+      return WalletType.banano;
+    case CryptoCurrency.maticpoly:
+      return WalletType.polygon;
+    case CryptoCurrency.sol:
+      return WalletType.solana;
+    case CryptoCurrency.trx:
+      return WalletType.tron;
+    case CryptoCurrency.wow:
+      return WalletType.wownero;
+    case CryptoCurrency.zano:
+      return WalletType.zano;
+    case CryptoCurrency.dcr:
+      return WalletType.decred;
+    default:
+      return null;
+  }
+}

cw_decred/lib/wallet.dart

@@ -222,7 +222,7 @@ abstract class DecredWalletBase
 
   Future<bool> checkSync() async {
     final syncStatusJSON = await _libwallet.syncStatus(walletInfo.name);
-    final decoded = json.decode(syncStatusJSON);
+    final decoded = json.decode(syncStatusJSON.isEmpty ? "{}" : syncStatusJSON);
 
     final syncStatusCode = decoded["syncstatuscode"] ?? 0;
     // final syncStatusStr = decoded["syncstatus"] ?? "";
@@ -710,14 +710,18 @@ abstract class DecredWalletBase
   // walletBirthdayBlockHeight checks if the wallet birthday is set and returns
   // it. Returns -1 if not.
   Future<int> walletBirthdayBlockHeight() async {
-    final res = await _libwallet.birthState(walletInfo.name);
-    final decoded = json.decode(res);
-    // Having these values set indicates that sync has not reached the birthday
-    // yet, so no birthday is set.
-    if (decoded["setfromheight"] == true || decoded["setfromtime"] == true) {
-      return -1;
+    try {
+      final res = await _libwallet.birthState(walletInfo.name);
+      final decoded = json.decode(res);
+      // Having these values set indicates that sync has not reached the birthday
+      // yet, so no birthday is set.
+      if (decoded["setfromheight"] == true || decoded["setfromtime"] == true) {
+        return -1;
+      }
+      return decoded["height"] ?? 0;
+    } on FormatException catch (_) {
+      return 0;
     }
-    return decoded["height"] ?? 0;
   }
 
   Future<bool> verifyMessage(String message, String signature, {String? address = null}) async {