Mr cyjane k cyjan monerodart

.github/workflows/cache_dependencies.yml

@@ -46,6 +46,7 @@ jobs:
             /opt/android/cake_wallet/cw_monero/android/.cxx
             /opt/android/cake_wallet/cw_monero/ios/External
             /opt/android/cake_wallet/cw_shared_external/ios/External
+            /opt/android/cake_wallet/scripts/monero_c/release
           key: ${{ hashFiles('**/build_monero.sh', '**/build_haven.sh', '**/monero_api.cpp') }}
 
       - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}

.github/workflows/pr_test_build.yml

@@ -27,18 +27,25 @@ jobs:
         if: github.event_name != 'pull_request'
         run: echo "BRANCH_NAME=${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
-      - name: Free Up GitHub Actions Ubuntu Runner Disk Space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+      - name: Free Disk Space (Ubuntu)
+        uses: insightsengineering/disk-space-reclaimer@v1
+        with:
+          tools-cache: true
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          swap-storage: true
+          docker-images: true
 
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
           java-version: "11.x"
-
+      - name: Configure placeholder git details
+        run: |
+          git config --global user.email "CI@cakewallet.com"
+          git config --global user.name "Cake Github Actions"
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
@@ -72,7 +79,8 @@ jobs:
             /opt/android/cake_wallet/cw_monero/android/.cxx
             /opt/android/cake_wallet/cw_monero/ios/External
             /opt/android/cake_wallet/cw_shared_external/ios/External
-          key: ${{ hashFiles('**/build_monero.sh', '**/build_haven.sh', '**/monero_api.cpp') }}
+            /opt/android/cake_wallet/scripts/monero_c/release
+          key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh', '**/build_haven.sh', '**/monero_api.cpp') }}
 
       - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
         name: Generate Externals

.gitignore

@@ -156,6 +156,7 @@ assets/images/app_logo.png
 macos/Runner/Info.plist
 macos/Runner/DebugProfile.entitlements
 macos/Runner/Release.entitlements
+macos/Runner/Runner.entitlements
 lib/core/secure_storage.dart
 
 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
@@ -166,3 +167,8 @@ macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
 macos/Runner/Configs/AppInfo.xcconfig
+
+# Monero.dart (Monero_C)
+scripts/monero_c
+# iOS generated framework bin
+ios/MoneroWallet.framework/MoneroWallet

.metadata

@@ -1,23 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-  channel: stable
+  revision: "367f9ea16bfae1ca451b9cc27c1366870b187ae2"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-    - platform: macos
-      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
-      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+      base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+    - platform: windows
+      create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+      base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
 
   # User provided section
 

android/app/src/main/AndroidManifestBase.xml

@@ -38,7 +38,8 @@
         android:fullBackupContent="false"
         android:versionCode="__versionCode__"
         android:versionName="__versionName__"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleInstance"

android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/aarch64-linux-android_libc++_shared.so

android/app/src/main/jniLibs/arm64-v8a/libmonero_libwallet2_api_c.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/aarch64-linux-android_libwallet2_api_c.so

android/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/arm-linux-androideabi_libc++_shared.so

android/app/src/main/jniLibs/armeabi-v7a/libmonero_libwallet2_api_c.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/arm-linux-androideabi_libwallet2_api_c.so

android/app/src/main/jniLibs/x86_64/libc++_shared.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/x86_64-linux-android_libc++_shared.so

android/app/src/main/jniLibs/x86_64/libmonero_libwallet2_api_c.so

@@ -0,0 +1 @@
+../../../../../../scripts/monero_c/release/monero/x86_64-linux-android_libwallet2_api_c.so

build-guide-win.md

