fix query node group info

plugin/dapp/paracross/commands/paracross.go

@@ -588,7 +588,7 @@ func nodeGroupStatus(cmd *cobra.Command, args []string) {
 		Title: title,
 	}
 
-	var res pt.ParaNodeAddrStatus
+	var res pt.ParaNodeGroupStatus
 	ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.GetNodeGroupStatus", params, &res)
 	ctx.Run()
 }
@@ -617,7 +617,7 @@ func nodeGroupList(cmd *cobra.Command, args []string) {
 		Status: status,
 	}
 
-	var res pt.RespParacrossNodeAddrs
+	var res pt.RespParacrossNodeGroups
 	ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.ListNodeGroupStatus", params, &res)
 	ctx.Run()
 }

plugin/dapp/paracross/executor/exec_del_local.go

@@ -85,7 +85,7 @@ func (e *Paracross) ExecDelLocal_NodeGroupConfig(payload *pt.ParaNodeGroupConfig
 	for _, log := range receiptData.Logs {
 		if log.Ty == pt.TyLogParaNodeGroupApply || log.Ty == pt.TyLogParaNodeGroupApprove ||
 			log.Ty == pt.TyLogParaNodeGroupQuit {
-			var g pt.ReceiptParaNodeConfig
+			var g pt.ReceiptParaNodeGroupConfig
 			err := types.Decode(log.Log, &g)
 			if err != nil {
 				return nil, err

plugin/dapp/paracross/executor/exec_local.go

@@ -86,7 +86,7 @@ func (e *Paracross) ExecLocal_NodeGroupConfig(payload *pt.ParaNodeGroupConfig, t
 	for _, log := range receiptData.Logs {
 		if log.Ty == pt.TyLogParaNodeGroupApply || log.Ty == pt.TyLogParaNodeGroupApprove ||
 			log.Ty == pt.TyLogParaNodeGroupQuit {
-			var g pt.ReceiptParaNodeConfig
+			var g pt.ReceiptParaNodeGroupConfig
 			err := types.Decode(log.Log, &g)
 			if err != nil {
 				return nil, err

plugin/dapp/paracross/executor/query.go

@@ -214,6 +214,25 @@ func listNodeStatus(db dbm.KVDB, prefix []byte) (types.Message, error) {
 	return &resp, nil
 }
 
+func listNodeGroupStatus(db dbm.KVDB, prefix []byte) (types.Message, error) {
+	res, err := db.List(prefix, []byte(""), 0, 1)
+	if err != nil {
+		return nil, err
+	}
+
+	var resp pt.RespParacrossNodeGroups
+	for _, r := range res {
+		var st pt.ParaNodeGroupStatus
+		err = types.Decode(r, &st)
+		if err != nil {
+			panic(err)
+		}
+		resp.Addrs = append(resp.Addrs, &st)
+	}
+	return &resp, nil
+}
+
+
 //按状态遍历
 func listLocalNodeStatus(db dbm.KVDB, title string, status int32) (types.Message, error) {
 	prefix := calcLocalNodeStatusPrefix(title, status)
@@ -222,7 +241,7 @@ func listLocalNodeStatus(db dbm.KVDB, title string, status int32) (types.Message
 
 func listLocalNodeGroupStatus(db dbm.KVDB, status int32) (types.Message, error) {
 	prefix := calcLocalNodeGroupStatusPrefix(status)
-	return listNodeStatus(db, prefix)
+	return listNodeGroupStatus(db, prefix)
 }
 
 func loadLocalTitle(db dbm.KV, title string, height int64) (types.Message, error) {

plugin/dapp/paracross/executor/superaccount.go

@@ -330,7 +330,8 @@ func (a *action) superManagerVoteProc(title string) error {
 	}
 	//return err to stop tx pass to para chain
 	if a.exec.GetMainHeight() <= consensMainHeight+confStopBlocks*int64(status.EmptyBlockInterval) {
-		clog.Error("paracross.nodeVote, super manager height not reach", "currHeight", a.exec.GetMainHeight(), "consensHeight", consensHeight, "confHeight", confStopBlocks)
+		clog.Error("paracross.nodeVote, super manager height not reach", "currHeight", a.exec.GetMainHeight(),
+			"consensHeight", consensHeight,"mainHeight",consensMainHeight, "confHeight", confStopBlocks,"interval",status.EmptyBlockInterval)
 		return pt.ErrParaConsensStopBlocksNotReach
 	}
 

plugin/dapp/paracross/proto/paracross.proto

@@ -119,6 +119,10 @@ message RespParacrossNodeAddrs {
     repeated ParaNodeAddrStatus addrs = 1;
 }
 
+message RespParacrossNodeGroups {
+    repeated ParaNodeGroupStatus addrs = 1;
+}
+
 message ParaBlock2MainMap {
     int64  height     = 1;
     string blockHash  = 2;

plugin/dapp/paracross/rpc/rpc.go

@@ -229,13 +229,13 @@ func (c *Jrpc) GetNodeGroupAddrs(req *pt.ReqParacrossNodeInfo, result *interface
 }
 
 // GetNodeGroupStatus get super node group status
-func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.ParaNodeAddrStatus, error) {
+func (c *channelClient) GetNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.ParaNodeGroupStatus, error) {
 	r := *req
 	data, err := c.Query(pt.GetExecName(), "GetNodeGroupStatus", &r)
 	if err != nil {
 		return nil, err
 	}
-	if resp, ok := data.(*pt.ParaNodeAddrStatus); ok {
+	if resp, ok := data.(*pt.ParaNodeGroupStatus); ok {
 		return resp, nil
 	}
 	return nil, types.ErrDecode
@@ -249,13 +249,13 @@ func (c *Jrpc) GetNodeGroupStatus(req *pt.ReqParacrossNodeInfo, result *interfac
 }
 
 //ListNodeGroupStatus list super node group by status
-func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.RespParacrossNodeAddrs, error) {
+func (c *channelClient) ListNodeGroupStatus(ctx context.Context, req *pt.ReqParacrossNodeInfo) (*pt.RespParacrossNodeGroups, error) {
 	r := *req
 	data, err := c.Query(pt.GetExecName(), "ListNodeGroupStatus", &r)
 	if err != nil {
 		return nil, err
 	}
-	if resp, ok := data.(*pt.RespParacrossNodeAddrs); ok {
+	if resp, ok := data.(*pt.RespParacrossNodeGroups); ok {
 		return resp, nil
 	}
 	return nil, types.ErrDecode