From b6a9ce58dbd1718ad168ef5993fccaf65201f34b Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Wed, 24 Apr 2024 21:37:22 +0200
Subject: [PATCH] monero.dart clean

---
 .fvmrc                                        |  3 +++
 .gitignore                                    |  3 +++
 .vscode/settings.json                         |  1 +
 android/app/build.gradle                      |  7 ++++++-
 android/app/src/main/AndroidManifest.xml      |  3 ++-
 .../arm64-v8a/libmonero_libwallet2_api_c.so   |  1 +
 .../armeabi-v7a/libmonero_libwallet2_api_c.so |  1 +
 .../x86_64/libmonero_libwallet2_api_c.so      |  1 +
 lib/wallets/crypto_currency/coins/monero.dart |  3 ++-
 .../crypto_currency/coins/wownero.dart        |  2 +-
 lib/wallets/wallet/impl/wownero_wallet.dart   |  6 ++++--
 macos/Flutter/GeneratedPluginRegistrant.swift |  6 ------
 macos/Podfile.lock                            |  4 ++--
 macos/Runner.xcodeproj/project.pbxproj        |  2 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |  2 +-
 pubspec.lock                                  | 20 ++++++++++---------
 pubspec.yaml                                  |  2 +-
 scripts/macos/build_all.sh                    |  6 +++---
 18 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 .fvmrc
 create mode 120000 android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
 create mode 120000 android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
 create mode 120000 android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so

diff --git a/.fvmrc b/.fvmrc
new file mode 100644
index 000000000..5fb0c142c
--- /dev/null
+++ b/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.16.0"
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ec9131840..144745e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,6 @@ libtor_ffi.dll
 flutter_libsparkmobile.dll
 secp256k1.dll
 /libisar.so
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index eba0d6cd7..a86b03d61 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
   "dart.lineLength": 80,
+  "dart.flutterSdkPath": ".fvm/versions/3.16.0"
 }
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ec8747bff..cd56f57ff 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -45,7 +45,12 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
-
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+    }
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.cypherstack.stackwallet"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3f1a56aa8..786db2728 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,8 @@
         android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
-        android:fullBackupContent="false">
+        android:fullBackupContent="false"
+        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait"
diff --git a/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
new file mode 120000
index 000000000..49289969b
--- /dev/null
+++ b/android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so
@@ -0,0 +1 @@
+../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/aarch64-linux-android_libwallet2_api_c.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
new file mode 120000
index 000000000..a69eec096
--- /dev/null
+++ b/android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so
@@ -0,0 +1 @@
+../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/arm-linux-androideabi_libwallet2_api_c.so
\ No newline at end of file
diff --git a/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so b/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
new file mode 120000
index 000000000..5c18d1cee
--- /dev/null
+++ b/android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so
@@ -0,0 +1 @@
+../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/x86_64-linux-android_libwallet2_api_c.so
\ No newline at end of file
diff --git a/lib/wallets/crypto_currency/coins/monero.dart b/lib/wallets/crypto_currency/coins/monero.dart
index 748d1b7eb..05c067427 100644
--- a/lib/wallets/crypto_currency/coins/monero.dart
+++ b/lib/wallets/crypto_currency/coins/monero.dart
@@ -4,6 +4,7 @@ import 'package:stackwallet/utilities/default_nodes.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
 import 'package:stackwallet/wallets/crypto_currency/intermediate/cryptonote_currency.dart';
