asset transfer tx improve

plugin/dapp/paracross/commands/paracross.go

@@ -112,7 +112,8 @@ func createAssetWithdraw(cmd *cobra.Command, args []string) {
 }
 
 func createAssetTx(cmd *cobra.Command, isWithdraw bool) (string, error) {
-	title, _ := cmd.Flags().GetString("paraName")
+	title, _ := cmd.Flags().GetString("title")
+	//这里cfg除了里面FormatTx需要外，没其他作用，平行链执行器需要的参数已经填好了，这里title就是默认空就可以，支持主链构建平行链交易
 	cfg := types.GetCliSysParam(title)
 
 	amount, _ := cmd.Flags().GetFloat64("amount")
@@ -125,11 +126,12 @@ func createAssetTx(cmd *cobra.Command, isWithdraw bool) (string, error) {
 	note, _ := cmd.Flags().GetString("note")
 	symbol, _ := cmd.Flags().GetString("symbol")
 
-	if !strings.HasPrefix(title, "user.p") {
+	paraName, _ := cmd.Flags().GetString("paraName")
+	if !strings.HasPrefix(paraName, "user.p") {
 		fmt.Fprintln(os.Stderr, "title is not right, title format like `user.p.guodun.`")
 		return "", types.ErrInvalidParam
 	}
-	execName := title + pt.ParaX
+	execName := paraName + pt.ParaX
 
 	param := types.CreateTx{
 		To:          toAddr,

plugin/dapp/paracross/executor/action.go

@@ -181,7 +181,7 @@ func makeRecordReceipt(addr string, commit *pt.ParacrossCommitAction) *types.Rec
 	}
 }
 
-func makeDoneReceipt(cfg *types.Chain33Config, execMainHeight int64, commit *pt.ParacrossNodeStatus,
+func makeDoneReceipt(cfg *types.Chain33Config, execMainHeight, execHeight int64, commit *pt.ParacrossNodeStatus,
 	most, commitCount, totalCount int32) *types.Receipt {
 
 	log := &pt.ReceiptParacrossDone{
@@ -194,6 +194,7 @@ func makeDoneReceipt(cfg *types.Chain33Config, execMainHeight int64, commit *pt.
 		TxResult:        commit.TxResult,
 		MainBlockHeight: commit.MainBlockHeight,
 		MainBlockHash:   commit.MainBlockHash,
+		ChainExecHeight: execHeight,
 	}
 	key := calcTitleKey(commit.Title)
 	status := &pt.ParacrossStatus{
@@ -511,7 +512,7 @@ func (a *action) commitTxDone(nodeStatus *pt.ParacrossNodeStatus, stat *pt.Parac
 	}
 
 	//add commit done receipt
-	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), nodeStatus, int32(most), int32(commitCount), int32(len(nodes)))
+	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), a.height, nodeStatus, int32(most), int32(commitCount), int32(len(nodes)))
 	receipt = mergeReceipt(receipt, receiptDone)
 
 	r, err := a.commitTxDoneStep2(nodeStatus, stat, titleStatus)
@@ -696,7 +697,7 @@ func (a *action) commitTxDoneByStat(stat *pt.ParacrossHeightStatus, titleStatus
 
 	//add commit done receipt
 	cfg := a.api.GetConfig()
-	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), mostStatus, int32(most), int32(commitCount), int32(len(nodes)))
+	receiptDone := makeDoneReceipt(cfg, a.exec.GetMainHeight(), a.height, mostStatus, int32(most), int32(commitCount), int32(len(nodes)))
 	receipt = mergeReceipt(receipt, receiptDone)
 
 	r, err := a.commitTxDoneStep2(mostStatus, stat, titleStatus)

plugin/dapp/paracross/executor/exec_local.go

@@ -30,7 +30,6 @@ func (e *Paracross) ExecLocal_Commit(payload *pt.ParacrossCommitAction, tx *type
 		} else if log.Ty == pt.TyLogParacrossCommitDone {
 			var g pt.ReceiptParacrossDone
 			types.Decode(log.Log, &g)
-			g.ChainExecHeight = e.GetHeight()
 
 			key := calcLocalTitleKey(g.Title)
 			set.KV = append(set.KV, &types.KeyValue{Key: key, Value: types.Encode(&g)})

plugin/dapp/paracross/executor/query.go

@@ -295,12 +295,13 @@ func listLocalTitles(db dbm.KVDB) (types.Message, error) {
 			panic(err)
 		}
 		rst := &pt.RespParacrossDone{
-			TotalNodes:     st.TotalNodes,
-			TotalCommit:    st.TotalCommit,
-			MostSameCommit: st.MostSameCommit,
-			Title:          st.Title,
-			Height:         st.Height,
-			TxResult:       string(st.TxResult),
+			TotalNodes:      st.TotalNodes,
+			TotalCommit:     st.TotalCommit,
+			MostSameCommit:  st.MostSameCommit,
+			Title:           st.Title,
+			Height:          st.Height,
+			ChainExecHeight: st.ChainExecHeight,
+			TxResult:        string(st.TxResult),
 		}
 
 		resp.Titles = append(resp.Titles, rst)