update README.md

Dev v0.7

.gitignore

@@ -10,7 +10,6 @@
 opt
 
 vendor
-external-libs/monero
+external-libs
-external-libs/libsodium
 tmp
 builder

.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

README.md

@@ -4,7 +4,13 @@ An Android Wallet for Wownero
 [<img src="https://f-droid.org/badge/get-it-on.png"
       alt="Get it on F-Droid"
       height="80">](https://f-droid.org/packages/com.wownero.wownerujo/)
-<a href='https://play.google.com/store/apps/details?id=com.wownero.wownerujo&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80'/></a>
+<a href='https://play.google.com/store/apps/details?id=com.wownero.wownerujo'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80'/></a>
+
+## Run your own mobile full node for improved speed and privacy
+
+- [CyberWOW]
+- [Wownero daemon]
+- [Wownero RPC daemon]
 
 ## QUICKSTART
 - Download it with the F-Droid app or the Google Play app.
@@ -14,11 +20,6 @@ An Android Wallet for Wownero
 ## Disclaimer
 You may lose all your Wowneroj if you use this app.
 
-## Random Notes
-- Based off Wownero v0.5.
-- Use your own daemon.
-- Screen stays on until first sync is complete.
-
 ## HOW TO BUILD
 
 If you want to build the external libs yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md).
@@ -37,3 +38,6 @@ Then, fire up Android Studio and build the APK.
 
 
 [beta channel]:https://play.google.com/apps/testing/com.wownero.wownerujo/join
+[CyberWOW]: https://play.google.com/store/apps/details?id=org.wownero.cyberwow
+[Wownero daemon]: https://github.com/enerc/wownero-daemon/releases
+[Wownero RPC daemon]: https://git.wownero.com/wownero/wownero/releases

app/CMakeLists.txt

@@ -147,6 +147,26 @@ add_library(version STATIC IMPORTED)
 set_target_properties(version PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
 
+add_library(randomx STATIC IMPORTED)
+set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librandomx.a)
+
+add_library(net STATIC IMPORTED)
+set_target_properties(net PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libnet.a)
+
+add_library(hardforks STATIC IMPORTED)
+set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libhardforks.a)
+
+add_library(rpc_base STATIC IMPORTED)
+set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librpc_base.a)
+
+add_library(blocks STATIC IMPORTED)
+set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
+
 #############
 # System
 #############
@@ -157,6 +177,7 @@ include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
 
 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})
 
