feat: macos support, that works. To some extend.

cypherstack · Apr 1, 2024 · 27f7465 · 27f7465
1 parent 4e4a72b
commit 27f7465
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 12 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -76,7 +76,7 @@ import 'package:stackwallet/wallets/isar/providers/all_wallets_info_provider.dar
 import 'package:stackwallet/widgets/crypto_notifications.dart';
 import 'package:window_size/window_size.dart';
 import 'package:monero/monero.dart' as monero_dart;
-import 'package:monero/monero.dart' as wownero_dart;
+import 'package:monero/wownero.dart' as wownero_dart;
 
 final openedFromSWBFileStringStateProvider =
     StateProvider<String?>((ref) => null);
@@ -87,6 +87,23 @@ final openedFromSWBFileStringStateProvider =
 void main(List<String> args) async {
   monero_dart.printStarts = true;
   wownero_dart.printStarts = true;
+
+  // await Future.delayed(Duration(seconds: 1));
+  // final wptr = wownero_dart.WalletManagerFactory_getWalletManager();
+  // final w = wownero_dart.WalletManager_createWallet(wptr, path: '/tmp/${DateTime.now()}', password: '');
+  // final a = wownero_dart.Wallet_address(w);
+  // print("wow: $a");
+  // final wptr0 = monero_dart.WalletManagerFactory_getWalletManager();
+  // final w0 = monero_dart.WalletManager_createWallet(wptr0, path: '/tmp/${DateTime.now()}', password: '');
+  // final a0 = monero_dart.Wallet_address(w0);
+  // print("xmr: $a0");
+  // final wptr1 = wownero_dart.WalletManagerFactory_getWalletManager();
+  // final w1 = wownero_dart.WalletManager_createWallet(wptr1, path: '/tmp/${DateTime.now()}', password: '');
+  // final a1 = wownero_dart.Wallet_address(w1);
+  // print("wow: $a1");
+  // await Future.delayed(Duration(seconds: 1));
+  // exit(0);
+
   WidgetsFlutterBinding.ensureInitialized();
 
   if (Util.isDesktop && args.length == 2 && args.first == "-d") {

diff --git a/lib/wallets/wallet/impl/monerodart_wallet.dart b/lib/wallets/wallet/impl/monerodart_wallet.dart
@@ -209,7 +209,7 @@ class MoneroDartWallet extends Wallet with MnemonicInterface {
       "${TorService.sharedInstance.getProxyInfo().host.address}:${TorService.sharedInstance.getProxyInfo().port}" : "";
     print("proxy: $proxy");
     monero.Wallet_init(xmrwPtr!, daemonAddress: "$host:${node.port}", proxyAddress: proxy);
-    monero.Wallet_init3(xmrwPtr!, argv0: '', defaultLogBaseName: 'moneroc', console: true, logPath: '/dev/shm/log.txt');
+    monero.Wallet_init3(xmrwPtr!, argv0: '', defaultLogBaseName: 'moneroc', console: true, logPath: '/tmp/log-monero.txt');
     syncCheckTimer?.cancel();
     syncCheckTimer = Timer.periodic(const Duration(seconds: 2), (timer) {
       refreshSyncTimer();

diff --git a/lib/wallets/wallet/impl/wownerodart_wallet.dart b/lib/wallets/wallet/impl/wownerodart_wallet.dart
@@ -208,8 +208,8 @@ class WowneroDartWallet extends Wallet with MnemonicInterface {
     final proxy = (TorService.sharedInstance.status == TorConnectionStatus.connected) ?
       "${TorService.sharedInstance.getProxyInfo().host.address}:${TorService.sharedInstance.getProxyInfo().port}" : "";
     print("proxy: $proxy");
-    wownero.Wallet_init(wowwPtr!, daemonAddress: "$host:${node.port}", proxyAddress: proxy);
-    wownero.Wallet_init3(wowwPtr!, argv0: '', defaultLogBaseName: 'wowneroc', console: true, logPath: '/dev/shm/log.txt');
+    wownero.Wallet_init(wowwPtr!, daemonAddress: "node.suchwow.xyz:34568", proxyAddress: proxy);
+    wownero.Wallet_init3(wowwPtr!, argv0: '', defaultLogBaseName: 'wowneroc', console: true, logPath: '/tmp/log-wownero.txt');
     syncCheckTimer?.cancel();
     syncCheckTimer = Timer.periodic(const Duration(seconds: 2), (timer) {
       refreshSyncTimer();

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -31,6 +31,8 @@
 		B98151822A67402A009D013C /* mobileliblelantus.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = B98151802A674022009D013C /* mobileliblelantus.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B98151842A674143009D013C /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B98151832A674143009D013C /* libsqlite3.0.tbd */; };
 		BFD0376C00E1FFD46376BB9D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9206484E84CB0AD93E3E68CA /* Pods_RunnerTests.framework */; };
+		CE9E461B2BBB049A008A49E4 /* monero_libwallet2_api_c.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE9E461A2BBB049A008A49E4 /* monero_libwallet2_api_c.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		CE9E461D2BBB04A8008A49E4 /* wownero_libwallet2_api_c.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE9E461C2BBB04A8008A49E4 /* wownero_libwallet2_api_c.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F653CA022D33E8B60E11A9F3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -63,6 +65,17 @@
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CE9E46192BBB047B008A49E4 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 12;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				CE9E461D2BBB04A8008A49E4 /* wownero_libwallet2_api_c.dylib in CopyFiles */,
+				CE9E461B2BBB049A008A49E4 /* monero_libwallet2_api_c.dylib in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -93,6 +106,8 @@
 		B98151802A674022009D013C /* mobileliblelantus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mobileliblelantus.framework; path = ../crypto_plugins/flutter_liblelantus/scripts/macos/mobileliblelantus/mobileliblelantus.framework; sourceTree = "<group>"; };
 		B98151832A674143009D013C /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		BF5E76865ACB46314AC27D8F /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		CE9E461A2BBB049A008A49E4 /* monero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = monero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
+		CE9E461C2BBB04A8008A49E4 /* wownero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = wownero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
 		E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -140,6 +155,8 @@
 		33CC10E42044A3C60003C045 = {
 			isa = PBXGroup;
 			children = (
+				CE9E461C2BBB04A8008A49E4 /* wownero_libwallet2_api_c.dylib */,
+				CE9E461A2BBB049A008A49E4 /* monero_libwallet2_api_c.dylib */,
 				33FAB671232836740065AC1E /* Runner */,
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				331C80D6294CF71000263BE5 /* RunnerTests */,
@@ -250,6 +267,7 @@
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
 				529691D83C3BADE14E2EAC03 /* [CP] Embed Pods Frameworks */,
+				CE9E46192BBB047B008A49E4 /* CopyFiles */,
 			);
 			buildRules = (
 			);

diff --git a/macos/monero_libwallet2_api_c.dylib b/macos/monero_libwallet2_api_c.dylib
@@ -0,0 +1 @@
+/Users/user/go/src/git.mrcyjanek.net/monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib
diff --git a/macos/wownero_libwallet2_api_c.dylib b/macos/wownero_libwallet2_api_c.dylib
@@ -0,0 +1 @@
+/Users/user/go/src/git.mrcyjanek.net/monero_c/release/wownero/host-apple-darwin_libwallet2_api_c.dylib
diff --git a/pubspec.lock b/pubspec.lock
@@ -368,7 +368,7 @@ packages:
     source: path
     version: "0.0.1"
   cw_monero:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "crypto_plugins/flutter_libmonero/cw_monero"
       relative: true
@@ -382,7 +382,7 @@ packages:
     source: path
     version: "0.0.1"
   cw_wownero:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "crypto_plugins/flutter_libmonero/cw_wownero"
       relative: true

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -36,12 +36,6 @@ dependencies:
   flutter_libmonero:
     path: ./crypto_plugins/flutter_libmonero
 
-  cw_monero:
-    path: ./crypto_plugins/flutter_libmonero/cw_monero
-
-  cw_wownero:
-    path: ./crypto_plugins/flutter_libmonero/cw_wownero
-
   cw_core:
     path: ./crypto_plugins/flutter_libmonero/cw_core