changes for simulating mix

docker-compose.yml

@@ -96,20 +96,38 @@ services:
       - bootstrap
     networks:
       - simulation
-      
-  rest-traffic:
-    build:
-      context: ./tools/rest-traffic
-      dockerfile: Dockerfile
+
+  lp-mix:
+    image: lightpushmix:test
+    pull_policy: never
+    #deploy:
+    #replicas: 2
+    entrypoint: sh
+    environment:
+      - NUM_NWAKU_NODES=${NUM_NWAKU_NODES}
     command:
-      --multiple-nodes=http://waku-simulator-nwaku-[1..${NUM_NWAKU_NODES:-5}]:8645
-      --msg-size-kbytes=${MSG_SIZE_KBYTES:-10}
-      --delay-seconds=${TRAFFIC_DELAY_SECONDS:-15}
+      - '/opt/run_lp_mix_publisher.sh'
+    volumes:
+      - ./run_lp_mix_publisher.sh:/opt/run_lp_mix_publisher.sh:Z
     networks:
       - simulation
     depends_on:
       - nwaku
 
+  #  rest-traffic:
+  #  build:
+  #    context: ./tools/rest-traffic
+  #    dockerfile: Dockerfile
+  #  image: alrevuelta/rest-traffic:28430f8
+  #  command:
+  #    --multiple-nodes=http://waku-simulator-nwaku-[1..${NUM_NWAKU_NODES:-5}]:8645
+  #    --msg-size-kbytes=${MSG_SIZE_KBYTES:-10}
+  #    --delay-seconds=${TRAFFIC_DELAY_SECONDS:-15}
+  #  networks:
+  #    - simulation
+  #  depends_on:
+  #    - nwaku
+
   prometheus:
     image: prom/prometheus:latest
     volumes:
@@ -236,4 +254,4 @@ services:
 #       - simulation
 
 volumes:
-  privatekeys-volume:
+  privatekeys-volume:

monitoring/prometheus-config.yml

@@ -213,4 +213,25 @@ scrape_configs:
       - waku-simulator-nwaku-197:8008
       - waku-simulator-nwaku-198:8008
       - waku-simulator-nwaku-199:8008
-      - waku-simulator-nwaku-200:8008
+      - waku-simulator-nwaku-200:8008
+      - waku-simulator-lp-mix-1:8008
+      - waku-simulator-lp-mix-2:8008
+      - waku-simulator-lp-mix-3:8008
+      - waku-simulator-lp-mix-4:8008
+      - waku-simulator-lp-mix-5:8008
+      - waku-simulator-lp-mix-6:8008
+      - waku-simulator-lp-mix-7:8008
+      - waku-simulator-lp-mix-8:8008
+      - waku-simulator-lp-mix-9:8008
+      - waku-simulator-lp-mix-10:8008
+      - waku-simulator-lp-mix-11:8008
+      - waku-simulator-lp-mix-12:8008
+      - waku-simulator-lp-mix-13:8008
+      - waku-simulator-lp-mix-14:8008
+      - waku-simulator-lp-mix-15:8008
+      - waku-simulator-lp-mix-16:8008
+      - waku-simulator-lp-mix-17:8008
+      - waku-simulator-lp-mix-18:8008
+      - waku-simulator-lp-mix-19:8008
+      - waku-simulator-lp-mix-20:8008
+      - waku-simulator-lp-mix-21:8008

run_bootstrap.sh

@@ -10,6 +10,7 @@ exec /usr/bin/wakunode\
       --rest-admin=true\
       --rest-address=0.0.0.0\
       --max-connections=300\
+      --peer-exchange=true\
       --discv5-discovery=true\
       --discv5-enr-auto-update=True\
       --log-level=DEBUG\
@@ -17,4 +18,5 @@ exec /usr/bin/wakunode\
       --metrics-server-address=0.0.0.0\
       --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68\
       --nat=extip:${IP}\
+      --shard=0\
       --cluster-id=66

run_nwaku.sh

@@ -127,6 +127,7 @@ echo "Using bootstrap node: ${BOOTSTRAP_ENR}"
 exec /usr/bin/wakunode\
       --relay=true\
       --lightpush=true\
+      --peer-exchange=true\
       --max-connections=250\
       --rest=true\
       --rest-address=0.0.0.0\
@@ -139,4 +140,5 @@ exec /usr/bin/wakunode\
       --discv5-bootstrap-node=${BOOTSTRAP_ENR}\
       --nat=extip:${IP}\
       --shard=0\
-      --cluster-id=66
+      --cluster-id=66\
+      --mix=true

wakusim.env

@@ -1,7 +1,7 @@
 # Env variables for metal-01.he-eu-hel1.misc.wakusim host.
-NWAKU_IMAGE=harbor.status.im/wakuorg/nwaku:latest
+NWAKU_IMAGE=quay.io/wakuorg/nwaku-pr:3284
 # Network scaling.
-NUM_NWAKU_NODES=50
+NUM_NWAKU_NODES=10
 # Simulation traffic.
 MSG_SIZE_KBYTES=10
 TRAFFIC_DELAY_SECONDS=30