updata

plugin/dapp/paracross/cmd/build/fork-test.sh

 #!/usr/bin/env bash
+set -x
 
 # shellcheck source=/dev/null
 source testcase.sh

plugin/dapp/paracross/cmd/build/testcase.sh

 #!/usr/bin/env bash
+set -x
+
 PARA_CLI="docker exec ${NODE3} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
 
 PARA_CLI2="docker exec ${NODE2} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
@@ -378,6 +380,8 @@ function para_cross_transfer_withdraw() {
     query_tx "${PARA_CLI}" "${hash}"
 
     hash2=$(${CLI} send para asset_withdraw --paraName user.p.para. -a 0.7 -n test -t 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
+    echo "${hash2}"
+    query_tx "${PARA_CLI}" "${hash2}"
 
     local times=200
     while true; do
@@ -1088,9 +1092,6 @@ function para_test() {
     para_create_nodegroup
     para_nodegroup_behalf_quit_test
     para_create_nodegroup_gamechain
-    #    para_nodemanage_cancel_test
-    #    para_nodemanage_test
-    #    para_nodemanage_node_behalf_join
     token_create "${PARA_CLI}"
     token_transfer "${PARA_CLI}"
     para_cross_transfer_withdraw
@@ -1100,12 +1101,12 @@ function para_test() {
 }
 
 function paracross() {
+    set -x
     if [ "${2}" == "init" ]; then
         para_init "${3}"
     elif [ "${2}" == "config" ]; then
         para_set_wallet
         para_transfer
-
     elif [ "${2}" == "test" ]; then
         para_test "${1}"
     fi
@@ -1127,5 +1128,4 @@ function paracross() {
     elif [ "${2}" == "fork2CheckRst" ]; then
         checkParaBlockHashfun 30
     fi
-
 }

plugin/dapp/paracross/executor/action.go

@@ -535,7 +535,7 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error
 
 	// 获取监督节点的数据 监督节点在高度分叉后
 	supervisionNodesMap, supervisionNodesArry, err := a.getSupervisionNodesGroup(commit.Status.Title)
-	if err != nil && err != pt.ErrTitleNotExist && a.exec.GetMainHeight() >= pt.GetDappForkHeight(cfg, pt.ForkCommitTx) {
+	if err != nil && errors.Cause(err) != pt.ErrTitleNotExist && a.exec.GetMainHeight() >= pt.GetDappForkHeight(cfg, pt.ForkCommitTx) {
 		return nil, errors.Wrap(err, "getSupervisionNodesGroup")
 	}
 

plugin/dapp/x2ethereum/cmd/build/publicTest.sh

@@ -14,9 +14,10 @@ NOC='\033[0m'
 
 # 出错退出前拷贝日志文件
 function exit_cp_file() {
+    set -x
     # shellcheck disable=SC2116
-    #    dirNameFa=$(echo ~)
-    dirName="/x2ethereumlogs"
+    dirNameFa=$(echo ~)
+    dirName="${dirNameFa}/x2ethereumlogs"
 
     if [ ! -d "${dirName}" ]; then
         # shellcheck disable=SC2086
@@ -26,18 +27,22 @@ function exit_cp_file() {
     for name in a b c d; do
         # shellcheck disable=SC2154
         docker cp "${dockerNamePrefix}_ebrelayer${name}_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
+        docker exec "${dockerNamePrefix}_ebrelayer${name}_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
     done
+
     docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33.log"
+    docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
 
     exit 1
 }
 
 function copyErrLogs() {
+    set -x
     if [ -n "$CASE_ERR" ]; then
         # /var/lib/jenkins
         # shellcheck disable=SC2116
-        #        dirNameFa=$(echo ~)
-        dirName="/x2ethereumlogs"
+        dirNameFa=$(echo ~)
+        dirName="${dirNameFa}/x2ethereumlogs"
 
         if [ ! -d "${dirName}" ]; then
             # shellcheck disable=SC2086
@@ -47,8 +52,10 @@ function copyErrLogs() {
         for name in a b c d; do
             # shellcheck disable=SC2154
             docker cp "${dockerNamePrefix}_ebrelayer${name}_rpc_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}_rpc.log"
+            docker exec "${dockerNamePrefix}_ebrelayer${name}_rpc_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
         done
         docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33_rpc.log"
+        docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
     fi
 }