Merge branch 'main' into updatable-builds

.github/workflows/cache_dependencies.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.4"
           channel: stable
 
       - name: Install package dependencies

.github/workflows/no_print_in_dart.yaml

@@ -0,0 +1,21 @@
+name: No print statements in dart files
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  PR_test_build:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for print() statements in dart code (use printV() instead)
+        if: github.event_name == 'pull_request'
+        run: |
+          GIT_GREP_OUT="$(git grep ' print(' | (grep .dart: || test $? = 1) | (grep -v print_verbose.dart || test $? = 1) || true)"
+          [[ "x$GIT_GREP_OUT" == "x" ]] && exit 0
+          echo "$GIT_GREP_OUT"
+          echo "There are .dart files which use print() statements"
+          echo "Please use printV from package: cw_core/utils/print_verbose.dart"
+          exit 1

.github/workflows/pr_test_build_android.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.0"
           channel: stable
 
       - name: Install package dependencies
@@ -136,12 +136,12 @@ jobs:
       - name: Generate key properties
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=$STORE_PASS keyPassword=$KEY_PASS
+          dart run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=$STORE_PASS keyPassword=$KEY_PASS
 
       - name: Generate localization
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_localization.dart
+          dart run tool/generate_localization.dart
 
       - name: Build generated code
         run: |

.github/workflows/pr_test_build_linux.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.0"
           channel: stable
 
       - name: Install package dependencies
@@ -111,7 +111,7 @@ jobs:
       - name: Generate localization
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_localization.dart
+          dart run tool/generate_localization.dart
 
       - name: Build generated code
         run: |

README.md

@@ -99,6 +99,17 @@ Cake Wallet includes support for several cryptocurrencies, including:
 * F-Droid: https://fdroid.cakelabs.com
 * APK: https://github.com/cake-tech/cake_wallet/releases
 
