bump version

Fix node port input field (#943 )
Weblate (#996 )
2025-09-02 15:53:04 +02:00 · 2025-06-17 19:27:03 +02:00 · 2025-06-15 22:48:39 +02:00 · 2025-06-15 22:46:11 +02:00 · 2025-06-15 22:44:52 +02:00 · 2025-06-15 22:42:57 +02:00
575 changed files with 42571 additions and 17221 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
  build:
    working_directory: ~/code
    docker:
-      - image: bitriseio/android-ndk
+      - image: cimg/android:2023.12-ndk
    environment:
      JVM_OPTS: -Xmx3200m
    steps:
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,11 @@
 /captures
 .externalNativeBuild
 .DS_Store
+/app/build
 /app/release
+/app/alpha*
+/app/prod*
+/app/.cxx
+/monerujo.id
+/external-libs/VERSION
+/external-libs/include/wallet2_api.h
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-workspace.xml
-markdown-*
-misc.xml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-xmrwallet
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="disableWrapperSourceDistributionNotification" value="true" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/xmrwallet.iml" filepath="$PROJECT_DIR$/xmrwallet.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/README.md
+++ b/README.md
@@ -15,28 +15,33 @@ Another Android Monero Wallet for Monero
 - Advanced users can copy over synced wallet files (all files) onto sdcard in directory Monerujo (created first time App is started)
 - See the [FAQ](doc/FAQ.md)

-## Translations
-Help us translate Monerujo! You can find instructions [On Taiga](https://taiga.getmonero.org/project/erciccione-monero-localization/wiki/monerujo), and if you need help/support, open an issue or contact the Localization Workgroup. You can find us on the freenode channel `#monero-translations`, also relayed on [MatterMost](https://mattermost.getmonero.org/monero/channels/monero-translations), and matrix/riot.
+## Translation
+If you'd like to help translate Monerujo, take a look at our [Weblate project!](https://hosted.weblate.org/engage/monerujo/)
+Thank you so much for your help!
+
+<a href="https://hosted.weblate.org/engage/monerujo/">
+<img src="https://hosted.weblate.org/widget/monerujo/multi-auto.svg" alt="Translation status" />
+</a>

 ### Disclaimer
-You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
+You may lose all your Monero if you use this App. Be cautious when spending on the mainnet.

 ### Random Notes
- works on the mainnet & stagenet
- use your own daemon - it's easy
+- Works on the mainnet & stagenet
+- Use your own daemon - it's easy
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/

 ### TODO
- see taiga.getmonero.org & issues on github
+- See taiga.getmonero.org & issues on github

 ### Issues / Pitfalls
 - Users of Zenfone MAX & Zenfone 2 Laser (possibly others) **MUST** use the armeabi-v7a APK as the arm64-v8a build uses hardware AES
-functionality these models don't have.
+  functionality these models don't have.
 - You should backup your wallet files in the "monerujo" folder periodically.
 - Also note, that on some devices the backups will only be visible on a PC over USB after a reboot of the device (it's an Android bug/feature)
 - Created wallets on a private testnet are unusable because the restore height is set to that
-of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
-The official monero client shows the same behaviour.
+  of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
+  The official monero client shows the same behaviour.

 ### HOW TO BUILD

--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,5 +0,0 @@
-.externalNativeBuild
-build
-app.iml
-prod
-alpha
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.4.1)
+project(monerujo)
 message(STATUS ABI_INFO  = ${ANDROID_ABI})

 add_library( monerujo
@@ -13,7 +14,7 @@ set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs)

 add_library(sodium STATIC IMPORTED)
 set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
-        ${EXTERNAL_LIBS_DIR}/libsodium/lib/${ANDROID_ABI}/libsodium.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libsodium.a)

 ############
 # OpenSSL
@@ -21,11 +22,11 @@ set_target_properties(sodium PROPERTIES IMPORTED_LOCATION

 add_library(crypto STATIC IMPORTED)
 set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
-        ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libcrypto.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libcrypto.a)

 add_library(ssl STATIC IMPORTED)
 set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libssl.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libssl.a)

 ############
 # Boost
@@ -33,39 +34,39 @@ set_target_properties(ssl PROPERTIES IMPORTED_LOCATION

 add_library(boost_chrono STATIC IMPORTED)
 set_target_properties(boost_chrono PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_chrono.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_chrono.a)

 add_library(boost_date_time STATIC IMPORTED)
 set_target_properties(boost_date_time PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_date_time.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_date_time.a)

 add_library(boost_filesystem STATIC IMPORTED)
 set_target_properties(boost_filesystem PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_filesystem.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_filesystem.a)

 add_library(boost_program_options STATIC IMPORTED)
 set_target_properties(boost_program_options PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_program_options.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_program_options.a)

 add_library(boost_regex STATIC IMPORTED)
 set_target_properties(boost_regex PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_regex.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_regex.a)

 add_library(boost_serialization STATIC IMPORTED)
 set_target_properties(boost_serialization PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_serialization.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_serialization.a)

 add_library(boost_system STATIC IMPORTED)
 set_target_properties(boost_system PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_system.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_system.a)

 add_library(boost_thread STATIC IMPORTED)
 set_target_properties(boost_thread PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_thread.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_thread.a)

 add_library(boost_wserialization STATIC IMPORTED)
 set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_wserialization.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_wserialization.a)

 #############
 # Monero
@@ -73,79 +74,107 @@ set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION

 add_library(wallet_api STATIC IMPORTED)
 set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet_api.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet_api.a)

 add_library(wallet STATIC IMPORTED)
 set_target_properties(wallet PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet.a)

 add_library(cryptonote_core STATIC IMPORTED)
 set_target_properties(cryptonote_core PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_core.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_core.a)

 add_library(cryptonote_basic STATIC IMPORTED)
 set_target_properties(cryptonote_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_basic.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_basic.a)

 add_library(mnemonics STATIC IMPORTED)
 set_target_properties(mnemonics PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmnemonics.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libmnemonics.a)

 add_library(common STATIC IMPORTED)
 set_target_properties(common PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcommon.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcommon.a)

 add_library(cncrypto STATIC IMPORTED)
 set_target_properties(cncrypto PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcncrypto.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcncrypto.a)

 add_library(ringct STATIC IMPORTED)
 set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libringct.a)

 add_library(ringct_basic STATIC IMPORTED)
 set_target_properties(ringct_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct_basic.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libringct_basic.a)

 add_library(blockchain_db STATIC IMPORTED)
 set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblockchain_db.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libblockchain_db.a)

 add_library(lmdb STATIC IMPORTED)
 set_target_properties(lmdb PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/liblmdb.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/liblmdb.a)

 add_library(easylogging STATIC IMPORTED)
 set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libeasylogging.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libeasylogging.a)

 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libunbound.a)

 add_library(epee STATIC IMPORTED)
 set_target_properties(epee PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libepee.a)

 add_library(blocks STATIC IMPORTED)
 set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libblocks.a)

 add_library(checkpoints STATIC IMPORTED)
 set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcheckpoints.a)

 add_library(device STATIC IMPORTED)
 set_target_properties(device PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libdevice.a)
