modify super manager approve process

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

@@ -226,14 +226,14 @@ function para_configkey() {
 }
 
 function query_tx() {
-    block_wait "${1}" 2
+    block_wait "${1}" 1
 
     local times=100
     while true; do
         ret=$(${1} tx query -s "${2}" | jq -r ".tx.hash")
         echo "query hash is ${2}, return ${ret} "
         if [ "${ret}" != "${2}" ]; then
-            block_wait "${1}" 2
+            block_wait "${1}" 1
             times=$((times - 1))
             if [ $times -le 0 ]; then
                 echo "query tx=$2 failed"

plugin/dapp/paracross/executor/superaccount.go

@@ -341,10 +341,12 @@ func (a *action) nodeVote(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 				return nil, err
 			}
 			consensHeight := data.(*pt.ParacrossStatus).Height
-			if a.exec.GetMainHeight() > consensHeight+confStopBlocks {
-				clog.Info("paracross.nodeVote, super manager pass", "currHeight", a.height, "consensHeight", consensHeight, "confHeight", confStopBlocks)
-				superManagerPass = true
+			//return err to stop tx pass to para chain
+			if a.exec.GetMainHeight() <= consensHeight + confStopBlocks {
+				clog.Error("paracross.nodeVote, super manager height not reach", "currHeight", a.exec.GetMainHeight(), "consensHeight", consensHeight, "confHeight", confStopBlocks)
+				return nil, pt.ErrParaConsensStopBlocksNotReach
 			}
+			superManagerPass = true
 		}
 
 		//超级用户投yes票，共识停止了一定高度就可以通过，防止当前所有授权节点都忘掉私钥场景

plugin/dapp/paracross/types/errors.go

@@ -49,4 +49,6 @@ var (
 	ErrParaNodeGroupStatusWrong = errors.New("ErrParaNodeGroupStatusWrong")
 	//ErrParaNodeGroupAddrNotMatch group addrs not match with apply
 	ErrParaNodeGroupAddrNotMatch = errors.New("ErrParaNodeGroupAddrNotMatch")
+	//ErrParaConsensStopBlocksNotReach consensus stop blocks not reach
+	ErrParaConsensStopBlocksNotReach = errors.New("ErrParaConsensStopBlocksNotReach")
 )