Merge branch 'staging' into masternode-dialog-update

Author: levoncrypto

.github/workflows/build.yaml

@@ -239,6 +239,23 @@ 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
@@ -370,11 +387,6 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "build_number=${BUILD_NUMBER}" >> $GITHUB_OUTPUT
 
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: '1.71.0'
-          targets: aarch64-apple-ios
-
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable

Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
       ocl-icd-opencl-dev opencl-headers valac zlib1g-dev \
       g++-aarch64-linux-gnu gcc-aarch64-linux-gnu \
       g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \
-      openjdk-17-jdk-headless \
+      openjdk-21-jdk-headless \
  && rm -rf /var/lib/apt/lists/*
 
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
@@ -38,7 +38,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
  && cargo install cargo-ndk \
  && chmod -R a+rwX "$CARGO_HOME" "$RUSTUP_HOME"
 
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
 
 ENV ANDROID_SDK_ROOT=/opt/android-sdk \
     ANDROID_HOME=/opt/android-sdk \

asset_sources/svg/campfire/exchange_icons/exolix.png

@@ -13,6 +13,7 @@ import 'package:isar_community/isar.dart';
 import '../../../app_config.dart';
 import '../../../services/exchange/change_now/change_now_exchange.dart';
 import '../../../services/exchange/exchange.dart';
+import '../../../services/exchange/exolix/exolix_exchange.dart';
 import '../../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../../services/exchange/trocador/trocador_exchange.dart';
 import '../../../services/exchange/wizard_swap/wizard_swap_exchange.dart';
@@ -83,6 +84,8 @@ class Currency {
       // already lower case ticker basically
       const (ChangeNowExchange) => network,
 
+      const (ExolixExchange) => network.toLowerCase(),
+
       // not used at the time being
       // case const (SimpleSwapExchange):
 

asset_sources/svg/stack_duo/exchange_icons/exolix.png

@@ -1,38 +1,57 @@
-/* 
+/*
  * This file is part of Stack Wallet.
- * 
+ *
  * Copyright (c) 2023 Cypher Stack
  * All Rights Reserved.
  * The code is distributed under GPLv3 license, see LICENSE file for details.
  * Generated by Cypher Stack on 2023-05-26
  *
  */
 
+import 'package:bip47/bip47.dart';
+import 'package:bitcoindart/bitcoindart.dart' as bitcoindart;
+
 class PaynymAccountLite {
   final String nymId;
   final String nymName;
   final String code;
   final bool segwit;
+  final bool taproot;
 
   PaynymAccountLite(
     this.nymId,
     this.nymName,
     this.code,
-    this.segwit,
-  );
+    this.segwit, {
+    this.taproot = false,
+  });
 
   PaynymAccountLite.fromMap(Map<String, dynamic> map)
-      : nymId = map["nymId"] as String,
-        nymName = map["nymName"] as String,
-        code = map["code"] as String,
-        segwit = map["segwit"] as bool;
+    : nymId = map["nymId"] as String,
+      nymName = map["nymName"] as String,
+      code = map["code"] as String,
+      segwit = map["segwit"] as bool,
+      taproot = map["taproot"] as bool? ?? inferTaproot(map["code"] as String);
+
+  static bool inferTaproot(String paymentCodeString) {
+    try {
+      final pCode = PaymentCode.fromPaymentCode(
+        paymentCodeString,
+        networkType: bitcoindart.bitcoin,
+      );
+      return pCode.isTaprootEnabled();
+    } catch (_) {
+      return false;
+    }
+  }
 
   Map<String, dynamic> toMap() => {
-        "nymId": nymId,
-        "nymName": nymName,
-        "code": code,
-        "segwit": segwit,
-      };
+    "nymId": nymId,
+    "nymName": nymName,
+    "code": code,
+    "segwit": segwit,
+    "taproot": taproot,
+  };
 
   @override
   String toString() {

asset_sources/svg/stack_wallet/exchange_icons/exolix.png

@@ -15,13 +15,10 @@ class PaynymClaim {
   PaynymClaim(this.claimed, this.token);
 
   PaynymClaim.fromMap(Map<String, dynamic> map)
-      : claimed = map["claimed"] as String,
-        token = map["token"] as String;
+    : claimed = map["claimed"].toString(),
+      token = map["token"] as String;
 
-  Map<String, dynamic> toMap() => {
-        "claimed": claimed,
-        "token": token,
-      };
+  Map<String, dynamic> toMap() => {"claimed": claimed, "token": token};
 
   @override
   String toString() {

crypto_plugins/frostdart

@@ -30,6 +30,7 @@ import '../../services/exchange/change_now/change_now_exchange.dart';
 import '../../services/exchange/exchange.dart';
 import '../../services/exchange/exchange_data_loading_service.dart';
 import '../../services/exchange/exchange_response.dart';
+import '../../services/exchange/exolix/exolix_exchange.dart';
 import '../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../services/exchange/trocador/trocador_exchange.dart';
 import '../../services/exchange/wizard_swap/wizard_swap_exchange.dart';
@@ -81,6 +82,7 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
     } else {
       return [
         ChangeNowExchange.instance,
+        ExolixExchange.instance,
         TrocadorExchange.instance,
         NanswapExchange.instance,
         WizardSwapExchange.instance,