Attestation Chaining, Revocation, and Communication Protocols

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.4.21'
-    ext.ktlint_version = '0.36.0'
+    ext.ktlint_version = '0.41.0'
     ext.coroutines_version = '1.4.2'
     ext.ktlint_gradle_version = '9.1.1'
     // https://github.com/cashapp/sqldelight/issues/1574
@@ -18,7 +18,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlint_gradle_version"
         classpath "com.squareup.sqldelight:gradle-plugin:$sqldelight_version"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jan 12 11:23:56 CET 2021
+#Tue May 11 09:51:47 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

ipv8-android/src/main/java/nl/tudelft/ipv8/android/messaging/bluetooth/BluetoothLeDiscovery.kt

@@ -10,7 +10,7 @@ private val logger = KotlinLogging.logger {}
  * A strategy for selecting discovered Bluetooth peers we should connect to.
  */
 class BluetoothLeDiscovery(
-    private val overlay: Overlay,
+    override val overlay: Overlay,
     private val peers: Int
 ) : DiscoveryStrategy {
     override fun takeStep() {

ipv8-android/src/main/java/nl/tudelft/ipv8/android/peerdiscovery/NetworkServiceDiscovery.kt

@@ -16,7 +16,7 @@ private val logger = KotlinLogging.logger {}
  */
 class NetworkServiceDiscovery(
     private val nsdManager: NsdManager,
-    private val overlay: Overlay
+    override val overlay: Overlay
 ) : DiscoveryStrategy {
     private var serviceName: String? = null
 

ipv8/build.gradle

@@ -10,6 +10,8 @@ apply plugin: 'org.jlleitschuh.gradle.ktlint'
 
 apply plugin: 'com.squareup.sqldelight'
 
+apply plugin: 'kotlin-kapt'
+
 dokka {
     outputFormat = 'html'
     outputDirectory = "$buildDir/dokka"
@@ -78,6 +80,13 @@ dependencies {
     testImplementation "com.squareup.sqldelight:sqlite-driver:$sqldelight_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
 
+    implementation "org.openjdk.jmh:jmh-core:1.21"
+    kapt "org.openjdk.jmh:jmh-generator-annprocess:1.21"
+
+    // Guava
+    implementation "com.google.guava:guava:30.1.1-jre"
+    implementation "com.squareup.sqldelight:sqlite-driver:$sqldelight_version"
+
 
     // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk15to18', version: '1.63'
@@ -88,6 +97,7 @@ dependencies {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
         "-Xuse-experimental=kotlin.Experimental,kotlin.ExperimentalUnsignedTypes",
+        "-Xopt-in=kotlin.RequiresOptIn",
         "-Werror" // Set Kotlin compiler warnings as errors
     ]
 }

ipv8/src/main/java/nl/tudelft/ipv8/Community.kt

@@ -76,9 +76,8 @@ abstract class Community : Overlay {
     }
 
     override fun unload() {
-        super.unload()
-
         job.cancel()
+        super.unload()
     }
 
     override fun bootstrap() {

ipv8/src/main/java/nl/tudelft/ipv8/IPv8.kt

@@ -11,11 +11,21 @@ class IPv8(
     private val endpoint: EndpointAggregator,
     private val configuration: IPv8Configuration,
     val myPeer: Peer,
-    val network: Network = Network()
+    val network: Network = Network(),
 ) {
     private val overlayLock = Object()
 
+    /*
+     * Primary Overlays. Should not contain duplicates.
+     */
     val overlays = mutableMapOf<Class<out Overlay>, Overlay>()
+
+    /*
+     * Secondary Overlays. These contain alternative channels of an Overlay.
+     * Ensure unique Service IDs. TODO: remove Overlays singleton constraint.
+     */
+    val secondaryOverlays = mutableMapOf<String, Overlay>()
+
     private val strategies = mutableListOf<DiscoveryStrategy>()
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
@@ -31,6 +41,10 @@ class IPv8(
         return overlays[T::class.java] as? T
     }
 
+    inline fun <reified T : Overlay> getSecondaryOverlay(serviceId: String): T? {
+        return secondaryOverlays[serviceId] as? T
+    }
+
     fun start() {
         if (isStarted()) throw IllegalStateException("IPv8 has already started")
 
@@ -68,6 +82,45 @@ class IPv8(
         startLoopingCall()
     }
 
+    /*
+     * Method for adding secondary overlays. These allow for multiple class instances, however, service IDs must be unique.
+     * As a consequence, the used peer, endpoint and network can be different than the main ones.
+     */
+    fun addSecondaryOverlayStrategy(overlayConfiguration: SecondaryOverlayConfiguration<*>): Overlay {
+        synchronized(overlayLock) {
+            val overlay = overlayConfiguration.factory.create()
+            if (!this.secondaryOverlays.containsKey(overlay.serviceId)) {
+                overlay.myPeer = overlayConfiguration.myPeer ?: myPeer
+                overlay.endpoint = overlayConfiguration.endpoint ?: endpoint
+                overlay.network = overlayConfiguration.network ?: network
+                overlay.maxPeers = overlayConfiguration.maxPeers
+                overlay.load()
+
+                this.secondaryOverlays[overlay.serviceId] = overlay
+
+                for (strategyFactory in overlayConfiguration.walkers) {
+                    val strategy = strategyFactory
+                        .setOverlay(overlay)
+                        .create()
+                    strategy.load()
+                    strategies.add(strategy)
+                }
+            }
+            return secondaryOverlays[overlay.serviceId]!!
+        }
+    }
+
+    fun unloadSecondaryOverlayStrategy(serviceId: String) {
+        synchronized(overlayLock) {
+            val overlay = this.secondaryOverlays.remove(serviceId)
+            for (strategy in strategies) {
+                if (strategy.overlay == overlay) {
+                    this.strategies.remove(strategy)
+                }
+            }
+        }
+    }
+
     private fun onTick() {
         if (endpoint.isOpen()) {
             synchronized(overlayLock) {
@@ -104,6 +157,11 @@ class IPv8(
             }
             overlays.clear()
 
+            for ((_, overlay) in secondaryOverlays) {
+                overlay.unload()
+            }
+            secondaryOverlays.clear()
+
             for (strategy in strategies) {
                 strategy.unload()
             }

ipv8/src/main/java/nl/tudelft/ipv8/IPv8Configuration.kt

@@ -1,5 +1,7 @@
 package nl.tudelft.ipv8
 
+import nl.tudelft.ipv8.messaging.EndpointAggregator
+import nl.tudelft.ipv8.peerdiscovery.Network
 import nl.tudelft.ipv8.peerdiscovery.strategy.DiscoveryStrategy
 
 class IPv8Configuration(
@@ -9,8 +11,17 @@ class IPv8Configuration(
     val overlays: List<OverlayConfiguration<*>>
 )
 
-class OverlayConfiguration<T : Overlay>(
+open class OverlayConfiguration<T : Overlay>(
     val factory: Overlay.Factory<T>,
     val walkers: List<DiscoveryStrategy.Factory<*>>,
     val maxPeers: Int = 30
 )
+
+class SecondaryOverlayConfiguration<T : Overlay>(
+    factory: Overlay.Factory<T>,
+    walkers: List<DiscoveryStrategy.Factory<*>>,
+    maxPeers: Int = 30,
+    val myPeer: Peer? = null,
+    val endpoint: EndpointAggregator? = null,
+    val network: Network? = null
+) : OverlayConfiguration<T>(factory, walkers, maxPeers)

ipv8/src/main/java/nl/tudelft/ipv8/Overlay.kt

@@ -22,7 +22,7 @@ interface Overlay : EndpointListener {
         get() = myPeer.lamportTimestamp
 
     /**
-     * Called to inintialize this overlay.
+     * Called to initialize this overlay.
      */
     fun load() {
         endpoint.addListener(this)
@@ -84,7 +84,7 @@ interface Overlay : EndpointListener {
     /**
      * Get a peer for introduction.
      *
-     * @param Optionally specify a peer that is not considered eligible for introduction.
+     * @param exclude Optionally specify a peer that is not considered eligible for introduction.
      * @return A peer to send an introduction request to, or null if are none available.
      */
     fun getPeerForIntroduction(exclude: Peer? = null): Peer?