Add custom HARD, USDX circulating supply endpoints (#718)

* HARD circulating supply query

* USDX circulating supply query

* add rest endpoints

* drop trailing newlines

* HARD, USDX total supply queries

x/validator-vesting/client/cli/query.go

@@ -22,6 +22,10 @@ func GetQueryCmd(queryRoute string, cdc *codec.Codec) *cobra.Command {
 	valVestingQueryCmd.AddCommand(flags.GetCommands(
 		queryCirculatingSupply(queryRoute, cdc),
 		queryTotalSupply(queryRoute, cdc),
+		queryCirculatingSupplyHARD(queryRoute, cdc),
+		queryCirculatingSupplyUSDX(queryRoute, cdc),
+		queryTotalSupplyHARD(queryRoute, cdc),
+		queryTotalSupplyUSDX(queryRoute, cdc),
 	)...)
 
 	return valVestingQueryCmd
@@ -79,3 +83,107 @@ func queryTotalSupply(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		},
 	}
 }
+
+func queryCirculatingSupplyHARD(queryRoute string, cdc *codec.Codec) *cobra.Command {
+	return &cobra.Command{
+		Use:   "circulating-supply-hard",
+		Short: "Get HARD circulating supply",
+		Long:  "Get the current circulating supply of HARD tokens",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+
+			// Query
+			res, height, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryCirculatingSupplyHARD), nil)
+			if err != nil {
+				return err
+			}
+			cliCtx = cliCtx.WithHeight(height)
+
+			// Decode and print results
+			var out int64
+			if err := cdc.UnmarshalJSON(res, &out); err != nil {
+				return fmt.Errorf("failed to unmarshal supply: %w", err)
+			}
+			return cliCtx.PrintOutput(out)
+		},
+	}
+}
+
+func queryCirculatingSupplyUSDX(queryRoute string, cdc *codec.Codec) *cobra.Command {
+	return &cobra.Command{
+		Use:   "circulating-supply-usdx",
+		Short: "Get USDX circulating supply",
+		Long:  "Get the current circulating supply of USDX tokens",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+
+			// Query
+			res, height, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryCirculatingSupplyUSDX), nil)
+			if err != nil {
+				return err
+			}
+			cliCtx = cliCtx.WithHeight(height)
+
+			// Decode and print results
+			var out int64
+			if err := cdc.UnmarshalJSON(res, &out); err != nil {
+				return fmt.Errorf("failed to unmarshal supply: %w", err)
+			}
+			return cliCtx.PrintOutput(out)
+		},
+	}
+}
+
+func queryTotalSupplyHARD(queryRoute string, cdc *codec.Codec) *cobra.Command {
+	return &cobra.Command{
+		Use:   "total-supply-hard",
+		Short: "Get HARD total supply",
+		Long:  "Get the current total supply of HARD tokens",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+
+			// Query
+			res, height, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryTotalSupplyHARD), nil)
+			if err != nil {
+				return err
+			}
+			cliCtx = cliCtx.WithHeight(height)
+
+			// Decode and print results
+			var out int64
+			if err := cdc.UnmarshalJSON(res, &out); err != nil {
+				return fmt.Errorf("failed to unmarshal supply: %w", err)
+			}
+			return cliCtx.PrintOutput(out)
+		},
+	}
+}
+
+func queryTotalSupplyUSDX(queryRoute string, cdc *codec.Codec) *cobra.Command {
+	return &cobra.Command{
+		Use:   "total-supply-usdx",
+		Short: "Get USDX total supply",
+		Long:  "Get the current total supply of USDX tokens",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cliCtx := context.NewCLIContext().WithCodec(cdc)
+
+			// Query
+			res, height, err := cliCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", queryRoute, types.QueryTotalSupplyUSDX), nil)
+			if err != nil {
+				return err
+			}
+			cliCtx = cliCtx.WithHeight(height)
+
+			// Decode and print results
+			var out int64
+			if err := cdc.UnmarshalJSON(res, &out); err != nil {
+				return fmt.Errorf("failed to unmarshal supply: %w", err)
+			}
+			return cliCtx.PrintOutput(out)
+		},
+	}
+}

x/validator-vesting/client/rest/query.go

