From d4d888b6dc62a087f88f102d161f02ff6da27853 Mon Sep 17 00:00:00 2001
From: Dzmitry Hil <dzmitryhil@gmail.com>
Date: Wed, 27 Nov 2024 15:08:22 +0300
Subject: [PATCH] Integrate DEX-related asset FT queries and messages for the
 WASM. (#1031)

* Integrate DEX-related asset FT queries and messages for the WASM.
* Allow to use DEX-related asset FT queries for the WASM smart contracts.
* Add integration tests to test it.
---
 docs/api.md                                   |   6 +-
 docs/static/openapi.json                      |   4 +-
 .../contracts/modules/dex/src/contract.rs     |  72 +++++++-
 .../contracts/modules/dex/src/msg.rs          |  33 +++-
 integration-tests/modules/wasm_test.go        | 154 ++++++++++++++----
 proto/coreum/asset/ft/v1/query.proto          |   7 +
 proto/coreum/asset/ft/v1/token.proto          |   2 +-
 proto/coreum/asset/ft/v1/tx.proto             |   2 +-
 proto/coreum/dex/v1/params.proto              |   2 +-
 x/asset/ft/client/cli/tx.go                   |   2 +-
 x/asset/ft/keeper/grpc_query.go               |   4 +-
 x/asset/ft/types/query.pb.go                  | 154 +++++++++---------
 x/asset/ft/types/token.pb.go                  |   2 +-
 x/asset/ft/types/tx.pb.go                     |   2 +-
 x/dex/types/params.pb.go                      |   2 +-
 x/wasm/handler/message.go                     |   1 +
 x/wasm/handler/query.go                       |   1 +
 17 files changed, 319 insertions(+), 131 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index 78b487549..039b2d100 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -2366,7 +2366,7 @@ DEXSettings defines the token settings of the dex.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `unified_ref_amount` | [string](#string) |  |  `unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size`  |
+| `unified_ref_amount` | [string](#string) |  |  `unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size`  |
 | `whitelisted_denoms` | [string](#string) | repeated |  `whitelisted_denoms is the list of denoms to trade with.`  |
 
 
@@ -2795,7 +2795,7 @@ MsgIssue defines message to issue new fungible token.
 | ----- | ---- | ----- | ----------- |
 | `sender` | [string](#string) |  |    |
 | `denom` | [string](#string) |  |    |
-| `unified_ref_amount` | [string](#string) |  |  `unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size`  |
+| `unified_ref_amount` | [string](#string) |  |  `unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size`  |
 
 
 
@@ -4917,7 +4917,7 @@ Params keeps gov manageable parameters.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `default_unified_ref_amount` | [string](#string) |  |  `default_unified_ref_amount is the default approximate amount you need to by 1USD, used to for tokens without custom value`  |
+| `default_unified_ref_amount` | [string](#string) |  |  `default_unified_ref_amount is the default approximate amount you need to buy 1USD, used to for tokens without custom value`  |
 | `price_tick_exponent` | [int32](#int32) |  |  `price_tick_exponent is the exponent used for the price tick calculation`  |
 | `max_orders_per_denom` | [uint64](#uint64) |  |  `max_orders_per_denom is the maximum number of orders per denom the user can have`  |
 | `order_reserve` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) |  |  `order_reserve is the reserve required to save the order in the order book`  |
diff --git a/docs/static/openapi.json b/docs/static/openapi.json
index 981a9c795..fddf80941 100644
--- a/docs/static/openapi.json
+++ b/docs/static/openapi.json
@@ -9592,7 +9592,7 @@
       "properties": {
         "unified_ref_amount": {
           "type": "string",
-          "title": "unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size"
+          "title": "unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size"
         },
         "whitelisted_denoms": {
           "type": "array",
@@ -10178,7 +10178,7 @@
       "properties": {
         "default_unified_ref_amount": {
           "type": "string",
-          "title": "default_unified_ref_amount is the default approximate amount you need to by 1USD, used to for tokens without custom value"
+          "title": "default_unified_ref_amount is the default approximate amount you need to buy 1USD, used to for tokens without custom value"
         },
         "price_tick_exponent": {
           "type": "integer",
diff --git a/integration-tests/contracts/modules/dex/src/contract.rs b/integration-tests/contracts/modules/dex/src/contract.rs
index a479c6b1f..d15bd92d5 100644
--- a/integration-tests/contracts/modules/dex/src/contract.rs
+++ b/integration-tests/contracts/modules/dex/src/contract.rs
@@ -1,11 +1,12 @@
-use coreum_wasm_sdk::types::coreum::asset::ft::v1::MsgIssue;
+use coreum_wasm_sdk::types::coreum::asset::ft::v1::{MsgIssue, MsgUpdateDexUnifiedRefAmount, MsgUpdateDexWhitelistedDenoms, QueryBalanceRequest, QueryBalanceResponse, QueryDexSettingsRequest, QueryDexSettingsResponse};
 use coreum_wasm_sdk::types::coreum::dex::v1::{
-    MsgCancelOrder, MsgCancelOrdersByDenom, MsgPlaceOrder, Order, OrderType,
+    MsgCancelOrder, MsgCancelOrdersByDenom, MsgPlaceOrder, OrderType,
     QueryAccountDenomOrdersCountRequest, QueryAccountDenomOrdersCountResponse,
     QueryOrderBookOrdersRequest, QueryOrderBookOrdersResponse, QueryOrderBooksRequest,
     QueryOrderBooksResponse, QueryOrderRequest, QueryOrderResponse, QueryOrdersRequest,
     QueryOrdersResponse, QueryParamsRequest, QueryParamsResponse, Side, TimeInForce,
 };
+
 use coreum_wasm_sdk::types::cosmos::base::query::v1beta1::PageRequest;
 use cosmwasm_std::{entry_point, to_json_binary, Binary, CosmosMsg, Deps, StdError, StdResult};
 use cosmwasm_std::{DepsMut, Env, MessageInfo, Response};
@@ -70,6 +71,13 @@ pub fn execute(
         ExecuteMsg::CancelOrdersByDenom { account, denom } => {
             cancel_orders_by_denom(env, account, denom)
         }
+        ExecuteMsg::UpdateDEXUnifiedRefAmount { denom, amount } => {
+            update_dex_unified_ref_amount(env, denom, amount)
+        }
+        ExecuteMsg::UpdateDEXWhitelistedDenoms {
+            denom,
+            whitelisted_denoms,
+        } => update_dex_whitelisted_denoms(env, denom, whitelisted_denoms),
     }
 }
 
@@ -169,6 +177,43 @@ fn cancel_orders_by_denom(
         .add_message(CosmosMsg::Any(cancel_orders_by_denom.to_any())))
 }
 
+fn update_dex_unified_ref_amount(
+    env: Env,
+    denom: String,
+    amount: String,
+) -> Result<Response, ContractError> {
+    let dex_unified_ref_amount = MsgUpdateDexUnifiedRefAmount {
+        sender: env.contract.address.to_string(),
+        denom: denom.clone(),
+        unified_ref_amount: amount.clone(),
+    };
+
+    Ok(Response::new()
+        .add_attribute("method", "dex_unified_ref_amount")
+        .add_attribute("sender", env.contract.address.to_string())
+        .add_attribute("unified_ref_amount", amount)
+        .add_message(CosmosMsg::Any(dex_unified_ref_amount.to_any())))
+}
+
+fn update_dex_whitelisted_denoms(
+    env: Env,
+    denom: String,
+    whitelisted_denoms: Vec<String>,
+) -> Result<Response, ContractError> {
+    let update_dex_whitelisted_denoms = MsgUpdateDexWhitelistedDenoms {
+        sender: env.contract.address.to_string(),
+        denom: denom.clone(),
+        whitelisted_denoms: whitelisted_denoms.clone(),
+    };
+
+    Ok(Response::new()
+        .add_attribute("method", "update_dex_whitelisted_denoms")
+        .add_attribute("sender", env.contract.address.to_string())
+        .add_attribute("account", denom)
+        .add_attribute("whitelisted_denoms", whitelisted_denoms.join(","))
+        .add_message(CosmosMsg::Any(update_dex_whitelisted_denoms.to_any())))
+}
+
 // ********** Queries **********
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
@@ -190,6 +235,12 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::AccountDenomOrdersCount { account, denom } => {
             to_json_binary(&query_account_denom_orders_count(deps, account, denom)?)
         }
+        QueryMsg::DEXSettings { denom } => {
+            to_json_binary(&query_dex_settings(deps, denom)?)
+        }
+        QueryMsg::Balance { account, denom } => {
+            to_json_binary(&query_balance(deps, account, denom)?)
+        }
     }
 }
 
@@ -311,3 +362,20 @@ fn query_account_denom_orders_count(
     let request = QueryAccountDenomOrdersCountRequest { account, denom };
     request.query(&deps.querier)
 }
+
+fn query_dex_settings(
+    deps: Deps,
+    denom: String,
+) -> StdResult<QueryDexSettingsResponse> {
+    let request = QueryDexSettingsRequest { denom };
+    request.query(&deps.querier)
+}
+
+fn query_balance(
+    deps: Deps,
+    account: String,
+    denom: String,
+) -> StdResult<QueryBalanceResponse> {
+    let request = QueryBalanceRequest { account, denom };
+    request.query(&deps.querier)
+}
diff --git a/integration-tests/contracts/modules/dex/src/msg.rs b/integration-tests/contracts/modules/dex/src/msg.rs
index 4c39828a6..6840051a2 100644
--- a/integration-tests/contracts/modules/dex/src/msg.rs
+++ b/integration-tests/contracts/modules/dex/src/msg.rs
@@ -1,5 +1,5 @@
 use coreum_wasm_sdk::types::coreum::asset::ft::v1::{DexSettings, ExtensionIssueSettings};
-use coreum_wasm_sdk::types::coreum::dex::v1::{MsgPlaceOrder, Order};
+use coreum_wasm_sdk::types::coreum::dex::v1::MsgPlaceOrder;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Uint128;
 
@@ -21,9 +21,26 @@ pub struct InstantiateMsg {
 
 #[cw_serde]
 pub enum ExecuteMsg {
-    PlaceOrder { order: MsgPlaceOrder },
-    CancelOrder { order_id: String },
-    CancelOrdersByDenom { account: String, denom: String },
+    PlaceOrder {
+        order: MsgPlaceOrder,
+    },
+    CancelOrder {
+        order_id: String,
+    },
+    CancelOrdersByDenom {
+        account: String,
+        denom: String,
+    },
+    #[serde(rename = "update_dex_unified_ref_amount")]
+    UpdateDEXUnifiedRefAmount {
+        denom: String,
+        amount: String,
+    },
+    #[serde(rename = "update_dex_whitelisted_denoms")]
+    UpdateDEXWhitelistedDenoms {
+        denom: String,
+        whitelisted_denoms: Vec<String>,
+    },
 }
 
 #[cw_serde]
@@ -46,4 +63,12 @@ pub enum QueryMsg {
         account: String,
         denom: String,
     },
+    #[serde(rename = "dex_settings")]
+    DEXSettings {
+        denom: String,
+    },
+    Balance {
+        account: String,
+        denom: String,
+    },
 }
diff --git a/integration-tests/modules/wasm_test.go b/integration-tests/modules/wasm_test.go
index ebfc3c42a..ccb9b7042 100644
--- a/integration-tests/modules/wasm_test.go
+++ b/integration-tests/modules/wasm_test.go
@@ -64,6 +64,14 @@ const (
 	acceptNftOffer authzNFTMethod = "accept_nft_offer"
 )
 
+// fungible token wasm models
+//
+//nolint:tagliatelle
+type ftDEXSettings struct {
+	UnifiedRefAmount  string   `json:"unified_ref_amount"`
+	WhitelistedDenoms []string `json:"whitelisted_denoms"`
+}
+
 // fungible token wasm models
 //
 //nolint:tagliatelle
@@ -79,7 +87,7 @@ type issueFTRequest struct {
 	URI                string                               `json:"uri"`
 	URIHash            string                               `json:"uri_hash"`
 	ExtensionSettings  *assetfttypes.ExtensionIssueSettings `json:"extension_settings"`
-	DexSettings        *assetfttypes.DEXSettings            `json:"dex_settings"`
+	DEXSettings        *ftDEXSettings                       `json:"dex_settings"`
 }
 
 // fungible token wasm models
@@ -134,24 +142,44 @@ type cancelOrdersByDenomBodyDEXRequest struct {
 	Denom   string `json:"denom"`
 }
 
+type updateDEXUnifiedRefAmountRequest struct {
+	Denom  string `json:"denom"`
+	Amount string `json:"amount"`
+}
+
+//nolint:tagliatelle
+type updateDEXWhitelistedDenoms struct {
+	Denom             string   `json:"denom"`
+	WhitelistedDenoms []string `json:"whitelisted_denoms"`
+}
+
 //nolint:tagliatelle
-type OrderBodyDEXRequest struct {
+type orderBodyDEXRequest struct {
 	Account string `json:"acc"`
 	OrderID string `json:"order_id"`
 }
 
-type OrdersBodyDEXRequest struct {
+type ordersBodyDEXRequest struct {
 	Creator string `json:"creator"`
 }
 
 //nolint:tagliatelle
-type OrderBookOrdersBodyDEXRequest struct {
+type orderBookOrdersBodyDEXRequest struct {
 	BaseDenom  string        `json:"base_denom"`
 	QuoteDenom string        `json:"quote_denom"`
 	Side       dextypes.Side `json:"side"`
 }
 
-type AccountDenomOrdersCountBodyDEXRequest struct {
+type accountDenomOrdersCountBodyDEXRequest struct {
+	Account string `json:"account"`
+	Denom   string `json:"denom"`
+}
+
+type dexSettingsDEXRequest struct {
+	Denom string `json:"denom"`
+}
+
+type balanceDEXRequest struct {
 	Account string `json:"account"`
 	Denom   string `json:"denom"`
 }
@@ -186,9 +214,11 @@ type dexMethod string
 
 const (
 	// tx.
-	dexMethodPlaceOrder          dexMethod = "place_order"
-	dexMethodCancelOrder         dexMethod = "cancel_order"
-	dexMethodCancelOrdersByDenom dexMethod = "cancel_orders_by_denom"
+	dexMethodPlaceOrder                 dexMethod = "place_order"
+	dexMethodCancelOrder                dexMethod = "cancel_order"
+	dexMethodCancelOrdersByDenom        dexMethod = "cancel_orders_by_denom"
+	dexMethodUpdateDEXUnifiedRefAmount  dexMethod = "update_dex_unified_ref_amount"
+	dexMethodUpdateDEXWhitelistedDenoms dexMethod = "update_dex_whitelisted_denoms"
 	// query.
 	dexMethodParams                  dexMethod = "params"
 	dexMethodOrder                   dexMethod = "order"
@@ -196,6 +226,8 @@ const (
 	dexMethodOrderBooks              dexMethod = "order_books"
 	dexMethodOrderBookOrders         dexMethod = "order_book_orders"
 	dexMethodAccountDenomOrdersCount dexMethod = "account_denom_orders_count"
+	dexMethodDEXSettings             dexMethod = "dex_settings"
+	dexMethodBalance                 dexMethod = "balance"
 )
 
 // TestContractInstantiation tests contract instantiation using two instantiation methods.
@@ -1797,11 +1829,11 @@ func TestWASMFungibleTokenInContractLegacy(t *testing.T) {
 
 	// ********** Params **********
 
-	paramsPayLoad, err := json.Marshal(map[ftMethod]struct{}{
+	paramsPayload, err := json.Marshal(map[ftMethod]struct{}{
 		ftMethodParams: {},
 	})
 	requireT.NoError(err)
-	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayLoad)
+	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayload)
 	requireT.NoError(err)
 	var wasmParamsRes assetfttypes.QueryParamsResponse
 	requireT.NoError(json.Unmarshal(queryOut, &wasmParamsRes))
@@ -2931,11 +2963,11 @@ func TestWASMNonFungibleTokenInContractLegacy(t *testing.T) {
 
 	// ********** Params **********
 
-	paramsPayLoad, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
+	paramsPayload, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
 		moduleswasm.NftMethodParams: {},
 	})
 	requireT.NoError(err)
-	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayLoad)
+	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayload)
 	requireT.NoError(err)
 	var wasmParamsRes assetnfttypes.QueryParamsResponse
 	requireT.NoError(json.Unmarshal(queryOut, &wasmParamsRes))
@@ -3066,11 +3098,11 @@ func TestWASMNonFungibleTokenInContractLegacy(t *testing.T) {
 	_, err = chain.Wasm.ExecuteWASMContract(ctx, txf, admin, contractAddr, classFreezePayload, sdk.Coin{})
 	requireT.NoError(err)
 
-	classFrozenAccountsPayLoad, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
+	classFrozenAccountsPayload, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
 		moduleswasm.NftMethodClassFrozenAccounts: {},
 	})
 	requireT.NoError(err)
-	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, classFrozenAccountsPayLoad)
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, classFrozenAccountsPayload)
 	requireT.NoError(err)
 	var classFrozenAccountsQueryRes assetnfttypes.QueryClassFrozenAccountsResponse
 	requireT.NoError(json.Unmarshal(queryOut, &classFrozenAccountsQueryRes))
@@ -3117,11 +3149,11 @@ func TestWASMNonFungibleTokenInContractLegacy(t *testing.T) {
 	_, err = chain.Wasm.ExecuteWASMContract(ctx, txf, admin, contractAddr, addToClassWhitelistPayload, sdk.Coin{})
 	requireT.NoError(err)
 
-	classWhitelistedAccountsPayLoad, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
+	classWhitelistedAccountsPayload, err := json.Marshal(map[moduleswasm.NftMethod]struct{}{
 		moduleswasm.NftMethodClassWhitelistedAccounts: {},
 	})
 	requireT.NoError(err)
-	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, classWhitelistedAccountsPayLoad)
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, classWhitelistedAccountsPayload)
 	requireT.NoError(err)
 	var classWhitelistedAccountsQueryRes assetnfttypes.QueryClassWhitelistedAccountsResponse
 	requireT.NoError(json.Unmarshal(queryOut, &classWhitelistedAccountsQueryRes))
@@ -3632,7 +3664,6 @@ func TestWASMDEXInContract(t *testing.T) {
 	clientCtx := chain.ClientContext
 	txf := chain.TxFactoryAuto()
 	bankClient := banktypes.NewQueryClient(clientCtx)
-	assetftClient := assetfttypes.NewQueryClient(clientCtx)
 	tmQueryClient := cmtservice.NewServiceClient(chain.ClientContext)
 
 	dexParms := chain.QueryDEXParams(ctx, t)
@@ -3672,10 +3703,6 @@ func TestWASMDEXInContract(t *testing.T) {
 	requireT.NoError(err)
 	denom1 := assetfttypes.BuildDenom(issueMsg.Subunit, issuer)
 
-	// Issue another fungible token using smart contract
-	burnRate := "1000000000000000000"           // LegacyDec has 18 decimal positions, so here we are passing 1e19= 100%
-	sendCommissionRate := "1000000000000000000" // LegacyDec has 18 decimal positions, so here we are passing 1e19 = 100%
-
 	issuanceAmount := sdkmath.NewInt(10_000_000)
 	issuanceReq := issueFTRequest{
 		Symbol:        "ABC2",
@@ -3688,10 +3715,14 @@ func TestWASMDEXInContract(t *testing.T) {
 			assetfttypes.Feature_dex_order_cancellation,
 			assetfttypes.Feature_dex_unified_ref_amount_change,
 		},
-		BurnRate:           burnRate,
-		SendCommissionRate: sendCommissionRate,
+		BurnRate:           sdkmath.LegacyMustNewDecFromStr("1").BigInt().String(),
+		SendCommissionRate: sdkmath.LegacyMustNewDecFromStr("1").BigInt().String(),
 		URI:                "https://example.com",
 		URIHash:            "1234567890abcdef",
+		DEXSettings: &ftDEXSettings{
+			UnifiedRefAmount:  sdkmath.LegacyMustNewDecFromStr("150").BigInt().String(),
+			WhitelistedDenoms: []string{denom1},
+		},
 	}
 	issuerFTInstantiatePayload, err := json.Marshal(issuanceReq)
 	requireT.NoError(err)
@@ -3741,13 +3772,13 @@ func TestWASMDEXInContract(t *testing.T) {
 	blockRes, err := tmQueryClient.GetLatestBlock(ctx, &cmtservice.GetLatestBlockRequest{})
 	requireT.NoError(err)
 
-	// ********** Query Params **********
+	// ********** Query params **********
 
-	paramsPayLoad, err := json.Marshal(map[dexMethod]struct{}{
+	paramsPayload, err := json.Marshal(map[dexMethod]struct{}{
 		dexMethodParams: {},
 	})
 	requireT.NoError(err)
-	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayLoad)
+	queryOut, err := chain.Wasm.QueryWASMContract(ctx, contractAddr, paramsPayload)
 	requireT.NoError(err)
 	var wasmParamsRes dextypes.QueryParamsResponse
 	requireT.NoError(json.Unmarshal(queryOut, &wasmParamsRes))
@@ -3761,6 +3792,55 @@ func TestWASMDEXInContract(t *testing.T) {
 		dexParms.PriceTickExponent, wasmParamsRes.Params.PriceTickExponent,
 	)
 
+	// ********** Query and update asset FT DEX settings **********
+
+	dexSettingsPayload, err := json.Marshal(map[dexMethod]dexSettingsDEXRequest{
+		dexMethodDEXSettings: {
+			denom2,
+		},
+	})
+	requireT.NoError(err)
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, dexSettingsPayload)
+	requireT.NoError(err)
+	//nolint:tagliatelle
+	var dexSettingsRes struct {
+		DEXSettings ftDEXSettings `json:"dex_settings"`
+	}
+	requireT.NoError(json.Unmarshal(queryOut, &dexSettingsRes))
+	requireT.Equal(*issuanceReq.DEXSettings, dexSettingsRes.DEXSettings)
+
+	newUnifiedRefAmount := sdkmath.LegacyMustNewDecFromStr("19000")
+	updateDEXUnifiedRefAmountPayload, err := json.Marshal(map[dexMethod]updateDEXUnifiedRefAmountRequest{
+		dexMethodUpdateDEXUnifiedRefAmount: {
+			Denom:  denom2,
+			Amount: newUnifiedRefAmount.BigInt().String(),
+		},
+	})
+	requireT.NoError(err)
+	_, err = chain.Wasm.ExecuteWASMContract(ctx, txf, admin, contractAddr, updateDEXUnifiedRefAmountPayload, sdk.Coin{})
+	requireT.NoError(err)
+
+	newWhitelistedDenoms := []string{denom1, chain.ChainSettings.Denom}
+	updateDEXWhitelistedDenomsPayload, err := json.Marshal(map[dexMethod]updateDEXWhitelistedDenoms{
+		dexMethodUpdateDEXWhitelistedDenoms: {
+			Denom:             denom2,
+			WhitelistedDenoms: newWhitelistedDenoms,
+		},
+	})
+	requireT.NoError(err)
+	_, err = chain.Wasm.ExecuteWASMContract(ctx, txf, admin, contractAddr, updateDEXWhitelistedDenomsPayload, sdk.Coin{})
+	requireT.NoError(err)
+
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, dexSettingsPayload)
+	requireT.NoError(err)
+	requireT.NoError(json.Unmarshal(queryOut, &dexSettingsRes))
+	requireT.Equal(
+		ftDEXSettings{
+			UnifiedRefAmount:  newUnifiedRefAmount.BigInt().String(),
+			WhitelistedDenoms: newWhitelistedDenoms,
+		}, dexSettingsRes.DEXSettings,
+	)
+
 	// ********** Place Order **********
 
 	orderQuantity := sdkmath.NewInt(100)
@@ -3787,16 +3867,22 @@ func TestWASMDEXInContract(t *testing.T) {
 	_, err = chain.Wasm.ExecuteWASMContract(ctx, txf, admin, contractAddr, placeOrderPayload, sdk.Coin{})
 	requireT.NoError(err)
 
-	assetftBalanceRes, err := assetftClient.Balance(ctx, &assetfttypes.QueryBalanceRequest{
-		Account: contractAddr,
-		Denom:   denom1,
+	balancePayload, err := json.Marshal(map[dexMethod]balanceDEXRequest{
+		dexMethodBalance: {
+			Account: contractAddr,
+			Denom:   denom1,
+		},
 	})
 	requireT.NoError(err)
-	requireT.Equal(orderQuantity.String(), assetftBalanceRes.LockedInDEX.String())
+	queryOut, err = chain.Wasm.QueryWASMContract(ctx, contractAddr, balancePayload)
+	requireT.NoError(err)
+	var ftBalanceRes assetfttypes.QueryBalanceResponse
+	requireT.NoError(json.Unmarshal(queryOut, &ftBalanceRes))
+	requireT.Equal(orderQuantity.String(), ftBalanceRes.LockedInDEX.String())
 
 	// ********** Query Order **********
 
-	orderPayload, err := json.Marshal(map[dexMethod]OrderBodyDEXRequest{
+	orderPayload, err := json.Marshal(map[dexMethod]orderBodyDEXRequest{
 		dexMethodOrder: {
 			Account: contractAddr,
 			OrderID: "id1",
@@ -3830,7 +3916,7 @@ func TestWASMDEXInContract(t *testing.T) {
 
 	// ********** Query Orders **********
 
-	ordersPayload, err := json.Marshal(map[dexMethod]OrdersBodyDEXRequest{
+	ordersPayload, err := json.Marshal(map[dexMethod]ordersBodyDEXRequest{
 		dexMethodOrders: {
 			Creator: contractAddr,
 		},
@@ -3864,7 +3950,7 @@ func TestWASMDEXInContract(t *testing.T) {
 
 	// ********** Query Order Book Orders **********
 
-	orderBookOrdersPayload, err := json.Marshal(map[dexMethod]OrderBookOrdersBodyDEXRequest{
+	orderBookOrdersPayload, err := json.Marshal(map[dexMethod]orderBookOrdersBodyDEXRequest{
 		dexMethodOrderBookOrders: {
 			BaseDenom:  denom1,
 			QuoteDenom: denom2,
@@ -3883,7 +3969,7 @@ func TestWASMDEXInContract(t *testing.T) {
 
 	// ********** Query Account Denom Orders Count **********
 
-	accountDenomOrdersCountPayload, err := json.Marshal(map[dexMethod]AccountDenomOrdersCountBodyDEXRequest{
+	accountDenomOrdersCountPayload, err := json.Marshal(map[dexMethod]accountDenomOrdersCountBodyDEXRequest{
 		dexMethodAccountDenomOrdersCount: {
 			Account: contractAddr,
 			Denom:   denom1,
diff --git a/proto/coreum/asset/ft/v1/query.proto b/proto/coreum/asset/ft/v1/query.proto
index 6272d0955..81d213e7b 100644
--- a/proto/coreum/asset/ft/v1/query.proto
+++ b/proto/coreum/asset/ft/v1/query.proto
@@ -15,11 +15,13 @@ option go_package = "github.com/CoreumFoundation/coreum/v5/x/asset/ft/types";
 service Query {
   // Params queries the parameters of x/asset/ft module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/params";
   }
 
   // Tokens queries the fungible tokens of the module.
   rpc Tokens(QueryTokensRequest) returns (QueryTokensResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/tokens";
   }
 
@@ -31,16 +33,19 @@ service Query {
 
   // TokenUpgradeStatuses returns token upgrades info.
   rpc TokenUpgradeStatuses(QueryTokenUpgradeStatusesRequest) returns (QueryTokenUpgradeStatusesResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/tokens/{denom}/upgrade-statuses";
   }
 
   // Balance returns balance of the denom for the account.
   rpc Balance(QueryBalanceRequest) returns (QueryBalanceResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/accounts/{account}/balances/summary/{denom}";
   }
 
   // FrozenBalances returns all the frozen balances for the account.
   rpc FrozenBalances(QueryFrozenBalancesRequest) returns (QueryFrozenBalancesResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/accounts/{account}/balances/frozen";
   }
 
@@ -52,6 +57,7 @@ service Query {
 
   // WhitelistedBalances returns all the whitelisted balances for the account.
   rpc WhitelistedBalances(QueryWhitelistedBalancesRequest) returns (QueryWhitelistedBalancesResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/accounts/{account}/balances/whitelisted";
   }
 
@@ -63,6 +69,7 @@ service Query {
 
   // DEXSettings returns DEX settings of the denom.
   rpc DEXSettings(QueryDEXSettingsRequest) returns (QueryDEXSettingsResponse) {
+    option (cosmos.query.v1.module_query_safe) = true;
     option (google.api.http).get = "/coreum/asset/ft/v1/tokens/{denom}/dex-settings";
   }
 }
diff --git a/proto/coreum/asset/ft/v1/token.proto b/proto/coreum/asset/ft/v1/token.proto
index 5f1cd7934..d251dd2b2 100644
--- a/proto/coreum/asset/ft/v1/token.proto
+++ b/proto/coreum/asset/ft/v1/token.proto
@@ -105,7 +105,7 @@ message TokenUpgradeStatuses {
 
 // DEXSettings defines the token settings of the dex.
 message DEXSettings {
-  // unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size
+  // unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size
   string unified_ref_amount = 1 [(gogoproto.customtype) = "cosmossdk.io/math.LegacyDec"];
   // whitelisted_denoms is the list of denoms to trade with.
   repeated string whitelisted_denoms = 2;
diff --git a/proto/coreum/asset/ft/v1/tx.proto b/proto/coreum/asset/ft/v1/tx.proto
index 1ac663aea..f074c5229 100644
--- a/proto/coreum/asset/ft/v1/tx.proto
+++ b/proto/coreum/asset/ft/v1/tx.proto
@@ -243,7 +243,7 @@ message MsgUpdateDEXUnifiedRefAmount {
 
   string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string denom = 2;
-  // unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size
+  // unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size
   string unified_ref_amount = 3 [
     (gogoproto.nullable) = false,
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec"
diff --git a/proto/coreum/dex/v1/params.proto b/proto/coreum/dex/v1/params.proto
index 331b90bce..ff58c844a 100644
--- a/proto/coreum/dex/v1/params.proto
+++ b/proto/coreum/dex/v1/params.proto
@@ -8,7 +8,7 @@ option go_package = "github.com/CoreumFoundation/coreum/v5/x/dex/types";
 
 // Params keeps gov manageable parameters.
 message Params {
-  // default_unified_ref_amount is the default approximate amount you need to by 1USD, used to for tokens without custom value
+  // default_unified_ref_amount is the default approximate amount you need to buy 1USD, used to for tokens without custom value
   string default_unified_ref_amount = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec"
diff --git a/x/asset/ft/client/cli/tx.go b/x/asset/ft/client/cli/tx.go
index f09471121..57065b668 100644
--- a/x/asset/ft/client/cli/tx.go
+++ b/x/asset/ft/client/cli/tx.go
@@ -252,7 +252,7 @@ $ %s tx %s issue WBTC wsatoshi 8 100000 "Wrapped Bitcoin Token" --from [issuer]
 	//nolint:lll // breaking this down will make it look worse when printed to user screen.
 	cmd.Flags().String(ExtensionIssuanceMsgFlag, "{}", "Optional json encoded data to pass to WASM on instantiation by the ft issuer.")
 	//nolint:lll // breaking this down will make it look worse when printed to user screen.
-	cmd.Flags().String(DEXUnifiedRefAmountFlag, "", "DEX unified ref amount is the approximate amount you need to by 1USD, used to define the price tick size.")
+	cmd.Flags().String(DEXUnifiedRefAmountFlag, "", "DEX unified ref amount is the approximate amount you need to buy 1USD, used to define the price tick size.")
 
 	flags.AddTxFlagsToCmd(cmd)
 
diff --git a/x/asset/ft/keeper/grpc_query.go b/x/asset/ft/keeper/grpc_query.go
index 24208461f..8e259657f 100644
--- a/x/asset/ft/keeper/grpc_query.go
+++ b/x/asset/ft/keeper/grpc_query.go
@@ -127,7 +127,7 @@ func (qs QueryService) Balance(
 	denom := req.GetDenom()
 	vestingLocked := qs.bankKeeper.LockedCoins(ctx, account).AmountOf(denom)
 	dexLocked := qs.keeper.GetDEXLockedBalance(sdk.UnwrapSDKContext(ctx), account, denom).Amount
-	expectedToReceiveInDex := qs.keeper.GetDEXExpectedToReceivedBalance(
+	expectedToReceiveInDEX := qs.keeper.GetDEXExpectedToReceivedBalance(
 		sdk.UnwrapSDKContext(ctx), account, denom,
 	).Amount
 
@@ -145,7 +145,7 @@ func (qs QueryService) Balance(
 		Locked:                 vestingLocked.Add(dexLocked),
 		LockedInVesting:        vestingLocked,
 		LockedInDEX:            dexLocked,
-		ExpectedToReceiveInDEX: expectedToReceiveInDex,
+		ExpectedToReceiveInDEX: expectedToReceiveInDEX,
 	}, nil
 }
 
diff --git a/x/asset/ft/types/query.pb.go b/x/asset/ft/types/query.pb.go
index d9afccfbe..efd9f6d78 100644
--- a/x/asset/ft/types/query.pb.go
+++ b/x/asset/ft/types/query.pb.go
@@ -1030,83 +1030,83 @@ func init() {
 func init() { proto.RegisterFile("coreum/asset/ft/v1/query.proto", fileDescriptor_e9fe336d9bdb8f05) }
 
 var fileDescriptor_e9fe336d9bdb8f05 = []byte{
-	// 1208 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x1b, 0x45,
-	0x14, 0xcf, 0xa6, 0x89, 0x53, 0x26, 0x04, 0xd4, 0x49, 0x08, 0xee, 0xb6, 0xd8, 0x61, 0x05, 0x69,
-	0x28, 0xcd, 0x0e, 0x49, 0x9a, 0x26, 0xa8, 0xa2, 0x05, 0xe7, 0xa3, 0x0a, 0x41, 0xc2, 0xb8, 0x85,
-	0x54, 0x08, 0x29, 0xda, 0x78, 0x27, 0xce, 0x2a, 0xf1, 0x8e, 0xeb, 0x19, 0x1b, 0x87, 0x2a, 0x1c,
-	0xe0, 0x00, 0xc7, 0x4a, 0x1c, 0x38, 0x73, 0xe0, 0xd2, 0x13, 0x9c, 0xb9, 0x70, 0x41, 0xea, 0xad,
-	0x95, 0xe0, 0x80, 0x38, 0x04, 0x94, 0x20, 0xf1, 0x6f, 0xa0, 0x9d, 0x79, 0xeb, 0xdd, 0xc5, 0xbb,
-	0xfe, 0x08, 0x11, 0x12, 0xa7, 0x78, 0x67, 0xdf, 0xef, 0xe3, 0xcd, 0x7b, 0xb3, 0xf3, 0x14, 0x94,
-	0x29, 0xb2, 0x2a, 0xad, 0x95, 0x89, 0xc5, 0x39, 0x15, 0x64, 0x5b, 0x90, 0xfa, 0x0c, 0xb9, 0x57,
-	0xa3, 0xd5, 0x7d, 0xb3, 0x52, 0x65, 0x82, 0x61, 0xac, 0xde, 0x9b, 0xf2, 0xbd, 0xb9, 0x2d, 0xcc,
-	0xfa, 0x8c, 0x9e, 0x8d, 0xc1, 0x54, 0xac, 0xaa, 0x55, 0xe6, 0x0a, 0xa4, 0xc7, 0x91, 0x0a, 0xb6,
-	0x4b, 0x5d, 0x78, 0x7f, 0xb9, 0xc8, 0x78, 0x99, 0x71, 0xb2, 0x65, 0x71, 0xaa, 0xd4, 0x48, 0x7d,
-	0x66, 0x8b, 0x0a, 0xcb, 0xe3, 0x29, 0x39, 0xae, 0x25, 0x1c, 0xe6, 0x06, 0x5c, 0x41, 0xac, 0x1f,
-	0x55, 0x64, 0x8e, 0xff, 0xfe, 0x02, 0xbc, 0xf7, 0x69, 0xc2, 0xee, 0xf5, 0xb1, 0x12, 0x2b, 0x31,
-	0xf9, 0x93, 0x78, 0xbf, 0x60, 0xf5, 0x62, 0x89, 0xb1, 0xd2, 0x1e, 0x25, 0x56, 0xc5, 0x21, 0x96,
-	0xeb, 0x32, 0x21, 0xf5, 0xc0, 0xbc, 0x31, 0x86, 0xf0, 0x7b, 0x1e, 0x45, 0x5e, 0x66, 0x54, 0xa0,
-	0xf7, 0x6a, 0x94, 0x0b, 0xe3, 0x5d, 0x34, 0x1a, 0x59, 0xe5, 0x15, 0xe6, 0x72, 0x8a, 0x17, 0x51,
-	0x4a, 0x65, 0x9e, 0xd6, 0x26, 0xb4, 0xa9, 0xe1, 0x59, 0xdd, 0x6c, 0xdd, 0x2f, 0x53, 0x61, 0x72,
-	0x03, 0x8f, 0x0e, 0xb3, 0x7d, 0x05, 0x88, 0x37, 0x5e, 0x41, 0xe7, 0x24, 0xe1, 0x1d, 0x6f, 0x5f,
-	0x40, 0x05, 0x8f, 0xa1, 0x41, 0x9b, 0xba, 0xac, 0x2c, 0xd9, 0x9e, 0x2a, 0xa8, 0x07, 0x63, 0x1d,
-	0x1c, 0x41, 0x28, 0x48, 0xcf, 0xa3, 0x41, 0xb9, 0xa7, 0xa0, 0x7c, 0x3e, 0x4e, 0x59, 0x22, 0x40,
-	0x58, 0x45, 0x1b, 0x8b, 0x68, 0x22, 0x20, 0x7b, 0xbf, 0x52, 0xaa, 0x5a, 0x36, 0xbd, 0x2d, 0x2c,
-	0x51, 0xe3, 0x94, 0xb7, 0xb7, 0xc1, 0xd0, 0x8b, 0x6d, 0x90, 0xe0, 0xea, 0x6d, 0x74, 0x96, 0xc3,
-	0x1a, 0x18, 0x9b, 0x4a, 0x34, 0xf6, 0x0f, 0x0e, 0xf0, 0xd9, 0xc4, 0x1b, 0x22, 0x9c, 0x77, 0xd3,
-	0xdc, 0x2a, 0x42, 0x41, 0x93, 0x80, 0xc6, 0xa4, 0xa9, 0xba, 0xc0, 0xf4, 0xba, 0xc4, 0x54, 0x1d,
-	0x00, 0xbd, 0x62, 0xe6, 0xad, 0x12, 0x05, 0x6c, 0x21, 0x84, 0xc4, 0xe3, 0x28, 0xe5, 0x70, 0x5e,
-	0xa3, 0xd5, 0x74, 0xbf, 0xcc, 0x12, 0x9e, 0x8c, 0xaf, 0x35, 0x28, 0xb5, 0x2f, 0x0b, 0x99, 0xdd,
-	0x8a, 0xd1, 0xbd, 0xd4, 0x51, 0x57, 0x81, 0x23, 0xc2, 0x0b, 0x28, 0x25, 0x4b, 0xc1, 0xd3, 0xfd,
-	0x13, 0x67, 0xba, 0xa9, 0x1c, 0x84, 0x1b, 0x2b, 0x60, 0x2c, 0x67, 0xed, 0x59, 0x6e, 0xd1, 0x4f,
-	0x0a, 0xa7, 0xd1, 0x90, 0x55, 0x2c, 0xb2, 0x9a, 0x2b, 0xa0, 0x5e, 0xfe, 0x63, 0x50, 0xc7, 0xfe,
-	0x70, 0x1d, 0x1f, 0x0c, 0xa0, 0xb1, 0x28, 0x0f, 0x64, 0xb8, 0x80, 0x86, 0xb6, 0xd4, 0x92, 0x22,
-	0xca, 0xbd, 0xe0, 0xc9, 0xff, 0x76, 0x98, 0x7d, 0x4e, 0x65, 0xc9, 0xed, 0x5d, 0xd3, 0x61, 0xa4,
-	0x6c, 0x89, 0x1d, 0x73, 0xcd, 0x15, 0x05, 0x3f, 0x1a, 0xdf, 0x44, 0xc3, 0x1f, 0xef, 0x38, 0x82,
-	0xee, 0x39, 0x5c, 0x50, 0x5b, 0xa9, 0x75, 0x02, 0x87, 0x11, 0x78, 0x1e, 0xa5, 0xb6, 0xab, 0xec,
-	0x13, 0xea, 0xa6, 0xcf, 0x74, 0x83, 0x85, 0x60, 0x0f, 0xb6, 0xc7, 0x8a, 0xbb, 0xd4, 0x4e, 0x0f,
-	0x74, 0x05, 0x53, 0xc1, 0x78, 0x0d, 0x9d, 0x53, 0xbf, 0x36, 0x1d, 0x77, 0xb3, 0x4e, 0xb9, 0x70,
-	0xdc, 0x52, 0x7a, 0xb0, 0x1b, 0x86, 0x67, 0x15, 0x6e, 0xcd, 0xfd, 0x40, 0xa1, 0x70, 0x1e, 0x8d,
-	0x04, 0x54, 0x36, 0x6d, 0xa4, 0x53, 0x92, 0xe6, 0x4a, 0x5b, 0x9a, 0xa3, 0xc3, 0xec, 0xf0, 0x3b,
-	0x40, 0xb4, 0xbc, 0x72, 0xb7, 0x30, 0xec, 0xb3, 0x2e, 0xd3, 0x06, 0xe6, 0x48, 0xa7, 0x8d, 0x0a,
-	0x2d, 0x0a, 0x6a, 0x6f, 0x0a, 0xb6, 0x59, 0xa5, 0x45, 0xea, 0xd4, 0xa9, 0x4f, 0x3f, 0x24, 0xe9,
-	0x17, 0x3a, 0xd1, 0x8f, 0xaf, 0x00, 0xc5, 0x1d, 0x56, 0x50, 0x04, 0x4a, 0x69, 0x9c, 0xc6, 0xac,
-	0xd3, 0x86, 0xf1, 0x29, 0xd2, 0x65, 0x47, 0xac, 0xca, 0x7d, 0x85, 0xbe, 0x38, 0xf5, 0x13, 0x17,
-	0x6a, 0xd4, 0xfe, 0x48, 0xa3, 0x1a, 0x8f, 0x35, 0x74, 0x21, 0xd6, 0xc0, 0x69, 0x9f, 0xbd, 0x12,
-	0x3a, 0x0b, 0x4d, 0x1b, 0x3e, 0x7d, 0x01, 0x8d, 0x4f, 0xb0, 0xc4, 0x1c, 0x37, 0xf7, 0x9a, 0xb7,
-	0xcd, 0x0f, 0x7f, 0xcf, 0x4e, 0x95, 0x1c, 0xb1, 0x53, 0xdb, 0x32, 0x8b, 0xac, 0x4c, 0xe0, 0xb6,
-	0x51, 0x7f, 0xa6, 0xb9, 0xbd, 0x4b, 0xc4, 0x7e, 0x85, 0x72, 0x09, 0xe0, 0x85, 0x26, 0xb9, 0xb1,
-	0x8e, 0xce, 0xb7, 0x26, 0x74, 0xd2, 0x13, 0xbb, 0x11, 0x57, 0x9e, 0xe6, 0xe6, 0xbc, 0x1e, 0x3d,
-	0xb6, 0x6d, 0x53, 0x52, 0x1f, 0x14, 0x3f, 0xde, 0xf8, 0x5c, 0x43, 0x59, 0xc9, 0xbc, 0x11, 0x1c,
-	0xc6, 0xff, 0xbe, 0xfa, 0xbf, 0x68, 0x70, 0x27, 0xc5, 0xba, 0xf8, 0xdf, 0xb6, 0x40, 0x1e, 0x65,
-	0x12, 0xb2, 0x3a, 0x69, 0x1f, 0x7c, 0x94, 0x58, 0xad, 0xd3, 0x68, 0x06, 0x82, 0x9e, 0x97, 0xec,
-	0xcb, 0x2b, 0x77, 0x6f, 0x53, 0xe1, 0x7d, 0xde, 0x3a, 0x0c, 0x04, 0x1c, 0xa5, 0x5b, 0x01, 0xe0,
-	0x63, 0x03, 0x3d, 0x6d, 0xd3, 0xc6, 0x26, 0x87, 0x75, 0x30, 0x93, 0x8d, 0xbb, 0xea, 0x42, 0xf0,
-	0xdc, 0xa8, 0x67, 0xc9, 0xfb, 0x3e, 0x86, 0x39, 0x87, 0x6d, 0xda, 0xf0, 0x1f, 0x66, 0x1f, 0x8e,
-	0xa0, 0x41, 0xa9, 0x8a, 0x0f, 0x50, 0x4a, 0x4d, 0x56, 0x78, 0x32, 0x8e, 0xb6, 0x75, 0x88, 0xd3,
-	0x2f, 0x75, 0x8c, 0x53, 0xee, 0x0d, 0xe3, 0xb3, 0x9f, 0xff, 0xfc, 0xaa, 0xff, 0x22, 0xd6, 0x49,
-	0xe2, 0xa8, 0xeb, 0xc9, 0xab, 0x09, 0xa1, 0x8d, 0x7c, 0x64, 0x72, 0x69, 0x23, 0x1f, 0x1d, 0x35,
-	0xda, 0xcb, 0xab, 0x61, 0x00, 0x7f, 0xa1, 0xa1, 0x41, 0x09, 0xc3, 0x2f, 0xb7, 0xa7, 0xf5, 0xd5,
-	0x27, 0x3b, 0x85, 0x81, 0x38, 0xf9, 0xf2, 0xaf, 0xef, 0x2e, 0x6b, 0xd2, 0xc1, 0x4b, 0xd8, 0x48,
-	0x76, 0x40, 0xee, 0xcb, 0x2e, 0x38, 0xc0, 0x3f, 0x6a, 0x68, 0x2c, 0x6e, 0x9e, 0xc3, 0x57, 0xdb,
-	0x2b, 0xc6, 0x0f, 0x9f, 0xfa, 0x7c, 0x8f, 0x28, 0xb0, 0x7d, 0x5d, 0x3a, 0x9e, 0xc7, 0x73, 0x9d,
-	0x1d, 0x93, 0x9a, 0xe2, 0x98, 0xf6, 0x27, 0x4d, 0xfc, 0xad, 0x86, 0x86, 0xe0, 0x24, 0xe1, 0xe4,
-	0x2a, 0x45, 0x4f, 0xaf, 0x3e, 0xd5, 0x39, 0x10, 0xbc, 0xdd, 0x92, 0xde, 0xde, 0xc2, 0x37, 0xe3,
-	0xbc, 0xc1, 0x91, 0xe7, 0xe4, 0x3e, 0xfc, 0x3a, 0x20, 0xfe, 0x27, 0x84, 0xf0, 0x5a, 0xb9, 0x6c,
-	0x55, 0xf7, 0x9b, 0x5b, 0xfd, 0xbd, 0x86, 0x9e, 0x89, 0x5e, 0x91, 0xd8, 0x4c, 0x74, 0x11, 0x7b,
-	0x99, 0xeb, 0xa4, 0xeb, 0x78, 0x30, 0x7f, 0x43, 0x9a, 0x5f, 0xc4, 0xd7, 0x7a, 0x35, 0x0f, 0x43,
-	0xda, 0x0f, 0x1a, 0x1a, 0x89, 0x50, 0xe3, 0xe9, 0xee, 0x2c, 0xf8, 0x8e, 0xcd, 0x6e, 0xc3, 0xc1,
-	0xf0, 0x7a, 0xd0, 0xc0, 0x6f, 0xe2, 0x1b, 0x27, 0x73, 0xdd, 0xdc, 0xf1, 0x9f, 0x34, 0x34, 0x1a,
-	0x73, 0x2d, 0xe1, 0xb9, 0x44, 0x53, 0xc9, 0x57, 0xa9, 0x7e, 0xb5, 0x37, 0x10, 0xe4, 0xb3, 0x24,
-	0x53, 0x79, 0x03, 0x5f, 0xef, 0x35, 0x95, 0xf0, 0x84, 0xfd, 0x58, 0x43, 0xb8, 0x55, 0x04, 0xcf,
-	0xf6, 0xe0, 0xc8, 0xcf, 0x62, 0xae, 0x27, 0x0c, 0x24, 0x91, 0x0f, 0x8a, 0xb2, 0x82, 0x97, 0xfe,
-	0x45, 0x26, 0xcd, 0xca, 0x7c, 0xa3, 0xa1, 0xf0, 0x2d, 0x81, 0x5f, 0x4d, 0xb4, 0xd5, 0x7a, 0xa1,
-	0xe9, 0x57, 0xba, 0x0b, 0x06, 0xf3, 0x0b, 0xd2, 0xf7, 0x0c, 0x26, 0x5d, 0x7c, 0x5b, 0x6c, 0xda,
-	0x98, 0xf6, 0x6f, 0xbd, 0x5c, 0xfe, 0xd1, 0x51, 0x46, 0x7b, 0x72, 0x94, 0xd1, 0xfe, 0x38, 0xca,
-	0x68, 0x0f, 0x8e, 0x33, 0x7d, 0x4f, 0x8e, 0x33, 0x7d, 0xbf, 0x1e, 0x67, 0xfa, 0x3e, 0xbc, 0x16,
-	0x1a, 0x28, 0x96, 0x24, 0xe9, 0x2a, 0xab, 0xb9, 0xb6, 0x1c, 0x51, 0x7c, 0x95, 0xfa, 0x3c, 0x69,
-	0x04, 0x52, 0x72, 0xc8, 0xd8, 0x4a, 0xc9, 0x7f, 0x52, 0xcc, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff,
-	0xd7, 0xd2, 0x61, 0x1e, 0xb8, 0x11, 0x00, 0x00,
+	// 1213 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
+	0x14, 0xce, 0xa6, 0x89, 0x53, 0x26, 0x04, 0xd4, 0x49, 0x08, 0xee, 0xb6, 0xd8, 0x61, 0x05, 0x49,
+	0x28, 0xcd, 0x0e, 0x49, 0x9a, 0x26, 0x88, 0x1f, 0x2d, 0xce, 0x0f, 0x08, 0xa9, 0x84, 0x71, 0x0b,
+	0xa9, 0x10, 0x52, 0xb4, 0xf6, 0x4e, 0x9c, 0x55, 0xe2, 0x1d, 0xd7, 0x33, 0x36, 0x0e, 0x55, 0x39,
+	0x94, 0x03, 0x1c, 0x2b, 0x71, 0xe0, 0x3f, 0xe0, 0xd0, 0x13, 0x27, 0x2e, 0x9c, 0x91, 0x2a, 0x2e,
+	0xa9, 0x04, 0x07, 0xc4, 0x21, 0xa0, 0x04, 0x89, 0x7f, 0x03, 0xed, 0xcc, 0x5b, 0xef, 0x1a, 0xaf,
+	0xed, 0x75, 0x88, 0x90, 0x7a, 0xf2, 0xee, 0xec, 0xfb, 0xbe, 0xf7, 0x7d, 0x33, 0x6f, 0x66, 0x9e,
+	0x8c, 0x52, 0x05, 0x56, 0xa1, 0xd5, 0x12, 0xb1, 0x38, 0xa7, 0x82, 0x6c, 0x0b, 0x52, 0x9b, 0x25,
+	0x77, 0xaa, 0xb4, 0xb2, 0x6f, 0x96, 0x2b, 0x4c, 0x30, 0x8c, 0xd5, 0x77, 0x53, 0x7e, 0x37, 0xb7,
+	0x85, 0x59, 0x9b, 0xd5, 0xd3, 0x11, 0x98, 0xb2, 0x55, 0xb1, 0x4a, 0x5c, 0x81, 0xf4, 0x28, 0x52,
+	0xc1, 0x76, 0xa9, 0x0b, 0xdf, 0x2f, 0x15, 0x18, 0x2f, 0x31, 0x4e, 0xf2, 0x16, 0xa7, 0x2a, 0x1b,
+	0xa9, 0xcd, 0xe6, 0xa9, 0xb0, 0x3c, 0x9e, 0xa2, 0xe3, 0x5a, 0xc2, 0x61, 0x6e, 0xc0, 0x15, 0xc4,
+	0xfa, 0x51, 0x05, 0xe6, 0xf8, 0xdf, 0x2f, 0xc0, 0x77, 0x9f, 0x26, 0xac, 0x5e, 0x1f, 0x2b, 0xb2,
+	0x22, 0x93, 0x8f, 0xc4, 0x7b, 0x82, 0xd1, 0x8b, 0x45, 0xc6, 0x8a, 0x7b, 0x94, 0x58, 0x65, 0x87,
+	0x58, 0xae, 0xcb, 0x84, 0xcc, 0x07, 0xe2, 0x8d, 0x31, 0x84, 0x3f, 0xf4, 0x28, 0xb2, 0xd2, 0x51,
+	0x8e, 0xde, 0xa9, 0x52, 0x2e, 0x8c, 0x0f, 0xd0, 0x68, 0xd3, 0x28, 0x2f, 0x33, 0x97, 0x53, 0xbc,
+	0x84, 0x12, 0xca, 0x79, 0x52, 0x9b, 0xd0, 0xa6, 0x87, 0xe7, 0x74, 0xb3, 0x75, 0xbe, 0x4c, 0x85,
+	0xc9, 0x0c, 0x3c, 0x3a, 0x4c, 0xf7, 0xe5, 0x20, 0xde, 0x78, 0x05, 0x9d, 0x93, 0x84, 0xb7, 0xbc,
+	0x79, 0x81, 0x2c, 0x78, 0x0c, 0x0d, 0xda, 0xd4, 0x65, 0x25, 0xc9, 0xf6, 0x54, 0x4e, 0xbd, 0x18,
+	0x1b, 0xa0, 0x08, 0x42, 0x21, 0xf5, 0x02, 0x1a, 0x94, 0x73, 0x0a, 0x99, 0xcf, 0x47, 0x65, 0x96,
+	0x08, 0x48, 0xac, 0xa2, 0x8d, 0x25, 0x34, 0x11, 0x90, 0x7d, 0x54, 0x2e, 0x56, 0x2c, 0x9b, 0xde,
+	0x14, 0x96, 0xa8, 0x72, 0xca, 0x3b, 0xcb, 0x60, 0xe8, 0xc5, 0x0e, 0x48, 0x50, 0xf5, 0x3e, 0x3a,
+	0xcb, 0x61, 0x0c, 0x84, 0x4d, 0xb7, 0x15, 0xf6, 0x2f, 0x0e, 0xd0, 0xd9, 0xc0, 0x1b, 0x22, 0xec,
+	0xbb, 0x21, 0x6e, 0x0d, 0xa1, 0xa0, 0x48, 0x20, 0xc7, 0xa4, 0xa9, 0xaa, 0xc0, 0xf4, 0xaa, 0xc4,
+	0x54, 0x15, 0x00, 0xb5, 0x62, 0x66, 0xad, 0x22, 0x05, 0x6c, 0x2e, 0x84, 0xc4, 0xe3, 0x28, 0xe1,
+	0x70, 0x5e, 0xa5, 0x95, 0x64, 0xbf, 0x74, 0x09, 0x6f, 0xc6, 0xb7, 0x1a, 0x2c, 0xb5, 0x9f, 0x16,
+	0x9c, 0xbd, 0x1b, 0x91, 0x77, 0xaa, 0x6b, 0x5e, 0x05, 0x6e, 0x4a, 0xbc, 0x88, 0x12, 0x72, 0x29,
+	0x78, 0xb2, 0x7f, 0xe2, 0x4c, 0x9c, 0x95, 0x83, 0x70, 0x63, 0x15, 0x84, 0x65, 0xac, 0x3d, 0xcb,
+	0x2d, 0xf8, 0xa6, 0x70, 0x12, 0x0d, 0x59, 0x85, 0x02, 0xab, 0xba, 0x02, 0xd6, 0xcb, 0x7f, 0x0d,
+	0xd6, 0xb1, 0x3f, 0xbc, 0x8e, 0x0f, 0x06, 0xd0, 0x58, 0x33, 0x0f, 0x38, 0x5c, 0x44, 0x43, 0x79,
+	0x35, 0xa4, 0x88, 0x32, 0x2f, 0x78, 0xe9, 0x7f, 0x3f, 0x4c, 0x3f, 0xa7, 0x5c, 0x72, 0x7b, 0xd7,
+	0x74, 0x18, 0x29, 0x59, 0x62, 0xc7, 0x5c, 0x77, 0x45, 0xce, 0x8f, 0xc6, 0xd7, 0xd0, 0xf0, 0x67,
+	0x3b, 0x8e, 0xa0, 0x7b, 0x0e, 0x17, 0xd4, 0x56, 0xd9, 0xba, 0x81, 0xc3, 0x08, 0xbc, 0x80, 0x12,
+	0xdb, 0x15, 0xf6, 0x39, 0x75, 0x93, 0x67, 0xe2, 0x60, 0x21, 0xd8, 0x83, 0xed, 0xb1, 0xc2, 0x2e,
+	0xb5, 0x93, 0x03, 0xb1, 0x60, 0x2a, 0x18, 0xaf, 0xa3, 0x73, 0xea, 0x69, 0xcb, 0x71, 0xb7, 0x6a,
+	0x94, 0x0b, 0xc7, 0x2d, 0x26, 0x07, 0xe3, 0x30, 0x3c, 0xab, 0x70, 0xeb, 0xee, 0xc7, 0x0a, 0x85,
+	0xb3, 0x68, 0x24, 0xa0, 0xb2, 0x69, 0x3d, 0x99, 0x90, 0x34, 0x97, 0x3b, 0xd2, 0x1c, 0x1d, 0xa6,
+	0x87, 0x6f, 0x00, 0xd1, 0xca, 0xea, 0xed, 0xdc, 0xb0, 0xcf, 0xba, 0x42, 0xeb, 0x98, 0x23, 0x9d,
+	0xd6, 0xcb, 0xb4, 0x20, 0xa8, 0xbd, 0x25, 0xd8, 0x56, 0x85, 0x16, 0xa8, 0x53, 0xa3, 0x3e, 0xfd,
+	0x90, 0xa4, 0x5f, 0xec, 0x46, 0x3f, 0xbe, 0x0a, 0x14, 0xb7, 0x58, 0x4e, 0x11, 0xa8, 0x4c, 0xe3,
+	0x34, 0x62, 0x9c, 0xd6, 0x8d, 0x2f, 0x90, 0x2e, 0x2b, 0x62, 0x4d, 0xce, 0x2b, 0xd4, 0xc5, 0xa9,
+	0xef, 0xb8, 0x50, 0xa1, 0xf6, 0x37, 0x15, 0xaa, 0x71, 0xa0, 0xa1, 0x0b, 0x91, 0x02, 0x4e, 0x7b,
+	0xef, 0x15, 0xd1, 0x59, 0x28, 0xda, 0xf0, 0xee, 0x0b, 0x68, 0x7c, 0x82, 0x65, 0xe6, 0xb8, 0x99,
+	0xd7, 0xbc, 0x69, 0x7e, 0xf8, 0x47, 0x7a, 0xba, 0xe8, 0x88, 0x9d, 0x6a, 0xde, 0x2c, 0xb0, 0x12,
+	0x81, 0xdb, 0x46, 0xfd, 0xcc, 0x70, 0x7b, 0x97, 0x88, 0xfd, 0x32, 0xe5, 0x12, 0xc0, 0x73, 0x0d,
+	0x72, 0x63, 0x03, 0x9d, 0x6f, 0x35, 0x74, 0xd2, 0x1d, 0xbb, 0x19, 0xb5, 0x3c, 0x8d, 0xc9, 0x79,
+	0xbd, 0x79, 0xdb, 0x76, 0xb4, 0xa4, 0x0e, 0x14, 0x3f, 0xde, 0xf8, 0x52, 0x43, 0x69, 0xc9, 0xbc,
+	0x19, 0x6c, 0xc6, 0xff, 0x7f, 0xf5, 0x7f, 0xd5, 0xe0, 0x4e, 0x8a, 0x54, 0xf1, 0xc4, 0x96, 0x40,
+	0x16, 0xa5, 0xda, 0xb8, 0x3a, 0x69, 0x1d, 0x7c, 0xda, 0x76, 0xb5, 0x4e, 0xa3, 0x18, 0x08, 0x7a,
+	0x5e, 0xb2, 0xaf, 0xac, 0xde, 0xbe, 0x49, 0x85, 0x77, 0xbc, 0x75, 0x69, 0x08, 0x38, 0x4a, 0xb6,
+	0x02, 0x40, 0xc7, 0x26, 0x7a, 0xda, 0xa6, 0xf5, 0x2d, 0x0e, 0xe3, 0x20, 0x26, 0x1d, 0x75, 0xd5,
+	0x85, 0xe0, 0x99, 0x51, 0x4f, 0x92, 0x77, 0x3e, 0x86, 0x39, 0x87, 0x6d, 0x5a, 0xf7, 0x5f, 0xe6,
+	0x0e, 0x46, 0xd0, 0xa0, 0xcc, 0x8a, 0xef, 0x6b, 0x28, 0xa1, 0x5a, 0x2b, 0x3c, 0x19, 0xc5, 0xdb,
+	0xda, 0xc5, 0xe9, 0x53, 0x5d, 0xe3, 0x94, 0x7c, 0x63, 0xea, 0xeb, 0xbf, 0xbf, 0xbf, 0xa4, 0xdd,
+	0xff, 0xe5, 0xaf, 0x6f, 0xfa, 0x2f, 0x62, 0x9d, 0xb4, 0x6d, 0x78, 0xa5, 0x08, 0xd5, 0x28, 0x74,
+	0x10, 0xd1, 0xd4, 0xc0, 0x74, 0x10, 0xd1, 0xdc, 0x71, 0xc4, 0x10, 0xa1, 0x1a, 0x03, 0xfc, 0x95,
+	0x86, 0x06, 0x25, 0x16, 0xbf, 0xdc, 0x99, 0xdb, 0x97, 0x30, 0xd9, 0x2d, 0x0c, 0x14, 0x90, 0x40,
+	0xc1, 0x4b, 0xd8, 0x68, 0xaf, 0x80, 0xdc, 0x95, 0x15, 0x71, 0x0f, 0xff, 0xa4, 0xa1, 0xb1, 0xa8,
+	0xde, 0x0e, 0x5f, 0xe9, 0x9c, 0x31, 0xba, 0x11, 0xd5, 0x17, 0x7a, 0x44, 0x81, 0xec, 0xeb, 0x81,
+	0xec, 0x05, 0x3c, 0xdf, 0x5d, 0x36, 0xa9, 0x2a, 0xa2, 0x19, 0xbf, 0xf5, 0xc4, 0x0f, 0x35, 0x34,
+	0x04, 0x5b, 0x0b, 0xb7, 0x5f, 0xaf, 0xe6, 0xed, 0xac, 0x4f, 0x77, 0x0f, 0x04, 0x81, 0x37, 0x02,
+	0x81, 0xef, 0xe0, 0x6b, 0x51, 0x02, 0xe1, 0x20, 0xe0, 0xe4, 0x2e, 0x3c, 0xdd, 0x23, 0xfe, 0xc1,
+	0x42, 0x78, 0xb5, 0x54, 0xb2, 0x2a, 0xfb, 0x8d, 0x49, 0xff, 0x41, 0x43, 0xcf, 0x34, 0x5f, 0x9c,
+	0xd8, 0x6c, 0x2b, 0x25, 0xf2, 0x8a, 0xd7, 0x49, 0xec, 0x78, 0x70, 0xb0, 0x1c, 0x38, 0x58, 0xc2,
+	0x57, 0x7b, 0x75, 0x00, 0xfd, 0xdb, 0x8f, 0x1a, 0x1a, 0x69, 0xe2, 0xc7, 0x33, 0xf1, 0x74, 0xf8,
+	0xb2, 0xcd, 0xb8, 0xe1, 0xa0, 0x7a, 0x23, 0x50, 0x7d, 0x1d, 0xbf, 0x7d, 0x32, 0xd5, 0x8d, 0x69,
+	0xff, 0x59, 0x43, 0xa3, 0x11, 0x37, 0x16, 0x9e, 0x6f, 0x2b, 0xaa, 0xfd, 0x2d, 0xab, 0x5f, 0xe9,
+	0x0d, 0x04, 0x7e, 0xde, 0x0b, 0xfc, 0xbc, 0x85, 0xdf, 0xe8, 0xd5, 0x4f, 0xb8, 0x03, 0x3f, 0xd0,
+	0x10, 0x6e, 0xcd, 0x84, 0xe7, 0x7a, 0x90, 0xe5, 0x5b, 0x99, 0xef, 0x09, 0x03, 0x4e, 0xb2, 0x81,
+	0x93, 0x55, 0xbc, 0xfc, 0x1f, 0x9c, 0x34, 0x96, 0xe7, 0x3b, 0x0d, 0x85, 0x6f, 0x11, 0xfc, 0x6a,
+	0x5b, 0x59, 0xad, 0x17, 0x9e, 0x7e, 0x39, 0x5e, 0x30, 0x88, 0x7f, 0x33, 0x10, 0x3f, 0x8b, 0x49,
+	0x8c, 0xf3, 0xc6, 0xa6, 0xf5, 0x19, 0xff, 0x6a, 0xcc, 0x64, 0x1f, 0x1d, 0xa5, 0xb4, 0xc7, 0x47,
+	0x29, 0xed, 0xcf, 0xa3, 0x94, 0xf6, 0xe0, 0x38, 0xd5, 0xf7, 0xf8, 0x38, 0xd5, 0xf7, 0xdb, 0x71,
+	0xaa, 0xef, 0x93, 0xab, 0xa1, 0xae, 0x63, 0x59, 0x92, 0xae, 0xb1, 0xaa, 0x6b, 0xcb, 0x3e, 0xc6,
+	0xcf, 0x52, 0x5b, 0x20, 0xf5, 0x20, 0x95, 0xec, 0x44, 0xf2, 0x09, 0xf9, 0x4f, 0xc6, 0xfc, 0x3f,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0xd7, 0xa7, 0x1d, 0xd5, 0xdd, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/asset/ft/types/token.pb.go b/x/asset/ft/types/token.pb.go
index 932b52f06..80d4d266f 100644
--- a/x/asset/ft/types/token.pb.go
+++ b/x/asset/ft/types/token.pb.go
@@ -345,7 +345,7 @@ func (m *TokenUpgradeStatuses) GetV1() *TokenUpgradeV1Status {
 
 // DEXSettings defines the token settings of the dex.
 type DEXSettings struct {
-	// unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size
+	// unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size
 	UnifiedRefAmount *cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=unified_ref_amount,json=unifiedRefAmount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"unified_ref_amount,omitempty"`
 	// whitelisted_denoms is the list of denoms to trade with.
 	WhitelistedDenoms []string `protobuf:"bytes,2,rep,name=whitelisted_denoms,json=whitelistedDenoms,proto3" json:"whitelisted_denoms,omitempty"`
diff --git a/x/asset/ft/types/tx.pb.go b/x/asset/ft/types/tx.pb.go
index 886ca4c17..295a65de8 100644
--- a/x/asset/ft/types/tx.pb.go
+++ b/x/asset/ft/types/tx.pb.go
@@ -643,7 +643,7 @@ var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo
 type MsgUpdateDEXUnifiedRefAmount struct {
 	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
 	Denom  string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"`
-	// unified_ref_amount is the approximate amount you need to by 1USD, used to define the price tick size
+	// unified_ref_amount is the approximate amount you need to buy 1USD, used to define the price tick size
 	UnifiedRefAmount cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=unified_ref_amount,json=unifiedRefAmount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"unified_ref_amount"`
 }
 
diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go
index 46a022d1f..9ab538331 100644
--- a/x/dex/types/params.pb.go
+++ b/x/dex/types/params.pb.go
@@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // Params keeps gov manageable parameters.
 type Params struct {
-	// default_unified_ref_amount is the default approximate amount you need to by 1USD, used to for tokens without custom value
+	// default_unified_ref_amount is the default approximate amount you need to buy 1USD, used to for tokens without custom value
 	DefaultUnifiedRefAmount cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=default_unified_ref_amount,json=defaultUnifiedRefAmount,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"default_unified_ref_amount"`
 	// price_tick_exponent is the exponent used for the price tick calculation
 	PriceTickExponent int32 `protobuf:"varint,2,opt,name=price_tick_exponent,json=priceTickExponent,proto3" json:"price_tick_exponent,omitempty"`
diff --git a/x/wasm/handler/message.go b/x/wasm/handler/message.go
index 4306a71a0..7b16d6d47 100644
--- a/x/wasm/handler/message.go
+++ b/x/wasm/handler/message.go
@@ -93,6 +93,7 @@ type coreumMsg struct {
 
 // NewCoreumMsgHandler returns coreum handler that handles messages received from smart contracts.
 // The in the input sender is the address of smart contract.
+// Deprecated: Supported for backward compatibility of legacy smart contracts only.
 func NewCoreumMsgHandler() *wasmkeeper.MessageEncoders {
 	return &wasmkeeper.MessageEncoders{
 		Custom: func(sender sdk.AccAddress, msg json.RawMessage) ([]sdk.Msg, error) {
diff --git a/x/wasm/handler/query.go b/x/wasm/handler/query.go
index 7764a4ca7..0a100ad32 100644
--- a/x/wasm/handler/query.go
+++ b/x/wasm/handler/query.go
@@ -241,6 +241,7 @@ func convertStringToDataBytes(dataString string) (*codectypes.Any, error) {
 	return dataValue, nil
 }
 
+// Deprecated: Supported for backward compatibility of legacy smart contracts only.
 func processCoreumQuery(
 	ctx sdk.Context,
 	queries coreumQuery,