uodata

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

@@ -8,10 +8,10 @@ PARA_CLI2="docker exec ${NODE2} /root/chain33-cli --paraName user.p.para. --rpc_
 PARA_CLI1="docker exec ${NODE1} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
 PARA_CLI4="docker exec ${NODE4} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
 PARA_CLI5="docker exec ${NODE5} /root/chain33-cli --paraName user.p.game. --rpc_laddr http://localhost:8901"
-PARA_CLI6="docker exec ${NODE6} /root/chain33-cli --paraName user.p.game. --rpc_laddr http://localhost:8901"
-PARA_CLI7="docker exec ${NODE7} /root/chain33-cli --paraName user.p.game. --rpc_laddr http://localhost:8901"
-PARA_CLI8="docker exec ${NODE8} /root/chain33-cli --paraName user.p.game. --rpc_laddr http://localhost:8901"
-PARA_CLI9="docker exec ${NODE9} /root/chain33-cli --paraName user.p.game. --rpc_laddr http://localhost:8901"
+PARA_CLI6="docker exec ${NODE6} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
+PARA_CLI7="docker exec ${NODE7} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
+PARA_CLI8="docker exec ${NODE8} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
+PARA_CLI9="docker exec ${NODE9} /root/chain33-cli --paraName user.p.para. --rpc_laddr http://localhost:8901"
 MAIN_CLI="docker exec ${NODE3} /root/chain33-cli"
 
 PARANAME="para"
@@ -242,7 +242,7 @@ function para_transfer() {
     #1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY test
     main_transfer2paracross "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
     #1Ka7EPFRqs3v9yreXG6qA4RQbNmbPJCZPj
-    main_transfer2paracross "${ADDR_1KA_KEY}" 200
+    main_transfer2paracross "${ADDR_1KA_KEY}" 100
 
     block_wait "${CLI}" 2
 
@@ -255,7 +255,7 @@ function para_transfer() {
 
 function main_transfer2account() {
     echo "${1}"
-    local coins=300
+    local coins=200
     if [ "$#" -ge 2 ]; then
         coins="$2"
     fi
@@ -294,7 +294,6 @@ function query_tx() {
     block_wait "${1}" 1
 
     local times=200
-    #        local times=10
     while true; do
         ret=$(${1} tx query -s "${2}" | jq -r ".tx.hash")
         echo "query hash is ${2}, return ${ret} "

plugin/dapp/paracross/executor/action.go

@@ -727,7 +727,7 @@ func (a *action) commitTxDone(nodeStatus *pt.ParacrossNodeStatus, stat *pt.Parac
 	clog.Debug("paracross.Commit commit ----pass", "most", mostCount, "mostHash", common.ToHex([]byte(mostHash)))
 	// 如果已经有监督节点
 	mostSupervisionCount := 0
-	if len(supervisionNodes) > 0 {
+	if len(supervisionNodes) > 0 && stat.SupervisionDetails != nil {
 		for i, v := range stat.SupervisionDetails.Addrs {
 			clog.Debug("paracross.Commit commit SupervisionDetails", "addr", v, "hash", common.ToHex(stat.SupervisionDetails.BlockHash[i]))
 		}
@@ -753,10 +753,15 @@ func (a *action) commitTxDone(nodeStatus *pt.ParacrossNodeStatus, stat *pt.Parac
 		receipt = mergeReceipt(receipt, r)
 	}
 
+	supervisionDetailsAddrsLen := 0
+	if stat.SupervisionDetails != nil {
+		supervisionDetailsAddrsLen = len(stat.SupervisionDetails.Addrs)
+	}
+
 	//add commit done receipt
 	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), a.height, nodeStatus,
 		int32(mostCount), int32(len(stat.Details.Addrs)), int32(len(nodes)),
-		int32(mostSupervisionCount), int32(len(stat.SupervisionDetails.Addrs)), int32(len(supervisionNodes)))
+		int32(mostSupervisionCount), int32(supervisionDetailsAddrsLen), int32(len(supervisionNodes)))
 	receipt = mergeReceipt(receipt, receiptDone)
 
 	r, err := a.commitTxDoneStep2(nodeStatus, stat, titleStatus)
@@ -857,7 +862,7 @@ func (a *action) loopCommitTxDone(title string) (*types.Receipt, error) {
 	// 获取监督节点的数据
 	supervisionNodes, _, err := a.getSupervisionNodesGroup(title)
 	if err != nil && errors.Cause(err) != pt.ErrTitleNotExist {
-		return nil, errors.Wrap(err, "getSupervisionNodesGroup")
+		return nil, errors.Wrap(err, "getSupervisionNodesGroup loopCommitTxDone")
 	}
 	//从当前共识高度开始遍历
 	titleStatus, err := getTitle(a.db, calcTitleKey(title))
@@ -888,7 +893,7 @@ func (a *action) loopCommitTxDone(title string) (*types.Receipt, error) {
 
 		r, err := a.checkCommitTxDone(stat, nodes, supervisionNodes)
 		if err != nil {
-			clog.Error("paracross.loopCommitTxDone checkExecCommitTxDone", "para title", title, "height", stat.Height, "error", err)
+			clog.Error("paracropara_cross_transfer main chain and game chain failedss.loopCommitTxDone checkExecCommitTxDone", "para title", title, "height", stat.Height, "error", err)
 			return receipt, nil
 		}
 		if r == nil {
@@ -961,11 +966,16 @@ func (a *action) commitTxDoneByStat(stat *pt.ParacrossHeightStatus, titleStatus
 		TxResult:        txRst,
 	}
 
+	supervisionDetailsAddrsLen := 0
+	if stat.SupervisionDetails != nil {
+		supervisionDetailsAddrsLen = len(stat.SupervisionDetails.Addrs)
+	}
+
 	//add commit done receipt
 	cfg := a.api.GetConfig()
 	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), a.height, mostStatus,
 		int32(most), int32(len(stat.Details.Addrs)), int32(len(nodes)),
-		int32(mostSupervisionCount), int32(len(stat.SupervisionDetails.Addrs)), int32(len(supervisionNodes)))
+		int32(mostSupervisionCount), int32(supervisionDetailsAddrsLen), int32(len(supervisionNodes)))
 	receipt = mergeReceipt(receipt, receiptDone)
 
 	r, err := a.commitTxDoneStep2(mostStatus, stat, titleStatus)