[Masterchef]: Query Apr fixes (#1259)

* query fixes

* comment

---------

Co-authored-by: Adarsh Kumar <itsadarshkumar@gmail.com>

Author: amityadav0

api/elys/masterchef/query.pulsar.go

@@ -279,7 +279,7 @@ message QueryAprResponse {
   ];
 }
 
-message QueryAprsRequest {}
+message QueryAprsRequest { uint64 days = 1; }
 
 message QueryAprsResponse {
   string usdc_apr_usdc = 1 [

proto/elys/masterchef/query.proto

@@ -84,10 +84,11 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					Skip:      true, // use custom command
 				},
 				{
-					RpcMethod: "Aprs",
-					Use:       "aprs",
-					Short:     "Query aprs",
-					Example:   "elysd q masterchef aprs",
+					RpcMethod:      "Aprs",
+					Use:            "aprs [days]",
+					Short:          "Query aprs",
+					Example:        "elysd q masterchef aprs [days]",
+					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "days"}},
 				},
 				{
 					RpcMethod: "AllLiquidityPoolTVL",

x/masterchef/autocli.go

@@ -17,8 +17,8 @@ func CmdApr() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "apr",
 		Short:   "calculate APR",
-		Example: "elysd q masterchef apr [withdraw-type] [denom]",
-		Args:    cobra.ExactArgs(2),
+		Example: "elysd q masterchef apr [withdraw-type] [denom] [days]",
+		Args:    cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 
@@ -30,10 +30,15 @@ func CmdApr() *cobra.Command {
 			}
 
 			denom := args[1]
+			days, err := strconv.Atoi(args[2])
+			if err != nil {
+				return err
+			}
 
 			params := &types.QueryAprRequest{
 				WithdrawType: commitmenttypes.EarnType(withdrawType),
 				Denom:        denom,
+				Days:         uint64(days),
 			}
 
 			res, err := queryClient.Apr(context.Background(), params)

x/masterchef/client/cli/query_apr.go

@@ -18,52 +18,72 @@ func (k Keeper) Aprs(goCtx context.Context, req *types.QueryAprsRequest) (*types
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	usdcAprUsdc, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_USDC_PROGRAM, Denom: ptypes.BaseCurrency})
+	usdcAprUsdc, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_USDC_PROGRAM, Denom: ptypes.BaseCurrency, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenAprUsdc, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_USDC_PROGRAM, Denom: ptypes.Eden})
+	edenAprUsdc, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_USDC_PROGRAM, Denom: ptypes.Eden, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	usdcAprEdenb, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_EDENB_PROGRAM, Denom: ptypes.BaseCurrency})
+	usdcAprEdenb, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_EDENB_PROGRAM, Denom: ptypes.BaseCurrency, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenAprEdenb, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_EDENB_PROGRAM, Denom: ptypes.Eden})
+	edenAprEdenb, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_EDENB_PROGRAM, Denom: ptypes.Eden, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	usdcAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.BaseCurrency})
+	usdcAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.BaseCurrency, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.Eden})
+	edenAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.Eden, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenbAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.EdenB})
+	edenbAprEden, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_EDEN_PROGRAM, Denom: ptypes.EdenB, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	usdcAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.BaseCurrency})
+	usdcAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.BaseCurrency, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.Eden})
+	edenAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.Eden, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	edenbAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.EdenB})
+	edenbAprElys, err := k.CalculateApr(ctx, &types.QueryAprRequest{
+		WithdrawType: commitmenttypes.EarnType_ELYS_PROGRAM, Denom: ptypes.EdenB, Days: req.Days,
+	})
 	if err != nil {
 		return nil, err
 	}