@@ -0,0 +1,38 @@
+# Building CakeWallet for Windows
+
+## Requirements and Setup
+
+The following are the system requirements to build CakeWallet for your Windows PC.
+
+```
+Windows 10 or later (64-bit), x86-64 based
+Flutter 3 or above
+```
+
+## Building CakeWallet on Windows
+
+These steps will help you configure and execute a build of CakeWallet from its source code.
+
+### 1. Installing Package Dependencies
+
+For build CakeWallet windows application from sources you will be needed to have:
+> [Install Flutter]Follow installation guide (https://docs.flutter.dev/get-started/install/windows) and install do not miss to dev tools (install https://docs.flutter.dev/get-started/install/windows/desktop#development-tools) which are required for windows desktop development (need to install Git for Windows and Visual Studio 2022). Then install `Desktop development with C++` packages via GUI Visual Studio 2022, or Visual Studio Build Tools 2022 including: `C++ Build Tools core features`, `C++ 2022 Redistributable Update`, `C++ core desktop features`, `MVC v143 - VS 2022 C++ x64/x86 build tools`, `C++ CMake tools for Windwos`, `Testing tools core features - Build Tools`, `C++ AddressSanitizer`.
+> [Install WSL] for building monero dependencies need to install Windows WSL (https://learn.microsoft.com/en-us/windows/wsl/install) and required packages for WSL (Ubuntu):
+`$ sudo apt update `
+`$ sudo apt build-essential cmake gcc-mingw-w64 g++-mingw-w64 autoconf libtool pkg-config`
+
+### 2. Pull CakeWallet source code
+
+You can downlaod CakeWallet source code from our [GitHub repository](github.com/cake-tech/cake_wallet) via git by following next command:
+`$ git clone https://github.com/cake-tech/cake_wallet.git --branch MrCyjaneK-cyjan-monerodart`
+OR you can download it as [Zip archive](https://github.com/cake-tech/cake_wallet/archive/refs/heads/MrCyjaneK-cyjan-monerodart.zip)
+
+### 3. Build Monero, Monero_c and their dependencies
+
+For use monero in the application need to build Monero wrapper - Monero_C which will be used by monero.dart package. For that need to run shell (bash - typically same named utility should be available after WSL is enabled in your system) with previously installed WSL, then change current directory to the application project directory with your used shell and then change current directory to `scripts/windows`: `$ cd scripts/windows`. Run build script: `$ ./build_all.sh`.
+
+### 4. Configure and build CakeWallet application
+
+To configure the application open directory where you have downloaded or unarchived CakeWallet sources and run `cakewallet.bat`.
+Or if you used WSL and have active shell session you can run `$ ./cakewallet.sh` script in `scripts/windows` which will run `cakewallet.bat` in WSL.
+After execution of `cakewallet.bat` you should to get `Cake Wallet.zip` in project root directory which will contains `CakeWallet.exe` file and another needed files for run the application. Now you can extract files from `Cake Wallet.zip` archive and run the application.

cakewallet.bat

@@ -0,0 +1,51 @@
+@echo off
+set cw_win_app_config=--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron
+set cw_root=%cd%
+set cw_archive_name=Cake Wallet.zip
+set cw_archive_path=%cw_root%\%cw_archive_name%
+set secrets_file_path=lib\.secrets.g.dart
+set release_dir=build\windows\x64\runner\Release
+@REM Path could be different
+if [%~1]==[] (set tools_root=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT) else (set tools_root=%1)
+@REM Generate android manifest file
+cd scripts
+bash.exe gen_android_manifest.sh
+cd /d %cw_root%
+echo === Generating pubspec.yaml ===
+copy /Y pubspec_description.yaml pubspec.yaml > nul
+call flutter pub get > nul
+call dart run tool\generate_pubspec.dart
+call flutter pub get > nul
+call dart run tool\configure.dart %cw_win_app_config%
+
+IF NOT EXIST "%secrets_file_path%" (
+    echo === Generating new secrets file ===
+    call dart run tool\generate_new_secrets.dart
+) ELSE (echo === Using previously/already generated secrets file: %secrets_file_path% ===)
+
+echo === Generating mobx models ===
+for /d %%i in (cw_core cw_monero cw_bitcoin cw_ethereum cw_evm cw_polygon cw_nano cw_bitcoin_cash cw_solana cw_tron .) do (
+    cd %%i
+    call flutter pub get > nul
+    call dart run build_runner build --delete-conflicting-outputs > nul
+    cd /d %cw_root%
+)
+
+echo === Generating localization files ===
+call dart run tool\generate_localization.dart
+
+echo === Building the application executable file ===
+call flutter build windows --dart-define-from-file=env.json --release
+
+echo === Prepare distribution actions. Copy needed files to the application bundle ===
+copy /Y "%tools_root%\msvcp140.dll" "%release_dir%\" > nul
+copy /Y "%tools_root%\vcruntime140.dll" "%release_dir%\" > nul
+copy /Y "%tools_root%\vcruntime140_1.dll" "%release_dir%\" > nul
+
+echo === Generate the application archive ===
+xcopy /s /e /v /Y "%release_dir%\*.*" "build\Cake Wallet\" > nul
+tar acf "%cw_archive_name%" -C build\ "Cake Wallet"
+
+echo === Open Explorer with the application archive ===
+echo Cake Wallet created archive at: %cw_archive_path%
+%SystemRoot%\explorer.exe /select, %cw_archive_path%

configure_cake_wallet.sh

@@ -1,11 +1,14 @@
+#!/bin/bash
+
 IOS="ios"
 ANDROID="android"
+MACOS="macos"
 
-PLATFORMS=($IOS $ANDROID)
+PLATFORMS=($IOS $ANDROID $MACOS)
 PLATFORM=$1
 
 if ! [[ " ${PLATFORMS[*]} " =~ " ${PLATFORM} " ]]; then
-    echo "specify platform: ./configure_cake_wallet.sh ios|android"
+    echo "specify platform: ./configure_cake_wallet.sh ios|android|macos"
     exit 1
 fi
 
@@ -14,6 +17,11 @@ if [ "$PLATFORM" == "$IOS" ]; then
     cd scripts/ios
 fi
 
+if [ "$PLATFORM" == "$MACOS" ]; then
+    echo "Configuring for macOS"
+    cd scripts/macos
+fi
+
 if [ "$PLATFORM" == "$ANDROID" ]; then
     echo "Configuring for Android"
     cd scripts/android

cw_core/lib/pathForWallet.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
+import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:path_provider/path_provider.dart';
 
 Future<String> pathForWalletDir({required String name, required  WalletType type}) async {
-  final root = await getApplicationDocumentsDirectory();
+  final root = await getAppDir();
   final prefix = walletTypeToString(type).toLowerCase();
   final walletsDir = Directory('${root.path}/wallets');
   final walletDire = Directory('${walletsDir.path}/$prefix/$name');
@@ -20,8 +21,8 @@ Future<String> pathForWallet({required String name, required WalletType type}) a
         .then((path) => path + '/$name');
 
 Future<String> outdatedAndroidPathForWalletDir({required String name}) async {
-  final directory = await getApplicationDocumentsDirectory();
+  final directory = await getAppDir();
   final pathDir = directory.path + '/$name';
 
   return pathDir;
-}
+}

cw_core/lib/root_dir.dart

@@ -0,0 +1,35 @@
+import 'dart:io';
+import 'package:path_provider/path_provider.dart';
+
+String? _rootDirPath;
+
+void setRootDirFromEnv() => _rootDirPath = Platform.environment['CAKE_WALLET_DIR'];
+
+Future<Directory> getAppDir({String appName = 'cake_wallet'}) async {
+  Directory dir;
+
+  if (_rootDirPath != null && _rootDirPath!.isNotEmpty) {
+    dir = Directory.fromUri(Uri.file(_rootDirPath!));
+    dir.create(recursive: true);
+  } else {
+    if (Platform.isWindows) {
+      dir = await getApplicationSupportDirectory();
+    } else if (Platform.isLinux) {
+      String appDirPath;
+
+      try {
+        dir = await getApplicationDocumentsDirectory();
+        appDirPath = '${dir.path}/$appName';
+      } catch (e) {
+        appDirPath = '/home/${Platform.environment['USER']}/.$appName';
+      }
+
+      dir = Directory.fromUri(Uri.file(appDirPath));
+      await dir.create(recursive: true);
+    } else {
+      dir = await getApplicationDocumentsDirectory();
+    }
+  }
+
+  return dir;
+}

cw_core/lib/sec_random_native.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/services.dart';
@@ -6,6 +8,12 @@ const utils = const MethodChannel('com.cake_wallet/native_utils');
 
 Future<Uint8List> secRandom(int count) async {
   try {
+    if (Platform.isWindows || Platform.isLinux) {
+      // Used method to get securely generated random bytes from cake backups
+      const byteSize = 256;
+      final rng = Random.secure();
+      return Uint8List.fromList(List<int>.generate(count, (_) => rng.nextInt(byteSize)));
+    }
     return await utils.invokeMethod<Uint8List>('sec_random', {'count': count}) ?? Uint8List.fromList([]);
   } on PlatformException catch (_) {
     return Uint8List.fromList([]);

cw_haven/lib/api/account_list.dart

@@ -4,7 +4,6 @@ import 'package:cw_haven/api/signatures.dart';
 import 'package:cw_haven/api/types.dart';
 import 'package:cw_haven/api/haven_api.dart';
 import 'package:cw_haven/api/structs/account_row.dart';
-import 'package:flutter/foundation.dart';
 import 'package:cw_haven/api/wallet.dart';
 
 final accountSizeNative = havenApi
@@ -72,12 +71,11 @@ void _setLabelForAccount(Map<String, dynamic> args) {
 }
 
 Future<void> addAccount({required String label}) async {
-  await compute(_addAccount, label);
+  _addAccount(label);
   await store();
 }
 
 Future<void> setLabelForAccount({required int accountIndex, required String label}) async {
-    await compute(
-        _setLabelForAccount, {'accountIndex': accountIndex, 'label': label});
+    _setLabelForAccount({'accountIndex': accountIndex, 'label': label});
     await store();
 }