+# here order matters
 target_link_libraries(  monerujo
 
                         wallet_api
@@ -164,6 +185,7 @@ target_link_libraries(  monerujo
                         cryptonote_core
                         cryptonote_basic
                         mnemonics
+                        net
                         ringct
                         ringct_basic
                         common
@@ -178,6 +200,11 @@ target_link_libraries(  monerujo
                         device
                         multisig
                         version
+                        randomx
+                        hardforks
+                        rpc_base
+                        blocks
+
 
                         boost_chrono
                         boost_date_time

app/build.gradle

@@ -10,8 +10,8 @@ android {
         // https://source.android.com/security/bulletin/2018-03-01
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 1180
+        versionCode 1230
-        versionName '2.5.0.4'
+        versionName '2.7.0.0'
         // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -50,13 +50,13 @@ android {
         }
     }
     // def abiCodes = ['arm64-v8a': 2]
-    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 4]
+    def abiCodes = ['arm64-v8a': 2, 'x86_64': 4]
     splits {
         abi {
             enable true
             reset()
             // include 'arm64-v8a'
-            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+            include 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
@@ -68,12 +68,12 @@ android {
 //                abi {
 //                    enable true
 //                    reset()
-//                    include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+//                    include 'arm64-v8a', 'x86_64'
 //                    universalApk true
 //                }
 //            }
 //
-//            abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 4]
+//            abiCodes = ['arm64-v8a': 2, 'x86_64': 4]
 //        }
     }
     // Map for the version code that gives each ABI a value.

app/src/main/java/com/wownero/wownerujo/LoginFragment.java

@@ -374,18 +374,11 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     private static final String PREF_DAEMON_TESTNET = "daemon_testnet";
 
 
-    private static final String PREF_DAEMONLIST_MAINNET
+    private static final String PREF_DAEMONLIST_MAINNET = "localhost";
-        = "node.wowne.ro"
+
-        + ";node.pwned.systems"
+    private static final String PREF_DAEMONLIST_STAGENET = "";
-        + ";node.wowkira.com"
+
-        + ";localhost"
+    private static final String PREF_DAEMONLIST_TESTNET = "";
-        ;
-
-    private static final String PREF_DAEMONLIST_STAGENET =
-            "node.wowne.ro";
-
-    private static final String PREF_DAEMONLIST_TESTNET =
-            "node.wowne.ro";
 
     private NodeList daemonMainNet;
     private NodeList daemonStageNet;

app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java

@@ -53,6 +53,14 @@ public class RestoreHeight {
         blockheight.put("2018-12", 66000L);
         blockheight.put("2019-01", 72000L);
         blockheight.put("2019-02", 77000L);
+        blockheight.put("2019-03", 84000L);
+        blockheight.put("2019-04", 93000L);
+        blockheight.put("2019-05", 101000L);
+        blockheight.put("2019-06", 110000L);
+        blockheight.put("2019-07", 119000L);
+        blockheight.put("2019-08", 128000L);
+        blockheight.put("2019-09", 137000L);
+        blockheight.put("2019-10", 146000L);
     }
 
     long latestHeight = 77000L;

app/src/main/res/values/strings.xml

@@ -373,7 +373,7 @@
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
     <string name="generate_address_label_sub">Public Subaddress #%1$d</string>
-    <string name="default_restore_height">2019-02</string>
+    <string name="default_restore_height">2019-10</string>
     <string name="menu_language">Language</string>
     <string name="language_system_default">Use System Language</string>
 </resources>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 

external-libs/.gitignore

@@ -1 +0,0 @@
-boost

external-libs/boost/lib/arm64-v8a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/boost/lib/armeabi-v7a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/boost/lib/x86/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/boost/lib/x86_64/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/collect.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-#  -D BOOST_ROOT=/opt/android/boost_1_58_0
-
-set -e
-
-orig_path=$PATH
-build_root=$EXTERNAL_LIBS_BUILD_ROOT
-
-packages=(boost openssl monero libsodium)
-archs=(arm arm64 x86_64)
-
-for arch in ${archs[@]}; do
-    case ${arch} in
-        "arm")
-			xarch="armeabi-v7a"
-			;;
-        "arm64")
-			xarch="arm64-v8a"
-            ;;
-        "x86")
-			xarch="x86"
-            ;;
-        "x86_64")
-			xarch="x86_64"
-            ;;
-        *)
-			exit 16
-            ;;
-    esac
-
-	for package in ${packages[@]}; do
-		OUTPUT_DIR=`pwd`/$package/lib/$xarch
-		mkdir -p $OUTPUT_DIR
-		rm -f $OUTPUT_DIR/*.a
-		cp -a $build_root/build/$package/$arch/lib/*.a $OUTPUT_DIR
-
-		if [ $package = "monero" -a -d "$build_root/build/$package/include" ]; then
-			rm -rf $OUTPUT_DIR/../../include
-		  cp -a $build_root/build/$package/include $OUTPUT_DIR/../..
-		fi
-
-	done
-done
-exit 0
-

external-libs/monero/lib/arm64-v8a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/monero/lib/armeabi-v7a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/monero/lib/x86/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/monero/lib/x86_64/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/openssl/lib/arm64-v8a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/openssl/lib/armeabi-v7a/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/openssl/lib/x86/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

external-libs/openssl/lib/x86_64/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 04 07:20:02 UTC 2018
+#Sun May 19 08:39:37 UTC 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

script/build-external-libs/android-openssl/build-all-arch.sh

@@ -8,18 +8,18 @@ set -e
 rm -rf prebuilt
 mkdir prebuilt
 
-archs=(armeabi arm64-v8a x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
     xLIB="/lib"
     case ${arch} in
-        "armeabi")
+        "arm")
             _ANDROID_TARGET_SELECT=arch-arm
             _ANDROID_ARCH=arch-arm
             _ANDROID_EABI=arm-linux-androideabi-4.9
             _ANDROID_EABI_INC=arm-linux-androideabi
             configure_platform="android-armv7" ;;
-        "arm64-v8a")
+        "arm64")
             _ANDROID_TARGET_SELECT=arch-arm64-v8a
             _ANDROID_ARCH=arch-arm64
             _ANDROID_EABI=aarch64-linux-android-4.9

script/build-external-libs/build-boost.sh

@@ -20,7 +20,7 @@ args="--build-type=minimal link=static runtime-link=static --with-chrono \
 --toolset=clang-android threading=multi threadapi=pthread target-os=android \
 "
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 for arch in ${archs[@]}; do
     extra_build_flags=""
     case ${arch} in

script/build-external-libs/build-libsodium.sh

@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 cd $build_root/libsodium
 ./autogen.sh
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 for arch in ${archs[@]}; do
     extra_cmake_flags=""
     case ${arch} in

script/build-external-libs/build-wownero.sh

@@ -13,7 +13,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
 build_type=release # or debug
 
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
     ldflags=""
@@ -50,23 +50,24 @@ for arch in ${archs[@]}; do
         CC=clang CXX=clang++ \
         CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \
         cmake \
-        -D ANDROID=true \
+        -DANDROID=true \
-        -D ARCH="$xarch" \
+        -DARCH="$xarch" \
-        -D BOOST_LIBRARYDIR=$build_root/build/boost/$arch/lib \
+        -DBOOST_LIBRARYDIR=$build_root/build/boost/$arch/lib \
-        -D BOOST_ROOT=$build_root/build/boost/$arch \
+        -DBOOST_ROOT=$build_root/build/boost/$arch \
-        -D BUILD_64=$sixtyfour \
+        -DBUILD_64=$sixtyfour \
-        -D BUILD_GUI_DEPS=1 \
+        -DBUILD_GUI_DEPS=1 \
-        -D BUILD_TAG="android" \
+        -DBUILD_TAG="android" \
-        -D BUILD_TESTS=OFF \
+        -DBUILD_TESTS=OFF \
-        -D CMAKE_BUILD_TYPE=$build_type \
+        -DCMAKE_BUILD_TYPE=$build_type \
-        -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \
+        -DCMAKE_CXX_STANDARD=11 \
-        -D FORCE_USE_HEAP=1 \
+        -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \
-        -D OPENSSL_CRYPTO_LIBRARY=$build_root/build/openssl/$arch/lib/libcrypto.so \
+        -DFORCE_USE_HEAP=1 \
-        -D OPENSSL_INCLUDE_DIR=$build_root/build/openssl/$arch/include \
+        -DOPENSSL_CRYPTO_LIBRARY=$build_root/build/openssl/$arch/lib/libcrypto.so \
-        -D OPENSSL_ROOT_DIR=$build_root/build/openssl/$arch \
+        -DOPENSSL_INCLUDE_DIR=$build_root/build/openssl/$arch/include \
-        -D OPENSSL_SSL_LIBRARY=$build_root/build/openssl/$arch/lib/libssl.so \
+        -DOPENSSL_ROOT_DIR=$build_root/build/openssl/$arch \
-        -D LIBSODIUM_INCLUDE_DIR=$build_root/build/libsodium/$arch/include \
+        -DOPENSSL_SSL_LIBRARY=$build_root/build/openssl/$arch/lib/libssl.so \
-        -D STATIC=ON \
+        -DLIBSODIUM_INCLUDE_DIR=$build_root/build/libsodium/$arch/include \
+        -DSTATIC=ON \
         $extra_cmake_flags \
         ../..
 

script/build-external-libs/collect.sh

@@ -4,9 +4,46 @@ set -e
 
 source script/build-external-libs/env.sh
 
+rm -rf external-libs
+mkdir external-libs
 cd external-libs
 
-find . -name "*.a" -exec rm {} \;
+orig_path=$PATH
-find . -name "*.h" -exec rm {} \;
+build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
-./collect.sh
+packages=(boost openssl monero libsodium)
+archs=(arm64 x86_64)
+
+for arch in ${archs[@]}; do
+    case ${arch} in
+        "arm")
+                        xarch="armeabi-v7a"
+                        ;;
+        "arm64")
+                        xarch="arm64-v8a"
+            ;;
+        "x86")
+                        xarch="x86"
+            ;;
+        "x86_64")
+                        xarch="x86_64"
+            ;;
+        *)
+                        exit 16
+            ;;
+    esac
+
+        for package in ${packages[@]}; do
+                OUTPUT_DIR=`pwd`/$package/lib/$xarch
+                mkdir -p $OUTPUT_DIR
+                rm -f $OUTPUT_DIR/*.a
+                cp -a $build_root/build/$package/$arch/lib/*.a $OUTPUT_DIR
+
+                if [ $package = "monero" -a -d "$build_root/build/$package/include" ]; then
+                        rm -rf $OUTPUT_DIR/../../include
+                  cp -a $build_root/build/$package/include $OUTPUT_DIR/../..
+                fi
+
+        done
+done
+exit 0

script/build-external-libs/fetch-wownero.sh

@@ -11,9 +11,7 @@ cd $EXTERNAL_LIBS_BUILD_ROOT
 
 # url="$base_dir/vendor/wownero"
 url="https://github.com/wownero/wownero"
-# url="https://github.com/wowario/wownero"
+version="v0.7.0"
-version="v0.5.0.2"
-# version="1b5cefa"
 
 
 rm -rf wownero

script/build-external-libs/patch-wownero.sh

@@ -9,10 +9,6 @@ cd wownero
 
 sed -i 's/-Werror/-Wall/g' CMakeLists.txt
 sed -i 's/program_options locale/program_options/g' CMakeLists.txt
-sed -i 's/find_path(ZMQ_INCLUDE_PATH zmq.hpp)//g' CMakeLists.txt
-sed -i 's/find_library(ZMQ_LIB zmq)//g' CMakeLists.txt
-sed -i 's/message(FATAL_ERROR "Could not find required header zmq.hpp")//g' CMakeLists.txt
-sed -i 's/message(FATAL_ERROR "Could not find required libzmq")//g' CMakeLists.txt
 sed -i 's/bool create_address_file = false/bool create_address_file = true/g' src/wallet/wallet2.h
 
 sodium_pattern="find_library(SODIUM_LIBRARY sodium)"

script/build-external-libs/post-build-openssl.sh

@@ -6,24 +6,17 @@ source script/build-external-libs/env.sh
 
 build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
-mkdir -p $build_root/build/openssl/{arm,arm64,x86_64}
+mkdir -p $build_root/build/openssl/
-
-cp -a $build_root/android-openssl/prebuilt/armeabi   $build_root/build/openssl/arm/lib
-cp -a $build_root/android-openssl/prebuilt/arm64-v8a $build_root/build/openssl/arm64/lib
-cp -a $build_root/android-openssl/prebuilt/x86_64    $build_root/build/openssl/x86_64/lib
-
 cp -aL $build_root/android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ $build_root/build/openssl/include
 
-ln -s $build_root/build/openssl/include $build_root/build/openssl/arm/include
+archs=(arm64 x86_64)
-ln -s $build_root/build/openssl/include $build_root/build/openssl/arm64/include
-ln -s $build_root/build/openssl/include $build_root/build/openssl/x86_64/include
-
 
-ln -sf $build_root/build/openssl/include $build_root/tool/arm/sysroot/usr/include/openssl
+for arch in ${archs[@]}; do
-ln -sf $build_root/build/openssl/arm/lib/*.so $build_root/tool/arm/sysroot/usr/lib
+    mkdir -p $build_root/build/openssl/$arch
 
-ln -sf $build_root/build/openssl/include $build_root/tool/arm64/sysroot/usr/include/openssl
+    cp -a $build_root/android-openssl/prebuilt/$arch $build_root/build/openssl/$arch/lib
-ln -sf $build_root/build/openssl/arm64/lib/*.so $build_root/tool/arm64/sysroot/usr/lib
 
-ln -sf $build_root/build/openssl/include $build_root/tool/x86_64/sysroot/usr/include/openssl
+    ln -s $build_root/build/openssl/include $build_root/build/openssl/$arch/include
-ln -sf $build_root/build/openssl/x86_64/lib/*.so $build_root/tool/x86_64/sysroot/usr/lib64
+    ln -sf $build_root/build/openssl/include $build_root/tool/$arch/sysroot/usr/include/openssl
+    ln -sf $build_root/build/openssl/$arch/lib/*.so $build_root/tool/$arch/sysroot/usr/lib
+done

script/build-external-libs/prep-toolchain.sh

@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
 
 args="--api 23 --stl=libc++"
-archs=(arm arm64 x86_64)
+archs=(arm64 x86_64)
 
 for arch in ${archs[@]}; do
 

script/nix/f-droid-build-shell.nix

@@ -5,13 +5,21 @@ with pkgs;
 let
 
   fdroid-python-packages = python-packages: with python-packages; [
-    requests
+    androguard
+    clint
+    defusedxml
+    GitPython
+    libcloud
+    mwclient
     paramiko
+    pillow
+    pyasn1
     pyasn1-modules
-    clint
+    python-vagrant
     pyyaml
-
+    qrcode
-    virtualenvwrapper
+    requests
+    ruamel_yaml
   ]
 
 ; python-with-fdroid-packages = pkgs.python3.withPackages fdroid-python-packages

script/nix/shell.nix

@@ -84,20 +84,18 @@ with nixpkgs;
   ])
 
 ; profile = ''
-    export ANDROID_HOME=~/Android/Sdk
+    export ANDROID_HOME=~/SDK/Android/Sdk
 
-    # export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle
+    export ANDROID_NDK_ROOT=~/SDK/Android/ndk-archive/android-ndk-r17c
 
-    export ANDROID_NDK_ROOT=~/Android/ndk-archive/android-ndk-r17c
+    PATH=~/SDK/Android/android-studio/bin/:$PATH
-
-    PATH=~/sdk/android/android-studio/bin/:$PATH
     PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
     export PATH
 
     export _JAVA_AWT_WM_NONREPARENTING=1
 
-    export app_version=1180
+    export app_version=1230
-    export gradle_app_version=2x5x0x4
+    export gradle_app_version=2x7x0x0
     export release_key=~/.android/fuwa-release-key.jks
 
     export USE_CCACHE=1