From 086fe43f56d9c5c5d1d920082fe50c8c1a5efb31 Mon Sep 17 00:00:00 2001
From: wormholeslab <dev@wormholes.com>
Date: Wed, 9 Aug 2023 16:52:15 +0800
Subject: [PATCH] perf: Optimize scripts for making docker and upgrade erbie to
 V0.14.4

---
 Dockerfile        | 12 ++++++------
 erbie.conf        |  6 +++---
 erbie_install.sh  | 30 +++++++++++++++---------------
 erbie_log.conf    | 14 ++++++++++++++
 noshowlog.sh      |  4 ++++
 params/version.go |  2 +-
 showlog.sh        |  4 ++++
 7 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 erbie_log.conf
 create mode 100644 noshowlog.sh
 create mode 100644 showlog.sh

diff --git a/Dockerfile b/Dockerfile
index 70f9abca..c0a604c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:20.04
 RUN apt-get update
 RUN apt-get install supervisor -y
-WORKDIR /wm
+WORKDIR /erb
 COPY erbie.conf /etc/supervisor/conf.d/
 COPY erbie_log.conf /etc/supervisor/conf.d/
-COPY showlog.sh /wm/ 
-COPY noshowlog.sh /wm/
+COPY showlog.sh /erb/ 
+COPY noshowlog.sh /erb/
 #COPY version /etc/
-COPY erbie /wm/
-#COPY start.sh /wm/
-RUN mkdir -p /wm/.erbie/erbie
+COPY erbie /erb/
+#COPY start.sh /erb/
+RUN mkdir -p /erb/.erbie/erbie
 CMD ["/usr/bin/supervisord", "-n"]
 ARG arg
 ENV version=$arg
diff --git a/erbie.conf b/erbie.conf
index 8e7f9278..a17b4d20 100644
--- a/erbie.conf
+++ b/erbie.conf
@@ -1,7 +1,7 @@
 [program:erbie]
 ; user=nyber
-directory=/wm
-command=/wm/erbie --datadir /wm/.erbie  --mine --rpc  --rpcvhosts '*' --rpccorsdomain "*"  --rpcaddr 0.0.0.0 --devnet --syncmode=full
+directory=/erb
+command=/erb/erbie --datadir /erb/.erbie  --mine --rpc  --rpcvhosts '*' --rpccorsdomain "*"  --rpcaddr 0.0.0.0 --devnet --syncmode=full
 autostart=true
 autorestart=true
 startsecs=10
@@ -10,6 +10,6 @@ priority=2
 startretries=10
 logfile_maxbytes=50MB
 redirect_stderr=true
-#stdout_logfile=/wm/.erbie/erbie.log
+#stdout_logfile=/erb/.erbie/erbie.log
 stdout_logfile=/dev/null
 
diff --git a/erbie_install.sh b/erbie_install.sh
index 9cdb772d..dfcad952 100644
--- a/erbie_install.sh
+++ b/erbie_install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #check docker cmd
-echo "Script version Number: v0.14.3"
+echo "Script version Number: v0.14.4"
 which docker >/dev/null 2>&1
 if  [ $? -ne 0 ] ; then
         echo "docker not found, please install first!"
@@ -30,10 +30,10 @@ if [ -n "$erb" ];then
                 if [[ $container =~ "Up" ]];then
                         while true
                         do
-                                key=$(docker exec -it erbie /usr/bin/ls -l /wm/.erbie/erbie/nodekey)
+                                key=$(docker exec -it erbie /usr/bin/ls -l /erb/.erbie/erbie/nodekey)
                                 if [ -n "$key" ];then
                                         echo -e "It is the latest version: $vr \nYour private key:"
-                                        docker exec -it erbie /usr/bin/cat .erbie/erbie/nodekey
+                                        docker exec -it erbie /usr/bin/cat /erb/.erbie/erbie/nodekey
                                         echo -e "\n"
                                         exit 0
                                 else
@@ -52,17 +52,17 @@ if [ -n "$erb" ];then
                 docker rm erbie > /dev/null 2>&1
                 docker rmi erbie/erbie:v1 > /dev/null 2>&1
                 if [ $cts -lt $vt5 ];then
-                        if [ -f /wm/.erbie/erbie/nodekey ];then
+                        if [ -f /erb/.erbie/erbie/nodekey ];then
                                 echo "Clearing historical data ............"
