modify cmd

plugin/dapp/paracross/cmd/test/test-rpc.sh

@@ -539,8 +539,8 @@ paracross_testBind() {
     chain33_SignAndSendTxWait "$rawtx" "${priv1q9}" "${para_ip}"
 
     echo "2. get bind"
-    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"superNode":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
-    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"superNode":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1Q9sQw"),true])' "$FUNCNAME" '(.result.List)'
+    #    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"Node":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
+    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"node":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1Q9sQw"),true])' "$FUNCNAME" '(.result.List)'
 }
 
 paracross_testUnBind() {
@@ -559,8 +559,8 @@ paracross_testUnBind() {
     #    superNode=$(jq -r ".result.List.SuperNode" <<<"$resp")
     #    miners=$(jq -r ".result.List.Miners" <<<"$resp")
 
-    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"superNode":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
-    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"superNode":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1Q9sQw"),false])' "$FUNCNAME" '(.result.List)'
+    #    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"Node":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1KSBd17H7Z"),true])' "$FUNCNAME" '(.result.List)'
+    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetNodeBindMinerList","payload":{"node":"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4","Miner":"${addr1q9}"}}]}' "${para_ip}" '(.error|not) and (.result.List| [has("1Q9sQw"),true])' "$FUNCNAME" '(.result.List)'
 }
 
 paracross_testBindMiner() {

plugin/dapp/paracross/commands/paracross.go

@@ -338,12 +338,22 @@ func superNodeCmd() *cobra.Command {
 	cmd.AddCommand(nodeVoteCmd())
 	cmd.AddCommand(nodeQuitCmd())
 	cmd.AddCommand(nodeCancelCmd())
-	cmd.AddCommand(nodeBindCmd())
-
 	cmd.AddCommand(getNodeInfoCmd())
 	cmd.AddCommand(getNodeIDInfoCmd())
 	cmd.AddCommand(getNodeListCmd())
 	cmd.AddCommand(nodeModifyCmd())
+
+	cmd.AddCommand(nodeMinerCmd())
+	return cmd
+}
+
+func nodeMinerCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "miner",
+		Short: "super node bind miner cmd",
+	}
+
+	cmd.AddCommand(nodeBindCmd())
 	cmd.AddCommand(getNodeBindListCmd())
 	cmd.AddCommand(getMinerBindListCmd())
 	return cmd
@@ -559,7 +569,7 @@ func nodeBindCmd() *cobra.Command {
 }
 
 func addNodeBindFlags(cmd *cobra.Command) {
-	cmd.Flags().Uint32P("action", "a", 1, "action bind:1 or unbind:2")
+	cmd.Flags().Uint32P("action", "a", 1, "action bind:1, unbind:2, modify:3")
 	_ = cmd.MarkFlagRequired("action")
 
 	cmd.Flags().Uint64P("coins", "c", 0, "bind coins, unbind not needed")
@@ -646,17 +656,20 @@ func getMinerBindListCmd() *cobra.Command {
 func addNodeBindCmdFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("miner", "m", "", "bind miner addr")
 	cmd.MarkFlagRequired("miner")
+
+	cmd.Flags().BoolP("unbind", "u", false, "query with unbinded miner,default false")
 }
 
 func nodeBindInfo(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	miner, _ := cmd.Flags().GetString("miner")
+	unbind, _ := cmd.Flags().GetBool("unbind")
 
 	var params rpctypes.Query4Jrpc
 	params.Execer = pt.ParaX
 	params.FuncName = "GetMinerBindNodeList"
 
-	params.Payload = types.MustPBToJSON(&types.ReqString{Data: miner})
+	params.Payload = types.MustPBToJSON(&pt.ParaNodeMinerListReq{Miner: miner, WithUnBind: unbind})
 
 	var res types.ReplyStrings
 	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &res)

plugin/dapp/paracross/executor/bindminer.go

@@ -265,7 +265,7 @@ func (a *action) addNodeBindMinerCount(node, miner string) (*types.Receipt, int6
 		return nil, 0, err
 	}
 
-	//new index --> target
+	//new index --> miner
 	rIdx := makeNodeBindMinerIndexReceipt(node, miner, bindInfo.BindTotalCount)
 	mergeReceipt(receipt, rIdx)
 

plugin/dapp/paracross/executor/query.go

@@ -639,17 +639,30 @@ func (p *Paracross) Query_GetNodeBindMinerList(in *pt.ParaNodeMinerListReq) (typ
 }
 
 // Query_GetMinerBindNodeList query get miner bind super node list
-func (p *Paracross) Query_GetMinerBindNodeList(in *types.ReqString) (types.Message, error) {
-	if in == nil || len(in.Data) <= 0 {
+func (p *Paracross) Query_GetMinerBindNodeList(in *pt.ParaNodeMinerListReq) (types.Message, error) {
+	if in == nil || len(in.Miner) <= 0 {
 		return nil, types.ErrInvalidParam
 	}
 
 	db := p.GetStateDB()
-	nodeInfo, err := getMinerBindNodeList(db, in.Data)
+	nodeInfo, err := getMinerBindNodeList(db, in.Miner)
 	if err != nil {
-		return nil, errors.Wrapf(err, "getBindNodeCount miner=%s", in.Data)
+		return nil, errors.Wrapf(err, "getBindNodeCount miner=%s", in.Miner)
 	}
 	var nodeAddrs types.ReplyStrings
-	nodeAddrs.Datas = append(nodeAddrs.Datas, nodeInfo.Nodes...)
+	if in.WithUnBind {
+		nodeAddrs.Datas = append(nodeAddrs.Datas, nodeInfo.Nodes...)
+		return &nodeAddrs, nil
+	}
+
+	for _, n := range nodeInfo.Nodes {
+		minerInfo, err := getBindAddrInfo(db, in.Node, in.Miner)
+		if err != nil {
+			return nil, err
+		}
+		if minerInfo.BindStatus == opBind {
+			nodeAddrs.Datas = append(nodeAddrs.Datas, n)
+		}
+	}
 	return &nodeAddrs, nil
 }

plugin/dapp/paracross/executor/reward_test.go

@@ -58,12 +58,12 @@ func (suite *RewardTestSuite) TestRewardBindAddr() {
 	addr := "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
 	key := calcParaBindMinerAddr(node, addr)
 	newer := &pt.ParaBindMinerInfo{
-		Addr:        addr,
-		BindStatus:  opBind,
-		BindCoins:   100,
-		BlockTime:   100,
-		BlockHeight: 1,
-		TargetNode:  node,
+		Addr:          addr,
+		BindStatus:    opBind,
+		BindCoins:     100,
+		BlockTime:     100,
+		BlockHeight:   1,
+		ConsensusNode: node,
 	}
 	data := types.Encode(newer)
 	suite.stateDB.Set(key, data)
@@ -83,12 +83,9 @@ func (suite *RewardTestSuite) TestRewardBindAddr() {
 	key = calcParaBindMinerAddr(node, addr2)
 	suite.stateDB.Set(key, data)
 
-	node1 := &pt.ParaNodeBindOne{SuperNode: node, Miner: addr}
-	node2 := &pt.ParaNodeBindOne{SuperNode: node, Miner: addr2}
-
-	list := &pt.ParaNodeBindList{}
-	list.Miners = append(list.Miners, node1)
-	list.Miners = append(list.Miners, node2)
+	var list []*pt.ParaBindMinerInfo
+	list = append(list, newer)
+	list = append(list, &new2)
 
 	recp, change, err := suite.action.rewardBindAddr(50000005, list, 1)
 	suite.Nil(err)