+
+add_library(device_trezor STATIC IMPORTED)
+set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libdevice_trezor.a)

 add_library(multisig STATIC IMPORTED)
 set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmultisig.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libmultisig.a)

 add_library(version STATIC IMPORTED)
 set_target_properties(version PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libversion.a)
+
+add_library(net STATIC IMPORTED)
+set_target_properties(net PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libnet.a)
+
+add_library(hardforks STATIC IMPORTED)
+set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libhardforks.a)
+
+add_library(randomx STATIC IMPORTED)
+set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/librandomx.a)
+
+add_library(rpc_base STATIC IMPORTED)
+set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/librpc_base.a)
+
+add_library(wallet-crypto STATIC IMPORTED)
+set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet-crypto.a)
+
+add_library(cryptonote_format_utils_basic STATIC IMPORTED)
+set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_format_utils_basic.a)

 #############
 # System
@@ -153,19 +182,27 @@ set_target_properties(version PROPERTIES IMPORTED_LOCATION

 find_library( log-lib log )

-include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
+include_directories( ${EXTERNAL_LIBS_DIR}/include )

 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})

+if(${ANDROID_ABI} STREQUAL "x86_64")
+    set(EXTRA_LIBS "wallet-crypto")
+else()
+    set(EXTRA_LIBS "")
+endif()
+
 target_link_libraries(  monerujo

                        wallet_api
                        wallet
                        cryptonote_core
                        cryptonote_basic
+                        cryptonote_format_utils_basic
                        mnemonics
                        ringct
                        ringct_basic
+                        net
                        common
                        cncrypto
                        blockchain_db
@@ -176,8 +213,13 @@ target_link_libraries(  monerujo
                        blocks
                        checkpoints
                        device
+                        device_trezor
                        multisig
                        version
+                        randomx
+                        hardforks
+                        rpc_base
+                        ${EXTRA_LIBS}

                        boost_chrono
                        boost_date_time
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.3'
+    ndkVersion '17.2.4988734'
    defaultConfig {
        applicationId "com.m2049r.xmrwallet"
+        buildToolsVersion = '35.0.0'
+        compileSdk 35
        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 140
-        versionName "1.9.0 'We Comin' Rougher'"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 35
+        versionCode 4107
+        versionName "4.1.7 'Exolix'"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
                cppFlags "-std=c++11"
@@ -18,14 +18,34 @@ android {
            }
        }
    }
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }

-    flavorDimensions "version"
+    flavorDimensions = ['type', 'net']
    productFlavors {
+        mainnet {
+            dimension 'net'
+        }
+        stagenet {
+            dimension 'net'
+            applicationIdSuffix '.stage'
+            versionNameSuffix ' (stage)'
+        }
+        devnet {
+            dimension 'net'
+            applicationIdSuffix '.test'
+            versionNameSuffix ' (test)'
+        }
        alpha {
-            applicationIdSuffix ".alpha"
-            versionNameSuffix " (alpha)"
+            dimension 'type'
+            applicationIdSuffix '.alpha'
+            versionNameSuffix ' (alpha)'
        }
        prod {
+            dimension 'type'
        }
    }

