update scripts

init.sh

@@ -24,4 +24,5 @@ cd ../
 ./cryptor.sh  $N
 ./net.sh $N
 ./nebula.sh $N
+./sentry.sh $N
 

nebula.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+
+rm -rfv ./data/nebula/*
+
 N=${1:-1}
 echo "N=$N"
 
@@ -9,7 +12,7 @@ echo "N=$N"
 for i in $(seq 1 $N)
 do
     echo "generate config at $i"
-    config_dir=$PWD/data/nebula${i}
+    config_dir=$PWD/data/nebula/${i}
     data_dir=$config_dir/data
     echo $config_dir $data_dir
     rm -rfv $data_dir
@@ -60,7 +63,7 @@ echo "  nebula$i:"                                         >> $composefile
 echo "    image: 192.168.1.220:5000/nebula:v0.0.1"         >> $composefile
 echo "    container_name: nebula$i"                        >> $composefile
 echo "    volumes:"                                       >> $composefile
-echo "      - ./data/nebula$i:/root"                        >> $composefile
+echo "      - ./data/nebula/$i:/root"                     >> $composefile
 echo "    depends_on:"                                    >> $composefile
 echo "      - net$i"                                      >> $composefile
 echo "      - sentry$i"                                   >> $composefile
@@ -68,7 +71,7 @@ echo "$resource"                                          >> $composefile
 
 
 
-idx=$(((($i-1))*10))
+idx=$(((($i-1))*100))
 
 echo "    ports:"                                         >> $composefile
 echo "      - $((38004+$idx)):38004"                        >> $composefile

net.sh

@@ -4,10 +4,10 @@ set -e
 
 N=${1:-1}
 
-for i in $(seq 1 $N)
-do
-  rm -rfv ./data/net$i
-done
+# for i in $(seq 1 $N)
+# do
+  rm -rfv ./data/net/*
+# done
 
 composefile="docker-compose-net.yml"
 
@@ -40,7 +40,7 @@ echo "$deploy"                                          >> $composefile
 echo "    ports:"                                       >> $composefile
 echo "      - \"$((38010 + i)):38010\""                 >> $composefile
 echo "    volumes:"                                     >> $composefile
-echo "      - ./data/net$i:/root/data"                  >> $composefile
+echo "      - ./data/net/$i:/root/data"                  >> $composefile
 echo "    networks:"                                    >> $composefile
 echo "      meta:"                                      >> $composefile
 echo "        ipv4_address: 172.99.1.$i"                >> $composefile

ring.sh

@@ -4,6 +4,9 @@ set -e
 
 N=${1:-1}
 
+
+rm -rfv ./data/ring/*
+
 composefile="docker-compose_ring.yml"
 
 
@@ -36,7 +39,7 @@ echo "    image: 192.168.1.220:5000/ring:v0.0.1"         >> $composefile
 echo "    container_name: ring$i"                        >> $composefile
 echo "    entrypoint: sh -c 'echo "+"ring"+" && sleep 10 && ringd start  --ethconfig.httphost  0.0.0.0 --mempool.sentryurl  sentry$i:38003   --mempool.nebulaurl nebula$i:38004  --mempool.p2purl  net$i:38010  --mempool.cryptourl  cryptor$i:38001  --mempool.checkerurl txchecker:38002   --mempool.writeunreadytxs=false   --mempool.writerepeatedmsg=false     --mempool.batchconfirminittimeout=60   --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0' "       >> $composefile
 echo "    volumes:"                                       >> $composefile
-echo "      - ./data/ring$i:/data"                        >> $composefile
+echo "      - ./data/ring/$i:/data"                        >> $composefile
 echo "    depends_on:"                                    >> $composefile
 echo "      - cryptor$i"                                  >> $composefile
 echo "      - net$i"                                      >> $composefile

start.sh

@@ -6,7 +6,7 @@ cd  mainchain
 ./scripts/run-testnet.sh 
 cd ../
 
-docker compose -f docker-compose-prometheus.yml -f  docker-compose-cadvisor.yml -f docker-compose_cryptor.yml  -f  docker-compose-net.yml  -f   docker-compose_nebula-sentry.yml   -f    docker-compose_ring.yml  -f docker-compose_nebula.yml  -f docker-compose_sentry.yml     up    -d
+docker compose -f docker-compose-prometheus.yml -f  docker-compose-cadvisor.yml -f docker-compose_cryptor.yml  -f  docker-compose-net.yml    -f    docker-compose_ring.yml  -f docker-compose_nebula.yml  -f docker-compose_sentry.yml     up    -d
 
 
 

stop.sh

@@ -10,6 +10,6 @@ cd  mainchain
 cd ../
 
 
-docker compose -f docker-compose-prometheus.yml -f  docker-compose-cadvisor.yml -f docker-compose_cryptor.yml  -f  docker-compose-net.yml  -f   docker-compose_nebula-sentry.yml   -f    docker-compose_ring.yml  -f docker-compose_nebula.yml  -f docker-compose_sentry.yml     down
+docker compose -f docker-compose-prometheus.yml -f  docker-compose-cadvisor.yml -f docker-compose_cryptor.yml  -f  docker-compose-net.yml    -f    docker-compose_ring.yml  -f docker-compose_nebula.yml  -f docker-compose_sentry.yml    down