add gRPC for RBAC

docs/core/proto-docs.md

@@ -812,6 +812,10 @@
     - [QueryProposalsResponse](#lbm.fbridge.v1.QueryProposalsResponse)
     - [QuerySubmittedProvisionRequest](#lbm.fbridge.v1.QuerySubmittedProvisionRequest)
     - [QuerySubmittedProvisionResponse](#lbm.fbridge.v1.QuerySubmittedProvisionResponse)
+    - [QueryVoteRequest](#lbm.fbridge.v1.QueryVoteRequest)
+    - [QueryVoteResponse](#lbm.fbridge.v1.QueryVoteResponse)
+    - [QueryVotesRequest](#lbm.fbridge.v1.QueryVotesRequest)
+    - [QueryVotesResponse](#lbm.fbridge.v1.QueryVotesResponse)
 
     - [Query](#lbm.fbridge.v1.Query)
 
@@ -12133,7 +12137,7 @@ GenesisState defines the fbridge module's genesis state.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `proposal_id` | [string](#string) |  | the proposal id |
+| `proposal_id` | [uint64](#uint64) |  | the proposal id |
 
 
 
@@ -12179,6 +12183,7 @@ GenesisState defines the fbridge module's genesis state.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `proposals` | [RoleProposal](#lbm.fbridge.v1.RoleProposal) | repeated |  |
+| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) |  | pagination defines an pagination for the response. |
 
 
 
@@ -12216,6 +12221,67 @@ GenesisState defines the fbridge module's genesis state.
 
 
 
+
+<a name="lbm.fbridge.v1.QueryVoteRequest"></a>
+
+### QueryVoteRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `proposal_id` | [uint64](#uint64) |  | proposal_id defines the unique id of the proposal. |
+| `voter` | [string](#string) |  | voter defines the oter address for the proposals. |
+
+
+
+
+
+
+<a name="lbm.fbridge.v1.QueryVoteResponse"></a>
+
+### QueryVoteResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `vote` | [Vote](#lbm.fbridge.v1.Vote) |  | vote defined the queried vote. |
+
+
+
+
+
+
+<a name="lbm.fbridge.v1.QueryVotesRequest"></a>
+
+### QueryVotesRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `proposal_id` | [uint64](#uint64) |  | proposal_id defines the unique id of the proposal. |
+
+
+
+
+
+
+<a name="lbm.fbridge.v1.QueryVotesResponse"></a>
+
+### QueryVotesResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `votes` | [Vote](#lbm.fbridge.v1.Vote) | repeated | votes defined the queried votes. |
+
+
+
+
+
  <!-- end messages -->
 
  <!-- end enums -->
@@ -12241,8 +12307,10 @@ GenesisState defines the fbridge module's genesis state.
 | `Guardians` | [QueryGuardiansRequest](#lbm.fbridge.v1.QueryGuardiansRequest) | [QueryGuardiansResponse](#lbm.fbridge.v1.QueryGuardiansResponse) | Guardians queries a list of Guardians registered on the bridge | GET|/lbm/fbridge/v1/guardians|
 | `Operators` | [QueryOperatorsRequest](#lbm.fbridge.v1.QueryOperatorsRequest) | [QueryOperatorsResponse](#lbm.fbridge.v1.QueryOperatorsResponse) | Operators queries a list of Operators registered on the bridge | GET|/lbm/fbridge/v1/operators|
 | `Judges` | [QueryJudgesRequest](#lbm.fbridge.v1.QueryJudgesRequest) | [QueryJudgesResponse](#lbm.fbridge.v1.QueryJudgesResponse) | Judges queries a list of Judges registered on the bridge | GET|/lbm/fbridge/v1/judges|
-| `Proposals` | [QueryProposalsRequest](#lbm.fbridge.v1.QueryProposalsRequest) | [QueryProposalsResponse](#lbm.fbridge.v1.QueryProposalsResponse) | Proposals queries a list of SuggestRole Proposals | GET|/lbm/fbridge/v1/role/proposals|
-| `Proposal` | [QueryProposalRequest](#lbm.fbridge.v1.QueryProposalRequest) | [QueryProposalResponse](#lbm.fbridge.v1.QueryProposalResponse) | Proposal queries a SuggestRole Proposal | GET|/lbm/fbridge/v1/role/proposals/{proposal_id}|
+| `Proposals` | [QueryProposalsRequest](#lbm.fbridge.v1.QueryProposalsRequest) | [QueryProposalsResponse](#lbm.fbridge.v1.QueryProposalsResponse) | Proposals queries a list of SuggestRole Proposals | GET|/lbm/fbridge/v1/proposals|
+| `Proposal` | [QueryProposalRequest](#lbm.fbridge.v1.QueryProposalRequest) | [QueryProposalResponse](#lbm.fbridge.v1.QueryProposalResponse) | Proposal queries a SuggestRole Proposal | GET|/lbm/fbridge/v1/proposals/{proposal_id}|
+| `Vote` | [QueryVoteRequest](#lbm.fbridge.v1.QueryVoteRequest) | [QueryVoteResponse](#lbm.fbridge.v1.QueryVoteResponse) | Vote queries voted information based on proposalID, voterAddr. | GET|/lbm/fbridge/v1/proposals/{proposal_id}/votes/{voter}|
+| `Votes` | [QueryVotesRequest](#lbm.fbridge.v1.QueryVotesRequest) | [QueryVotesResponse](#lbm.fbridge.v1.QueryVotesResponse) | Votes queries votes of a given proposal. | GET|/lbm/fbridge/v1/proposals/{proposal_id}/votes|
 
  <!-- end services -->
 

proto/lbm/fbridge/v1/query.proto

@@ -70,12 +70,22 @@ service Query {
 
   // Proposals queries a list of SuggestRole Proposals
   rpc Proposals(QueryProposalsRequest) returns (QueryProposalsResponse) {
-    option (google.api.http).get = "/lbm/fbridge/v1/role/proposals";
+    option (google.api.http).get = "/lbm/fbridge/v1/proposals";
   }
 
   // Proposal queries a SuggestRole Proposal
   rpc Proposal(QueryProposalRequest) returns (QueryProposalResponse) {
-    option (google.api.http).get = "/lbm/fbridge/v1/role/proposals/{proposal_id}";
+    option (google.api.http).get = "/lbm/fbridge/v1/proposals/{proposal_id}";
+  }
+
+  // Vote queries voted information based on proposalID, voterAddr.
+  rpc Vote(QueryVoteRequest) returns (QueryVoteResponse) {
+    option (google.api.http).get = "/lbm/fbridge/v1/proposals/{proposal_id}/votes/{voter}";
+  }
+
+  // Votes queries votes of a given proposal.
+  rpc Votes(QueryVotesRequest) returns (QueryVotesResponse) {
+    option (google.api.http).get = "/lbm/fbridge/v1/proposals/{proposal_id}/votes";
   }
 }
 
@@ -172,14 +182,40 @@ message QueryProposalsRequest {
 }
 
 message QueryProposalsResponse {
-  repeated RoleProposal proposals = 1;
+  repeated RoleProposal proposals = 1 [(gogoproto.nullable) = false];
+
+  // pagination defines an pagination for the response.
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
 message QueryProposalRequest {
   // the proposal id
-  string proposal_id = 1;
+  uint64 proposal_id = 1;
 }
 
 message QueryProposalResponse {
-  RoleProposal proposal = 1;
-}
+  RoleProposal proposal = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryVoteRequest {
+  // proposal_id defines the unique id of the proposal.
+  uint64 proposal_id = 1;
+
+  // voter defines the oter address for the proposals.
+  string voter = 2;
+}
+
+message QueryVoteResponse {
+  // vote defined the queried vote.
+  Vote vote = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryVotesRequest {
+  // proposal_id defines the unique id of the proposal.
+  uint64 proposal_id = 1;
+}
+
+message QueryVotesResponse {
+  // votes defined the queried votes.
+  repeated Vote votes = 1 [(gogoproto.nullable) = false];
+}

x/fbridge/keeper/auth.go

@@ -131,8 +131,8 @@ func (k Keeper) IterateProposals(ctx sdk.Context, cb func(proposal types.RolePro
 	}
 }
 
-// GetProposals returns all the role proposals from store
-func (k Keeper) GetProposals(ctx sdk.Context) (proposals []types.RoleProposal) {
+// GetRoleProposals returns all the role proposals from store
+func (k Keeper) GetRoleProposals(ctx sdk.Context) (proposals []types.RoleProposal) {
 	k.IterateProposals(ctx, func(proposal types.RoleProposal) bool {
 		proposals = append(proposals, proposal)
 		return false
@@ -157,14 +157,19 @@ func (k Keeper) GetVote(ctx sdk.Context, proposalID uint64, voter sdk.AccAddress
 	return types.VoteOption(binary.BigEndian.Uint32(bz)), nil
 }
 
-func (k Keeper) GetVotes(ctx sdk.Context, proposalID uint64) []types.VoteOption {
+func (k Keeper) GetProposalVotes(ctx sdk.Context, proposalID uint64) []types.Vote {
 	store := ctx.KVStore(k.storeKey)
 
-	votes := make([]types.VoteOption, 0)
+	votes := make([]types.Vote, 0)
 	iterator := sdk.KVStorePrefixIterator(store, types.VotesKey(proposalID))
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
-		v := types.VoteOption(binary.BigEndian.Uint32(iterator.Value()))
+		_, voter := types.SplitVoterVoteKey(iterator.Key())
+		v := types.Vote{
+			ProposalId: proposalID,
+			Voter:      voter.String(),
+			Option:     types.VoteOption(binary.BigEndian.Uint32(iterator.Value())),
+		}
 		votes = append(votes, v)
 	}
 

x/fbridge/keeper/genesis.go

@@ -36,7 +36,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 			NextSeq: k.GetNextSequence(ctx),
 		},
 		NextRoleProposalId: k.GetNextProposalID(ctx),
-		RoleProposals:      k.GetProposals(ctx),
+		RoleProposals:      k.GetRoleProposals(ctx),
 		Votes:              k.GetAllVotes(ctx),
 		RoleMetadata:       k.GetRoleMetadata(ctx),
 		Roles:              k.GetRolePairs(ctx),
@@ -47,7 +47,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 func (k Keeper) IterateVotes(ctx sdk.Context, cb func(proposal types.Vote) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
 
-	iterator := sdk.KVStorePrefixIterator(store, types.KeyProposalPrefix)
+	iterator := sdk.KVStorePrefixIterator(store, types.KeyProposalVotePrefix)
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		id, voter := types.SplitVoterVoteKey(iterator.Key())

x/fbridge/keeper/grpc_query.go

@@ -2,18 +2,28 @@ package keeper
 
 import (
 	"context"
+	"fmt"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/Finschia/finschia-sdk/store/prefix"
 	sdk "github.com/Finschia/finschia-sdk/types"
+	"github.com/Finschia/finschia-sdk/types/query"
 	"github.com/Finschia/finschia-sdk/x/fbridge/types"
 )
 
 var _ types.QueryServer = Keeper{}
 
-func (k Keeper) Params(ctx context.Context, request *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
-	panic("implement me")
+func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	params := k.GetParams(ctx)
+
+	return &types.QueryParamsResponse{Params: params}, nil
 }
 
 func (k Keeper) NextSeqSend(goCtx context.Context, req *types.QueryNextSeqSendRequest) (*types.QueryNextSeqSendResponse, error) {
@@ -51,22 +61,112 @@ func (k Keeper) Commitments(ctx context.Context, request *types.QueryCommitments
 	panic("implement me")
 }
 
-func (k Keeper) Guardians(ctx context.Context, request *types.QueryGuardiansRequest) (*types.QueryGuardiansResponse, error) {
-	panic("implement me")
+func (k Keeper) Guardians(goCtx context.Context, req *types.QueryGuardiansRequest) (*types.QueryGuardiansResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	guardians := make([]string, 0)
+	roles := k.GetRolePairs(ctx)
+	for _, pair := range roles {
+		if pair.Role == types.RoleGuardian {
+			guardians = append(guardians, pair.Address)
+		}
+	}
+
+	return &types.QueryGuardiansResponse{Guardians: guardians}, nil
 }
 
-func (k Keeper) Operators(ctx context.Context, request *types.QueryOperatorsRequest) (*types.QueryOperatorsResponse, error) {
-	panic("implement me")
+func (k Keeper) Operators(goCtx context.Context, req *types.QueryOperatorsRequest) (*types.QueryOperatorsResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	operators := make([]string, 0)
+	roles := k.GetRolePairs(ctx)
+	for _, pair := range roles {
+		if pair.Role == types.RoleOperator {
+			operators = append(operators, pair.Address)
+		}
+	}
+
+	return &types.QueryOperatorsResponse{Operators: operators}, nil
 }
 
-func (k Keeper) Judges(ctx context.Context, request *types.QueryJudgesRequest) (*types.QueryJudgesResponse, error) {
-	panic("implement me")
+func (k Keeper) Judges(goCtx context.Context, req *types.QueryJudgesRequest) (*types.QueryJudgesResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	judges := make([]string, 0)
+	roles := k.GetRolePairs(ctx)
+	for _, pair := range roles {
+		if pair.Role == types.RoleJudge {
+			judges = append(judges, pair.Address)
+		}
+	}
+
+	return &types.QueryJudgesResponse{Judges: judges}, nil
 }
 
-func (k Keeper) Proposals(ctx context.Context, request *types.QueryProposalsRequest) (*types.QueryProposalsResponse, error) {
-	panic("implement me")
+func (k Keeper) Proposals(goCtx context.Context, req *types.QueryProposalsRequest) (*types.QueryProposalsResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyProposalPrefix)
+	proposals := make([]types.RoleProposal, 0)
+	pageRes, err := query.Paginate(store, req.Pagination, func(_, value []byte) error {
+		var proposal types.RoleProposal
+		k.cdc.MustUnmarshal(value, &proposal)
+		proposals = append(proposals, proposal)
+		return nil
+	})
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &types.QueryProposalsResponse{Proposals: proposals, Pagination: pageRes}, nil
 }
 
-func (k Keeper) Proposal(ctx context.Context, request *types.QueryProposalRequest) (*types.QueryProposalResponse, error) {
-	panic("implement me")
+func (k Keeper) Proposal(goCtx context.Context, req *types.QueryProposalRequest) (*types.QueryProposalResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	proposal, found := k.GetRoleProposal(ctx, req.ProposalId)
+	if !found {
+		return nil, status.Error(codes.NotFound, fmt.Sprintf("role proposal %d", req.ProposalId))
+	}
+
+	return &types.QueryProposalResponse{Proposal: proposal}, nil
+}
+
+func (k Keeper) Votes(goCtx context.Context, req *types.QueryVotesRequest) (*types.QueryVotesResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	votes := k.GetProposalVotes(ctx, req.ProposalId)
+	return &types.QueryVotesResponse{Votes: votes}, nil
+}
+
+func (k Keeper) Vote(goCtx context.Context, req *types.QueryVoteRequest) (*types.QueryVoteResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	opt, err := k.GetVote(ctx, req.ProposalId, sdk.MustAccAddressFromBech32(req.Voter))
+	if err != nil {
+		return nil, status.Error(codes.NotFound, err.Error())
+	}
+
+	return &types.QueryVoteResponse{Vote: types.Vote{ProposalId: req.ProposalId, Voter: req.Voter, Option: opt}}, nil
 }