Merge pull request #168 from bandprotocol/add-check-grantee

[Feeds] Add check grantee

Author: warittornc

app/app.go

@@ -531,6 +531,7 @@ func NewBandApp(
 		keys[feedstypes.StoreKey],
 		app.OracleKeeper,
 		app.StakingKeeper,
+		app.AuthzKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 

x/feeds/client/cli/query.go

@@ -30,6 +30,7 @@ func GetQueryCmd() *cobra.Command {
 		GetQueryCmdParams(),
 		GetQueryCmdDelegatorSignal(),
 		GetQueryCmdSupportedFeeds(),
+		GetQueryCmdIsFeeder(),
 	)
 
 	return queryCmd
@@ -276,3 +277,30 @@ func GetQueryCmdParams() *cobra.Command {
 
 	return cmd
 }
+
+// GetQueryCmdIsFeeder implements the query if an address is a feeder command.
+func GetQueryCmdIsFeeder() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "is-feeder [validator-address] [feeder-address]",
+		Short: "Checks if the given address is a feeder for the validator",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx := client.GetClientContextFromCmd(cmd)
+			queryClient := types.NewQueryClient(clientCtx)
+
+			res, err := queryClient.IsFeeder(context.Background(), &types.QueryIsFeederRequest{
+				ValidatorAddress: args[0],
+				FeederAddress:    args[1],
+			})
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/feeds/keeper/grpc_query.go

@@ -265,9 +265,9 @@ func (q queryServer) IsFeeder(
 	if err != nil {
 		return nil, err
 	}
-	resp, err := sdk.AccAddressFromBech32(req.FeederAddress)
+	feeder, err := sdk.AccAddressFromBech32(req.FeederAddress)
 	if err != nil {
 		return nil, err
 	}
-	return &types.QueryIsFeederResponse{IsFeeder: q.keeper.IsFeeder(ctx, val, resp)}, nil
+	return &types.QueryIsFeederResponse{IsFeeder: q.keeper.IsFeeder(ctx, val, feeder)}, nil
 }

x/feeds/keeper/keeper.go

@@ -27,13 +27,15 @@ func NewKeeper(
 	storeKey storetypes.StoreKey,
 	oracleKeeper types.OracleKeeper,
 	stakingKeeper types.StakingKeeper,
+	authzKeeper types.AuthzKeeper,
 	authority string,
 ) Keeper {
 	return Keeper{
 		cdc:           cdc,
 		storeKey:      storeKey,
 		oracleKeeper:  oracleKeeper,
 		stakingKeeper: stakingKeeper,
+		authzKeeper:   authzKeeper,
 		authority:     authority,
 	}
 }

x/feeds/keeper/keeper_test.go

@@ -27,6 +27,7 @@ var (
 	ValidValidator3  = sdk.ValAddress("1000000003")
 	ValidDelegator   = sdk.AccAddress("2000000001")
 	ValidDelegator2  = sdk.AccAddress("2000000002")
+	ValidFeeder      = sdk.AccAddress("3000000001")
 	InvalidValidator = sdk.ValAddress("9000000001")
 	InvalidDelegator = sdk.AccAddress("9000000002")
 )
@@ -127,11 +128,14 @@ func (suite *KeeperTestSuite) SetupTest() {
 		AnyTimes()
 	suite.stakingKeeper = stakingKeeper
 
+	authzKeeper := feedstestutil.NewMockAuthzKeeper(ctrl)
+
 	suite.feedsKeeper = keeper.NewKeeper(
 		encCfg.Codec,
 		key,
 		oracleKeeper,
 		stakingKeeper,
+		authzKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	suite.feedsKeeper.InitGenesis(suite.ctx, *types.DefaultGenesisState())