Merge branch 'main' into migrate-mempool-instance

.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/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.4"
           channel: stable
 
       - name: Install package dependencies
@@ -131,12 +131,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.4"
           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: |

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/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

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!
 

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/electrum_wallet.dart

@@ -486,10 +486,11 @@ abstract class ElectrumWalletBase
 
   @action
   Future<void> updateFeeRates() async {
-    if (await checkIfMempoolAPIIsEnabled()) {
+    if (await checkIfMempoolAPIIsEnabled() && type == WalletType.bitcoin) {
       try {
-        final response =
-            await http.get(Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended"));
+        final response = await http
+            .get(Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended"))
+            .timeout(Duration(seconds: 5));
 
         final result = json.decode(response.body) as Map<String, dynamic>;
         final slowFee = (result['economyFee'] as num?)?.toInt() ?? 0;