Julian/various fixes

Dockerfile

@@ -63,11 +63,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "build-tools;36.0.0" \
+      "build-tools;37.0.0" \
       "platforms;android-32" \
       "platforms;android-33" \
       "platforms;android-34" \
       "platforms;android-35" \
       "platforms;android-36" \
+      "platforms;android-37" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \
@@ -148,11 +151,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "build-tools;36.0.0" \
+      "build-tools;37.0.0" \
       "platforms;android-32" \
       "platforms;android-33" \
       "platforms;android-34" \
       "platforms;android-35" \
       "platforms;android-36" \
+      "platforms;android-37" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \

android/gradle.properties

@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+# Jetifier removed in AGP 9; all deps are AndroidX already.
+# Preserve Flutter's legacy Kotlin and Android DSL compatibility on AGP 9.
+android.newDsl=false
+android.builtInKotlin=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-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.11.1' apply false
-    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
+    id "com.android.application" version '9.1.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.3.20" apply false
 }
 
 include ":app"

lib/db/isar/main_db.dart

@@ -349,6 +349,7 @@ class MainDB {
               blockTime: utxo.blockTime,
               blockHeight: utxo.blockHeight,
               blockHash: utxo.blockHash,
+              otherData: utxo.otherData,
               // passing null keeps the stored value
               isBlocked: applyAutoBlock ? true : null,
               blockedReason: applyAutoBlock ? utxo.blockedReason : null,
@@ -463,52 +464,14 @@ class MainDB {
   //
   Future<void> deleteWalletBlockchainData(String walletId) async {
     await isar.writeTxn(() async {
-      final transactionCount = await getTransactions(walletId).count();
-      final transactionCountV2 = await isar.transactionV2s
-          .where()
-          .walletIdEqualTo(walletId)
-          .count();
-      final addressCount = await getAddresses(walletId).count();
-      final utxoCount = await getUTXOs(walletId).count();
-
-      const paginateLimit = 100;
-
       // transactions
-      for (int i = 0; i < transactionCount; i += paginateLimit) {
-        final txnIds = await getTransactions(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.transactions.deleteAll(txnIds);
-      }
-
+      await getTransactions(walletId).deleteAll();
       // transactions V2
-      for (int i = 0; i < transactionCountV2; i += paginateLimit) {
-        final txnIds = await isar.transactionV2s
-            .where()
-            .walletIdEqualTo(walletId)
-            .offset(i)
-            .limit(paginateLimit)
-            .idProperty()
-            .findAll();
-        await isar.transactionV2s.deleteAll(txnIds);
-      }
-
+      await isar.transactionV2s.where().walletIdEqualTo(walletId).deleteAll();
       // addresses
-      for (int i = 0; i < addressCount; i += paginateLimit) {
-        final addressIds = await getAddresses(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.addresses.deleteAll(addressIds);
-      }
-
+      await getAddresses(walletId).deleteAll();
       // utxos
-      for (int i = 0; i < utxoCount; i += paginateLimit) {
-        final utxoIds = await getUTXOs(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.utxos.deleteAll(utxoIds);
-      }
-
+      await getUTXOs(walletId).deleteAll();
       // spark coins
       await isar.sparkCoins
           .where()
@@ -518,28 +481,14 @@ class MainDB {
   }
 
   Future<void> deleteAddressLabels(String walletId) async {
-    final addressLabelCount = await getAddressLabels(walletId).count();
     await isar.writeTxn(() async {
-      const paginateLimit = 50;
-      for (int i = 0; i < addressLabelCount; i += paginateLimit) {
-        final labelIds = await getAddressLabels(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.addressLabels.deleteAll(labelIds);
-      }
+      await getAddressLabels(walletId).deleteAll();
     });
   }
 
   Future<void> deleteTransactionNotes(String walletId) async {
-    final noteCount = await getTransactionNotes(walletId).count();
     await isar.writeTxn(() async {
-      const paginateLimit = 50;
-      for (int i = 0; i < noteCount; i += paginateLimit) {
-        final labelIds = await getTransactionNotes(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.transactionNotes.deleteAll(labelIds);
-      }
+      await getTransactionNotes(walletId).deleteAll();
     });
   }
 

lib/db/special_migrations.dart

@@ -43,7 +43,9 @@ abstract class CampfireMigration {
       final myHive = HiveImpl();
       myHive.init(appDirectory.path);
       _wallets = await myHive.openBox<dynamic>('wallets');
-      _secureStore = const FlutterSecureStorage();
+      _secureStore = const FlutterSecureStorage(
+        aOptions: AndroidOptions(resetOnError: false, migrateWithBackup: true),
+      );
     } else {
       await setDidRun();
     }

lib/electrumx_rpc/electrumx_client.dart

@@ -210,8 +210,9 @@ class ElectrumXClient {
 
   Future<bool> _allow() async {
     if (_prefs.wifiOnly) {
-      return (await Connectivity().checkConnectivity()) ==
-          ConnectivityResult.wifi;
+      return (await Connectivity().checkConnectivity()).contains(
+        ConnectivityResult.wifi,
+      );
     }
     return true;
   }
@@ -519,7 +520,11 @@ class ElectrumXClient {
   /// Ping the server to ensure it is responding
   ///
   /// Returns true if ping succeeded
-  Future<bool> ping({String? requestID, int retryCount = 1}) async {
+  Future<bool> ping({
+    String? requestID,
+    int retryCount = 1,
+    Duration timeout = const Duration(seconds: 30),
+  }) async {
     try {
       // This doesn't work because electrum_adapter only returns the result:
       // (which is always `null`).
@@ -535,14 +540,15 @@ class ElectrumXClient {
       return await request(
             requestID: requestID,
             command: 'server.ping',
-            requestTimeout: const Duration(seconds: 30),
+            requestTimeout: timeout,
             retries: retryCount,
           ).timeout(
-            const Duration(seconds: 30),
+            timeout,
             onTimeout: () {
               Logging.instance.d(
                 "ElectrumxClient.ping timed out with retryCount=$retryCount, host=$_host",
               );
+              return false;
             },
           )
           as bool;

lib/main.dart

@@ -303,7 +303,12 @@ void main(List<String> args) async {
         await DbVersionMigrator().migrate(
           dbVersion,
           secureStore: const SecureStorageWrapper(
-            store: FlutterSecureStorage(),
+            store: FlutterSecureStorage(
+              aOptions: AndroidOptions(
+                resetOnError: false,
+                migrateWithBackup: true,
+              ),
+            ),
             isDesktop: false,
           ),
         );

lib/models/exchange/incomplete_exchange.dart

@@ -28,6 +28,10 @@ class IncompleteExchangeModel extends ChangeNotifier {
   final Decimal sendAmount;
   final Decimal receiveAmount;
 
+  String get payInAmount => trade?.payInAmount ?? sendAmount.toString();
+
+  Decimal? get payInDecimal => Decimal.tryParse(payInAmount);
+
   final ExchangeRateType rateType;
 
   final bool reversed;
@@ -55,6 +59,28 @@ class IncompleteExchangeModel extends ChangeNotifier {
     }
   }
 
+  String? _extraId;
+
+  String? get extraId => _extraId;
+
+  set extraId(String? extraId) {
+    if (_extraId != extraId) {
+      _extraId = extraId;
+      notifyListeners();
+    }
+  }
+
+  String? _refundExtraId;
+
+  String? get refundExtraId => _refundExtraId;
+
+  set refundExtraId(String? refundExtraId) {
+    if (_refundExtraId != refundExtraId) {
+      _refundExtraId = refundExtraId;
+      notifyListeners();
+    }
+  }
+
   Estimate? _estimate;
 
   Estimate? get estimate => _estimate;

lib/models/isar/models/blockchain_data/utxo.dart

@@ -86,12 +86,10 @@ class UTXO {
     int? overrideMinConfirms, // added to handle namecoin name op outputs
   }) {
     final confirmations = getConfirmations(currentChainHeight);
-
-    if (overrideMinConfirms != null) {
-      return confirmations >= overrideMinConfirms;
-    }
-    return confirmations >=
+    final requiredConfirmations =
+        overrideMinConfirms ??
         (isCoinbase ? minimumCoinbaseConfirms : minimumConfirms);
+    return confirmations >= max(requiredConfirmations, mwebPegoutMaturity ?? 0);
   }
 
   /// A lingering [blockedReason] on an unblocked utxo means the wallet
@@ -107,6 +105,24 @@ class UTXO {
     return keyImage != null;
   }
 
+  @ignore
+  int? get mwebPegoutMaturity {
+    if (otherData == null) {
+      return null;
+    }
+
+    try {
+      final value =
+          (jsonDecode(otherData!) as Map)[UTXOOtherDataKeys.mwebPegoutMaturity];
+      return value is int && value > 0 ? value : null;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  @ignore
+  bool get isMwebPegout => mwebPegoutMaturity != null;
+
   @ignore
   String? get keyImage {
     if (otherData == null) {
@@ -189,6 +205,7 @@ class UTXO {
 
 abstract final class UTXOOtherDataKeys {
   static const keyImage = "keyImage";
+  static const mwebPegoutMaturity = "mwebPegoutMaturity";
   static const spent = "spent";
   static const nameOpData = "nameOpData";
 }

lib/models/node_model.dart

@@ -69,6 +69,54 @@ class NodeModel {
     this.nodeApiSecret,
   });
 
+  factory NodeModel.fromStackBackup(
+    Map<String, dynamic> map, {
+    Set<String>? legacyPrimaryNodeIds,
+  }) {
+    final id = map['id'] as String;
+    return NodeModel(
+      host: map['host'] as String,
+      port: map['port'] as int,
+      name: map['name'] as String,
+      id: id,
+      useSSL: _backupBool(map['useSSL'], fallback: true),
+      loginName: map['loginName'] as String?,
+      enabled: _backupBool(map['enabled'], fallback: true),
+      coinName: map['coinName'] as String,
+      isFailover: _backupBool(map['isFailover'], fallback: false),
+      isDown: _backupBool(map['isDown'], fallback: false),
+      trusted: _nullableBackupBool(map['trusted']),
+      torEnabled: _backupBool(map['torEnabled'], fallback: true),
+      clearnetEnabled: _backupBool(
+        map['clearEnabled'] ?? map['plainEnabled'],
+        fallback: true,
+      ),
+      forceNoTor: _backupBool(map['forceNoTor'], fallback: false),
+      isPrimary: _backupBool(
+        map['isPrimary'],
+        fallback: legacyPrimaryNodeIds?.contains(id) ?? false,
+      ),
+      nodeApiSecret: map['nodeApiSecret'] as String?,
+    );
+  }
+
+  static bool _backupBool(Object? value, {required bool fallback}) =>
+      _nullableBackupBool(value) ?? fallback;
+
+  static bool? _nullableBackupBool(Object? value) {
+    if (value is bool) {
+      return value;
+    }
+    if (value is String) {
+      return switch (value.trim().toLowerCase()) {
+        'true' => true,
+        'false' => false,
+        _ => null,
+      };
+    }
+    return null;
+  }
+
   NodeModel copyWith({
     String? host,
     int? port,

lib/pages/cakepay/cakepay_order_view.dart

@@ -816,7 +816,7 @@ class _CakePayOrderViewState extends ConsumerState<CakePayOrderView> {
                               : STextStyles.itemSubtitle12(context),
                         ),
                         const Spacer(),
-                        IconCopyButton(data: order.orderId),
+                        IconCopyButton(data: selected.address),
                         const SizedBox(width: 4),
                         Text("Copy", style: STextStyles.link2(context)),
                       ],