+import 'package:monero/monero.dart' as monero;
 
 class Monero extends CryptonoteCurrency {
   Monero(super.network) {
@@ -20,7 +21,7 @@ class Monero extends CryptonoteCurrency {
 
   @override
   bool validateAddress(String address) {
-    return monero_wallet.validateAddress(address);
+    return monero.Wallet_addressValid(address, 0);
   }
 
   @override
diff --git a/lib/wallets/crypto_currency/coins/wownero.dart b/lib/wallets/crypto_currency/coins/wownero.dart
index e96660c00..501904218 100644
--- a/lib/wallets/crypto_currency/coins/wownero.dart
+++ b/lib/wallets/crypto_currency/coins/wownero.dart
@@ -20,7 +20,7 @@ class Wownero extends CryptonoteCurrency {
 
   @override
   bool validateAddress(String address) {
-    return wownero_wallet.validateAddress(address);
+    return wownero_wallet.addressValid(address);
   }
 
   @override
diff --git a/lib/wallets/wallet/impl/wownero_wallet.dart b/lib/wallets/wallet/impl/wownero_wallet.dart
index 6d39f5cfa..514f9e244 100644
--- a/lib/wallets/wallet/impl/wownero_wallet.dart
+++ b/lib/wallets/wallet/impl/wownero_wallet.dart
@@ -330,7 +330,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
         //     date: DateTime.now().subtract(const Duration(
         //         days:
         //         2))); // subtract a couple days to ensure we have a buffer for SWB
-        final bufferedCreateHeight = getSeedHeightSync(wallet!.seed.trim());
+        // TODO(mrcyjanek): implement
+        final bufferedCreateHeight = 1; //getSeedHeightSync(wallet!.seed.trim());
 
         await info.updateRestoreHeight(
           newRestoreHeight: bufferedCreateHeight,
@@ -441,7 +442,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
 
         // extract seed height from 14 word seed
         if (seedLength == 14) {
-          height = getSeedHeightSync(mnemonic.trim());
+          // TODO(mrcyjanek): implement
+          height = 1; // getSeedHeightSync(mnemonic.trim());
         } else {
           height = max(height, 0);
         }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index b044b4b00..681a96548 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,9 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import connectivity_plus
-import cw_monero
-import cw_shared_external
-import cw_wownero
 import desktop_drop
 import device_info_plus
 import devicelocale
@@ -27,9 +24,6 @@ import window_size
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
-  CwMoneroPlugin.register(with: registry.registrar(forPlugin: "CwMoneroPlugin"))
-  CwSharedExternalPlugin.register(with: registry.registrar(forPlugin: "CwSharedExternalPlugin"))
-  CwWowneroPlugin.register(with: registry.registrar(forPlugin: "CwWowneroPlugin"))
   DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index f76e35a57..3c7eac5bb 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -171,7 +171,7 @@ SPEC CHECKSUMS:
   device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
   flutter_libepiccash: be1560a04150c5cc85bcf08d236ec2b3d1f5d8da
-  flutter_libsparkmobile: 8ae86b0ccc7e52c9db6b53e258ee2977deb184ab
+  flutter_libsparkmobile: df2d36af1691379c81249e7be7b68be3c81d388b
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
   flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
@@ -189,4 +189,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index c2c2e62ad..c7d39b845 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -268,7 +268,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a9d38bc3b..5b6f6cbd1 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/pubspec.lock b/pubspec.lock
index 423323325..111adbb54 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -374,13 +374,6 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  cw_shared_external:
-    dependency: transitive
-    description:
-      path: "crypto_plugins/flutter_libmonero/cw_shared_external"
-      relative: true
-    source: path
-    version: "0.0.1"
   cw_wownero:
     dependency: "direct main"
     description:
@@ -674,8 +667,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "3f986ca1a94bdac5d31373454c989cc2f5842de8"
-      resolved-ref: "3f986ca1a94bdac5d31373454c989cc2f5842de8"
+      ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c"
+      resolved-ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c"
       url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
     source: git
     version: "0.0.1"
@@ -1147,6 +1140,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  monero:
+    dependency: transitive
+    description:
+      path: "."
+      ref: "342bad5d91d8476f0e32a57ae944f2cfe34d4241"
+      resolved-ref: "342bad5d91d8476f0e32a57ae944f2cfe34d4241"
+      url: "https://git.mrcyjanek.net/mrcyjanek/monero.dart"
+    source: git
+    version: "0.0.0"
   mutex:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b9b3a004e..e7d144167 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,7 +30,7 @@ dependencies:
   flutter_libsparkmobile:
     git:
       url: https://github.com/cypherstack/flutter_libsparkmobile.git
-      ref: 3f986ca1a94bdac5d31373454c989cc2f5842de8
+      ref: 65a6676e37f1bcaf2e293afbd50e50c81394276c
 
   flutter_libmonero:
     path: ./crypto_plugins/flutter_libmonero
diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh
index 0e086fc71..e708c2890 100755
--- a/scripts/macos/build_all.sh
+++ b/scripts/macos/build_all.sh
@@ -6,9 +6,9 @@ set -e
 source ../rust_version.sh
 set_rust_to_1671
 
-(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) &
-(cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh )  &
-(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh  ) &
+(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh )
+(cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh )
+(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh  )
 
 wait
 echo "Done building"