Hv (#295)

* hv
* Change build version

scripts/ios/app_config.sh

@@ -2,6 +2,7 @@
 
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
+HAVEN="haven"
 DIR=`pwd`
 
 if [ -z "$APP_IOS_TYPE" ]; then
@@ -22,7 +23,10 @@ case $APP_IOS_TYPE in
 		CONFIG_ARGS="--monero"
 		;;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin"
+		CONFIG_ARGS="--monero --bitcoin --haven"
+		;;
+	$HAVEN)
+		CONFIG_ARGS="--haven"
 		;;
 esac
 

scripts/ios/app_env.sh

@@ -7,8 +7,9 @@ APP_IOS_BUNDLE_ID=""
 
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
+HAVEN="haven"
 
-TYPES=($MONERO_COM $CAKEWALLET)
+TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
@@ -17,10 +18,15 @@ MONERO_COM_BUILD_NUMBER=14
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.3.8"
-CAKEWALLET_BUILD_NUMBER=84
+CAKEWALLET_VERSION="4.3.9"
+CAKEWALLET_BUILD_NUMBER=89
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
+HAVEN_NAME="Haven"
+HAVEN_VERSION="1.0.0"
+HAVEN_BUILD_NUMBER=3
+HAVEN_BUNDLE_ID="com.cakewallet.haven"
+
 if ! [[ " ${TYPES[*]} " =~ " ${APP_IOS_TYPE} " ]]; then
     echo "Wrong app type."
     exit 1
@@ -39,6 +45,12 @@ case $APP_IOS_TYPE in
 		APP_IOS_BUILD_NUMBER=$CAKEWALLET_BUILD_NUMBER
 		APP_IOS_BUNDLE_ID=$CAKEWALLET_BUNDLE_ID
 		;;
+	$HAVEN)
+		APP_IOS_NAME=$HAVEN_NAME
+		APP_IOS_VERSION=$HAVEN_VERSION
+		APP_IOS_BUILD_NUMBER=$HAVEN_BUILD_NUMBER
+		APP_IOS_BUNDLE_ID=$HAVEN_BUNDLE_ID
+		;;
 esac
 
 export APP_IOS_TYPE

scripts/ios/app_icon.sh

@@ -14,6 +14,10 @@ case $APP_IOS_TYPE in
 	ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
     ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
     ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
+    "haven")
+	ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
+    ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
+    ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
 esac
 
 rm $DEST_DIR_PATH/app_icon_120.png

scripts/ios/build_all.sh

@@ -10,4 +10,5 @@ DIR=$(dirname "$0")
 case $APP_IOS_TYPE in
 	"monero.com") $DIR/build_monero_all.sh ;;
 	"cakewallet") $DIR/build_monero_all.sh ;;
+	"haven")      $DIR/build_haven_all.sh ;;
 esac

scripts/ios/build_haven.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+. ./config.sh
+
+HAVEN_URL="https://github.com/haven-protocol-org/haven-main.git"
+HAVEN_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/haven"
+HAVEN_VERSION=tags/v2.2.2
+BUILD_TYPE=release
+PREFIX=${EXTERNAL_IOS_DIR}
+
+echo "Cloning haven from - $HAVEN_URL to - $HAVEN_DIR_PATH"		
+git clone $HAVEN_URL $HAVEN_DIR_PATH
+cd $HAVEN_DIR_PATH
+git checkout $HAVEN_VERSION
+git submodule update --init --force
+mkdir -p build
+cd ..
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -z $INSTALL_PREFIX ]; then
+    INSTALL_PREFIX=${ROOT_DIR}/haven
+fi
+
+for arch in "arm64" #"armv7" "arm64"
+do
+
+echo "Building IOS ${arch}"
+export CMAKE_INCLUDE_PATH="${PREFIX}/include"
+export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
+
+case $arch in
+	"armv7"	)
+		DEST_LIB=../../lib-armv7;;
+	"arm64"	)
+		DEST_LIB=../../lib-armv8-a;;
+esac
+
+rm -rf haven/build > /dev/null
+
+mkdir -p haven/build/${BUILD_TYPE}
+pushd haven/build/${BUILD_TYPE}
+cmake -D IOS=ON \
+	-DARCH=${arch} \
+	-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+	-DSTATIC=ON \
+	-DBUILD_GUI_DEPS=ON \
+	-DINSTALL_VENDORED_LIBUNBOUND=ON \
+	-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}  \
+    -DUSE_DEVICE_TREZOR=OFF \
+	../..
+make -j4 && make install
+cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}
+cp src/offshore/liboffshore.a ${DEST_LIB}
+popd
+
+done
+
+mkdir -p $EXTERNAL_IOS_LIB_DIR/haven
+mkdir -p $EXTERNAL_IOS_INCLUDE_DIR/haven
+#only for arm64
+cp ${HAVEN_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR/haven
+cp ${HAVEN_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR/haven

scripts/ios/build_haven_all.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. ./config.sh
+./install_missing_headers.sh
+./build_openssl.sh
+./build_boost.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_haven.sh

scripts/ios/config.sh

@@ -2,7 +2,7 @@
 
 export IOS_SCRIPTS_DIR=`pwd`
 export CW_ROOT=${IOS_SCRIPTS_DIR}/../..
-export EXTERNAL_DIR=${CW_ROOT}/cw_monero/ios/External
+export EXTERNAL_DIR=${CW_ROOT}/cw_shared_external/ios/External
 export EXTERNAL_IOS_DIR=${EXTERNAL_DIR}/ios
 export EXTERNAL_IOS_SOURCE_DIR=${EXTERNAL_IOS_DIR}/sources
 export EXTERNAL_IOS_LIB_DIR=${EXTERNAL_IOS_DIR}/lib

scripts/ios/setup.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+. ./config.sh
+
+cd $EXTERNAL_IOS_LIB_DIR
+libtool -static -o libboost.a ./boost/*.a
+libtool -static -o libhaven.a ./haven/*.a
+libtool -static -o libmonero.a ./monero/*.a
+
+CW_HAVEN_EXTERNAL_LIB=../../../cw_haven/ios/External/ios/lib
+CW_HAVEN_EXTERNAL_INCLUDE=../../../cw_haven/ios/External/ios/include
+CW_MONERO_EXTERNAL=../../../cw_haven/ios/External/ios/lib
+
+mkdir -p $CW_HAVEN_EXTERNAL_INCLUDE
+mkdir -p $CW_HAVEN_EXTERNAL_LIB
+mkdir -p $CW_MONERO_EXTERNAL
+
+ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
+ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
+ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
+ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
+cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB
+cp ../include/haven/* $CW_HAVEN_EXTERNAL_INCLUDE
+
+#ln -s ./libboost.a $CW_HAVEN_EXTERNAL_LIB
+#ln -s ./libcrypto.a $CW_HAVEN_EXTERNAL_LIB
+#ln -s ./libssl.a $CW_HAVEN_EXTERNAL_LIB
+#ln -s ./libsodium.a $CW_HAVEN_EXTERNAL_LIB
+#cp ./libhaven.a $CW_HAVEN_EXTERNAL_LIB