update peer id

host/host.sh

@@ -44,11 +44,17 @@ if [ $# -eq 3 ]; then
   done 
   while true 
   do
-    if [ $(echo ${input_string_enr} | wc -L)  -eq 200 ] ; then
+
+    echo "peer----------------"
+    echo ${input_string_enr##*/}
+    echo ${input_string_enr##*/} | wc -L
+
+
+    if [ $(echo ${input_string_enr##*/} | wc -L)  -eq 53 ] ; then
         break 
     fi 
-    echo ${input_string_enr}" is not a valid seed enr"
-    echo "please input your p2p seed enr: "
+    echo ${input_string_enr}" is not a valid peer id"
+    echo "please input your p2p peer id: "
     read input_string_enr
   done 
 fi 
@@ -73,11 +79,19 @@ done
 
 while true 
 do
-  echo "please input your p2p seed enr, or cancel with no: "
+  echo "please input your p2p peer id, or cancel with no: "
   read input_string_enr
-    if [ $(echo ${input_string_enr} | wc -L)  -eq 200 ] ; then
-          break 
-    fi 
+    echo "peer----------------"
+    echo ${input_string_enr##*/}
+    echo ${input_string_enr##*/} | wc -L
+
+    if [ $(echo ${input_string_enr##*/} | wc -L)  -eq 53 ] ; then
+        break 
+    fi
+
+    # if [ $(echo ${input_string_enr} | wc -L)  -eq 200 ] ; then
+    #       break 
+    # fi 
     if [ ${input_string_enr} == "no" ]; then
       isSeed=1
       break 
@@ -161,19 +175,26 @@ do
   echo "single-node: true" >> $configFile
   echo "log-level: \"debug\"" >> $configFile
   echo "enable-prom: true" >> $configFile
-  echo "use-discovery: true" >> $configFile
+  echo "use-discovery: false" >> $configFile
   echo "nebula-grpc-address: \"nebula:38004\"" >> $configFile
   echo "grpc-host: \"0.0.0.0\"" >> $configFile
   echo "grpc-port: 38010" >> $configFile
   echo "p2p-host-ip: \"$ipAddr\"" >> $configFile
-  if [ $i -eq 1 ]; then
-    echo "p2p-priv-key: \"/etc/MetaNet/default-priv-key\"" >> $configFile
-  else
-    echo "bootstrap-node: [${seedEnr}]" >> $configFile
-    #echo "bootstrap-node: [\"enr:-JG4QEOwrARSiElnvYO0oWjgOrt9-faERbU0O_pYM2Cuh_s9K__lZ2Lco569gWZFfOrqI7pEwKBxG3RYqZRvhJCHwMGGAYvHpaQegmlkgnY0gmlwhBJmI8iJc2VjcDI1NmsxoQJ81pyuyqa2QoPztOPsCqpkcW1gJwUxOcSJuWr9VUNavIN0Y3CCdn2DdWRwgnZ-\"]" >> $configFile
-  fi
+
+
+   echo "peer: [\"${seedEnr}\"]" >> $configFile
+
+  # echo "peer: \"$ipAddr\"" >> $configFile
+  # peer: ["要连接的peerid"]
+  # if [ $i -eq 1 ]; then
+  #   echo "p2p-priv-key: \"/etc/MetaNet/default-priv-key\"" >> $configFile
+  # else
+  #   echo "bootstrap-node: [${seedEnr}]" >> $configFile
+  # fi
 done
 # net config end
+#echo "bootstrap-node: [\"enr:-JG4QEOwrARSiElnvYO0oWjgOrt9-faERbU0O_pYM2Cuh_s9K__lZ2Lco569gWZFfOrqI7pEwKBxG3RYqZRvhJCHwMGGAYvHpaQegmlkgnY0gmlwhBJmI8iJc2VjcDI1NmsxoQJ81pyuyqa2QoPztOPsCqpkcW1gJwUxOcSJuWr9VUNavIN0Y3CCdn2DdWRwgnZ-\"]" >> $configFile
+
 
 
 
@@ -375,23 +396,26 @@ echo ""                                                 >> $composefile
 
 
 
-
-echo "  nebula:"                                         >> $composefile
-echo "    image: caduceus/cmp2-test-net-meta-nebula:v0.0.13"       >> $composefile
-echo "    container_name: nebula"                        >> $composefile
-echo "    volumes:"                                      >> $composefile
-echo "      - "$datadir"/nebula/:/root"                  >> $composefile
-echo "    depends_on:"                                   >> $composefile
-echo "      - net"                                       >> $composefile
-echo "      - sentry"                                    >> $composefile
-echo "$resourcenebula"                                   >> $composefile
-echo "    ports:"                                        >> $composefile
-echo "      - $((38004)):38004"                          >> $composefile
-echo "      - $((28000)):28080"                          >> $composefile
-echo "    networks:"                                     >> $composefile
-echo "      - meta"                                      >> $composefile
-echo "" 						                                     >> $composefile
-
+if [ $i -eq 1 ]; then
+  #echo "p2p-priv-key: \"/etc/MetaNet/default-priv-key\"" >> $configFile
+  echo "" 						                                     >> $composefile
+else
+  echo "  nebula:"                                         >> $composefile
+  echo "    image: caduceus/cmp2-test-net-meta-nebula:v0.0.13"       >> $composefile
+  echo "    container_name: nebula"                        >> $composefile
+  echo "    volumes:"                                      >> $composefile
+  echo "      - "$datadir"/nebula/:/root"                  >> $composefile
+  echo "    depends_on:"                                   >> $composefile
+  echo "      - net"                                       >> $composefile
+  echo "      - sentry"                                    >> $composefile
+  echo "$resourcenebula"                                   >> $composefile
+  echo "    ports:"                                        >> $composefile
+  echo "      - $((38004)):38004"                          >> $composefile
+  echo "      - $((28000)):28080"                          >> $composefile
+  echo "    networks:"                                     >> $composefile
+  echo "      - meta"                                      >> $composefile
+  echo "" 						                                     >> $composefile
+fi
 
 
 echo "  ring:"                                           >> $composefile