Merge pull request #117 from oraichain/add-query-prices

Add query prices

Author: ledanghuy1811

proto/cosmwasm/txfees/v1/query.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package cosmwasm.txfees.v1;
 
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "cosmwasm/txfees/v1/params.proto";
@@ -21,6 +22,10 @@ service Query {
     option (google.api.http).get = "/cosmwasm/txfees/v1/allowed_tokens";
   }
 
+  rpc TokenExchangeRate(QueryTokenExchangeRateRequest) returns (QueryTokenExchangeRateResponse) {
+    option (google.api.http).get = "/cosmwasm/txfees/v1/token_exchange_rate";
+  }
+
 }
 
 // QueryParamsRequest is the request type for the Query/Params RPC method.
@@ -40,3 +45,17 @@ message QueryAllowedTokensResponse {
   // tokens defines the parameters of the module.
   repeated string tokens = 1 [ (gogoproto.nullable) = false ];
 }
+
+message QueryTokenExchangeRateRequest {
+  string denom = 1;
+}
+
+message QueryTokenExchangeRateResponse {
+  string base_denom = 1;
+  string quote_denom = 2;
+  string rate = 3 [
+    (cosmos_proto.scalar)  = "cosmos.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable)   = false
+  ];
+}

tests/interchaintest/helpers/types.go

@@ -38,7 +38,9 @@ type QueryWasmGasLessContracts struct {
 }
 
 type QueryTxfeesTokenExchangeRate struct {
-	Rate string `json:"rate`
+	BaseDenom  string `json:"base_denom"`
+	QuoteDenom string `json:"quote_denom"`
+	Rate       string `json:"rate"`
 }
 
 type PageResponse struct {

tests/interchaintest/txfees_test.go

@@ -112,6 +112,11 @@ func TestAddFeeToken(t *testing.T) {
 	_, err = cosmos.PollForProposalStatus(ctx, orai, height, height+10, proposalAddFeeToken, govv1beta1.StatusPassed)
 	require.NoError(t, err, "proposal status did not change to passed in expected number of blocks")
 
+	// execute a transaction with new fee token
+	rate, err := helpers.QueryTokenExchangeRate(ctx, orai, expectedDenom)
+	require.NoError(t, err)
+	require.NotEmpty(t, rate)
+
 	receiver := CreateTestingUser(t, ctx, t.Name(), math.OneInt(), chains...)[0]
 	sendAmount := ibc.WalletAmount{
 		Address: receiver.FormattedAddress(),

x/txfees/client/cli/query.go

@@ -23,6 +23,7 @@ func GetQueryCmd() *cobra.Command {
 	cmd.AddCommand(
 		GetParams(),
 		GetAllowedTokens(),
+		GetTokenExchangeRate(),
 	)
 
 	return cmd
@@ -81,3 +82,32 @@ func GetAllowedTokens() *cobra.Command {
 
 	return cmd
 }
+
+// GetTokenExchangeRate returns the exchange rate of allowed token for the module
+func GetTokenExchangeRate() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "token-exchange-rate [denom] [flags]",
+		Short: "Get the exchange rate of allowed token for the x/txfees module",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			res, err := queryClient.TokenExchangeRate(cmd.Context(), &types.QueryTokenExchangeRateRequest{
+				Denom: args[0],
+			})
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/txfees/keeper/grpc_query.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 
+	errors "cosmossdk.io/errors"
 	"github.com/CosmWasm/wasmd/x/txfees/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -31,3 +32,32 @@ func (k Keeper) AllowedTokens(ctx context.Context, _ *types.QueryAllowedTokensRe
 
 	return &types.QueryAllowedTokensResponse{Tokens: tokens}, nil
 }
+
+func (k Keeper) TokenExchangeRate(ctx context.Context, req *types.QueryTokenExchangeRateRequest) (*types.QueryTokenExchangeRateResponse, error) {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+
+	allowed, err := k.IsTokenAllowed(sdkCtx, req.Denom)
+	if err != nil {
+		return nil, err
+	}
+
+	if !allowed {
+		return nil, errors.Wrapf(types.ErrTokenAllowed, "token %s is not allowed", req.Denom)
+	}
+
+	baseDenom, err := k.GetBaseTokenDenom(sdkCtx)
+	if err != nil {
+		return nil, err
+	}
+
+	rate, err := k.QueryOraiDexTokenExchangeRate(sdkCtx, req.Denom)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.QueryTokenExchangeRateResponse{
+		BaseDenom:  baseDenom,
+		QuoteDenom: req.Denom,
+		Rate:       rate,
+	}, nil
+}