wownero
/
wownerujo
Archived
4
0
Fork 0
Code Releases 19 Activity

Merge pull request #18 from fuwa0529/dev-v0.6

Browse Source 
dev-v0.6
master v2.6.0.0
fuwa 5 years ago committed by GitHub
parent 133bfa59c2 fef345152e
commit ebda5db115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File

3
.idea/gradle.xml
Unescape View File

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

11
app/CMakeLists.txt
Unescape View File

@ -147,6 +147,14 @@ add_library(version STATIC IMPORTED)
set_target_properties(version PROPERTIES IMPORTED_LOCATION set_target_properties(version PROPERTIES IMPORTED_LOCATION
${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a) ${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)
############# #############
# System # System
############# #############
@ -157,6 +165,7 @@ include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR}) message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR})
# here order matters
target_link_libraries( monerujo target_link_libraries( monerujo
wallet_api wallet_api
@ -164,6 +173,7 @@ target_link_libraries( monerujo
cryptonote_core cryptonote_core
cryptonote_basic cryptonote_basic
mnemonics mnemonics
net
ringct ringct
ringct_basic ringct_basic
common common
@ -178,6 +188,7 @@ target_link_libraries( monerujo
device device
multisig multisig
version version
randomx
boost_chrono boost_chrono
boost_date_time boost_date_time

4
app/build.gradle
Unescape View File

@ -10,8 +10,8 @@ android {
// https://source.android.com/security/bulletin/2018-03-01 // https://source.android.com/security/bulletin/2018-03-01
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 28 targetSdkVersion 28
versionCode 1180 versionCode 1200
versionName '2.5.0.4' versionName '2.6.0.0'
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { cmake {

4
app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java
Unescape View File

@ -53,6 +53,10 @@ public class RestoreHeight {
blockheight.put("2018-12", 66000L); blockheight.put("2018-12", 66000L);
blockheight.put("2019-01", 72000L); blockheight.put("2019-01", 72000L);
blockheight.put("2019-02", 77000L); 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);
} }
long latestHeight = 77000L; long latestHeight = 77000L;

2
app/src/main/res/values/strings.xml
Unescape View File

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

2
build.gradle
Unescape View File

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

4
gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,6 +1,6 @@
#Thu Oct 04 07:20:02 UTC 2018 #Sun May 19 08:39:37 UTC 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

6
script/build-external-libs/android-openssl/build-all-arch.sh
Unescape View File

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

35
script/build-external-libs/build-wownero.sh
Unescape View File

@ -50,23 +50,24 @@ for arch in ${archs[@]}; do
CC=clang CXX=clang++ \ CC=clang CXX=clang++ \
CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \ CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \
cmake \ 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 \ $extra_cmake_flags \
../.. ../..

6
script/build-external-libs/fetch-wownero.sh
Unescape View File

@ -10,10 +10,10 @@ cd $EXTERNAL_LIBS_BUILD_ROOT
# url="$base_dir/vendor/wownero" # url="$base_dir/vendor/wownero"
# url="https://github.com/wownero/wownero"
url="https://github.com/wownero/wownero" url="https://github.com/wownero/wownero"
# url="https://github.com/wowario/wownero" version="v0.6.0.0"
version="v0.5.0.2" # version="dev-v0.6"
# version="1b5cefa"
rm -rf wownero rm -rf wownero

25
script/build-external-libs/post-build-openssl.sh
Unescape View File

@ -6,24 +6,17 @@ source script/build-external-libs/env.sh
build_root=$EXTERNAL_LIBS_BUILD_ROOT 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 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=(arm 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

12
script/nix/shell.nix
Unescape View File

@ -84,20 +84,18 @@ with nixpkgs;
]) ])
; profile = '' ; 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 PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
export PATH export PATH
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export app_version=1180 export app_version=1200
export gradle_app_version=2x5x0x4 export gradle_app_version=2x6x0x0
export release_key=~/.android/fuwa-release-key.jks export release_key=~/.android/fuwa-release-key.jks
export USE_CCACHE=1 export USE_CCACHE=1