@@ -16,6 +16,10 @@ import (
 func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router) {
 	r.HandleFunc(fmt.Sprintf("/%s/circulatingsupply", types.QueryPath), getCirculatingSupplyHandlerFn(cliCtx)).Methods("GET")
 	r.HandleFunc(fmt.Sprintf("/%s/totalsupply", types.QueryPath), getTotalSupplyHandlerFn(cliCtx)).Methods("GET")
+	r.HandleFunc(fmt.Sprintf("/%s/circulatingsupplyhard", types.QueryPath), getCirculatingSupplyHARDHandlerFn(cliCtx)).Methods("GET")
+	r.HandleFunc(fmt.Sprintf("/%s/circulatingsupplyusdx", types.QueryPath), getCirculatingSupplyUSDXHandlerFn(cliCtx)).Methods("GET")
+	r.HandleFunc(fmt.Sprintf("/%s/totalsupplyhard", types.QueryPath), getTotalSupplyHARDHandlerFn(cliCtx)).Methods("GET")
+	r.HandleFunc(fmt.Sprintf("/%s/totalsupplyusdx", types.QueryPath), getTotalSupplyUSDXHandlerFn(cliCtx)).Methods("GET")
 }
 
 func getTotalSupplyHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
@@ -100,3 +104,169 @@ func getCirculatingSupplyHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 		w.Write(resBytes)
 	}
 }
+
+func getCirculatingSupplyHARDHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		params := types.NewBaseQueryParams(page, limit)
+		bz, err := cliCtx.Codec.MarshalJSON(params)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err))
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryCirculatingSupplyHARD)
+		res, _, err := cliCtx.QueryWithData(route, bz)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		var circSupply int64
+		err = cliCtx.Codec.UnmarshalJSON(res, &circSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		resBytes, err := json.Marshal(circSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		w.Write(resBytes)
+	}
+}
+
+func getCirculatingSupplyUSDXHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		params := types.NewBaseQueryParams(page, limit)
+		bz, err := cliCtx.Codec.MarshalJSON(params)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err))
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryCirculatingSupplyUSDX)
+		res, _, err := cliCtx.QueryWithData(route, bz)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		var circSupply int64
+		err = cliCtx.Codec.UnmarshalJSON(res, &circSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		resBytes, err := json.Marshal(circSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		w.Write(resBytes)
+	}
+}
+
+func getTotalSupplyHARDHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		params := types.NewBaseQueryParams(page, limit)
+		bz, err := cliCtx.Codec.MarshalJSON(params)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err))
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryTotalSupplyHARD)
+		res, _, err := cliCtx.QueryWithData(route, bz)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		var totalSupply int64
+		err = cliCtx.Codec.UnmarshalJSON(res, &totalSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		resBytes, err := json.Marshal(totalSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		w.Write(resBytes)
+	}
+}
+
+func getTotalSupplyUSDXHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 0)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		params := types.NewBaseQueryParams(page, limit)
+		bz, err := cliCtx.Codec.MarshalJSON(params)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err))
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryTotalSupplyUSDX)
+		res, _, err := cliCtx.QueryWithData(route, bz)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		var totalSupply int64
+		err = cliCtx.Codec.UnmarshalJSON(res, &totalSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		resBytes, err := json.Marshal(totalSupply)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		w.Write(resBytes)
+	}
+}

x/validator-vesting/keeper/querier.go

@@ -19,6 +19,14 @@ func NewQuerier(keeper Keeper) sdk.Querier {
 			return queryGetCirculatingSupply(ctx, req, keeper)
 		case types.QueryTotalSupply:
 			return queryGetTotalSupply(ctx, req, keeper)
+		case types.QueryCirculatingSupplyHARD:
+			return getCirculatingSupplyHARD(ctx, req, keeper)
+		case types.QueryCirculatingSupplyUSDX:
+			return getCirculatingSupplyUSDX(ctx, req, keeper)
+		case types.QueryTotalSupplyHARD:
+			return getTotalSupplyHARD(ctx, req, keeper)
+		case types.QueryTotalSupplyUSDX:
+			return getCirculatingSupplyUSDX(ctx, req, keeper) // Intentional - USDX total supply is the circulating supply
 		default:
 			return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0])
 		}
@@ -82,5 +90,188 @@ func getCirculatingSupply(blockTime time.Time) sdk.Int {
 	default:
 		return sdk.NewInt(100000000)
 	}
