Merge branch 'dev' into locktime-anti-fee-sniping

Author: bc1cindy

.github/workflows/pr_test_build_linux.yml

@@ -9,7 +9,7 @@ jobs:
   PR_test_build:
     runs-on: [Linux, amd64, forlinux]
     container:
-      image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly
+      image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.41.9-ndkr28-go1.24.1-ruststablenightly
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
@@ -116,10 +116,18 @@ jobs:
           ./scripts/prepare_moneroc.sh
           mkdir -p scripts/monero_c/release
           pushd scripts/monero_c/release
-            mkdir -p $(git describe --tags)
-            pushd $(git describe --tags)
+            TAG=$(git describe --tags)
+            mkdir -p "$TAG"
+            pushd "$TAG"
               wget https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC2/release-bundle.zip
               unzip release-bundle.zip
+              # RC2's bundle puts everything under an inner v0.18.4.6-*/ dir, strip it
+              shopt -s nullglob
+              for inner in v0.18.4.6-*/; do
+                mv "$inner"* .
+                rmdir "$inner"
+              done
+              shopt -u nullglob
               rm release-bundle.zip
             popd
           popd
@@ -219,6 +227,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_core]
+        timeout-minutes: 15
+        run: cd cw_core && flutter test
       - name: Test [cw_monero]
         timeout-minutes: 15
         run: cd cw_monero && flutter test

.github/workflows/reusable-build.yml

@@ -21,7 +21,7 @@ jobs:
   PR_test_build:
     runs-on: [Linux, amd64, android]
     container:
-      image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly
+      image: ghcr.io/cake-tech/cake_wallet:debian13-flutter3.41.9-ndkr28-go1.24.1-ruststablenightly
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
@@ -115,6 +115,7 @@ jobs:
         run: |
           pushd scripts/android
             source ./app_env.sh cakewallet
+            export GITHUB_HUH=yeah
             ./app_config.sh
           popd
 

Dockerfile

@@ -1,4 +1,4 @@
-# docker buildx build --push --pull --platform linux/amd64,linux/arm64 . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:debian13-flutter3.32.0-ndkr28-go1.24.1-ruststablenightly
+# docker buildx build --push --pull --platform linux/amd64,linux/arm64 . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:debian13-flutter3.41.9-ndkr28-go1.24.1-ruststablenightly
 
 # Heavily inspired by cirrusci images
 # https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile
@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.source=https://github.com/cake-tech/cake_wallet
 ENV GOLANG_VERSION=1.24.1
 
 # Pin Flutter version to latest known-working version
-ENV FLUTTER_VERSION=3.32.0
+ENV FLUTTER_VERSION=3.41.9
 
 # Pin Android Studio, platform, and build tools versions to latest known-working version
 # Comes from https://developer.android.com/studio/#command-tools

android/gradle.properties

@@ -1,5 +1,4 @@
 org.gradle.jvmargs=-Xmx6144M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.ndk.suppressMinSdkVersionError=21
+android.ndk.suppressMinSdkVersionError=21

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-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.1" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "com.android.application" version "8.9.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.3.20" apply false
     id "com.google.gms.google-services" version "4.3.8" apply false
 }
 

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -25,10 +25,10 @@ import 'package:cw_bitcoin/psbt/signer.dart';
 import 'package:cw_bitcoin/psbt/transaction_builder.dart';
 import 'package:cw_bitcoin/psbt/v0_deserialize.dart';
 import 'package:cw_bitcoin/psbt/v0_finalizer.dart';
+import 'package:cw_core/amount/money.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_core/output_info.dart';
-import 'package:cw_core/parse_fixed.dart';
 import 'package:cw_core/payjoin_session.dart';
 import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/sync_status.dart';
@@ -349,13 +349,15 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
 
     final lBalance = await lightningWallet!.getBalance();
 
-    this.balance[CryptoCurrency.btcln] =
-        ElectrumBalance(confirmed: lBalance.toInt(), unconfirmed: 0, frozen: 0);
+    this.balance[CryptoCurrency.btcln] = ElectrumBalance(
+        confirmed: lBalance,
+        unconfirmed: Money.zero(CryptoCurrency.btcln),
+        frozen: Money.zero(CryptoCurrency.btcln));
 
     return ElectrumBalance(
       confirmed: balance.confirmed,
       unconfirmed: balance.unconfirmed,
-      frozen: balance.frozen.toInt(),
+      frozen: balance.frozen ?? Money.zero(currency),
     );
   }
 
@@ -504,19 +506,19 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     final isLNCompatible = await lightningWallet?.isCompatible(lnAddr);
     if ((credentials.coinTypeToSpendFrom == UnspentCoinType.lightning && lightningWallet != null) ||
         isLNCompatible == true) {
-      BigInt amount;
+      Money amount;
       if (credentials.outputs.first.sendAll) {
         amount = await lightningWallet!.getBalance();
       } else {
-        amount = parseFixed(
-            credentials.outputs.first.cryptoAmount?.isNotEmpty == true
-                ? credentials.outputs.first.cryptoAmount!
-                : "0",
-            8);
+        amount = credentials.outputs.first.cryptoAmount;
       }
 
-      return lightningWallet!.createTransaction(lnAddr, amount > BigInt.zero ? amount : null,
-          credentials.priority, credentials.outputs.first.sendAll);
+
+      return lightningWallet!.createTransaction(
+          lnAddr,
+          amount.amount > BigInt.zero ? amount.amount : null,
+          credentials.priority,
+          credentials.outputs.first.sendAll,);
     }
 
     final tx = (await super.createTransaction(credentials)) as PendingBitcoinTransaction;
@@ -535,7 +537,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
                 ))
             .toList(),
         cwOutputs: credentials.outputs,