@@ -37,6 +57,9 @@ android {
        debug {
            applicationIdSuffix ".debug"
        }
+        applicationVariants.all { variant ->
+            variant.buildConfigField "String", "ID_F", "\"" + getId("ID_F") + "\""
+        }
    }

    externalNativeBuild {
@@ -49,7 +72,7 @@ android {
        abi {
            enable true
            reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
            universalApk true
        }
    }
@@ -61,7 +84,8 @@ android {
    def availableLocales = ["en"]
    new File("app/src/main/res/").eachFileMatch(~/^values-.*/) { file ->
        def languageTag = file.name.substring(7).replace("-r", "-")
-        availableLocales.add(languageTag)
+        if (languageTag != "night")
+            availableLocales.add(languageTag)
    }

    // APKs for the same app that all have the same version information.
@@ -72,8 +96,7 @@ android {
        variant.outputs.all {
            output ->
                def abiName = output.getFilter(com.android.build.OutputFile.ABI)
-                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode
-                //def flavor = output.getFilter(flavor)
+                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * versionCode

                if (abiName == null) abiName = "universal"
                def v = "${variant.versionName}".replaceFirst(" '.*' ?", "")
@@ -83,28 +106,72 @@ android {
                outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
        }
    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    namespace 'com.m2049r.xmrwallet'
+    buildFeatures {
+        buildConfig true
+    }
+
+    testOptions {
+        unitTests {
+            all {
+                jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+            }
+        }
+    }
+
+    lint {
+        disable "MissingTranslation" // Translation is crowd-sourced.
+    }
+}
+
+static def getId(name) {
+    Properties props = new Properties()
+    props.load(new FileInputStream(new File('monerujo.id')))
+    return props[name]
 }

 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportVersion"
-    implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.ext.supportVersion"
+    implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.21'))
+
+    implementation 'androidx.core:core:1.16.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.preference:preference:1.2.1'
+
+    implementation 'com.google.android.material:material:1.12.0'
+
+    implementation 'com.google.guava:guava:33.4.8-android'
+
    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation 'io.github.rburgst:okhttp-digest:3.1.1'
+    implementation "com.jakewharton.timber:timber:5.0.1"

-    implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-    implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
+    implementation 'info.guardianproject.netcipher:netcipher:2.1.0'
+    //implementation 'info.guardianproject.netcipher:netcipher-okhttp3:2.1.0'
+    implementation fileTree(dir: 'libs/classes', include: ['*.jar'])
+    implementation 'com.nulab-inc:zxcvbn:1.9.0'

-    implementation 'com.nulab-inc:zxcvbn:1.2.3'
+    implementation 'dnsjava:dnsjava:3.6.3'
+    implementation 'org.slf4j:slf4j-nop:2.0.17'
+    implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'

-    implementation 'dnsjava:dnsjava:2.1.8'
-    implementation 'org.jitsi:dnssecjava:1.1.3'
-    implementation 'org.slf4j:slf4j-nop:1.7.25'
+    //noinspection GradleDependency
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.mockito:mockito-all:1.10.19"
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
+    testImplementation 'org.json:json:20250517'
+    testImplementation 'net.jodah:concurrentunit:0.4.6'

-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
-    testImplementation 'org.json:json:20140107'
-    testImplementation 'net.jodah:concurrentunit:0.4.2'
+    compileOnly 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
 }
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name" translatable="false">monerujo - Debug</string>
-</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,53 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.m2049r.xmrwallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
+    <queries>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.START" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.STATUS" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_HS_PORT" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_V3_ONION_SERVICE" />
+        </intent>
+
+        <package android:name="org.torproject.android" />
+    </queries>

    <application
        android:name=".XmrWalletApplication"
        android:allowBackup="false"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:preserveLegacyExternalStorage="true"
        android:supportsRtl="true"
-        android:theme="@style/MyMaterialTheme">
-
+        android:theme="@style/MyMaterialThemeClassic"
+        android:usesCleartextTraffic="true">
        <activity
-            android:name=".WalletActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/wallet_activity_name"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".LoginActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="@string/app_name"
+            android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:exported="true"
            android:launchMode="singleTop"
            android:screenOrientation="portrait">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
+
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
+        </activity>
+        <activity
+            android:name=".WalletActivity"
+            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:label="@string/wallet_activity_name"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
+        <activity
+            android:name=".LoginActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="locked">
            <intent-filter>
                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+
+                <data android:scheme="monero" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+
+                <data android:scheme="bitcoin" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>

            <meta-data
                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                android:resource="@xml/usb_device_filter" />
        </activity>
-        
+        <activity
+            android:name=".onboarding.OnBoardingActivity"
+            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
        <service
            android:name=".service.WalletService"
            android:description="@string/service_description"
            android:exported="false"
-            android:label="Monero Wallet Service" />
+            android:foregroundServiceType="specialUse"
+            android:label="Monero Wallet Service">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Keeps app in sync with the blockchain" />
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
    </application>
+
 </manifest>
--- a/app/src/main/assets/licenses.html
+++ b/app/src/main/assets/licenses.html
@@ -43,6 +43,9 @@ Copyright (c) 2014 Dushyanth Maguluru
 <h3>AndroidLicensesPage (https://github.com/adamsp/AndroidLicensesPage)</h3>
 Copyright (c) 2013 Adam Speakman

+<h3>SwipeableRecyclerView (https://github.com/brnunes/SwipeableRecyclerView)</h3>
+Copyright (c) 2015 Bruno R. Nunes
+
 <h3>Apache License, Version 2.0, January 2004</h3>
 http://www.apache.org/licenses/<br/>
 <br/>
--- a/app/src/main/cpp/device_io_monerujo.hpp
+++ b/app/src/main/cpp/device_io_monerujo.hpp
@@ -1,88 +0,0 @@
-// Copyright (c) 2017-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#if defined(HAVE_MONERUJO)
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/**
- * @brief LedgerFind - find Ledger Device and return it's name
- * @param buffer     - buffer for name of found device
- * @param len        - length of buffer
- * @return  0 - success
- *         -1 - no device connected / found
- *         -2 - JVM not found
- */
-int LedgerFind(char *buffer, size_t len);
-
-/**
- * @brief LedgerExchange - exchange data with Ledger Device
- * @param command        - buffer for data to send
- * @param cmd_len        - length of send to send
- * @param response       - buffer for received data
- * @param max_resp_len   - size of receive buffer
- *
- * @return length of received data in response or -1 if error
- */
-int  LedgerExchange(unsigned char *command, unsigned int cmd_len, unsigned char *response, unsigned int max_resp_len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "device_io.hpp"
-
-#pragma once
-
-namespace hw {
-  namespace io {
-    class device_io_monerujo: device_io {
-    public:
-      device_io_monerujo() {};
-      ~device_io_monerujo() {};
-
-      void init() {};
-      void release() {};
-
-      void connect(void *params) {};
-      void disconnect() {};
-      bool connected() const {return true;}; // monerujo is always connected before it gets here
-
-      // returns number of bytes read or -1 on error
-      int  exchange(unsigned char *command, unsigned int cmd_len, unsigned char *response, unsigned int max_resp_len) {
-        return LedgerExchange(command, cmd_len, response, max_resp_len);
-      }
-    };
-  };
-};
-
-#endif //#if defined(HAVE_MONERUJO)
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
--- a/app/src/main/cpp/monerujo.h
+++ b/app/src/main/cpp/monerujo.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 m2049r
+ * Copyright (c) 2017-2024 m2049r
 * <p>
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@

 #include <jni.h>

+#include <string>
+
 /*
 #include <android/log.h>

@@ -28,6 +30,10 @@
 #define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
 */

+void ThrowException(JNIEnv *jenv, const char* type, const char* msg) {
+    jenv->ThrowNew(jenv->FindClass(type), msg);
+}
+
 jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
    jclass c = env->GetObjectClass(obj);
    return env->GetFieldID(c, fieldName, "J"); // of type long
@@ -35,8 +41,16 @@ jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handl

 template<typename T>
 T *getHandle(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
+    return reinterpret_cast<T *>(env->GetLongField(obj, getHandleField(env, obj, fieldName)));
+}
+
+template<typename T>
+void destroyNativeObject(JNIEnv *env, T nativeObjectHandle, jobject obj, const char *fieldName = "handle") {
    jlong handle = env->GetLongField(obj, getHandleField(env, obj, fieldName));
-    return reinterpret_cast<T *>(handle);
+    if (handle != 0) {
+        ThrowException(env, "java/lang/IllegalStateException", "invalid handle (destroy)");
+    }
+    delete reinterpret_cast<T *>(nativeObjectHandle);
 }

 void setHandleFromLong(JNIEnv *env, jobject obj, jlong handle) {
@@ -54,24 +68,48 @@ extern "C"
 {
 #endif

+extern const char *const MONERO_VERSION; // the actual monero core version
+
 // from monero-core crypto/hash-ops.h - avoid #including monero code here
 enum {
    HASH_SIZE = 32,
    HASH_DATA_AREA = 136
 };

-void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed);
+void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed,
+                  uint64_t height);

 inline void slow_hash(const void *data, const size_t length, char *hash) {
-    cn_slow_hash(data, length, hash, 0 /* variant */, 0/*prehashed*/);
+    cn_slow_hash(data, length, hash, 0 /*variant*/, 0 /*prehashed*/, 0 /*height*/);
 }

 inline void slow_hash_broken(const void *data, char *hash, int variant) {
-    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/);
+    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/,
+                 0 /*height*/);
 }
-
 #ifdef __cplusplus
 }
 #endif

+namespace Monerujo {
+    class SidekickWallet {
+    public:
+        enum Status {
+            Status_Ok,
+            Status_Error,
+            Status_Critical
+        };
+
+        SidekickWallet(uint8_t networkType, std::string a, std::string b);
+
+        ~SidekickWallet();
+
+        std::string call(int commandId, const std::string &request);
+
+        void reset();
+
+        Status status() const;
+
+    };
+}
 #endif //XMRWALLET_WALLET_LIB_H
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/com/btchip/comm/BTChipTransport.java
+++ b/app/src/main/java/com/btchip/comm/BTChipTransport.java
@@ -20,12 +20,10 @@

 package com.btchip.comm;

-import com.btchip.BTChipException;
-
 public interface BTChipTransport {
-    public byte[] exchange(byte[] command);
+    byte[] exchange(byte[] command);

-    public void close();
+    void close();

-    public void setDebug(boolean debugFlag);
+    void setDebug(boolean debugFlag);
 }
--- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
+++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
@@ -28,7 +28,6 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbRequest;

-import com.btchip.BTChipException;
 import com.btchip.comm.BTChipTransport;
 import com.btchip.comm.LedgerHelper;
 import com.btchip.utils.Dump;
@@ -46,8 +45,12 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
        HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
        for (UsbDevice device : deviceList.values()) {
            Timber.d("%04X:%04X %s, %s", device.getVendorId(), device.getProductId(), device.getManufacturerName(), device.getProductName());
-            if ((device.getVendorId() == VID) && (device.getProductId() == PID_HID)) {
-                return device;
+            if (device.getVendorId() == VID) {
+                final int deviceProductId = device.getProductId();
+                for (int pid : PID_HIDS) {
+                    if (deviceProductId == pid)
+                        return device;
+                }
            }
        }
        return null;
@@ -74,7 +77,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
    }

    private static final int VID = 0x2C97;
-    private static final int PID_HID = 0x0001;
+    private static final int[] PID_HIDS = {0x0001, 0x0004, 0x0005};

    private UsbDeviceConnection connection;
    private UsbInterface dongleInterface;
--- a/app/src/main/java/com/m2049r/levin/data/Bucket.java
+++ b/app/src/main/java/com/m2049r/levin/data/Bucket.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.data;
+
+import com.m2049r.levin.util.HexHelper;
+import com.m2049r.levin.util.LevinReader;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class Bucket {
+
+    // constants copied from monero p2p & epee
+
+    public final static int P2P_COMMANDS_POOL_BASE = 1000;
+    public final static int COMMAND_HANDSHAKE_ID = P2P_COMMANDS_POOL_BASE + 1;
+    public final static int COMMAND_TIMED_SYNC_ID = P2P_COMMANDS_POOL_BASE + 2;
+    public final static int COMMAND_PING_ID = P2P_COMMANDS_POOL_BASE + 3;
+    public final static int COMMAND_REQUEST_STAT_INFO_ID = P2P_COMMANDS_POOL_BASE + 4;
+    public final static int COMMAND_REQUEST_NETWORK_STATE_ID = P2P_COMMANDS_POOL_BASE + 5;
+    public final static int COMMAND_REQUEST_PEER_ID_ID = P2P_COMMANDS_POOL_BASE + 6;
+    public final static int COMMAND_REQUEST_SUPPORT_FLAGS_ID = P2P_COMMANDS_POOL_BASE + 7;
+
+    public final static long LEVIN_SIGNATURE = 0x0101010101012101L; // Bender's nightmare
+
+    public final static long LEVIN_DEFAULT_MAX_PACKET_SIZE = 100000000; // 100MB by default
+
+    public final static int LEVIN_PACKET_REQUEST = 0x00000001;
+    public final static int LEVIN_PACKET_RESPONSE = 0x00000002;
+
+    public final static int LEVIN_PROTOCOL_VER_0 = 0;
+    public final static int LEVIN_PROTOCOL_VER_1 = 1;
+
+    public final static int LEVIN_OK = 0;
+    public final static int LEVIN_ERROR_CONNECTION = -1;
+    public final static int LEVIN_ERROR_CONNECTION_NOT_FOUND = -2;
+    public final static int LEVIN_ERROR_CONNECTION_DESTROYED = -3;
+    public final static int LEVIN_ERROR_CONNECTION_TIMEDOUT = -4;
+    public final static int LEVIN_ERROR_CONNECTION_NO_DUPLEX_PROTOCOL = -5;
+    public final static int LEVIN_ERROR_CONNECTION_HANDLER_NOT_DEFINED = -6;
+    public final static int LEVIN_ERROR_FORMAT = -7;
+
+    public final static int P2P_SUPPORT_FLAG_FLUFFY_BLOCKS = 0x01;
+    public final static int P2P_SUPPORT_FLAGS = P2P_SUPPORT_FLAG_FLUFFY_BLOCKS;
+
+    final private long signature;
+    final private long cb;
+    final public boolean haveToReturnData;
+    final public int command;
+    final public int returnCode;
+    final private int flags;
+    final private int protcolVersion;
+    final byte[] payload;
+
+    final public Section payloadSection;
+
+    // create a request
+    public Bucket(int command, byte[] payload) throws IOException {
+        this.signature = LEVIN_SIGNATURE;
+        this.cb = payload.length;
+        this.haveToReturnData = true;
+        this.command = command;
+        this.returnCode = 0;
+        this.flags = LEVIN_PACKET_REQUEST;
+        this.protcolVersion = LEVIN_PROTOCOL_VER_1;
+        this.payload = payload;
+        payloadSection = LevinReader.readPayload(payload);
+    }
+
+    // create a response
+    public Bucket(int command, byte[] payload, int rc) throws IOException {
+        this.signature = LEVIN_SIGNATURE;
+        this.cb = payload.length;
+        this.haveToReturnData = false;
+        this.command = command;
+        this.returnCode = rc;
+        this.flags = LEVIN_PACKET_RESPONSE;
+        this.protcolVersion = LEVIN_PROTOCOL_VER_1;
+        this.payload = payload;
+        payloadSection = LevinReader.readPayload(payload);
+    }
+
+    public Bucket(DataInput in) throws IOException {
+        signature = in.readLong();
+        cb = in.readLong();
+        haveToReturnData = in.readBoolean();
+        command = in.readInt();
+        returnCode = in.readInt();
+        flags = in.readInt();
+        protcolVersion = in.readInt();
+
+        if (signature == Bucket.LEVIN_SIGNATURE) {
+            if (cb > Integer.MAX_VALUE)
+                throw new IllegalArgumentException();
+            payload = new byte[(int) cb];
+            in.readFully(payload);
+        } else
+            throw new IllegalStateException();
+        payloadSection = LevinReader.readPayload(payload);
+    }
+
+    public Section getPayloadSection() {
+        return payloadSection;
+    }
+
+    public void send(DataOutput out) throws IOException {
+        out.writeLong(signature);
+        out.writeLong(cb);
+        out.writeBoolean(haveToReturnData);
+        out.writeInt(command);
+        out.writeInt(returnCode);
+        out.writeInt(flags);
+        out.writeInt(protcolVersion);
+        out.write(payload);
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("sig:  ").append(signature).append("\n");
+        sb.append("cb:   ").append(cb).append("\n");
+        sb.append("call: ").append(haveToReturnData).append("\n");
+        sb.append("cmd:  ").append(command).append("\n");
+        sb.append("rc:   ").append(returnCode).append("\n");
+        sb.append("flags:").append(flags).append("\n");
+        sb.append("proto:").append(protcolVersion).append("\n");
+        sb.append(HexHelper.bytesToHex(payload)).append("\n");
+        sb.append(payloadSection.toString());
+        return sb.toString();
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/data/Section.java
+++ b/app/src/main/java/com/m2049r/levin/data/Section.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.data;
+
+import com.m2049r.levin.util.HexHelper;
+import com.m2049r.levin.util.LevinReader;
+import com.m2049r.levin.util.LevinWriter;
+import com.m2049r.levin.util.LittleEndianDataOutputStream;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class Section {
+
+    // constants copied from monero p2p & epee
+
+    static final public int PORTABLE_STORAGE_SIGNATUREA = 0x01011101;
+    static final public int PORTABLE_STORAGE_SIGNATUREB = 0x01020101;
+
+    static final public byte PORTABLE_STORAGE_FORMAT_VER = 1;
+
+    static final public byte PORTABLE_RAW_SIZE_MARK_MASK = 0x03;
+    static final public byte PORTABLE_RAW_SIZE_MARK_BYTE = 0;
+    static final public byte PORTABLE_RAW_SIZE_MARK_WORD = 1;
+    static final public byte PORTABLE_RAW_SIZE_MARK_DWORD = 2;
+    static final public byte PORTABLE_RAW_SIZE_MARK_INT64 = 3;
+
+    static final long MAX_STRING_LEN_POSSIBLE = 2000000000; // do not let string be so big
+
+    // data types
+    static final public byte SERIALIZE_TYPE_INT64 = 1;
+    static final public byte SERIALIZE_TYPE_INT32 = 2;
+    static final public byte SERIALIZE_TYPE_INT16 = 3;
+    static final public byte SERIALIZE_TYPE_INT8 = 4;
+    static final public byte SERIALIZE_TYPE_UINT64 = 5;
+    static final public byte SERIALIZE_TYPE_UINT32 = 6;
+    static final public byte SERIALIZE_TYPE_UINT16 = 7;
+    static final public byte SERIALIZE_TYPE_UINT8 = 8;
+    static final public byte SERIALIZE_TYPE_DUOBLE = 9;
+    static final public byte SERIALIZE_TYPE_STRING = 10;
+    static final public byte SERIALIZE_TYPE_BOOL = 11;
+    static final public byte SERIALIZE_TYPE_OBJECT = 12;
+    static final public byte SERIALIZE_TYPE_ARRAY = 13;
+
+    static final public byte SERIALIZE_FLAG_ARRAY = (byte) 0x80;
+
+    private final Map<String, Object> entries = new HashMap<String, Object>();
+
+    public void add(String key, Object entry) {
+        entries.put(key, entry);
+    }
+
+    public int size() {
+        return entries.size();
+    }
+
+    public Set<Map.Entry<String, Object>> entrySet() {
+        return entries.entrySet();
+    }
+
+    public Object get(String key) {
+        return entries.get(key);
+    }
+
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("\n");
+        for (Map.Entry<String, Object> entry : entries.entrySet()) {
+            sb.append(entry.getKey()).append("=");
+            final Object value = entry.getValue();
+            if (value instanceof List) {
+                @SuppressWarnings("unchecked") final List<Object> list = (List<Object>) value;
+                for (Object listEntry : list) {
+                    sb.append(listEntry.toString()).append("\n");
+                }
+            } else if (value instanceof String) {
+                sb.append("(").append(value).append(")\n");
+            } else if (value instanceof byte[]) {
+                sb.append(HexHelper.bytesToHex((byte[]) value)).append("\n");
+            } else {
+                sb.append(value.toString()).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
+    static public Section fromByteArray(byte[] buffer) {
+        try {
+            return LevinReader.readPayload(buffer);
+        } catch (IOException ex) {
+            throw new IllegalStateException();
+        }
+    }
+
+    public byte[] asByteArray() {
+        try {
+            ByteArrayOutputStream bas = new ByteArrayOutputStream();
+            DataOutput out = new LittleEndianDataOutputStream(bas);
+            LevinWriter writer = new LevinWriter(out);
+            writer.writePayload(this);
+            return bas.toByteArray();
+        } catch (IOException ex) {
+            throw new IllegalStateException();
+        }
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
+++ b/app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.scanner;
+
+import com.m2049r.xmrwallet.data.NodeInfo;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import timber.log.Timber;
+
+public class Dispatcher implements PeerRetriever.OnGetPeers {
+    static final public int NUM_THREADS = 50;
+    static final public int MAX_PEERS = 1000;
+    static final public long MAX_TIME = 30000000000L; //30 seconds
+
+    private int peerCount = 0;
+    final private Set<NodeInfo> knownNodes = new HashSet<>(); // set of nodes to test
+    final private Set<NodeInfo> rpcNodes = new HashSet<>(); // set of RPC nodes we like
+    final private ExecutorService exeService = Executors.newFixedThreadPool(NUM_THREADS);
+
+    public interface Listener {
+        void onGet(NodeInfo nodeInfo);
+    }
+
+    private Listener listener;
+
+    public Dispatcher(Listener listener) {
+        this.listener = listener;
+    }
+
+    public Set<NodeInfo> getRpcNodes() {
+        return rpcNodes;
+    }
+
+    public int getPeerCount() {
+        return peerCount;
+    }
+
+    public boolean getMorePeers() {
+        return peerCount < MAX_PEERS;
+    }
+
+    public void awaitTermination(int nodesToFind) {
+        try {
+            final long t = System.nanoTime();
+            while (!jobs.isEmpty()) {
+                try {
+                    Timber.d("Remaining jobs %d", jobs.size());
+                    final PeerRetriever retrievedPeer = jobs.poll().get();
+                    if (retrievedPeer.isGood() && getMorePeers())
+                        retrievePeers(retrievedPeer);
+                    final NodeInfo nodeInfo = retrievedPeer.getNodeInfo();
+                    Timber.d("Retrieved %s", nodeInfo);
+                    if ((nodeInfo.isValid() || nodeInfo.isFavourite())) {
+                        nodeInfo.setDefaultName();
+                        rpcNodes.add(nodeInfo);
+                        Timber.d("RPC: %s", nodeInfo);
+                        // the following is not totally correct but it works (otherwise we need to
+                        // load much more before filtering - but we don't have time
+                        if (listener != null) listener.onGet(nodeInfo);
+                        if (rpcNodes.size() >= nodesToFind) {
+                            Timber.d("are we done here?");
+                            filterRpcNodes();
+                            if (rpcNodes.size() >= nodesToFind) {
+                                Timber.d("we're done here");
+                                break;
+                            }
+                        }
+                    }
+                    if (System.nanoTime() - t > MAX_TIME) break; // watchdog
+                } catch (ExecutionException ex) {
+                    Timber.d(ex); // tell us about it and continue
+                }
+            }
+        } catch (InterruptedException ex) {
+            Timber.d(ex);
+        } finally {
+            Timber.d("Shutting down!");
+            exeService.shutdownNow();
+            try {
+                exeService.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS);
+            } catch (InterruptedException ex) {
+                Timber.d(ex);
+            }
+        }
+        filterRpcNodes();
+    }
+
+    static final public int HEIGHT_WINDOW = 1;
+
+    private boolean testHeight(long height, long consensus) {
+        return (height >= (consensus - HEIGHT_WINDOW))
+                && (height <= (consensus + HEIGHT_WINDOW));
+    }
+
+    private long calcConsensusHeight() {
+        Timber.d("Calc Consensus height from %d nodes", rpcNodes.size());
+        final Map<Long, Integer> nodeHeights = new TreeMap<Long, Integer>();
+        for (NodeInfo info : rpcNodes) {
+            if (!info.isValid()) continue;
+            Integer h = nodeHeights.get(info.getHeight());
+            if (h == null)
+                h = 0;
+            nodeHeights.put(info.getHeight(), h + 1);
+        }
+        long consensusHeight = 0;
+        long consensusCount = 0;
+        for (Map.Entry<Long, Integer> entry : nodeHeights.entrySet()) {
+            final long entryHeight = entry.getKey();
+            int count = 0;
+            for (long i = entryHeight - HEIGHT_WINDOW; i <= entryHeight + HEIGHT_WINDOW; i++) {
+                Integer v = nodeHeights.get(i);
+                if (v == null)
+                    v = 0;
+                count += v;
+            }
+            if (count >= consensusCount) {
+                consensusCount = count;
+                consensusHeight = entryHeight;
+            }
+            Timber.d("%d - %d/%d", entryHeight, count, entry.getValue());
+        }
+        return consensusHeight;
+    }
+
+    private void filterRpcNodes() {
+        long consensus = calcConsensusHeight();
+        Timber.d("Consensus Height = %d for %d nodes", consensus, rpcNodes.size());
+        for (Iterator<NodeInfo> iter = rpcNodes.iterator(); iter.hasNext(); ) {
+            NodeInfo info = iter.next();
+            // don't remove favourites
+            if (!info.isFavourite()) {
+                if (!testHeight(info.getHeight(), consensus)) {
+                    iter.remove();
+                    Timber.d("Removed %s", info);
+                }
+            }
+        }
+    }
+
+    // TODO: does this NEED to be a ConcurrentLinkedDeque?
+    private ConcurrentLinkedDeque<Future<PeerRetriever>> jobs = new ConcurrentLinkedDeque<>();
+
+    private void retrievePeer(NodeInfo nodeInfo) {
+        if (knownNodes.add(nodeInfo)) {
+            Timber.d("\t%d:%s", knownNodes.size(), nodeInfo);
+            jobs.add(exeService.submit(new PeerRetriever(nodeInfo, this)));
+            peerCount++; // jobs.size() does not perform well
+        }
+    }
+
+    private void retrievePeers(PeerRetriever peer) {
+        for (LevinPeer levinPeer : peer.getPeers()) {
+            if (getMorePeers())
+                retrievePeer(new NodeInfo(levinPeer));
+            else
+                break;
+        }
+    }
+
+    public void seedPeers(Collection<NodeInfo> seedNodes) {
+        for (NodeInfo node : seedNodes) {
+            if (node.isFavourite()) {
+                rpcNodes.add(node);
+                if (listener != null) listener.onGet(node);
+            }
+            retrievePeer(node);
+        }
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/scanner/LevinPeer.java
+++ b/app/src/main/java/com/m2049r/levin/scanner/LevinPeer.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.scanner;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+public class LevinPeer {
+    final public InetSocketAddress socketAddress;
+    final public int version;
+    final public long height;
+    final public String top;
+
+
+    public InetSocketAddress getSocketAddress() {
+        return socketAddress;
+    }
+
+    LevinPeer(InetAddress address, int port, int version, long height, String top) {
+        this.socketAddress = new InetSocketAddress(address, port);
+        this.version = version;
+        this.height = height;
+        this.top = top;
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/scanner/PeerRetriever.java
+++ b/app/src/main/java/com/m2049r/levin/scanner/PeerRetriever.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.scanner;
+
+import com.m2049r.levin.data.Bucket;
+import com.m2049r.levin.data.Section;
+import com.m2049r.levin.util.HexHelper;
+import com.m2049r.levin.util.LittleEndianDataInputStream;
+import com.m2049r.levin.util.LittleEndianDataOutputStream;
+import com.m2049r.xmrwallet.data.NodeInfo;
+import com.m2049r.xmrwallet.util.Helper;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.Callable;
+
+import timber.log.Timber;
+
+public class PeerRetriever implements Callable<PeerRetriever> {
+    static final public int CONNECT_TIMEOUT = 500; //ms
+    static final public int SOCKET_TIMEOUT = 500; //ms
+    static final public long PEER_ID = new Random().nextLong();
+    static final private byte[] HANDSHAKE = handshakeRequest().asByteArray();
+    static final private byte[] FLAGS_RESP = flagsResponse().asByteArray();
+
+    final private List<LevinPeer> peers = new ArrayList<>();
+
+    private NodeInfo nodeInfo;
+    private OnGetPeers onGetPeersCallback;
+
+    public interface OnGetPeers {
+        boolean getMorePeers();
+    }
+
+    public PeerRetriever(NodeInfo nodeInfo, OnGetPeers onGetPeers) {
+        this.nodeInfo = nodeInfo;
+        this.onGetPeersCallback = onGetPeers;
+    }
+
+    public NodeInfo getNodeInfo() {
+        return nodeInfo;
+    }
+
+    public boolean isGood() {
+        return !peers.isEmpty();
+    }
+
+    public List<LevinPeer> getPeers() {
+        return peers;
+    }
+
+    public PeerRetriever call() {
+        if (isGood()) // we have already been called?
+            throw new IllegalStateException();
+        // first check for an rpc service
+        nodeInfo.findRpcService();
+        if (onGetPeersCallback.getMorePeers())
+            try {
+                Timber.d("%s CONN", nodeInfo.getLevinSocketAddress());
+                if (!connect())
+                    return this;
+                Bucket handshakeBucket = new Bucket(Bucket.COMMAND_HANDSHAKE_ID, HANDSHAKE);
+                handshakeBucket.send(getDataOutput());
+
+                while (true) {// wait for response (which may never come)
+                    Bucket recv = new Bucket(getDataInput()); // times out after SOCKET_TIMEOUT
+                    if ((recv.command == Bucket.COMMAND_HANDSHAKE_ID)
+                            && (!recv.haveToReturnData)) {
+                        readAddressList(recv.payloadSection);
+                        return this;
+                    } else if ((recv.command == Bucket.COMMAND_REQUEST_SUPPORT_FLAGS_ID)
+                            && (recv.haveToReturnData)) {
+                        Bucket flagsBucket = new Bucket(Bucket.COMMAND_REQUEST_SUPPORT_FLAGS_ID, FLAGS_RESP, 1);
+                        flagsBucket.send(getDataOutput());
+                    } else {// and ignore others
+                        Timber.d("Ignored LEVIN COMMAND %d", recv.command);
+                    }
+                }
+            } catch (IOException ex) {
+            } finally {
+                disconnect(); // we have what we want - byebye
+                Timber.d("%s DISCONN", nodeInfo.getLevinSocketAddress());
+            }
+        return this;
+    }
+
+    private void readAddressList(Section section) {
+        Section data = (Section) section.get("payload_data");
+        int topVersion = (Integer) data.get("top_version");
+        long currentHeight = (Long) data.get("current_height");
+        String topId = HexHelper.bytesToHex((byte[]) data.get("top_id"));
+        Timber.d("PAYLOAD_DATA %d/%d/%s", topVersion, currentHeight, topId);
+
+        @SuppressWarnings("unchecked")
+        List<Section> peerList = (List<Section>) section.get("local_peerlist_new");
+        if (peerList != null) {
+            for (Section peer : peerList) {
+                Section adr = (Section) peer.get("adr");
+                Integer type = (Integer) adr.get("type");
+                if ((type == null) || (type != 1))
+                    continue;
+                Section addr = (Section) adr.get("addr");
+                if (addr == null)
+                    continue;
+                Integer ip = (Integer) addr.get("m_ip");
+                if (ip == null)
+                    continue;
+                Integer sport = (Integer) addr.get("m_port");
+                if (sport == null)
+                    continue;
+                int port = sport;
+                if (port < 0) // port is unsigned
+                    port = port + 0x10000;
+                InetAddress inet = HexHelper.toInetAddress(ip);
+                // make sure this is an address we want to talk to (i.e. a remote address)
+                if (!inet.isSiteLocalAddress() && !inet.isAnyLocalAddress()
+                        && !inet.isLoopbackAddress()
+                        && !inet.isMulticastAddress()
+                        && !inet.isLinkLocalAddress()) {
+                    peers.add(new LevinPeer(inet, port, topVersion, currentHeight, topId));
+                }
+            }
+        }
+    }
+
+    private Socket socket = null;
+
+    private boolean connect() {
+        if (socket != null) throw new IllegalStateException();
+        try {
+            socket = new Socket();
+            socket.connect(nodeInfo.getLevinSocketAddress(), CONNECT_TIMEOUT);
+            socket.setSoTimeout(SOCKET_TIMEOUT);
+        } catch (IOException ex) {
+            //Timber.d(ex);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isConnected() {
+        return socket.isConnected();
+    }
+
+    private void disconnect() {
+        try {
+            dataInput = null;
+            dataOutput = null;
+            if ((socket != null) && (!socket.isClosed())) {
+                socket.close();
+            }
+        } catch (IOException ex) {
+            Timber.d(ex);
+        } finally {
+            socket = null;
+        }
+    }
+
+    private DataOutput dataOutput = null;
+
+    private DataOutput getDataOutput() throws IOException {
+        if (dataOutput == null)
+            synchronized (this) {
+                if (dataOutput == null)
+                    dataOutput = new LittleEndianDataOutputStream(
+                            socket.getOutputStream());
+            }
+        return dataOutput;
+    }
+
+    private DataInput dataInput = null;
+
+    private DataInput getDataInput() throws IOException {
+        if (dataInput == null)
+            synchronized (this) {
+                if (dataInput == null)
+                    dataInput = new LittleEndianDataInputStream(
+                            socket.getInputStream());
+            }
+        return dataInput;
+    }
+
+    static private Section handshakeRequest() {
+        Section section = new Section(); // root object
+
+        Section nodeData = new Section();
+        nodeData.add("local_time", (new Date()).getTime());
+        nodeData.add("my_port", 0);
+        byte[] networkId = Helper.hexToBytes("1230f171610441611731008216a1a110"); // mainnet
+        nodeData.add("network_id", networkId);
+        nodeData.add("peer_id", PEER_ID);
+        section.add("node_data", nodeData);
+
+        Section payloadData = new Section();
+        payloadData.add("cumulative_difficulty", 1L);
+        payloadData.add("current_height", 1L);
+        byte[] genesisHash =
+                Helper.hexToBytes("418015bb9ae982a1975da7d79277c2705727a56894ba0fb246adaabb1f4632e3");
+        payloadData.add("top_id", genesisHash);
+        payloadData.add("top_version", (byte) 1);
+        section.add("payload_data", payloadData);
+        return section;
+    }
+
+    static private Section flagsResponse() {
+        Section section = new Section(); // root object
+        section.add("support_flags", Bucket.P2P_SUPPORT_FLAGS);
+        return section;
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/util/HexHelper.java
+++ b/app/src/main/java/com/m2049r/levin/util/HexHelper.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.util;
+
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public class HexHelper {
+
+    static public String bytesToHex(byte[] data) {
+        if ((data != null) && (data.length > 0))
+            return String.format("%0" + (data.length * 2) + "X",
+                    new BigInteger(1, data));
+        else
+            return "";
+    }
+
+    static public InetAddress toInetAddress(int ip) {
+        try {
+            String ipAddress = String.format("%d.%d.%d.%d", (ip & 0xff),
+                    (ip >> 8 & 0xff), (ip >> 16 & 0xff), (ip >> 24 & 0xff));
+            return InetAddress.getByName(ipAddress);
+        } catch (UnknownHostException ex) {
+            throw new IllegalArgumentException(ex);
+        }
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/util/LevinReader.java
+++ b/app/src/main/java/com/m2049r/levin/util/LevinReader.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.util;
+
+import com.m2049r.levin.data.Section;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+// Full Levin reader as seen on epee
+
+public class LevinReader {
+    private DataInput in;
+
+    private LevinReader(byte[] buffer) {
+        ByteArrayInputStream bis = new ByteArrayInputStream(buffer);
+        in = new LittleEndianDataInputStream(bis);
+    }
+
+    static public Section readPayload(byte[] payload) throws IOException {
+        LevinReader r = new LevinReader(payload);
+        return r.readPayload();
+    }
+
+    private Section readPayload() throws IOException {
+        if (in.readInt() != Section.PORTABLE_STORAGE_SIGNATUREA)
+            throw new IllegalStateException();
+        if (in.readInt() != Section.PORTABLE_STORAGE_SIGNATUREB)
+            throw new IllegalStateException();
+        if (in.readByte() != Section.PORTABLE_STORAGE_FORMAT_VER)
+            throw new IllegalStateException();
+        return readSection();
+    }
+
+    private Section readSection() throws IOException {
+        Section section = new Section();
+        long count = readVarint();
+        while (count-- > 0) {
+            // read section name string
+            String sectionName = readSectionName();
+            section.add(sectionName, loadStorageEntry());
+        }
+        return section;
+    }
+
+    private Object loadStorageArrayEntry(int type) throws IOException {
+        type &= ~Section.SERIALIZE_FLAG_ARRAY;
+        return readArrayEntry(type);
+    }
+
+    private List<Object> readArrayEntry(int type) throws IOException {
+        List<Object> list = new ArrayList<Object>();
+        long size = readVarint();
+        while (size-- > 0)
+            list.add(read(type));
+        return list;
+    }
+
+    private Object read(int type) throws IOException {
+        switch (type) {
+            case Section.SERIALIZE_TYPE_UINT64:
+            case Section.SERIALIZE_TYPE_INT64:
+                return in.readLong();
+            case Section.SERIALIZE_TYPE_UINT32:
+            case Section.SERIALIZE_TYPE_INT32:
+                return in.readInt();
+            case Section.SERIALIZE_TYPE_UINT16:
+                return in.readUnsignedShort();
+            case Section.SERIALIZE_TYPE_INT16:
+                return in.readShort();
+            case Section.SERIALIZE_TYPE_UINT8:
+                return in.readUnsignedByte();
+            case Section.SERIALIZE_TYPE_INT8:
+                return in.readByte();
+            case Section.SERIALIZE_TYPE_OBJECT:
+                return readSection();
+            case Section.SERIALIZE_TYPE_STRING:
+                return readByteArray();
+            default:
+                throw new IllegalArgumentException("type " + type
+                        + " not supported");
+        }
+    }
+
+    private Object loadStorageEntry() throws IOException {
+        int type = in.readUnsignedByte();
+        if ((type & Section.SERIALIZE_FLAG_ARRAY) != 0)
+            return loadStorageArrayEntry(type);
+        if (type == Section.SERIALIZE_TYPE_ARRAY)
+            return readStorageEntryArrayEntry();
+        else
+            return readStorageEntry(type);
+    }
+
+    private Object readStorageEntry(int type) throws IOException {
+        return read(type);
+    }
+
+    private Object readStorageEntryArrayEntry() throws IOException {
+        int type = in.readUnsignedByte();
+        if ((type & Section.SERIALIZE_FLAG_ARRAY) != 0)
+            throw new IllegalStateException("wrong type sequences");
+        return loadStorageArrayEntry(type);
+    }
+
+    private String readSectionName() throws IOException {
+        int nameLen = in.readUnsignedByte();
+        return readString(nameLen);
+    }
+
+    private byte[] read(long count) throws IOException {
+        if (count > Integer.MAX_VALUE)
+            throw new IllegalArgumentException();
+        int len = (int) count;
+        final byte buffer[] = new byte[len];
+        in.readFully(buffer);
+        return buffer;
+    }
+
+    private String readString(long count) throws IOException {
+        return new String(read(count), StandardCharsets.US_ASCII);
+    }
+
+    private byte[] readByteArray(long count) throws IOException {
+        return read(count);
+    }
+
+    private byte[] readByteArray() throws IOException {
+        long len = readVarint();
+        return readByteArray(len);
+    }
+
+    private long readVarint() throws IOException {
+        long v = 0;
+        int b = in.readUnsignedByte();
+        int sizeMask = b & Section.PORTABLE_RAW_SIZE_MARK_MASK;
+        switch (sizeMask) {
+            case Section.PORTABLE_RAW_SIZE_MARK_BYTE:
+                v = b >>> 2;
+                break;
+            case Section.PORTABLE_RAW_SIZE_MARK_WORD:
+                v = readRest(b, 1) >>> 2;
+                break;
+            case Section.PORTABLE_RAW_SIZE_MARK_DWORD:
+                v = readRest(b, 3) >>> 2;
+                break;
+            case Section.PORTABLE_RAW_SIZE_MARK_INT64:
+                v = readRest(b, 7) >>> 2;
+                break;
+            default:
+                throw new IllegalStateException();
+        }
+        return v;
+    }
+
+    // this should be in LittleEndianDataInputStream because it has little
+    // endian logic
+    private long readRest(final int firstByte, final int bytes) throws IOException {
+        long result = firstByte;
+        for (int i = 1; i < bytes + 1; i++) {
+            result = result + (((long) in.readUnsignedByte()) << (8 * i));
+        }
+        return result;
+    }
+
+}
--- a/app/src/main/java/com/m2049r/levin/util/LevinWriter.java
+++ b/app/src/main/java/com/m2049r/levin/util/LevinWriter.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.levin.util;
+
+import com.m2049r.levin.data.Section;
+
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+// a simplified Levin Writer WITHOUT support for arrays
+
+public class LevinWriter {
+    private DataOutput out;
+
+    public LevinWriter(DataOutput out) {
+        this.out = out;
+    }
+
+    public void writePayload(Section section) throws IOException {
+        out.writeInt(Section.PORTABLE_STORAGE_SIGNATUREA);
+        out.writeInt(Section.PORTABLE_STORAGE_SIGNATUREB);
+        out.writeByte(Section.PORTABLE_STORAGE_FORMAT_VER);
+        putSection(section);
+    }
+
+    private void writeSection(Section section) throws IOException {
+        out.writeByte(Section.SERIALIZE_TYPE_OBJECT);
+        putSection(section);
+    }
+
+    private void putSection(Section section) throws IOException {
+        writeVarint(section.size());
+        for (Map.Entry<String, Object> kv : section.entrySet()) {
+            byte[] key = kv.getKey().getBytes(StandardCharsets.US_ASCII);
+            out.writeByte(key.length);
+            out.write(key);
+            write(kv.getValue());
+        }
+    }
+
+    private void writeVarint(long i) throws IOException {
+        if (i <= 63) {
+            out.writeByte(((int) i << 2) | Section.PORTABLE_RAW_SIZE_MARK_BYTE);
+        } else if (i <= 16383) {
+            out.writeShort(((int) i << 2) | Section.PORTABLE_RAW_SIZE_MARK_WORD);
+        } else if (i <= 1073741823) {
+            out.writeInt(((int) i << 2) | Section.PORTABLE_RAW_SIZE_MARK_DWORD);
+        } else {
+            if (i > 4611686018427387903L)
+                throw new IllegalArgumentException();
+            out.writeLong((i << 2) | Section.PORTABLE_RAW_SIZE_MARK_INT64);
+        }
+    }
+
+    private void write(Object object) throws IOException {
+        if (object instanceof byte[]) {
+            byte[] value = (byte[]) object;
+            out.writeByte(Section.SERIALIZE_TYPE_STRING);
+            writeVarint(value.length);
+            out.write(value);
+        } else if (object instanceof String) {
+            byte[] value = ((String) object)
+                    .getBytes(StandardCharsets.US_ASCII);
+            out.writeByte(Section.SERIALIZE_TYPE_STRING);
+            writeVarint(value.length);
+            out.write(value);
+        } else if (object instanceof Integer) {
+            out.writeByte(Section.SERIALIZE_TYPE_UINT32);
+            out.writeInt((int) object);
+        } else if (object instanceof Long) {
+            out.writeByte(Section.SERIALIZE_TYPE_UINT64);
+            out.writeLong((long) object);
+        } else if (object instanceof Byte) {
+            out.writeByte(Section.SERIALIZE_TYPE_UINT8);
+            out.writeByte((byte) object);
+        } else if (object instanceof Section) {
+            writeSection((Section) object);
+        } else {
+            throw new IllegalArgumentException();
+        }
+    }
+}
--- a/app/src/main/java/com/m2049r/levin/util/LittleEndianDataInputStream.java
+++ b/app/src/main/java/com/m2049r/levin/util/LittleEndianDataInputStream.java
--- a/Show More
+++ b/Show More