Merge remote-tracking branch 'upstream/master'

Author: StevenL98

README.md

@@ -133,6 +133,16 @@ Video 1: <a href="doc/musicdao/thesis2.mp4">Load example.</a> This uses a defaul
 
 Video 2: <a href="doc/musicdao/thesis3.mp4">Share track.</a> Note: as a fresh magnet link is generated in this video, there is only 1 peer. For this reason it will be difficult to obtain the metadata of the magnet link (cold start issue, write about this in thesis) so the video stops there.
 
+### Federated, privacy-preserving music recommendations via gossiping
+ 
+This is a demonstration of machine learning which relies exclusively on edge computing. Music recommendation inside the MusicDAO is used to demonstrate gossip-based machine learning. 
+ 
+Every time a user opens MusicDAO, they are asked to reload the page in order to get recommendations. The recommendation engine yields two recommendations made by two different models: a musical feature-based model and a collaborative filtering model. The collaborative filtering model is based on federated matrix factorization as introduced in [this paper](https://dmle.iais.fraunhofer.de/papers/hegedus2019decentralized.pdf). The feature-based models are from this [paper](https://arxiv.org/pdf/1109.1396.pdf), called Adaline and Pegasos. These models are trained on audio features extracted from music files with the [Essentia library](https://essentia.upf.edu/).
+<img src="gossipML/docs/imgs/overview.png" height="400px">
+ 
+The feature-based models are gossiped along random walks through the network. At each peer they are merged and re-trained on peer's local data. The matrix factorization model seeks to learn a factorization of the user-song matrix. This means that one of the two factors contains only information on how users generally rate each song. This matrix can then be gossiped around the network while a user's personal vector as well as their listening history are kept private.
+ - [More about federated machine learning using gossiping for music recommendations](gossipML/README.md)
+ 
 ### Do you want to add your own app?
 
 - [Adding your own app to the TrustChain Super App](doc/AppTutorial.md)

app/build.gradle

@@ -149,7 +149,7 @@ dependencies {
     implementation ('net.java.dev.jna:jna:5.5.0@aar')
     implementation('com.github.tony19:logback-android:2.0.0')
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Testing
     testImplementation 'junit:junit:4.12'

build.gradle

@@ -13,7 +13,9 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://jitpack.io' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
@@ -36,8 +38,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url "https://dl.bintray.com/mattskala/maven" }
-        maven { url "https://dl.bintray.com/terl/lazysodium-maven" }
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 

common/build.gradle

@@ -98,7 +98,7 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     //implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // BitTorrent
     api files('libs/jlibtorrent-1.2.10.0.jar')
@@ -115,7 +115,7 @@ dependencies {
     testImplementation "io.mockk:mockk:1.9.3"
     testImplementation 'org.json:json:20190722'
     testImplementation "com.squareup.sqldelight:sqlite-driver:$sqldelight_version"
-    testImplementation "com.goterl.lazycode:lazysodium-java:4.3.2"
+    testImplementation "com.goterl:lazysodium-java:5.0.1"
     annotationProcessor 'androidx.room:room-compiler:2.2.5'
 }
 

common/src/test/java/nl/tudelft/trustchain/common/util/VotingHelperTest.kt

@@ -1,7 +1,7 @@
 package nl.tudelft.trustchain.common.util
 
-import com.goterl.lazycode.lazysodium.LazySodiumJava
-import com.goterl.lazycode.lazysodium.SodiumJava
+import com.goterl.lazysodium.LazySodiumJava
+import com.goterl.lazysodium.SodiumJava
 import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import io.mockk.mockk

currencyii/build.gradle

@@ -91,7 +91,7 @@ dependencies {
     // Logging
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Testing
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

debug/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Testing
     testImplementation 'junit:junit:4.12'

distributedai/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
 
     implementation "com.androidplot:androidplot-core:1.5.7"

eurotoken/build.gradle

@@ -64,7 +64,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Material
     implementation 'com.google.android.material:material:1.1.0'

gossipML/build.gradle

@@ -140,7 +140,7 @@ dependencies {
     testImplementation "io.mockk:mockk:1.9.3"
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.7'
     testImplementation "org.robolectric:robolectric:3.4.2"
-    testImplementation "com.goterl.lazycode:lazysodium-java:4.3.2"
+    testImplementation "com.goterl:lazysodium-java:5.0.1"
     testImplementation 'androidx.core:core-ktx:1.3.2'
 
     // Testing and generating example data

gossipML/src/test/java/gossipML/ipv8/ModelExchangeMessageTest.kt

@@ -1,7 +1,7 @@
 package nl.tudelft.trustchain.gossipML.ipv8
 
-import com.goterl.lazycode.lazysodium.LazySodiumJava
-import com.goterl.lazycode.lazysodium.SodiumJava
+import com.goterl.lazysodium.LazySodiumJava
+import com.goterl.lazysodium.SodiumJava
 import nl.tudelft.ipv8.keyvault.LibNaClSK
 import nl.tudelft.ipv8.util.hexToBytes
 import nl.tudelft.trustchain.gossipML.models.OnlineModel

ig-ssi/build.gradle

@@ -82,7 +82,7 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.3'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Testing
     testImplementation 'junit:junit:4.12'

kotlin-ipv8

@@ -7,7 +7,7 @@ dependencies {
 //    implementation project(':common')
     api(project(':ipv8-jvm')){
         exclude group: 'org.slf4j'
-        exclude group: 'com.goterl.lazycode'
+        exclude group: 'com.goterl'
         exclude group: 'org.bouncycastle'
     }
 

musicdao-datafeeder/build.gradle

@@ -99,7 +99,7 @@ dependencies {
     implementation 'org.knowm.xchange:xchange-binance:5.0.1'
 
     // Crypto library for testing
-    testImplementation "com.goterl.lazycode:lazysodium-java:4.2.4"
+    testImplementation "com.goterl:lazysodium-java:5.0.1"
 
     // Testing
     testImplementation 'junit:junit:4.12'

musicdao/build.gradle

@@ -1,5 +1,6 @@
 package com.example.musicdao
 
+import org.junit.Ignore
 import org.junit.Test
 import java.io.InputStream
 import java.net.URL
@@ -9,6 +10,7 @@ class FaucetEndpointTest {
     val endpointAddress = "http://134.122.59.107:3000"
 
     @Test
+    @Ignore("Unreliable tests") // unit test should not depend on external server
     fun getCoins() {
         val obj = URL("$endpointAddress?id=$id")
         val con: InputStream? = obj.openStream()

musicdao/src/test/java/com/example/musicdao/FaucetEndpointTest.kt

@@ -1,7 +1,7 @@
 package com.example.musicdao.catalog
 
-import com.goterl.lazycode.lazysodium.LazySodiumJava
-import com.goterl.lazycode.lazysodium.SodiumJava
+import com.goterl.lazysodium.LazySodiumJava
+import com.goterl.lazysodium.SodiumJava
 import nl.tudelft.ipv8.attestation.trustchain.*
 import nl.tudelft.ipv8.keyvault.JavaCryptoProvider
 import nl.tudelft.ipv8.keyvault.LibNaClSK

musicdao/src/test/java/com/example/musicdao/catalog/PlaylistCoverFragmentTest.kt

@@ -1,7 +1,7 @@
 package com.example.musicdao.ipv8
 
-import com.goterl.lazycode.lazysodium.LazySodiumJava
-import com.goterl.lazycode.lazysodium.SodiumJava
+import com.goterl.lazysodium.LazySodiumJava
+import com.goterl.lazysodium.SodiumJava
 import nl.tudelft.ipv8.keyvault.LibNaClSK
 import nl.tudelft.ipv8.util.hexToBytes
 import org.junit.Assert

musicdao/src/test/java/com/example/musicdao/ipv8/KeywordSearchMessageTest.kt

@@ -84,7 +84,7 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

peerchat/build.gradle

@@ -80,7 +80,8 @@ dependencies {
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation 'com.github.tony19:logback-android:2.0.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
+
 
     // Testing
     testImplementation 'junit:junit:4.12'

trustchain-explorer/build.gradle

@@ -71,7 +71,7 @@ dependencies {
     // Animation
     implementation 'com.airbnb.android:lottie:3.4.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

trustchain-payloadgenerator/build.gradle

@@ -71,7 +71,7 @@ dependencies {
     // Animation
     implementation 'com.airbnb.android:lottie:3.4.0'
 
-    implementation 'com.mattskala:itemadapter:0.4'
+    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"