Hv (#295)

* hv
* Change build version

scripts/android/app_env.sh

@@ -8,8 +8,9 @@ APP_ANDROID_PACKAGE=""
 
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
+HAVEN="haven"
 
-TYPES=($MONERO_COM $CAKEWALLET)
+TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
@@ -19,11 +20,17 @@ MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.3.8"
-CAKEWALLET_BUILD_NUMBER=89
+CAKEWALLET_VERSION="4.3.9"
+CAKEWALLET_BUILD_NUMBER=94
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 
+HAVEN_NAME="Haven"
+HAVEN_VERSION="1.0.0"
+HAVEN_BUILD_NUMBER=1
+HAVEN_BUNDLE_ID="com.cakewallet.haven"
+HAVEN_PACKAGE="com.cakewallet.haven"
+
 if ! [[ " ${TYPES[*]} " =~ " ${APP_ANDROID_TYPE} " ]]; then
     echo "Wrong app type."
     exit 1
@@ -44,6 +51,13 @@ case $APP_ANDROID_TYPE in
 		APP_ANDROID_BUNDLE_ID=$CAKEWALLET_BUNDLE_ID
 		APP_ANDROID_PACKAGE=$CAKEWALLET_PACKAGE
 		;;
+	$HAVEN)
+		APP_ANDROID_NAME=$HAVEN_NAME
+		APP_ANDROID_VERSION=$HAVEN_VERSION
+		APP_ANDROID_BUILD_NUMBER=$HAVEN_BUILD_NUMBER
+		APP_ANDROID_BUNDLE_ID=$HAVEN_BUNDLE_ID
+		APP_ANDROID_PACKAGE=$HAVEN_PACKAGE
+		;;
 esac
 
 export APP_ANDROID_TYPE

scripts/android/app_icon.sh

@@ -14,15 +14,20 @@ ANDROID_ICON_SET_DEST_PATH=`pwd`/../../android/app/src/main/res
 
 case $APP_ANDROID_TYPE in
 	"monero.com")
-	APP_LOGO=$ASSETS_DIR/images/monero.com_logo.png
-	ANDROID_ICON=$MONERO_COM_PATH
-	ANDROID_ICON_SET=$MONEROCOM_ICON_SET_PATH
+		APP_LOGO=$ASSETS_DIR/images/monero.com_logo.png
+		ANDROID_ICON=$MONERO_COM_PATH
+		ANDROID_ICON_SET=$MONEROCOM_ICON_SET_PATH
 	;;
 	"cakewallet")
     	APP_LOGO=$ASSETS_DIR/images/cakewallet_logo.png
     	ANDROID_ICON=$CAKEWALLET_PATH
     	ANDROID_ICON_SET=$CAKEWALLET_ICON_SET_PATH
     	;;
+    "haven")
+    	APP_LOGO=$ASSETS_DIR/images/cakewallet_logo.png
+    	ANDROID_ICON=$CAKEWALLET_PATH
+    	ANDROID_ICON_SET=$CAKEWALLET_ICON_SET_PATH
+    	;;
 esac
 
 rm $APP_LOGO_DEST_PATH

scripts/android/build_all.sh

@@ -1,8 +1,14 @@
-# /bin/bash
+#!/bin/sh
 
-./build_iconv.sh
-./build_boost.sh
-./build_openssl.sh
-./build_sodium.sh
-./build_zmq.sh
-./build_monero.sh
+if [ -z "$APP_ANDROID_TYPE" ]; then
+	echo "Please set APP_ANDROID_TYPE"
+	exit 1
+fi
+
+DIR=$(dirname "$0")
+
+case $APP_ANDROID_TYPE in
+	"monero.com") $DIR/build_monero_all.sh ;;
+	"cakewallet") $DIR/build_monero_all.sh ;;
+	"haven")      $DIR/build_haven_all.sh ;;
+esac

