Merge pull request #3012 from Sifchain/feature/margin-1-params-rest

feat: margin params rest endpoint

x/margin/client/rest/query.go

@@ -16,6 +16,7 @@ import (
 
 func registerQueryRoutes(cliCtx client.Context, r *mux.Router) {
 	r.HandleFunc("/margin/mtps-by-address", getMTPsForAddress(cliCtx))
+	r.HandleFunc("/margin/params", getParams(cliCtx))
 }
 
 func getMTPsForAddress(cliCtx client.Context) http.HandlerFunc {
@@ -49,3 +50,22 @@ func getMTPsForAddress(cliCtx client.Context) http.HandlerFunc {
 		rest.PostProcessResponse(w, cliCtx, res)
 	}
 }
+
+func getParams(cliCtx client.Context) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		cliCtx, ok := rest.ParseQueryHeightOrReturnBadRequest(w, cliCtx, r)
+		if !ok {
+			return
+		}
+
+		route := fmt.Sprintf("custom/%s/%s", types.QuerierRoute, types.QueryParams)
+		res, height, err := cliCtx.Query(route)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		cliCtx = cliCtx.WithHeight(height)
+		rest.PostProcessResponse(w, cliCtx, res)
+	}
+}

x/margin/keeper/keeper.go

@@ -585,7 +585,7 @@ func (k Keeper) GetSQ(ctx sdk.Context, pool clptypes.Pool) sdk.Dec {
 		panic(err)
 	}
 
-	sq := value.Quo(blocks).Quo(modifier)
+	sq := value.Mul(blocks).Quo(modifier)
 
 	return sq
 }

x/margin/keeper/legacy.go

@@ -17,6 +17,8 @@ func NewLegacyQuerier(k types.Keeper, cdc *codec.LegacyAmino) sdk.Querier {
 		switch path[0] {
 		case types.QueryMTPsForAddress:
 			return queryMtpsForAddress(ctx, req, cdc, querier)
+		case types.QueryParams:
+			return queryParams(ctx, req, cdc, querier)
 		default:
 			return nil, sdkerrors.Wrap(types.ErrUnknownRequest, "unknown request")
 		}
@@ -65,3 +67,15 @@ func queryMtpsForAddress(ctx sdk.Context, req abci.RequestQuery, cdc *codec.Lega
 	}
 	return bz, nil
 }
+
+func queryParams(ctx sdk.Context, req abci.RequestQuery, cdc *codec.LegacyAmino, querier queryServer) ([]byte, error) {
+	res, err := querier.GetParams(sdk.WrapSDKContext(ctx), &types.ParamsRequest{})
+	if err != nil {
+		return nil, err
+	}
+	bz, err := codec.MarshalJSONIndent(cdc, res)
+	if err != nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
+	}
+	return bz, nil
+}

x/margin/types/querier.go

@@ -5,4 +5,5 @@ package types
 
 const (
 	QueryMTPsForAddress = "mtps-for-address"
+	QueryParams         = "params"
 )