Fix missing library on ios

cw_monero/pubspec.lock

@@ -511,8 +511,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
-      resolved-ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
+      ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
+      resolved-ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"

cw_monero/pubspec.yaml

@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: 127c54599c612d7d3d226e4c016d5812e7a0966d
+      ref: 9301097ff504525070cc0cb915fe2f1bb0670345
       path: impls/monero.dart
   mutex: ^3.1.0
   ledger_flutter_plus: ^1.4.1

cw_wownero/pubspec.lock

@@ -471,8 +471,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
-      resolved-ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
+      ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
+      resolved-ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"

cw_wownero/pubspec.yaml

@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: 127c54599c612d7d3d226e4c016d5812e7a0966d # monero_c hash
+      ref: 9301097ff504525070cc0cb915fe2f1bb0670345 # monero_c hash
       path: impls/monero.dart
   mutex: ^3.1.0
 

cw_zano/pubspec.lock

@@ -476,8 +476,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
-      resolved-ref: "127c54599c612d7d3d226e4c016d5812e7a0966d"
+      ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
+      resolved-ref: "9301097ff504525070cc0cb915fe2f1bb0670345"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"

cw_zano/pubspec.yaml

@@ -26,7 +26,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: 127c54599c612d7d3d226e4c016d5812e7a0966d # monero_c hash
+      ref: 9301097ff504525070cc0cb915fe2f1bb0670345 # monero_c hash
       path: impls/monero.dart
 dev_dependencies:
   flutter_test:

scripts/ios/app_env.sh

@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.20.0"
-MONERO_COM_BUILD_NUMBER=110
+MONERO_COM_VERSION="1.20.2"
+MONERO_COM_BUILD_NUMBER=112
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.23.0"
-CAKEWALLET_BUILD_NUMBER=293
+CAKEWALLET_VERSION="4.23.2"
+CAKEWALLET_BUILD_NUMBER=296
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/ios/build_monero_all.sh

@@ -18,11 +18,15 @@ cd "$(dirname "$0")"
 for COIN in monero wownero zano;
 do
     pushd ../monero_c
-        rm -rf external/ios/build
         ./build_single.sh ${COIN} aarch64-apple-ios -j$MAKE_JOB_COUNT
+        ./build_single.sh ${COIN} aarch64-apple-iossimulator -j$MAKE_JOB_COUNT
     popd
 done
 
-unxz -f ../monero_c/release/monero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
-unxz -f ../monero_c/release/wownero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
-unxz -f ../monero_c/release/zano/aarch64-apple-ios_libwallet2_api_c.dylib.xz
+unxz -fk ../monero_c/release/monero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
+unxz -fk ../monero_c/release/wownero/aarch64-apple-ios_libwallet2_api_c.dylib.xz
+unxz -fk ../monero_c/release/zano/aarch64-apple-ios_libwallet2_api_c.dylib.xz
+
+unxz -fk ../monero_c/release/monero/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz
+unxz -fk ../monero_c/release/wownero/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz
+unxz -fk ../monero_c/release/zano/aarch64-apple-iossimulator_libwallet2_api_c.dylib.xz

scripts/ios/gen_framework.sh

@@ -1,47 +1,23 @@
 #!/bin/sh
 # Assume we are in scripts/ios
-IOS_DIR="$(pwd)/../../ios"
-DYLIB_NAME="monero_libwallet2_api_c.dylib"
-DYLIB_LINK_PATH="${IOS_DIR}/${DYLIB_NAME}"
-FRWK_DIR="${IOS_DIR}/MoneroWallet.framework"
 
-if [ ! -f $DYLIB_LINK_PATH ]; then
-    echo "Dylib is not found by the link: ${DYLIB_LINK_PATH}"
-    exit 0
+if [[ "$1" == "--simulator" ]];
+then
+    simulator=simulator
 fi
 
-cd $FRWK_DIR # go to iOS framework dir
-lipo -create $DYLIB_LINK_PATH -output MoneroWallet
-
-echo "Generated ${FRWK_DIR}"
-# also generate for wownero
 IOS_DIR="$(pwd)/../../ios"
-DYLIB_NAME="wownero_libwallet2_api_c.dylib"
-DYLIB_LINK_PATH="${IOS_DIR}/${DYLIB_NAME}"
-FRWK_DIR="${IOS_DIR}/WowneroWallet.framework"
 
-if [ ! -f $DYLIB_LINK_PATH ]; then
-    echo "Dylib is not found by the link: ${DYLIB_LINK_PATH}"
-    exit 0
-fi
 
-cd $FRWK_DIR # go to iOS framework dir
-lipo -create $DYLIB_LINK_PATH -output WowneroWallet
+FRWK_DIR="${IOS_DIR}/MoneroWallet.framework"
+cd $FRWK_DIR
+lipo -create "../../scripts/monero_c/release/monero/aarch64-apple-ios${simulator}_libwallet2_api_c.dylib" -output MoneroWallet
 
-echo "Generated ${FRWK_DIR}"
+FRWK_DIR="${IOS_DIR}/WowneroWallet.framework"
+cd $FRWK_DIR
+lipo -create "../../scripts/monero_c/release/wownero/aarch64-apple-ios${simulator}_libwallet2_api_c.dylib" -output WowneroWallet
 
-# also generate for zano
-IOS_DIR="$(pwd)/../../ios"
-DYLIB_NAME="zano_libwallet2_api_c.dylib"
-DYLIB_LINK_PATH="${IOS_DIR}/${DYLIB_NAME}"
 FRWK_DIR="${IOS_DIR}/ZanoWallet.framework"
+cd $FRWK_DIR
+lipo -create "../../scripts/monero_c/release/zano/aarch64-apple-ios${simulator}_libwallet2_api_c.dylib" -output ZanoWallet
 
-if [ ! -f $DYLIB_LINK_PATH ]; then
-    echo "Dylib is not found by the link: ${DYLIB_LINK_PATH}"
-    exit 0
-fi
-
-cd $FRWK_DIR # go to iOS framework dir
-lipo -create $DYLIB_LINK_PATH -output ZanoWallet
-
-echo "Generated ${FRWK_DIR}"

scripts/prepare_moneroc.sh

@@ -8,7 +8,7 @@ if [[ ! -d "monero_c/.git" ]];
 then
     git clone https://github.com/mrcyjanek/monero_c --branch master monero_c
     cd monero_c
-    git checkout 127c54599c612d7d3d226e4c016d5812e7a0966d
+    git checkout 9301097ff504525070cc0cb915fe2f1bb0670345
     git reset --hard
     git submodule update --init --force --recursive
     ./apply_patches.sh monero

tool/download_moneroc_prebuilds.dart

@@ -24,6 +24,7 @@ final List<String> triplets = [
   // "x86_64-host-apple-darwin", // not available on CI (yet)
   "aarch64-host-apple-darwin", // apple silicon macbooks (local builds)
   "aarch64-apple-ios",
+  "aarch64-apple-iossimulator",
 ];
 
 Future<void> main() async {