From 1e79ff618a008913c6e2190d1a04ab1d067cff96 Mon Sep 17 00:00:00 2001
From: Jon Griffiths <jon_p_griffiths@yahoo.com>
Date: Wed, 6 Apr 2022 14:16:50 +1200
Subject: [PATCH] build: update wally to 0.85 + windows/android build fixes

Also update configure arguments, and fix passing ndk x64
arch to wally.
---
 subprojects/libwally-core.wrap | 12 ++++++------
 tools/buildlibwally-core.sh    |  8 +-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/subprojects/libwally-core.wrap b/subprojects/libwally-core.wrap
index c7b1b8397..7f350331d 100644
--- a/subprojects/libwally-core.wrap
+++ b/subprojects/libwally-core.wrap
@@ -1,14 +1,14 @@
 [wrap-file]
-directory = wallycore-0.8.4
+directory = wallycore-0.8.5
 
-source_url = https://github.com/ElementsProject/libwally-core/releases/download/release_0.8.4/wallycore-0.8.4.tar.gz
-source_filename = wallycore-0.8.4.tar.gz
-source_hash = 8bca9067a8f10cf9e1fd2ae241c45ea891bada9d7685eadab052e948f2ae8afd
+source_url = https://github.com/ElementsProject/libwally-core/tarball/e6ab70fba3387d39cf5d871e45a8e6d16d90f593/ElementsProject-libwally-core-e6ab70f.tar.gz
+source_filename = ElementsProject-libwally-core-e6ab70f.tar.gz
+source_hash = c7dd0892a3c323f42505bfc852b75842ed60746daad71751f16a09f1c3711f33
 
 patch_url = file:./subprojects/libwally-core-meson/libwally-core-meson-f12b900e905ad04219f6b9e1598e1190706ff00a75f63964ab4a90182fb5ef3b.tar
 patch_filename = wallycore-meson-f12b900e905ad04219f6b9e1598e1190706ff00a75f63964ab4a90182fb5ef3b.tar
-patch_hash = b51f6e7d0e8d36c44bf94b66af1bbb78b306462d9775e8e68b48bfc2a459f422
+patch_hash = 7465c4ed52a59e2060135d1acefde2939c036a48f83f4e494914cde98400697e
 
 secp-url = https://github.com/ElementsProject/secp256k1-zkp.git
 # Update this line to the secp commit used in wally
-secp-commit = 7fec4e7acc66fb868a8546f36afd41742f381536
+secp-commit = 6c0aecf72b1f4290f50302440065392715d6240a
diff --git a/tools/buildlibwally-core.sh b/tools/buildlibwally-core.sh
index bff791d0d..833c1c641 100755
--- a/tools/buildlibwally-core.sh
+++ b/tools/buildlibwally-core.sh
@@ -43,7 +43,6 @@ cd ${WALLYCORE_BLDDIR}
 ${SED} -i 's/\"wallycore\"/\"greenaddress\"/' src/swig_java/swig.i
 
 CONFIGURE_ARGS="--enable-static --disable-shared --enable-elements --disable-tests"
-CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-ecmult-static-precomputation"
 CONFIGURE_ARGS="${CONFIGURE_ARGS} --prefix=${WALLYCORE_BLDDIR}/build"
 
 if [ "${BUILDTYPE}" = "debug" ]; then
@@ -68,12 +67,7 @@ if [ "$1" = "--ndk" ]; then
     export CFLAGS="${CFLAGS} -DPIC -fPIC ${EXTRA_FLAGS}"
     export LDFLAGS="${LDFLAGS} ${EXTRA_FLAGS}"
 
-    case ${HOST_ARCH} in
-        x86) HOST_ARCH=i686;;
-    esac
-
-    android_build_wally ${HOST_ARCH} ${NDK_TOOLSDIR} ${ANDROID_VERSION} --build=${HOST_OS} \
-          ${CONFIGURE_ARGS} ac_cv_c_bigendian=no --enable-swig-java --disable-swig-python --target=${SDK_PLATFORM}
+    android_build_wally ${HOST_ARCH} ${NDK_TOOLSDIR} ${ANDROID_VERSION} ${CONFIGURE_ARGS}
 elif [ \( "$1" = "--iphone" \) -o \( "$1" = "--iphonesim" \) ]; then
     . ${MESON_SOURCE_ROOT}/tools/ios_env.sh $1
     export CFLAGS="${CFLAGS} ${EXTRA_FLAGS} -O3"