Julian/various fixes contd

.github/workflows/build.yaml

@@ -254,7 +254,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -265,6 +265,8 @@ jobs:
         run: flutter doctor -v
 
       - name: Configure app
+        env:
+          MWEBD_FETCH: '1'
         run: |
           cd scripts
           echo "yes" | ./build_app.sh \
@@ -294,23 +296,6 @@ jobs:
       - name: Get dependencies
         run: flutter pub get
 
-      # Stack Wallet uses mwebd.exe as a subprocess on Windows, not the FFI
-      # DLL, so we don't need libmwebd.dll. The upstream plugin's Windows
-      # build path requires WSL, which the GitHub runner lacks.
-      - name: Patch flutter_mwebd to skip Windows FFI build (CI workaround)
-        run: |
-          set -euo pipefail
-          cache_root="$(cygpath -u "$LOCALAPPDATA")/Pub/Cache/hosted/pub.dev"
-          plugin_dir=$(find "$cache_root" -maxdepth 1 -type d -name 'flutter_mwebd-*' -print -quit)
-          if [ -z "$plugin_dir" ] || [ ! -f "$plugin_dir/pubspec.yaml" ]; then
-            echo "::error::Could not locate flutter_mwebd in $cache_root"
-            exit 1
-          fi
-          pubspec="$plugin_dir/pubspec.yaml"
-          echo "Patching $pubspec"
-          sed -i '/^      windows:$/,/^        ffiPlugin: true$/d' "$pubspec"
-          flutter pub get
-
       - name: Create git_versions.dart stubs
         run: |
           mkdir -p crypto_plugins/flutter_libepiccash/lib
@@ -373,7 +358,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -455,7 +440,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -882,7 +867,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -971,7 +956,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -1046,7 +1031,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -1340,7 +1325,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -1429,7 +1414,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6
@@ -1506,7 +1491,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.44.8'
+          flutter-version: '3.44.9'
           channel: 'stable'
 
       - uses: actions/setup-go@v6

.github/workflows/release-mwebd-windows.yaml

@@ -6,7 +6,7 @@ on:
       mwebd_version:
         description: 'mwebd tag to build (must match _mwebdVersion in tool/build_standalone_mwebd_windows.dart)'
         required: true
-        default: 'v0.1.8'
+        default: 'v0.1.19'
 
 permissions:
   contents: write
@@ -18,9 +18,9 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
-          go-version: '1.22'
+          go-version: '1.24.13'
 
       - name: Clone mwebd
         run: git clone https://github.com/ltcmweb/mwebd.git --branch "${{ inputs.mwebd_version }}" mwebd

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.0" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \
@@ -83,7 +86,7 @@ RUN curl -fsSL https://go.dev/dl/go1.24.13.linux-amd64.tar.gz -o /tmp/go.tar.gz
 ENV FLUTTER_HOME=/opt/flutter \
     PATH=/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$PATH
 
-RUN git clone --depth 1 --branch 3.44.8 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
+RUN git clone --depth 1 --branch 3.44.9 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
  && git config --global --add safe.directory '*' \
  && flutter config --no-analytics \
  && flutter precache --linux --android \
@@ -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.0" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \
@@ -168,7 +174,7 @@ RUN curl -fsSL https://go.dev/dl/go1.24.13.linux-amd64.tar.gz -o /tmp/go.tar.gz
 ENV FLUTTER_HOME=/opt/flutter \
     PATH=/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$PATH
 
-RUN git clone --depth 1 --branch 3.44.8 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
+RUN git clone --depth 1 --branch 3.44.9 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
  && git config --global --add safe.directory '*' \
  && flutter config --no-analytics \
  && flutter precache --android \
@@ -197,15 +203,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
       libjsoncpp-dev liblzma-dev libsecret-1-dev libssl-dev \
  && rm -rf /var/lib/apt/lists/*
 
+ENV PATH=/usr/local/go/bin:$PATH
+
+RUN curl -fsSL https://go.dev/dl/go1.24.13.linux-amd64.tar.gz -o /tmp/go.tar.gz \
+ && echo "1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730  /tmp/go.tar.gz" | sha256sum -c \
+ && tar -C /usr/local -xzf /tmp/go.tar.gz \
+ && rm /tmp/go.tar.gz
+
 ENV FLUTTER_HOME=/opt/flutter \
     PATH=/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$PATH
 
-RUN git clone --depth 1 --branch 3.44.8 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
+RUN git clone --depth 1 --branch 3.44.9 https://github.com/flutter/flutter.git "$FLUTTER_HOME" \
  && git config --global --add safe.directory '*' \
  && flutter config --no-analytics \
  && flutter precache --linux \
  && chmod -R a+rwX "$FLUTTER_HOME"
 
 RUN git config --system --add safe.directory '*'
 
-RUN flutter --version
+RUN flutter --version && go version

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

@@ -10,7 +10,6 @@
 
 import 'dart:io';
 
-import 'package:decimal/decimal.dart';
 import 'package:isar_community/isar.dart';
 import 'package:tuple/tuple.dart';
 
@@ -349,6 +348,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 +463,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 +480,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();
     });
   }