Tests p2p

.gitignore

@@ -18,3 +18,5 @@ build
 
 endtoend/node_modules
 
+endtoend/results
+

Dockerfile

@@ -1,11 +1,11 @@
-#FROM openjdk:11
+#FROM openjdk:11-slim
 FROM adoptopenjdk/openjdk11:x86_64-alpine-jdk-11.0.9_11-slim as build-stage
 WORKDIR /usr/src/minima/
 COPY gradle gradle
 COPY gradlew settings.gradle build.gradle ./
 WORKDIR /usr/src/minima/
 # Call gradlew before copying the source code to only download the gradle distribution once (layer will be cached)
-#RUN ./gradlew --no-daemon -v
+RUN ./gradlew --no-daemon -v
 COPY lib lib
 COPY src src
 COPY test test
@@ -18,6 +18,9 @@ RUN ls -l build/libs/*
 RUN stat build/libs/minima-all.jar
 #RUN tar -cf minimajar.tar build/libs/minima-all.jar
 
+#FROM openjdk:11-slim as production-stage
+#RUN apt-get update
+#RUN apt-get install -y curl
 FROM adoptopenjdk/openjdk11:x86_64-alpine-jdk-11.0.9_11-slim as production-stage
 RUN apk --no-cache add curl
 COPY --from=build-stage /usr/src/minima/build/libs/minima-all.jar /opt/minima/minima.jar

Dockerfile.arm64v8

@@ -1,12 +1,12 @@
-#FROM openjdk:11
+#FROM openjdk:11 as build-stage
 #FROM adoptopenjdk/openjdk11:x86_64-alpine-jdk-11.0.9_11-slim as build-stage
 FROM arm64v8/adoptopenjdk:11-jdk-hotspot-focal as build-stage
 WORKDIR /usr/src/minima/
 COPY gradle gradle
 COPY gradlew settings.gradle build.gradle ./
 WORKDIR /usr/src/minima/
 # Call gradlew before copying the source code to only download the gradle distribution once (layer will be cached)
-#RUN ./gradlew --no-daemon -v
+RUN ./gradlew --no-daemon -v
 COPY lib lib
 COPY src src
 COPY test test
@@ -19,8 +19,12 @@ RUN ls -l build/libs/*
 RUN stat build/libs/minima-all.jar
 #RUN tar -cf minimajar.tar build/libs/minima-all.jar
 
+# no alpine multi arch images yet, so we build with 11-jdk-hotspot-focal to build a 500 MB image (:11 leads to 700 MB image)
+#FROM openjdk:11 as production-stage
 #FROM adoptopenjdk/openjdk11:x86_64-alpine-jdk-11.0.9_11-slim as production-stage
 FROM arm64v8/adoptopenjdk:11-jdk-hotspot-focal as production-stage
+#COPY --from=build-stage /usr/src/minima/build/resources/main/log4j2.xml /opt/minima/log4j2.xml
+COPY --from=build-stage /usr/src/minima/src/resources/log4j2.xml /opt/minima/log4j2.xml
 COPY --from=build-stage /usr/src/minima/build/libs/minima-all.jar /opt/minima/minima.jar
 #COPY --from=build-stage /usr/src/minima/minimajar.tar /opt/minima/minimajar.tar
 WORKDIR /opt/minima
@@ -33,4 +37,5 @@ RUN ls -l *.jar
 RUN stat minima.jar
 # 9001 minima protocol 9002 REST 9003 WebSocket 9004 MiniDapp Server
 EXPOSE 9001 9002 9003 9004 
-ENTRYPOINT ["java", "-jar", "minima.jar"]
+#ENTRYPOINT ["java", "-jar", "minima.jar"]
+ENTRYPOINT ["java", "-Dlog4j.configurationFile=log4j2.xml", "-jar", "minima.jar"]

build.gradle

@@ -10,6 +10,9 @@ plugins {
     // Apply the java plugin to add support for Java
     id 'java'
 
+    // Support for kotlin (used by libraries)
+    id 'org.jetbrains.kotlin.jvm' version '1.4.20' 
+
     // Apply the application plugin to add support for building a CLI application.
     id 'application'
 
@@ -28,8 +31,17 @@ repositories {
     // Use jcenter for resolving dependencies.
     // You can declare any Maven/Ivy/file repository here.
     jcenter()
+
+    maven { 
+        url "https://dl.cloudsmith.io/public/libp2p/jvm-libp2p/maven/" 
+    }
+    maven {
+        url "https://artifacts.consensys.net/public/maven/maven/"
+    }
+
 }
 
+
 dependencies {
     // This dependency is used by the application.
     implementation 'com.google.guava:guava:29.0-jre'
@@ -41,6 +53,44 @@ dependencies {
 
     implementation 'com.jcraft:jsch:0.1.55'
 
+    // build and install locally for Apple Silicon
+    implementation 'com.google.protobuf:protobuf-java:3.11.0'
+    implementation("org.bouncycastle:bcprov-jdk15on:1.62")
+    implementation("org.bouncycastle:bcpkix-jdk15on:1.62")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-M1")
+
+    //implementation('io.libp2p:jvm-libp2p-minimal:0.8.1-RELEASE')
+    implementation 'io.libp2p:jvm-libp2p-minimal:0.8.1-RELEASE'
+    // implementation 'io.libp2p:jvm-libp2p-minimal'
+//    compile files('libs/jvm-libp2p-minimal-0.8.0-RELEASE.jar')
+
+    api("io.netty:netty-all:4.1.36.Final")
+
+    implementation("org.apache.logging.log4j:log4j-api:2.11.2")
+    implementation("org.apache.logging.log4j:log4j-core:2.11.2")
+
+    // below is needed to actually capture the log messages from log4j 
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.0-alpha1' // '1.7.30'
+
+    //implementation("org.slf4j:slf4j-api:2.0.0-alpha1")
+
+    // Bytes object needed for collections such as KVS
+    implementation("org.apache.tuweni:bytes:1.3.0")
+    // commons-lang3 is needed for Pair<,> in ssz 
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    // not sure we need the below, as we imported teku fork of tuweni ssz... But maybe we could switch to it.
+    implementation group: 'org.apache.tuweni', name: 'tuweni-ssz', version: '1.1.0', ext: 'pom'
+    // https://mvnrepository.com/artifact/org.apache.tuweni/tuweni-units - needed for eth discovery v5 lib (tech.pegasys.discovery)
+    //implementation group: 'org.apache.tuweni', name: 'tuweni-units', version: '1.1.0', ext: 'pom'
+    implementation("org.apache.tuweni:units:1.3.0")
+    // awaitility is used by Waiter.java
+    implementation group: 'org.awaitility', name: 'awaitility', version: '4.0.3'
+
+    implementation 'tech.pegasys.discovery:discovery:0.4.6'
+ //   implementation 'tech.pegasys.discovery:discovery:0.4.3-dev-57c2fd81'
+
+
     implementation 'com.h2database:h2:1.4.200'
 //    implementation group: 'com.h2database', name: 'h2', version: '1.4.200'
 
@@ -76,9 +126,26 @@ application {
     //mainClass.set("org.minima.Start") // new syntax for gradle 6.7+, plugins not compatible yet
 }
 
+// alternative main methods - see https://stackoverflow.com/questions/43937169/gradle-application-plugin-with-multiple-main-classes/46938169
+
+// define a task for any alternative static void main method  - first arg is gradle task name: ./gradlew runp2p
+task(runp2p, dependsOn: 'classes', type: JavaExec) {
+   main = 'org.minima.system.network.base.P2PStart'   // org/minima/system/network/base/P2PStart
+   classpath = sourceSets.main.runtimeClasspath
+   // args ''/ip4/127.0.0.1/tcp/63407/ipfs/QmRGduDqyGXEsAGxAw9gM6tZrJbg1NEKSvmqwnjQqKwRVk'  // use this line to hardcode args 
+   // systemProperty 'simple.message', 'Hello '
+   systemProperty 'log4j2.debug', 'false'
+//   systemProperty 'log4j.configurationFile', 'log4j2-p2p.properties'
+  systemProperty 'log4j.configurationFile', 'log4j2.xml'  
+// use below to log to file
+//  systemProperty "log4j.configurationFile", "log4j2-test-discovery.xml"
+
+}
+
+// needed for log4j to work with fatjar
 jar {
     manifest {
         attributes 'Main-Class': 'org.minima.Start'
+        attributes "Multi-Release": true 
     }
 }
-

endtoend/Dockerfile

@@ -1,17 +1,25 @@
 #FROM keymetrics/pm2:latest-alpine
-FROM node:15-alpine
+FROM node:16-alpine
 #FROM node:10
 #FROM mhart/alpine-node:15
 
 WORKDIR /app/
 
 # install some packages on Alpine
 RUN apk --no-cache add \
-    python \
-    bash
+    python2 \
+    bash \
+    build-base \
+    g++ \
+    cairo-dev \
+    jpeg-dev \
+    pango-dev \
+    giflib-dev
+
+RUN apk add --update  --repository http://dl-3.alpinelinux.org/alpine/edge/testing libmount ttf-dejavu ttf-droid ttf-freefont ttf-liberation ttf-ubuntu-font-family fontconfig
 
 # Copy nodejs package files
-COPY package-lock.json package.json /app/
+COPY package-lock.json package.json minima-api-1.0.0.tgz /app/
 
 # Install packages
 #ENV NPM_CONFIG_LOGLEVEL warn
@@ -26,4 +34,17 @@ COPY src /app/src
 
 CMD ["node", "src/index.js"]
 
+ARG topology=star
+ARG nbNodes=3
+ARG nodeFailure=2
+ARG graph=false
+
+ENV topology=$topology
+ENV nbNodes=$nbNodes
+ENV nodeFailure=$nodeFailure
+ENV graph=$graph
 
+RUN echo $topology
+RUN echo $nbNodes
+RUN echo $nodeFailure
+RUN echo $graph

endtoend/README.md

@@ -7,7 +7,7 @@ Quick Start
    cd minima_root_dir
    docker network create minima-e2e-testnet
    docker build -t minima:latest .   # OR on ARM: docker build -t minima:latest  -f Dockerfile.arm64v8 .
-   cd end2end
+   cd endtoend
    docker build -t minima-e2e . && docker run -v /var/run/docker.sock:/var/run/docker.sock --network minima-e2e-testnet minima-e2e
 
 Setup
@@ -19,15 +19,14 @@ build minima docker image (or pull it) - default image used is minima:latest
 #ARM: docker build -t minima:latest  -f Dockerfile.arm64v8 .
 
 build nodejs tests docker image (same for ARM and x64):
-   cd end2end
-   docker build -t minima-e2e .
+   docker build -t minima-e2e endtoend
 
 stop all running docker images (useful to stop instances manually, otherwise script stops automatically old instances at restart):
    docker stop $(docker ps -a -q)
 
 run docker instance to create network and perform network connectivity check (requires at least one connection):
-   docker run -v /var/run/docker.sock:/var/run/docker.sock --network minima-e2e-testnet minima-e2e
+   docker run -v /var/run/docker.sock:/var/run/docker.sock --env nbNodes=3 --network minima-e2e-testnet minima-e2e
 
 All in one:
-   docker build -t minima-e2e . && docker run -v /var/run/docker.sock:/var/run/docker.sock --network minima-e2e-testnet minima-e2e
+   docker build -t minima-e2e endtoend && docker run -v /var/run/docker.sock:/var/run/docker.sock --env nbNodes=3 --network minima-e2e-testnet minima-e2e