Merge pull request #9 from fuwa0529/dev

update to wow 0.8

Makefile

@@ -50,32 +50,17 @@ run-release:
 	cd cyberwow && \
 	flutter run --release --pid-file /tmp/flutter.pid
 
-# clang -target aarch64-linux-android21 cyberwow/native/hello.c -o cyberwow/native/output/hello
-c:
-	clang -target x86_64-linux-android21 cyberwow/native/hello.c -o cyberwow/native/output/x86_64/wownerod
-
-build-c: c
+build:
 	cd cyberwow && \
-	flutter clean
-
-push:
-	adb push cyberwow/native/output/hello /data/local/tmp
-
-test-android:
-	adb shell /data/local/tmp/hello
-
-test-c: c push test-android
+	flutter build apk --target-platform android-arm64
 
-collect:
-	cp ../vendor/wownero/bin/wownerod cyberwow/native/output/arm64/
-
-build:
+build-bundle:
 	cd cyberwow && \
-	flutter build apk --target-platform android-arm64 -v
+	flutter build appbundle --target-platform android-arm64
 
 build-debug:
 	cd cyberwow && \
-	flutter build apk --debug --target-platform android-arm64
+	flutter build appbundle --debug --target-platform android-arm64
 
 install: build
 	cd cyberwow && \
@@ -87,8 +72,6 @@ script := etc/scripts/build-external-libs
 
 wow: clean-external-libs collect-wownero build
 
-wow-no-native: build
-
 clean-external-libs:
 	$(script)/clean.sh
 
@@ -103,11 +86,7 @@ boost: iconv
 	$(script)/boost/fetch.sh
 	$(script)/boost/build.sh
 
-zlib: toolchain
-	$(script)/zlib/fetch.sh
-	$(script)/zlib/build.sh
-
-openssl: zlib
+openssl: toolchain
 	$(script)/openssl/fetch.sh
 	$(script)/openssl/build.sh
 

README.md

@@ -7,57 +7,12 @@ A dumb android pruned full node for Wownero.
       height="80">](https://f-droid.org/en/packages/org.wownero.cyberwow/)
 <a href='https://play.google.com/store/apps/details?id=org.wownero.cyberwow'><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>
 
-## How to build
-
-### Compile wownerod for android-arm64
-
-#### Simple method with Docker
-
-```
-pushd .
-git clone https://github.com/wownero/wownero
-cd wownero
-git submodule init && git submodule update
-
-docker build -f utils/build_scripts/android64.Dockerfile -t wownero-android .
-# Create container
-docker create -it --name wownero-android wownero-android bash
-# Get binaries
-docker cp wownero-android:/src/build/release/bin .
-```
-
-The binary needed is `./bin/wownerod`.
-
-#### Alternative methods
-
-1. One docker instance per hash
-
-See `etc/scripts/docker-build-wownero.sh`, modify the value of `version` per build.
 
-2. Debian based system similar to F-droid
-
-See the `wow` task in `Makefile`.
-
-### Install flutter and make sure it's in path
-
-### Compile CyberWOW
-
-```
-popd
-git clone https://github.com/wownero/cyberwow/
-cd cyberwow
-
-mkdir -p cyberwow/android/app/src/main/jniLibs/arm64-v8a
-
-# Copy wownerod that we just built
-cp $PATH_TO_WOWNEROD \
-cyberwow/android/app/src/main/jniLibs/arm64-v8a/libwownerod.so
-
-make build
-```
+## How to build
 
-The resulting apk is `cyberwow/build/app/outputs/apk/release/app-release.apk`.
+An example build script that works on an F-droid build server, which is based on debian stable, is here:
 
+<https://gitlab.com/fdroid/fdroiddata/-/raw/master/metadata/org.wownero.cyberwow.yml>
 
 ## How to use custom start up arguments
 

cyberwow/android/app/build.gradle

@@ -41,8 +41,8 @@ android {
         applicationId "org.wownero.cyberwow"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 25
-        versionName "0.7.0.0-l"
+        versionCode 26
+        versionName "0.8.0.0"
     }
 
     if(project.hasProperty("RELEASE_STORE_FILE")) {

cyberwow/lib/config/cyberwow.dart

@@ -34,6 +34,7 @@ final _theme = ThemeData
   accentColor: crtGreen,
   cursorColor: crtGreen,
 
+  backgroundColor: Colors.black,
   scaffoldBackgroundColor: Colors.black,
 
   textTheme: TextTheme

cyberwow/pubspec.lock

@@ -7,42 +7,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -78,7 +78,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.0+4"
+    version: "0.12.1"
   http_parser:
     dependency: transitive
     description:
@@ -92,7 +92,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   intl:
     dependency: "direct main"
     description:
@@ -134,21 +134,21 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.5"
+    version: "1.6.8"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.4+2"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   pedantic:
     dependency: transitive
     description:
@@ -183,35 +183,35 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.6+3"
+    version: "0.5.7+2"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+6"
+    version: "0.0.1+8"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+4"
+    version: "0.1.2+5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -223,7 +223,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -279,7 +279,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
 sdks:
-  dart: ">=2.5.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.4 <2.0.0"
+  dart: ">=2.6.0 <3.0.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"

cyberwow/pubspec.yaml

@@ -1,7 +1,7 @@
 name: cyberwow
 description: A new Flutter project.
 
-version: 0.7.0+25
+version: 0.8.0+0
 
 environment:
   sdk: ">=2.1.0 <3.0.0"

etc/nix/fdroid.nix

@@ -18,12 +18,10 @@ let
     pyasn1
     pyasn1-modules
     python-vagrant
-    libvirt
     pyyaml
     qrcode
     requests
     ruamel_yaml
-    libvirt
   ]
 
 ; python-with-fdroid-packages = pkgs.python3.withPackages fdroid-python-packages