scripts/android/build_haven.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+
+. ./config.sh
+HAVEN_VERSION=tags/v2.2.2
+HAVEN_SRC_DIR=${WORKDIR}/haven
+
+git clone https://github.com/haven-protocol-org/haven-main.git ${HAVEN_SRC_DIR}
+git checkout ${HAVEN_VERSION}
+cd $HAVEN_SRC_DIR
+git submodule init
+git submodule update
+
+for arch in "aarch" "aarch64" "i686" "x86_64"
+do
+FLAGS=""
+PREFIX=${WORKDIR}/prefix_${arch}
+DEST_LIB_DIR=${PREFIX}/lib/haven
+DEST_INCLUDE_DIR=${PREFIX}/include
+export CMAKE_INCLUDE_PATH="${PREFIX}/include"
+export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
+ANDROID_STANDALONE_TOOLCHAIN_PATH="${TOOLCHAIN_BASE_DIR}_${arch}"
+PATH="${ANDROID_STANDALONE_TOOLCHAIN_PATH}/bin:${ORIGINAL_PATH}"
+
+mkdir -p $DEST_LIB_DIR
+mkdir -p $DEST_INCLUDE_DIR
+
+case $arch in
+	"aarch"	)
+		CLANG=arm-linux-androideabi-clang
+ 		CXXLANG=arm-linux-androideabi-clang++
+		BUILD_64=OFF
+		TAG="android-armv7"
+		ARCH="armv7-a"
+		ARCH_ABI="armeabi-v7a"
+		FLAGS="-D CMAKE_ANDROID_ARM_MODE=ON -D NO_AES=true";;
+	"aarch64"	)
+		CLANG=aarch64-linux-androideabi-clang
+ 		CXXLANG=aarch64-linux-androideabi-clang++
+		BUILD_64=ON
+		TAG="android-armv8"
+		ARCH="armv8-a"
+		ARCH_ABI="arm64-v8a";;
+	"i686"		)
+		CLANG=i686-linux-androideabi-clang
+ 		CXXLANG=i686-linux-androideabi-clang++
+		BUILD_64=OFF
+		TAG="android-x86"
+		ARCH="i686"
+		ARCH_ABI="x86";;
+	"x86_64"	)  
+		CLANG=x86_64-linux-androideabi-clang
+ 		CXXLANG=x86_64-linux-androideabi-clang++
+		BUILD_64=ON
+		TAG="android-x86_64"
+		ARCH="x86-64"
+		ARCH_ABI="x86_64";;
+esac
+
+cd $HAVEN_SRC_DIR
+rm -rf ./build/release
+mkdir -p ./build/release
+cd ./build/release
+CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../..
+    
+make wallet_api -j4
+find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;
+
+cp -r ./lib/* $DEST_LIB_DIR
+cp ../../src/wallet/api/wallet2_api.h  $DEST_INCLUDE_DIR
+done

scripts/android/build_haven_all.sh

@@ -0,0 +1,8 @@
+# /bin/bash
+
+./build_iconv.sh
+./build_boost.sh
+./build_openssl.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_haven.sh

scripts/android/build_monero_all.sh

@@ -0,0 +1,8 @@
+# /bin/bash
+
+./build_iconv.sh
+./build_boost.sh
+./build_openssl.sh
+./build_sodium.sh
+./build_zmq.sh
+./build_monero.sh

scripts/android/copy_monero_deps.sh

@@ -2,7 +2,7 @@
 
 WORKDIR=/opt/android
 CW_DIR=${WORKDIR}/cake_wallet
-CW_EXRTERNAL_DIR=${CW_DIR}/cw_monero/ios/External/android
+CW_EXRTERNAL_DIR=${CW_DIR}/cw_shared_external/ios/External/android
 
 for arch in "aarch" "aarch64" "i686" "x86_64"
 do

scripts/android/pubspec_gen.sh

@@ -2,6 +2,7 @@
 
 MONERO_COM=monero.com
 CAKEWALLET=cakewallet
+HAVEN=haven
 CONFIG_ARGS=""
 
 case $APP_ANDROID_TYPE in
@@ -9,7 +10,10 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--monero"
                 ;;
         $CAKEWALLET)
-                CONFIG_ARGS="--monero --bitcoin"
+                CONFIG_ARGS="--monero --bitcoin --haven"
+                ;;
+        $HAVEN)
+                CONFIG_ARGS="--haven"
                 ;;
 esac