From fa2302f9dff5251dfe4280984dc3b4df475e1def Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Tue, 28 Dec 2021 19:00:57 +0200
Subject: [PATCH] Fixes for iOS build. Add moonpay api placeholders for
 secrets.

---
 scripts/ios/build_monero.sh            |  8 ++++----
 scripts/ios/build_zmq.sh               | 11 +++++++++--
 scripts/ios/install_missing_headers.sh |  4 ++++
 tool/utils/secret_key.dart             |  2 ++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/scripts/ios/build_monero.sh b/scripts/ios/build_monero.sh
index 2984f8ba0..bb9f6fb4c 100755
--- a/scripts/ios/build_monero.sh
+++ b/scripts/ios/build_monero.sh
@@ -49,13 +49,13 @@ cmake -D IOS=ON \
     -DUSE_DEVICE_TREZOR=OFF \
 	../..
 make -j4 && make install
-cp external/randomx/librandomx.a ${DEST_LIB}
-cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}
-cp src/cryptonote_basic/libcryptonote_format_utils_basic.a ${DEST_LIB}
+cp external/randomx/librandomx.a ${DEST_LIB}/
+cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}/
+cp src/cryptonote_basic/libcryptonote_format_utils_basic.a ${DEST_LIB}/
 popd
 
 done
 
 #only for arm64
 cp ${MONERO_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR
-cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
\ No newline at end of file
+cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
diff --git a/scripts/ios/build_zmq.sh b/scripts/ios/build_zmq.sh
index 5b3e7c4a3..e2fd7caae 100755
--- a/scripts/ios/build_zmq.sh
+++ b/scripts/ios/build_zmq.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+g#!/bin/sh
 
 . ./config.sh
 
@@ -9,5 +9,12 @@ echo "============================ ZMQ ============================"
 
 echo "Cloning ZMQ from - $ZMQ_URL"
 git clone $ZMQ_URL $ZMQ_PATH
+cd $ZMQ_PATH
+mkdir cmake-build
+cd cmake-build
+cmake ..
+make
 
-cp ${ZMQ_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR
\ No newline at end of file
+
+cp ${ZMQ_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR
+cp ${ZMQ_PATH}/cmake-build/lib/libzmq.a $EXTERNAL_IOS_LIB_DIR
diff --git a/scripts/ios/install_missing_headers.sh b/scripts/ios/install_missing_headers.sh
index 26d5bfd9e..1a732e4dc 100755
--- a/scripts/ios/install_missing_headers.sh
+++ b/scripts/ios/install_missing_headers.sh
@@ -27,6 +27,10 @@ if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h ]; then
   cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOTypes.h  ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h
 fi
 
+if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h ]; then
+  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOMapTypes.h  ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h
+fi
+
 if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h ]; then
   cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOKitLib.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h
 fi
diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart
index 9bf2d2722..e9bcfe253 100644
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@@ -21,6 +21,8 @@ class SecretKey {
     SecretKey('wyreSecretKey', () => ''),
     SecretKey('wyreApiKey', () => ''),
     SecretKey('wyreAccountId', () => ''),
+    SecretKey('moonPayApiKey', () => ''),
+    SecretKey('moonPaySecretKey', () => ''),
   ];
 
   final String name;