Staging

.github/workflows/test.yaml

@@ -25,14 +25,6 @@ jobs:
           sudo apt clean
           sudo apt update
           sudo apt install -y unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm debhelper libclang-dev opencl-headers libssl-dev ocl-icd-opencl-dev libc6-dev-i386
-      - name: Build Lelantus
-        run: |
-         cd crypto_plugins/flutter_liblelantus/scripts/linux/
-         ./build_all.sh
-      - name: Build Monero
-        run: |
-          cd crypto_plugins/flutter_libmonero/scripts/linux/
-          ./build_monero_all.sh
       - name: Build Epic Cash
         run: |
           cd crypto_plugins/flutter_libepiccash/scripts/linux/

.gitignore

@@ -20,6 +20,9 @@
 # is commented out by default.
 #.vscode/
 
+#CppWinRT manual install
+Microsoft.Windows*
+
 # Flutter/Dart/Pub related
 **/doc/api/
 .dart_tool/
@@ -59,17 +62,18 @@ coverage
 scripts/**/build
 /lib/external_api_keys.dart
 
-libcw_monero.dll
-libcw_wownero.dll
 libepic_cash_wallet.dll
-libmobileliblelantus.dll
 libtor_ffi.dll
 flutter_libsparkmobile.dll
 secp256k1.dll
 /libisar.so
 /lib/app_config.g.dart
 /android/app/src/main/app_icon-playstore.png
 
+# Dart generated files (Freezed, Riverpod, GoRouter etc..)
+lib/**/*.g.dart
+lib/**/*.freezed.dart
+
 ## other generated project files
 
 pubspec.yaml
@@ -106,3 +110,5 @@ scripts/linux/build/libsecret/subprojects/gi-docgen/.meson-subproject-wrap-hash.
 
 crypto_plugins/cs_monero/built_outputs
 crypto_plugins/cs_monero/build