-        fee: BigInt.from(tx.fee),
+        fee: tx.fee.amount,
         network: network,
         memo: credentials.outputs.first.memo,
         outputOrdering: BitcoinOrdering.none,
@@ -554,8 +556,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     tx.commitOverride = () async {
       final sender =
           await payjoinManager.initSender(payjoinUri!, originalPsbt, int.parse(tx.feeRate));
-      payjoinManager.spawnNewSender(
-          sender: sender, pjUrl: payjoinUri, amount: BigInt.from(tx.amount));
+      payjoinManager.spawnNewSender(sender: sender, pjUrl: payjoinUri, amount: tx.amount.amount);
     };
 
     return tx;
@@ -575,8 +576,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       btcTx,
       type,
       electrumClient: electrumClient,
-      amount: 0,
-      fee: 0,
+      amount: Money.zero(currency),
+      fee: Money.zero(currency),
       feeRate: "",
       network: network,
       hasChange: true,
@@ -633,8 +634,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
         btcTx,
         type,
         electrumClient: electrumClient,
-        amount: 0,
-        fee: 0,
+        amount: Money.zero(currency),
+        fee: Money.zero(currency),
         feeRate: "",
         network: network,
         hasChange: true,

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -153,11 +153,24 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
 
   @override
   String get addressForExchange {
-    if (addressPageType == LightningAddressType.p2l) {
-      final addresses = receiveAddresses
-          .where((element) => element.type == SegwitAddresType.p2wpkh && !element.isUsed);
-      return addresses.first.address;
+
+    final current = getFreshAddress();
+    final availableReceiveAddresses = receiveAddresses.where((element) =>
+        !element.isUsed &&
+            !element.isHidden &&
+            !hiddenAddresses.contains(element.address));
+
+    final bool isSilentPaymentsPage = addressPageType == SilentPaymentsAddresType.p2sp;
+    final bool isLightningPage = addressPageType == LightningAddressType.p2l;
+
+    if (isSilentPaymentsPage || isLightningPage) {
+      final segwit = availableReceiveAddresses
+          .where((e) => e.type == SegwitAddresType.p2wpkh)
+          .map((e) => e.address)
+          .toList();
+
+      return segwit.isNotEmpty ? segwit.first : current;
     }
-    return address;
+    return current;
   }
 }

cw_bitcoin/lib/electrum_balance.dart

@@ -1,49 +1,52 @@
 import 'dart:convert';
 
+import 'package:cw_core/amount/money.dart';
 import 'package:cw_core/balance.dart';
+import 'package:cw_core/currency.dart';
 
 class ElectrumBalance extends Balance {
   ElectrumBalance({
     required this.confirmed,
     required this.unconfirmed,
-    required int frozen,
-    this.secondConfirmed = 0,
-    this.secondUnconfirmed = 0,
-  }) : this._frozen = frozen, super.fromInt(confirmed, unconfirmed,
-            secondAvailable: secondConfirmed, secondAdditional: secondUnconfirmed, frozen: frozen);
+    required this.frozen,
+    this.secondConfirmed,
+    this.secondUnconfirmed,
+  }) : super(confirmed, unconfirmed,
+            secondAvailable: secondConfirmed, secondUnavailable: secondUnconfirmed);
 
-  static ElectrumBalance? fromJSON(String? jsonSource) {
+  Money confirmed;
+  Money unconfirmed;
+  Money? secondConfirmed;
+  Money? secondUnconfirmed;
+
+  @override
+  Money get available => (confirmed + unconfirmed) - frozen;
+
+  @override
+  Money get unavailable => unconfirmed;
+
+  @override
+  Money frozen;
+
+  static ElectrumBalance? fromJSON(String? jsonSource, Currency currency) {
     if (jsonSource == null) return null;
 
     final decoded = json.decode(jsonSource) as Map;
 
     return ElectrumBalance(
-      confirmed: decoded['confirmed'] as int? ?? 0,
-      unconfirmed: decoded['unconfirmed'] as int? ?? 0,
-      frozen: decoded['frozen'] as int? ?? 0,
-      secondConfirmed: decoded['secondConfirmed'] as int? ?? 0,
-      secondUnconfirmed: decoded['secondUnconfirmed'] as int? ?? 0,
+      confirmed: Money.fromInt(decoded['confirmed'] as int? ?? 0, currency),
+      unconfirmed: Money.fromInt(decoded['unconfirmed'] as int? ?? 0, currency),
+      frozen: Money.fromInt(decoded['frozen'] as int? ?? 0, currency),
+      secondConfirmed: Money.fromInt(decoded['secondConfirmed'] as int? ?? 0, currency),
+      secondUnconfirmed: Money.fromInt(decoded['secondUnconfirmed'] as int? ?? 0, currency),
     );
   }
 
-  int confirmed;
-  int unconfirmed;
-  final int _frozen;
-
-  @override
-  BigInt get frozen => BigInt.from(_frozen);
-
-  int secondConfirmed = 0;
-  int secondUnconfirmed = 0;
-
-  @override
-  BigInt get fullAvailableBalance => BigInt.from((confirmed + unconfirmed) + secondConfirmed - _frozen);
-
   String toJSON() => json.encode({
-        'confirmed': confirmed,
-        'unconfirmed': unconfirmed,
-        'frozen': _frozen,
-        'secondConfirmed': secondConfirmed,
-        'secondUnconfirmed': secondUnconfirmed,
+        'confirmed': confirmed.amount.toInt(),
+        'unconfirmed': unavailable.amount.toInt(),
+        'frozen': frozen.amount.toInt(),
+        'secondConfirmed': secondAvailable?.amount.toInt() ?? 0,
+        'secondUnconfirmed': secondUnavailable?.amount.toInt() ?? 0,
       });
 }