-                                cp /wm/.erbie/erbie/nodekey /wm/nodekey
-                                rm -rf /wm/.erbie
-                                mkdir -p /wm/.erbie/erbie
-                                mv /wm/nodekey /wm/.erbie/erbie/
+                                cp /erb/.erbie/erbie/nodekey /erb/nodekey
+                                rm -rf /erb/.erbie
+                                mkdir -p /erb/.erbie/erbie
+                                mv /erb/nodekey /erb/.erbie/erbie/
                         else
                                 read -p "Enter your private key：" ky
                         fi
                 elif [ $cts -ge $vt5 ];then
-                        if [ ! -f /wm/.erbie/erbie/nodekey ];then
+                        if [ ! -f /erb/.erbie/erbie/nodekey ];then
                                 read -p "Enter your private key：" ky
                         fi
                 fi
@@ -72,11 +72,11 @@ else
 fi
 
 if [ -n "$ky" ]; then
-        mkdir -p /wm/.erbie/erbie
+        mkdir -p /erb/.erbie/erbie
         if [ ${#ky} -eq 64 ];then
-                echo $ky > /wm/.erbie/erbie/nodekey
+                echo $ky > /erb/.erbie/erbie/nodekey
         elif [ ${#ky} -eq 66 ] && ([ ${ky:0:2} == "0x" ] || [ ${ky:0:2} == "0X" ]);then
-                echo ${ky:2:64} > /wm/.erbie/erbie/nodekey
+                echo ${ky:2:64} > /erb/.erbie/erbie/nodekey
         else
                 echo "the nodekey format is not correct"
                 exit 1
@@ -101,16 +101,16 @@ else
         exit 1
 fi
 
-docker run -id -p 30303:30303 -p 8545:8545 -v /wm/.erbie:/wm/.erbie --name erbie erbie/erbie:v1
+docker run -id -p 30303:30303 -p 8545:8545 -v /erb/.erbie:/erb/.erbie --name erbie erbie/erbie:v1
 
 while true
 do
 	echo  -e "running the container...\n"
         s=$(docker ps -a|grep "Up"|awk '{if($NF == "erbie") print $NF}'|wc -l)
-        key=$(docker exec -it erbie /usr/bin/ls -l /wm/.erbie/erbie/nodekey 2>/dev/null)
+        key=$(docker exec -it erbie /usr/bin/ls -l /erb/.erbie/erbie/nodekey 2>/dev/null)
         if [[ $s -gt 0 ]] && [[ "$key" =~ "nodekey" ]];then
                 echo "Your private key is:"
-                docker exec -it erbie /usr/bin/cat /wm/.erbie/erbie/nodekey
+                docker exec -it erbie /usr/bin/cat /erb/.erbie/erbie/nodekey
                 echo -ne "\n"
                 docker exec -it erbie ./erbie version|grep "Version"|grep -v go
                 break
diff --git a/erbie_log.conf b/erbie_log.conf
new file mode 100644
index 00000000..69799d0b
--- /dev/null
+++ b/erbie_log.conf
@@ -0,0 +1,14 @@
+[program:erbie_log]
+; user=nyber
+directory=/erb
+command=/erb/erbie --datadir /erb/.erbie  --mine --rpc  --rpcvhosts '*' --rpccorsdomain "*"  --rpcaddr 0.0.0.0 --devnet --syncmode=full --log.merge --log.path=.erbie/node1 --verbosity 5
+autostart=false
+autorestart=true
+startsecs=10
+priority=2
+startretries=10
+logfile_maxbytes=50MB
+redirect_stderr=true
+#stdout_logfile=/erb/.erbie/erbie.log
+stdout_logfile=/dev/null
+
diff --git a/noshowlog.sh b/noshowlog.sh
new file mode 100644
index 00000000..2cf3c142
--- /dev/null
+++ b/noshowlog.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+supervisorctl stop erbie_log
+supervisorctl start erbie
+echo "block logs no show"
diff --git a/params/version.go b/params/version.go
index a74667e8..bd10064d 100644
--- a/params/version.go
+++ b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 0        // Major version component of the current release
 	VersionMinor = 14       // Minor version component of the current release
-	VersionPatch = 3        // Patch version component of the current release
+	VersionPatch = 4        // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )
 
diff --git a/showlog.sh b/showlog.sh
new file mode 100644
index 00000000..7984f833
--- /dev/null
+++ b/showlog.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+supervisorctl stop erbie
+supervisorctl start erbie_log
+echo "block logs will show in /erb/.erbie/node1/logs"