+crypto_plugins/*.diff
+/devtools_options.yaml

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "crypto_plugins/flutter_libepiccash"]
 	path = crypto_plugins/flutter_libepiccash
 	url = https://github.com/cypherstack/flutter_libepiccash.git
-[submodule "crypto_plugins/flutter_liblelantus"]
-	path = crypto_plugins/flutter_liblelantus
-	url = https://github.com/cypherstack/flutter_liblelantus.git
 [submodule "crypto_plugins/frostdart"]
 	path = crypto_plugins/frostdart
 	url = https://github.com/cypherstack/frostdart

analysis_options.yaml

@@ -92,7 +92,7 @@ linter:
     constant_identifier_names: false
     prefer_final_locals: true
     prefer_final_in_for_each: true
-    require_trailing_commas: true
+#    require_trailing_commas: true // causes issues with dart 3.7
   # avoid_print: false  # Uncomment to disable the `avoid_print` rule
   # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
 

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

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

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.6.0' apply false
+    id "com.android.application" version '8.7.0' apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 

asset_sources/default_themes/stack_wallet/.gitignore

@@ -0,0 +1,2 @@
+light/
+dark/

docs/building.md

@@ -12,20 +12,6 @@ Here you will find instructions on how to install the necessary tools for buildi
 
 The following instructions are for building and running on a Linux host.  Alternatively, see the [Mac](#mac-host) and/or [Windows](#windows-host) section.  This entire section (except for the Android Studio section) needs to be completed in WSL if building on a Windows host.
 
-### Flutter
-Install Flutter 3.29.0 by [following their guide](https://docs.flutter.dev/get-started/install/linux/desktop?tab=download#install-the-flutter-sdk).  You can also clone https://github.com/flutter/flutter, check out the `3.29.0` tag, and add its `flutter/bin` folder to your PATH as in
-```sh
-FLUTTER_DIR="$HOME/development/flutter"
-git clone https://github.com/flutter/flutter.git "$FLUTTER_DIR"
-cd "$FLUTTER_DIR"
-git checkout 3.29.0
-echo 'export PATH="$PATH:'"$FLUTTER_DIR"'/bin"' >> "$HOME/.profile"
-source "$HOME/.profile"
-flutter precache
-```
-
-Run `flutter doctor` in a terminal to confirm its installation.
-
 ### Android Studio
 Install Android Studio.  Follow instructions here [https://developer.android.com/studio/install#linux](https://developer.android.com/studio/install#linux) or install via snap:
 ```
@@ -38,7 +24,7 @@ Use `Tools > SDK Manager` to install:
  - `SDK Tools > Android SDK command line tools`
  - `SDK Tools > CMake`
 and for Android builds,
- - `SDK Tools > Android SDK (API 30)`
+ - `SDK Tools > Android SDK (API 35)`
  - `SDK Tools > NDK`
 
 Then in `File > Settings > Plugins`, install the **Flutter** and **Dart** plugins and restart the IDE.  In `File > Settings > Languages & Frameworks > Flutter > Editor`, enable auto format on save to match the project's code style.  If you have problems with the Dart SDK, make sure to run `flutter` in a terminal to download it (use `source ~/.bashrc` to update your environment variables if you're still using the same terminal from which you ran `setup.sh`).  Run `flutter doctor` to install any missing dependencies and review and agree to any license agreements.
@@ -58,7 +44,7 @@ sudo apt-get install libssl-dev curl unzip automake build-essential file pkg-con
 
 For Ubuntu 20.04,
 ```
-sudo apt-get install valac
+sudo apt-get install valac python3-pip
 pip3 install --upgrade meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1
 ```
 
@@ -68,13 +54,13 @@ sudo apt install pipx libgcrypt20-dev libglib2.0-dev libsecret-1-dev
 pipx install meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1
 ```
 
-Install [Rust](https://www.rust-lang.org/tools/install) via [rustup.rs](https://rustup.rs), the required Rust toolchains, and `cargo-ndk 2.12.7` with command:
+Install [Rust](https://www.rust-lang.org/tools/install) via [rustup.rs](https://rustup.rs), the required Rust toolchains, and `cargo-ndk` with command:
 ```
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 source ~/.bashrc
-rustup install 1.67.1 1.71.0 1.72.0 1.73.0
-rustup default 1.67.1
-cargo install cargo-ndk --version 2.12.7 --locked
+rustup install 1.85.1 1.81.0
+rustup default 1.85.1
+cargo install cargo-ndk
 ```
 
 Android specific dependencies:
@@ -89,6 +75,20 @@ sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
 pip3 install --upgrade meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1
 ```
 
+### Flutter
+Install Flutter 3.29.2 by [following their guide](https://docs.flutter.dev/get-started/install/linux/desktop?tab=download#install-the-flutter-sdk).  You can also clone https://github.com/flutter/flutter, check out the `3.29.2` tag, and add its `flutter/bin` folder to your PATH as in
+```sh
+FLUTTER_DIR="$HOME/development/flutter"
+git clone https://github.com/flutter/flutter.git "$FLUTTER_DIR"
+cd "$FLUTTER_DIR"
+git checkout 3.29.2
+echo 'export PATH="$PATH:'"$FLUTTER_DIR"'/bin"' >> "$HOME/.profile"
+source "$HOME/.profile"
+flutter precache
+```
+
+Run `flutter doctor` in a terminal to confirm its installation.
+
 ### Clone the repository and initialize submodules
 After installing the prerequisites listed above, download the code and init the submodules
 ```
@@ -209,21 +209,21 @@ brew install brotli cairo coreutils gdbm gettext glib gmp libevent libidn2 libng
 ```
 <!-- TODO: determine which of the above list are not needed at all. -->
 
-Download and install [Rust](https://www.rust-lang.org/tools/install).  [Rustup](https://rustup.rs/) is recommended for Rust setup.  Use `rustc` to confirm successful installation.  Install toolchains 1.67.1 and 1.72.0 and `cbindgen` and `cargo-lipo` too.  You will also have to add the platform target(s) `aarch64-apple-ios` and/or `aarch64-apple-darwin`.  You can use the command(s):
+Download and install [Rust](https://www.rust-lang.org/tools/install).  [Rustup](https://rustup.rs/) is recommended for Rust setup.  Use `rustc` to confirm successful installation.  Install toolchains 1.81.0 and 1.85.1 and `cbindgen` and `cargo-lipo` too.  You will also have to add the platform target(s) `aarch64-apple-ios` and/or `aarch64-apple-darwin`.  You can use the command(s):
 ```
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 source ~/.bashrc 
-rustup install 1.67.1 1.71.0 1.72.0 1.73.0
-rustup default 1.67.1
-cargo install cargo-ndk --version 2.12.7 --locked
+rustup install 1.85.1 1.81.0
+rustup default 1.85.1
+cargo install cargo-ndk
 cargo install cbindgen cargo-lipo
 rustup target add aarch64-apple-ios aarch64-apple-darwin
 ```
 
 Optionally download [Android Studio](https://developer.android.com/studio) as an IDE and activate its Dart and Flutter plugins.  VS Code may work as an alternative, but this is not recommended.
 
 ### Flutter
-Install [Flutter](https://docs.flutter.dev/get-started/install) 3.29.0 on your Mac host by following [these instructions](https://docs.flutter.dev/get-started/install/macos).  Run `flutter doctor` in a terminal to confirm its installation.
+Install [Flutter](https://docs.flutter.dev/get-started/install) 3.29.2 on your Mac host by following [these instructions](https://docs.flutter.dev/get-started/install/macos).  Run `flutter doctor` in a terminal to confirm its installation.
 
 ### Build plugins and configure
 #### Building plugins for iOS 
@@ -283,20 +283,19 @@ The WSL2 host may optionally be navigated to the `stack_wallet` repository on th
 If the DLLs were built on the WSL filesystem instead of on Windows, copy the resulting `dll`s to their respective positions on the Windows host:
 
 - `stack_wallet/crypto_plugins/flutter_libepiccash/scripts/windows/build/libepic_cash_wallet.dll`
-- `stack_wallet/crypto_plugins/flutter_liblelantus/scripts/windows/build/libmobileliblelantus.dll`
 
 <!-- TODO: script the copying or installation of libraries from WSL2 to the parent Windows host -->
 
 Frostdart will be built by the Windows host later.
 
 ### Install Flutter on Windows host
-Install Flutter 3.29.0 on your Windows host (not in WSL2) by [following their guide](https://docs.flutter.dev/get-started/install/windows/desktop?tab=download#install-the-flutter-sdk) or by cloning https://github.com/flutter/flutter, checking out the `3.29.0` tag, and adding its `flutter/bin` folder to your PATH as in
+Install Flutter 3.29.2 on your Windows host (not in WSL2) by [following their guide](https://docs.flutter.dev/get-started/install/windows/desktop?tab=download#install-the-flutter-sdk) or by cloning https://github.com/flutter/flutter, checking out the `3.29.2` tag, and adding its `flutter/bin` folder to your PATH as in
 ```bat
 @echo off
 set "FLUTTER_DIR=%USERPROFILE%\development\flutter"
 git clone https://github.com/flutter/flutter.git "%FLUTTER_DIR%"
 cd /d "%FLUTTER_DIR%"
-git checkout 3.29.0
+git checkout 3.29.2
 setx PATH "%PATH%;%FLUTTER_DIR%\bin"
 echo Flutter setup completed. Please restart your command prompt.
 ```
@@ -306,9 +305,9 @@ Run `flutter doctor` in PowerShell to confirm its installation.
 ### Rust
 Install [Rust](https://www.rust-lang.org/tools/install) on the Windows host (not in WSL2).  Download the installer from [rustup.rs](https://rustup.rs), make sure it works on the commandline (you may need to open a new terminal), and install the following versions:
 ```
-rustup install 1.67.1 1.71.0 1.72.0 1.73.0
-rustup default 1.67.1
-cargo install cargo-ndk --version 2.12.7 --locked
+rustup install 1.85.1 1.81.0
+rustup default 1.85.1
+cargo install cargo-ndk
 ```
 
 ### Windows SDK and Developer Mode

ios/Podfile.lock

@@ -11,6 +11,8 @@ PODS:
     - ReachabilitySwift
   - cs_monero_flutter_libs_ios (0.0.1):
     - Flutter
+  - cs_salvium_flutter_libs_ios (0.0.1):
+    - Flutter
   - device_info_plus (0.0.1):
     - Flutter
   - devicelocale (0.0.1):
@@ -65,8 +67,6 @@ PODS:
     - Flutter
   - isar_flutter_libs (1.0.0):
     - Flutter
-  - lelantus (0.0.1):
-    - Flutter
   - local_auth_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -87,6 +87,8 @@ PODS:
   - "sqlite3 (3.46.0+1)":
     - "sqlite3/common (= 3.46.0+1)"
   - "sqlite3/common (3.46.0+1)"
+  - "sqlite3/dbstatvtab (3.46.0+1)":
+    - sqlite3/common
   - "sqlite3/fts5 (3.46.0+1)":
     - sqlite3/common
   - "sqlite3/perf-threadsafe (3.46.0+1)":
@@ -95,7 +97,8 @@ PODS:
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - sqlite3 (~> 3.46.0)
+    - "sqlite3 (~> 3.46.0+1)"
+    - sqlite3/dbstatvtab
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -109,12 +112,15 @@ PODS:
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
+  - xelis_flutter (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
   - coinlib_flutter (from `.symlinks/plugins/coinlib_flutter/darwin`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - cs_monero_flutter_libs_ios (from `.symlinks/plugins/cs_monero_flutter_libs_ios/ios`)
+  - cs_salvium_flutter_libs_ios (from `.symlinks/plugins/cs_salvium_flutter_libs_ios/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -127,7 +133,6 @@ DEPENDENCIES:
   - frostdart (from `.symlinks/plugins/frostdart/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
-  - lelantus (from `.symlinks/plugins/lelantus/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -138,6 +143,7 @@ DEPENDENCIES:
   - tor_ffi_plugin (from `.symlinks/plugins/tor_ffi_plugin/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+  - xelis_flutter (from `.symlinks/plugins/xelis_flutter/ios`)
 
 SPEC REPOS:
   trunk:
@@ -159,6 +165,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   cs_monero_flutter_libs_ios:
     :path: ".symlinks/plugins/cs_monero_flutter_libs_ios/ios"
+  cs_salvium_flutter_libs_ios:
+    :path: ".symlinks/plugins/cs_salvium_flutter_libs_ios/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   devicelocale:
@@ -183,8 +191,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/integration_test/ios"
   isar_flutter_libs:
     :path: ".symlinks/plugins/isar_flutter_libs/ios"
-  lelantus:
-    :path: ".symlinks/plugins/lelantus/ios"
   local_auth_darwin:
     :path: ".symlinks/plugins/local_auth_darwin/darwin"
   package_info_plus:
@@ -205,17 +211,20 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
+  xelis_flutter:
+    :path: ".symlinks/plugins/xelis_flutter/ios"
 
 SPEC CHECKSUMS:
   barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
   coinlib_flutter: 9275e8255ef67d3da33beb6e117d09ced4f46eb5
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   cs_monero_flutter_libs_ios: fd353631682247f72a36493ff060d4328d6f720d
+  cs_salvium_flutter_libs_ios: f9d6ce540cb34d8cb8641822cf02fa0695a8d405
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
+  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_libepiccash: 36241aa7d3126f6521529985ccb3dc5eaf7bb317
   flutter_libsparkmobile: 6373955cc3327a926d17059e7405dde2fb12f99f
@@ -225,7 +234,6 @@ SPEC CHECKSUMS:
   frostdart: 4c72b69ccac2f13ede744107db046a125acce597
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   isar_flutter_libs: fdf730ca925d05687f36d7f1d355e482529ed097
-  lelantus: 417f0221260013dfc052cae9cf4b741b6479edba
   local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
@@ -235,14 +243,15 @@ SPEC CHECKSUMS:
   SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
-  sqlite3_flutter_libs: 0d611efdf6d1c9297d5ab03dab21b75aeebdae31
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
   stack_wallet_backup: 5b8563aba5d8ffbf2ce1944331ff7294a0ec7c03
   SwiftProtobuf: 6ef3f0e422ef90d6605ca20b21a94f6c1324d6b3
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
   tor_ffi_plugin: d80e291b649379c8176e1be739e49be007d4ef93
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
+  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
+  xelis_flutter: a6a1ee1f1e47f5aeb42dc4a5889358b79d8d90fc
 
 PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -48,6 +48,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">