From 3f7d4acf654f7df29325d0cc661eaeb7ff94fd5b Mon Sep 17 00:00:00 2001
From: jianguo <zjg555543@163.com>
Date: Fri, 12 May 2023 15:03:14 +0800
Subject: [PATCH] optimized code

---
 dev/start.sh           | 16 +++++++++++++---
 dev/testnet/run4v1r.sh | 21 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dev/start.sh b/dev/start.sh
index c2bdc2f1a..ac0a661bb 100755
--- a/dev/start.sh
+++ b/dev/start.sh
@@ -133,7 +133,17 @@ run
 
 sleep 4
 
-okbchaincli tx gov submit-proposal upgrade $CURDIR/proposals/wasm.proposal --from captain --fees 1okb  -y -b block
-okbchaincli tx gov vote 1 yes --from captain --fees 0.01okb  -y -b block
+echo "upgrade earth proposal..."
+res=$(okbchaincli tx gov submit-proposal upgrade $CURDIR/proposals/wasm.proposal --from captain --fees 1okb  -y -b block)
+res=$(okbchaincli tx gov vote 1 yes --from captain --fees 0.01okb  -y -b block)
 
-# okbchaincli tx send captain 0x83D83497431C2D3FEab296a9fba4e5FaDD2f7eD0 1okb --fees 1okb -b block -y
+res=$(okbchaincli query gov proposal 1)
+result=$(echo "$res" | jq '.proposal_status' | sed 's/\"//g')
+
+if [[ "${result}" != "Passed" ]];
+then
+  echo "proposal result: ${Passed}"
+  exit 1
+fi;
+
+echo "start node succeed~"
diff --git a/dev/testnet/run4v1r.sh b/dev/testnet/run4v1r.sh
index 5c7a67621..05028a50e 100755
--- a/dev/testnet/run4v1r.sh
+++ b/dev/testnet/run4v1r.sh
@@ -9,11 +9,22 @@ okbchaincli keys add --recover val3 -m "lazy cause kite fence gravity regret vis
 
 sleep 4
 
-okbchaincli tx gov submit-proposal upgrade ../proposals/wasm.proposal --from val0 --fees 1okb  -y -b block
-okbchaincli tx gov vote 1 yes --from val0 --fees 0.01okb  -y -b block
-okbchaincli tx gov vote 1 yes --from val1 --fees 0.01okb  -y -b block
-okbchaincli tx gov vote 1 yes --from val2 --fees 0.01okb  -y -b block
-okbchaincli tx gov vote 1 yes --from val3 --fees 0.01okb  -y -b block
+echo "upgrade earth proposal..."
+res=$(okbchaincli tx gov submit-proposal upgrade ../proposals/wasm.proposal --from val0 --fees 1okb  -y -b block)
+res=$(okbchaincli tx gov vote 1 yes --from val0 --fees 0.01okb  -y -b block)
+res=$(okbchaincli tx gov vote 1 yes --from val1 --fees 0.01okb  -y -b block)
+res=$(okbchaincli tx gov vote 1 yes --from val2 --fees 0.01okb  -y -b block)
+
+res=$(okbchaincli query gov proposal 1)
+result=$(echo "$res" | jq '.proposal_status' | sed 's/\"//g')
+
+if [[ "${result}" != "Passed" ]];
+then
+  echo "proposal result: ${Passed}"
+  exit 1
+fi;
+
+echo "run4v1r succeed~"
 
 #sleep 5
 #