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.
CoreumFoundation · Nov 27, 2024 · d4d888b · d4d888b
1 parent b5a4514
commit d4d888b
Show file tree

Hide file tree

Showing 17 changed files with 319 additions and 131 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,
+    },
 }