-
+}
+
+func getCirculatingSupplyHARD(ctx sdk.Context, req abci.RequestQuery, keeper Keeper) ([]byte, error) {
+	supplyIncreaseDates := []time.Time{
+		time.Date(2020, 10, 15, 14, 0, 0, 0, time.UTC), // + 30,000,000 *** Year ONE ***
+		time.Date(2020, 11, 15, 14, 0, 0, 0, time.UTC), // + 5,000,000
+		time.Date(2020, 12, 15, 14, 0, 0, 0, time.UTC), // + 5,000,000
+		time.Date(2021, 1, 15, 14, 0, 0, 0, time.UTC),  // + 7,708,334
+		time.Date(2021, 2, 15, 14, 0, 0, 0, time.UTC),  // + 3,333,333
+		time.Date(2021, 3, 15, 14, 0, 0, 0, time.UTC),  // + 3,333,333
+		time.Date(2021, 4, 15, 14, 0, 0, 0, time.UTC),  // + 6,875,000
+		time.Date(2021, 5, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2021, 6, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2021, 7, 15, 14, 0, 0, 0, time.UTC),  // + 6,875,000
+		time.Date(2021, 8, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2021, 9, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000  *** Year ONE ***
+		time.Date(2021, 10, 15, 14, 0, 0, 0, time.UTC), // + 13,541,667 *** Year TWO ***
+		time.Date(2021, 11, 15, 14, 0, 0, 0, time.UTC), // + 2,500,000
+		time.Date(2021, 12, 15, 14, 0, 0, 0, time.UTC), // + 2,500,000
+		time.Date(2022, 1, 15, 14, 0, 0, 0, time.UTC),  // + 8,541,667
+		time.Date(2022, 2, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2022, 3, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2022, 4, 15, 14, 0, 0, 0, time.UTC),  // + 8,541,667
+		time.Date(2022, 5, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2022, 6, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2022, 7, 15, 14, 0, 0, 0, time.UTC),  // + 8,541,667
+		time.Date(2022, 8, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2022, 9, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000  *** Year TWO ***
+		time.Date(2022, 10, 15, 14, 0, 0, 0, time.UTC), // + 8,541,667  *** Year THREE ***
+		time.Date(2022, 11, 15, 14, 0, 0, 0, time.UTC), // + 2,500,000
+		time.Date(2022, 12, 15, 14, 0, 0, 0, time.UTC), // + 2,500,000
+		time.Date(2023, 1, 15, 14, 0, 0, 0, time.UTC),  // + 4,166,667
+		time.Date(2023, 2, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2023, 3, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2023, 4, 15, 14, 0, 0, 0, time.UTC),  // + 4,166,667
+		time.Date(2023, 5, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2023, 6, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2023, 7, 15, 14, 0, 0, 0, time.UTC),  // + 4,166,667
+		time.Date(2023, 8, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000
+		time.Date(2023, 9, 15, 14, 0, 0, 0, time.UTC),  // + 2,500,000  *** Year THREE ***
+		time.Date(2023, 10, 15, 14, 0, 0, 0, time.UTC), // + 3,333,334  *** Year FOUR ***
+		time.Date(2023, 11, 15, 14, 0, 0, 0, time.UTC), // + 1,666,667
+		time.Date(2023, 12, 15, 14, 0, 0, 0, time.UTC), // + 1,666,667
+		time.Date(2024, 1, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 2, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 3, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 4, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 5, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 6, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 7, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 8, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667
+		time.Date(2024, 9, 15, 14, 0, 0, 0, time.UTC),  // + 1,666,667  *** Year FOUR ***
+	}
+
+	circSupply := sdk.ZeroInt()
+	blockTime := ctx.BlockTime()
+	switch {
+	case blockTime.Before(supplyIncreaseDates[0]):
+		circSupply = sdk.NewInt(0)
+	case blockTime.After(supplyIncreaseDates[0]) && blockTime.Before(supplyIncreaseDates[1]) || blockTime.Equal(supplyIncreaseDates[0]):
+		circSupply = sdk.NewInt(30000000) // Start year ONE
+	case blockTime.After(supplyIncreaseDates[1]) && blockTime.Before(supplyIncreaseDates[2]) || blockTime.Equal(supplyIncreaseDates[1]):
+		circSupply = sdk.NewInt(35000000)
+	case blockTime.After(supplyIncreaseDates[2]) && blockTime.Before(supplyIncreaseDates[3]) || blockTime.Equal(supplyIncreaseDates[2]):
+		circSupply = sdk.NewInt(40000000)
+	case blockTime.After(supplyIncreaseDates[3]) && blockTime.Before(supplyIncreaseDates[4]) || blockTime.Equal(supplyIncreaseDates[3]):
+		circSupply = sdk.NewInt(47708334)
+	case blockTime.After(supplyIncreaseDates[4]) && blockTime.Before(supplyIncreaseDates[5]) || blockTime.Equal(supplyIncreaseDates[4]):
+		circSupply = sdk.NewInt(51041667)
+	case blockTime.After(supplyIncreaseDates[5]) && blockTime.Before(supplyIncreaseDates[6]) || blockTime.Equal(supplyIncreaseDates[5]):
+		circSupply = sdk.NewInt(54375000)
+	case blockTime.After(supplyIncreaseDates[6]) && blockTime.Before(supplyIncreaseDates[7]) || blockTime.Equal(supplyIncreaseDates[6]):
+		circSupply = sdk.NewInt(61250000)
+	case blockTime.After(supplyIncreaseDates[7]) && blockTime.Before(supplyIncreaseDates[8]) || blockTime.Equal(supplyIncreaseDates[7]):
+		circSupply = sdk.NewInt(63750000)
+	case blockTime.After(supplyIncreaseDates[8]) && blockTime.Before(supplyIncreaseDates[9]) || blockTime.Equal(supplyIncreaseDates[8]):
+		circSupply = sdk.NewInt(66250000)
+	case blockTime.After(supplyIncreaseDates[9]) && blockTime.Before(supplyIncreaseDates[10]) || blockTime.Equal(supplyIncreaseDates[9]):
+		circSupply = sdk.NewInt(73125000)
+	case blockTime.After(supplyIncreaseDates[10]) && blockTime.Before(supplyIncreaseDates[11]) || blockTime.Equal(supplyIncreaseDates[10]):
+		circSupply = sdk.NewInt(75625000)
+	case blockTime.After(supplyIncreaseDates[11]) && blockTime.Before(supplyIncreaseDates[12]) || blockTime.Equal(supplyIncreaseDates[11]):
+		circSupply = sdk.NewInt(78125000) // End year ONE
+	case blockTime.After(supplyIncreaseDates[12]) && blockTime.Before(supplyIncreaseDates[13]) || blockTime.Equal(supplyIncreaseDates[12]):
+		circSupply = sdk.NewInt(91666667) // Start year TWO
+	case blockTime.After(supplyIncreaseDates[13]) && blockTime.Before(supplyIncreaseDates[14]) || blockTime.Equal(supplyIncreaseDates[13]):
+		circSupply = sdk.NewInt(94166667)
+	case blockTime.After(supplyIncreaseDates[14]) && blockTime.Before(supplyIncreaseDates[15]) || blockTime.Equal(supplyIncreaseDates[14]):
+		circSupply = sdk.NewInt(96666667)
+	case blockTime.After(supplyIncreaseDates[15]) && blockTime.Before(supplyIncreaseDates[16]) || blockTime.Equal(supplyIncreaseDates[15]):
+		circSupply = sdk.NewInt(105208334)
+	case blockTime.After(supplyIncreaseDates[16]) && blockTime.Before(supplyIncreaseDates[17]) || blockTime.Equal(supplyIncreaseDates[16]):
+		circSupply = sdk.NewInt(107708334)
+	case blockTime.After(supplyIncreaseDates[17]) && blockTime.Before(supplyIncreaseDates[18]) || blockTime.Equal(supplyIncreaseDates[17]):
+		circSupply = sdk.NewInt(110208334)
+	case blockTime.After(supplyIncreaseDates[18]) && blockTime.Before(supplyIncreaseDates[19]) || blockTime.Equal(supplyIncreaseDates[18]):
+		circSupply = sdk.NewInt(118750000)
+	case blockTime.After(supplyIncreaseDates[19]) && blockTime.Before(supplyIncreaseDates[20]) || blockTime.Equal(supplyIncreaseDates[19]):
+		circSupply = sdk.NewInt(121250000)
+	case blockTime.After(supplyIncreaseDates[20]) && blockTime.Before(supplyIncreaseDates[21]) || blockTime.Equal(supplyIncreaseDates[20]):
+		circSupply = sdk.NewInt(123750000)
+	case blockTime.After(supplyIncreaseDates[21]) && blockTime.Before(supplyIncreaseDates[22]) || blockTime.Equal(supplyIncreaseDates[21]):
+		circSupply = sdk.NewInt(132291668)
+	case blockTime.After(supplyIncreaseDates[22]) && blockTime.Before(supplyIncreaseDates[23]) || blockTime.Equal(supplyIncreaseDates[22]):
+		circSupply = sdk.NewInt(134791668)
+	case blockTime.After(supplyIncreaseDates[23]) && blockTime.Before(supplyIncreaseDates[24]) || blockTime.Equal(supplyIncreaseDates[23]):
+		circSupply = sdk.NewInt(137291668) // End year TWO
+	case blockTime.After(supplyIncreaseDates[24]) && blockTime.Before(supplyIncreaseDates[25]) || blockTime.Equal(supplyIncreaseDates[24]):
+		circSupply = sdk.NewInt(145833335) // Start year THREE
+	case blockTime.After(supplyIncreaseDates[25]) && blockTime.Before(supplyIncreaseDates[26]) || blockTime.Equal(supplyIncreaseDates[25]):
+		circSupply = sdk.NewInt(148333335)
+	case blockTime.After(supplyIncreaseDates[26]) && blockTime.Before(supplyIncreaseDates[27]) || blockTime.Equal(supplyIncreaseDates[26]):
+		circSupply = sdk.NewInt(150833335)
+	case blockTime.After(supplyIncreaseDates[27]) && blockTime.Before(supplyIncreaseDates[28]) || blockTime.Equal(supplyIncreaseDates[27]):
+		circSupply = sdk.NewInt(155000000)
+	case blockTime.After(supplyIncreaseDates[28]) && blockTime.Before(supplyIncreaseDates[29]) || blockTime.Equal(supplyIncreaseDates[28]):
+		circSupply = sdk.NewInt(157500000)
+	case blockTime.After(supplyIncreaseDates[29]) && blockTime.Before(supplyIncreaseDates[30]) || blockTime.Equal(supplyIncreaseDates[29]):
+		circSupply = sdk.NewInt(160000000)
+	case blockTime.After(supplyIncreaseDates[30]) && blockTime.Before(supplyIncreaseDates[31]) || blockTime.Equal(supplyIncreaseDates[30]):
+		circSupply = sdk.NewInt(164166669)
+	case blockTime.After(supplyIncreaseDates[31]) && blockTime.Before(supplyIncreaseDates[32]) || blockTime.Equal(supplyIncreaseDates[31]):
+		circSupply = sdk.NewInt(166666669)
+	case blockTime.After(supplyIncreaseDates[32]) && blockTime.Before(supplyIncreaseDates[33]) || blockTime.Equal(supplyIncreaseDates[32]):
+		circSupply = sdk.NewInt(169166669)
+	case blockTime.After(supplyIncreaseDates[33]) && blockTime.Before(supplyIncreaseDates[34]) || blockTime.Equal(supplyIncreaseDates[33]):
+		circSupply = sdk.NewInt(173333336)
+	case blockTime.After(supplyIncreaseDates[34]) && blockTime.Before(supplyIncreaseDates[35]) || blockTime.Equal(supplyIncreaseDates[34]):
+		circSupply = sdk.NewInt(175833336)
+	case blockTime.After(supplyIncreaseDates[35]) && blockTime.Before(supplyIncreaseDates[36]) || blockTime.Equal(supplyIncreaseDates[35]):
+		circSupply = sdk.NewInt(178333336) // End year THREE
+	case blockTime.After(supplyIncreaseDates[36]) && blockTime.Before(supplyIncreaseDates[37]) || blockTime.Equal(supplyIncreaseDates[36]):
+		circSupply = sdk.NewInt(181666670) // Start year FOUR
+	case blockTime.After(supplyIncreaseDates[37]) && blockTime.Before(supplyIncreaseDates[38]) || blockTime.Equal(supplyIncreaseDates[37]):
+		circSupply = sdk.NewInt(183333337)
+	case blockTime.After(supplyIncreaseDates[38]) && blockTime.Before(supplyIncreaseDates[39]) || blockTime.Equal(supplyIncreaseDates[38]):
+		circSupply = sdk.NewInt(185000000)
+	case blockTime.After(supplyIncreaseDates[39]) && blockTime.Before(supplyIncreaseDates[40]) || blockTime.Equal(supplyIncreaseDates[39]):
+		circSupply = sdk.NewInt(186666670)
+	case blockTime.After(supplyIncreaseDates[40]) && blockTime.Before(supplyIncreaseDates[41]) || blockTime.Equal(supplyIncreaseDates[40]):
+		circSupply = sdk.NewInt(188333338)
+	case blockTime.After(supplyIncreaseDates[41]) && blockTime.Before(supplyIncreaseDates[42]) || blockTime.Equal(supplyIncreaseDates[41]):
+		circSupply = sdk.NewInt(190000000)
+	case blockTime.After(supplyIncreaseDates[42]) && blockTime.Before(supplyIncreaseDates[43]) || blockTime.Equal(supplyIncreaseDates[42]):
+		circSupply = sdk.NewInt(191666670)
+	case blockTime.After(supplyIncreaseDates[43]) && blockTime.Before(supplyIncreaseDates[44]) || blockTime.Equal(supplyIncreaseDates[43]):
+		circSupply = sdk.NewInt(193333339)
+	case blockTime.After(supplyIncreaseDates[44]) && blockTime.Before(supplyIncreaseDates[45]) || blockTime.Equal(supplyIncreaseDates[44]):
+		circSupply = sdk.NewInt(195000000)
+	case blockTime.After(supplyIncreaseDates[45]) && blockTime.Before(supplyIncreaseDates[46]) || blockTime.Equal(supplyIncreaseDates[45]):
+		circSupply = sdk.NewInt(196666670)
+	case blockTime.After(supplyIncreaseDates[46]) && blockTime.Before(supplyIncreaseDates[47]) || blockTime.Equal(supplyIncreaseDates[46]):
+		circSupply = sdk.NewInt(198333340)
+	case blockTime.After(supplyIncreaseDates[47]) && blockTime.Before(supplyIncreaseDates[48]) || blockTime.Equal(supplyIncreaseDates[47]):
+		circSupply = sdk.NewInt(200000000) // End year FOUR
+	default:
+		circSupply = sdk.NewInt(200000000)
+	}
+
+	bz, err := keeper.cdc.MarshalJSON(circSupply)
+	if err != nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
+	}
+	return bz, nil
+}
+
+func getCirculatingSupplyUSDX(ctx sdk.Context, req abci.RequestQuery, keeper Keeper) ([]byte, error) {
+	totalSupply := keeper.supplyKeeper.GetSupply(ctx).GetTotal().AmountOf("usdx")
+	supplyInt := sdk.NewDecFromInt(totalSupply).Mul(sdk.MustNewDecFromStr("0.000001")).TruncateInt64()
+	bz, err := types.ModuleCdc.MarshalJSON(supplyInt)
+	if err != nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
+	}
+	return bz, nil
+}
+
+func getTotalSupplyHARD(ctx sdk.Context, req abci.RequestQuery, keeper Keeper) ([]byte, error) {
+	totalSupply := keeper.supplyKeeper.GetSupply(ctx).GetTotal().AmountOf("hard")
+	supplyInt := sdk.NewDecFromInt(totalSupply).Mul(sdk.MustNewDecFromStr("0.000001")).TruncateInt64()
+	bz, err := types.ModuleCdc.MarshalJSON(supplyInt)
+	if err != nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
+	}
+	return bz, nil
 }

x/validator-vesting/types/querier.go

@@ -4,14 +4,22 @@ package types
 const (
 	QueryCirculatingSupply     = "circulating-supply"
 	QueryTotalSupply           = "total-supply"
+	QueryCirculatingSupplyHARD = "circulating-supply-hard"
+	QueryCirculatingSupplyUSDX = "circulating-supply-usdx"
+	QueryTotalSupplyHARD       = "total-supply-hard"
+	QueryTotalSupplyUSDX       = "total-supply-usdx"
 )
 
-// QueryCirculatingSupplyParams defines the parameters necessary for querying for all Evidence.
+// BaseQueryParams defines the parameters necessary for querying for all Evidence.
 type BaseQueryParams struct {
 	Page  int `json:"page" yaml:"page"`
 	Limit int `json:"limit" yaml:"limit"`
 }
 
+// NewBaseQueryParams returns a new BaseQueryParams
 func NewBaseQueryParams(page, limit int) BaseQueryParams {
-	return BaseQueryParams{Page: page, Limit: limit}
+	return BaseQueryParams{
+		Page:  page,
+		Limit: limit,
+	}
 }