+### APK Verification
+
+APK releases on GitHub, Accrescent, and F-Droid use the same key. They can easily be verified using [apksigner](https://developer.android.com/tools/apksigner#options-verify) or [AppVerifier](https://github.com/soupslurpr/AppVerifier).
+
+See below for Cake Wallet's SHA-256 signing certificate hash:
+
+```
+com.cakewallet.cake_wallet
+C5:40:53:AB:0F:10:D9:54:17:62:A3:DA:76:65:AE:3D:BA:5E:7C:74:3A:B4:F1:08:A5:34:9D:62:AC:10:6E:F5
+```
+
 # Support
 
 We have 24/7 free support. Please contact [email protected]

android/app/build.gradle

@@ -38,11 +38,14 @@ if (appPropertiesFile.exists()) {
 
 android {
     compileSdkVersion 34
+    buildToolsVersion "34.0.0"
 
     lintOptions {
         disable 'InvalidPackage'
     }
 
+    namespace "com.cakewallet.cake_wallet"
+
     defaultConfig {
         applicationId appProperties['id']
         minSdkVersion 24
@@ -80,7 +83,7 @@ android {
        }
    }
 
-    ndkVersion "25.1.8937393"
+    ndkVersion "27.0.12077973"
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cakewallet.cake_wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifestBase.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="__APP_PACKAGE__">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cakewallet.cake_wallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.8.21'
+    ext.kotlin_version = '2.0.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

android/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx3072M
+org.gradle.jvmargs=-Xmx4096M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

assets/bitcoin_electrum_server_list.yml

@@ -1,6 +1,3 @@
--
-  uri: electrum.cakewallet.com:50002
-  useSSL: true
 -
   uri: btc-electrum.cakewallet.com:50002
   useSSL: true

assets/node_list.yml

@@ -2,6 +2,7 @@
   uri: xmr-node.cakewallet.com:18081
   is_default: true
   trusted: true
+  useSSL: true
 -
   uri: cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081
   is_default: false

assets/text/Monerocom_Release_Notes.txt

@@ -1,3 +1,2 @@
-Monero enhancements
-Introducing StealthEx and LetxExchange
-Bug fixes
+UI/UX enhancements
+Bug fixes and app improvements

assets/text/Release_Notes.txt

@@ -1,7 +1,2 @@
-Added Litecoin MWEB
-Added wallet groups
-Silent Payment enhancements for speed & reliability
-Monero enhancements
-Introducing StealthEx and LetxExchange
-Additional ERC20 tokens scam detection
-Bug fixes
+UI/UX enhancements
+Bug fixes and app improvements

build-guide-linux.md

@@ -120,15 +120,15 @@ Install Flutter package dependencies with this command:
 
 Your CakeWallet binary will be built with some specific keys for iterate with 3rd party services. You may generate these secret keys placeholders with the following command:
 
-`$ flutter packages pub run tool/generate_new_secrets.dart`
+`$ dart run tool/generate_new_secrets.dart`
 
 We will generate mobx models for the project.
 
 `$ ./model_generator.sh`
 
 Then we need to generate localization files.
 
-`$ flutter packages pub run tool/generate_localization.dart`
+`$ dart run tool/generate_localization.dart`
 
 ### 5. Build!
 

build-guide-win.md

@@ -0,0 +1,38 @@
+# Building CakeWallet for Windows
+
+## Requirements and Setup
+
+The following are the system requirements to build CakeWallet for your Windows PC.
+
+```
+Windows 10 or later (64-bit), x86-64 based
+Flutter 3 or above
+```
+
+## Building CakeWallet on Windows
+
+These steps will help you configure and execute a build of CakeWallet from its source code.
+
+### 1. Installing Package Dependencies
+
+For build CakeWallet windows application from sources you will be needed to have:
+> [Install Flutter]Follow installation guide (https://docs.flutter.dev/get-started/install/windows) and install do not miss to dev tools (install https://docs.flutter.dev/get-started/install/windows/desktop#development-tools) which are required for windows desktop development (need to install Git for Windows and Visual Studio 2022). Then install `Desktop development with C++` packages via GUI Visual Studio 2022, or Visual Studio Build Tools 2022 including: `C++ Build Tools core features`, `C++ 2022 Redistributable Update`, `C++ core desktop features`, `MVC v143 - VS 2022 C++ x64/x86 build tools`, `C++ CMake tools for Windwos`, `Testing tools core features - Build Tools`, `C++ AddressSanitizer`.
+> [Install WSL] for building monero dependencies need to install Windows WSL (https://learn.microsoft.com/en-us/windows/wsl/install) and required packages for WSL (Ubuntu):
+`$ sudo apt update `
+`$ sudo apt build-essential cmake gcc-mingw-w64 g++-mingw-w64 autoconf libtool pkg-config`
+
+### 2. Pull CakeWallet source code
+
+You can downlaod CakeWallet source code from our [GitHub repository](github.com/cake-tech/cake_wallet) via git by following next command:
+`$ git clone https://github.com/cake-tech/cake_wallet.git --branch MrCyjaneK-cyjan-monerodart`
+OR you can download it as [Zip archive](https://github.com/cake-tech/cake_wallet/archive/refs/heads/MrCyjaneK-cyjan-monerodart.zip)
+
+### 3. Build Monero, Monero_c and their dependencies
+
+For use monero in the application need to build Monero wrapper - Monero_C which will be used by monero.dart package. For that need to run shell (bash - typically same named utility should be available after WSL is enabled in your system) with previously installed WSL, then change current directory to the application project directory with your used shell and then change current directory to `scripts/windows`: `$ cd scripts/windows`. Run build script: `$ ./build_all.sh`.
+
+### 4. Configure and build CakeWallet application
+
+To configure the application open directory where you have downloaded or unarchived CakeWallet sources and run `cakewallet.bat`.
+Or if you used WSL and have active shell session you can run `$ ./cakewallet.sh` script in `scripts/windows` which will run `cakewallet.bat` in WSL.
+After execution of `cakewallet.bat` you should to get `Cake Wallet.zip` in project root directory which will contains `CakeWallet.exe` file and another needed files for run the application. Now you can extract files from `Cake Wallet.zip` archive and run the application.

configure_cake_wallet.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x -e
 IOS="ios"
 ANDROID="android"
 MACOS="macos"
@@ -36,6 +36,6 @@ fi
 source ./app_env.sh cakewallet
 ./app_config.sh
 cd ../.. && flutter pub get
-flutter packages pub run tool/generate_localization.dart
-./model_generator.sh
+dart run tool/generate_localization.dart
+#./model_generator.sh
 #cd macos && pod install

cw_bitcoin/lib/bitcoin_hardware_wallet_service.dart

@@ -6,6 +6,7 @@ import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/hardware/hardware_account_data.dart';
 import 'package:ledger_bitcoin/ledger_bitcoin.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 
 class BitcoinHardwareWalletService {
   BitcoinHardwareWalletService(this.ledgerConnection);

cw_bitcoin/lib/bitcoin_wallet_service.dart

@@ -106,6 +106,15 @@ class BitcoinWalletService extends WalletService<
     final walletInfo = walletInfoSource.values
         .firstWhereOrNull((info) => info.id == WalletBase.idFor(wallet, getType()))!;
     await walletInfoSource.delete(walletInfo.key);
+
+    final unspentCoinsToDelete = unspentCoinsInfoSource.values.where(
+          (unspentCoin) => unspentCoin.walletId == walletInfo.id).toList();
+
+    final keysToDelete = unspentCoinsToDelete.map((unspentCoin) => unspentCoin.key).toList();
+
+    if (keysToDelete.isNotEmpty) {
+      await unspentCoinsInfoSource.deleteAll(keysToDelete);
+    }
   }
 
   @override

cw_bitcoin/lib/electrum.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/bitcoin_amount_format.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:flutter/foundation.dart';
 import 'package:rxdart/rxdart.dart';
 
@@ -117,17 +118,17 @@ class ElectrumClient {
             _parseResponse(message);
           }
         } catch (e) {
-          print("socket.listen: $e");
+          printV("socket.listen: $e");
         }
       },
       onError: (Object error) {
         final errorMsg = error.toString();
-        print(errorMsg);
+        printV(errorMsg);
         unterminatedString = '';
         socket = null;
       },
       onDone: () {
-        print("SOCKET CLOSED!!!!!");
+        printV("SOCKET CLOSED!!!!!");
         unterminatedString = '';
         try {
           if (host == socket?.address.host || socket == null) {
@@ -136,7 +137,7 @@ class ElectrumClient {
             socket = null;
           }
         } catch (e) {
-          print("onDone: $e");
+          printV("onDone: $e");
         }
       },
       cancelOnError: true,
@@ -181,7 +182,7 @@ class ElectrumClient {
         unterminatedString = '';
       }
     } catch (e) {
-      print("parse $e");
+      printV("parse $e");
     }
   }
 
@@ -403,7 +404,7 @@ class ElectrumClient {
     } on RequestFailedTimeoutException catch (_) {
       return null;
     } catch (e) {
-      print("getCurrentBlockChainTip: ${e.toString()}");
+      printV("getCurrentBlockChainTip: ${e.toString()}");
       return null;
     }
   }
@@ -434,7 +435,7 @@ class ElectrumClient {
 
       return subscription;
     } catch (e) {
-      print("subscribe $e");
+      printV("subscribe $e");
       return null;
     }
   }
@@ -473,7 +474,7 @@ class ElectrumClient {
 
       return completer.future;
     } catch (e) {
-      print("callWithTimeout $e");
+      printV("callWithTimeout $e");
       rethrow;
     }
   }

cw_bitcoin/lib/electrum_transaction_history.dart

@@ -5,6 +5,7 @@ import 'package:cw_bitcoin/electrum_transaction_info.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/utils/file.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/transaction_history.dart';
@@ -51,7 +52,7 @@ abstract class ElectrumTransactionHistoryBase
       final data = json.encode({'height': _height, 'transactions': txjson});
       await encryptionFileUtils.write(path: path, password: _password, data: data);
     } catch (e) {
-      print('Error while save bitcoin transaction history: ${e.toString()}');
+      printV('Error while save bitcoin transaction history: ${e.toString()}');
     }
   }
 
@@ -88,7 +89,7 @@ abstract class ElectrumTransactionHistoryBase
 
       _height = content['height'] as int;
     } catch (e) {
-      print(e);
+      printV(e);
     }
   }