Merge pull request #448 from mars-protocol/latest-core-contracts

Move latest core-contracts changes to public

Author: markonmars

Cargo.lock

@@ -13,7 +13,7 @@ ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release"
 RUST_OPTIMIZER_VERSION = "0.16.0"
 # Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/optimizer/blob/v0.16.0/Dockerfile#L1)
 # to be sure that we compile / test against the same version
-RUST_VERSION = "1.78.0"
+RUST_VERSION = "1.81.0"
 
 [tasks.install-stable]
 script = '''

Makefile.toml

@@ -18,6 +18,7 @@ use mars_types::{
 
 use super::MockEnvBuilder;
 
+#[allow(dead_code)]
 pub struct MockEnv {
     pub app: BasicApp,
     pub minter: Addr,

contracts/account-nft/tests/tests/helpers/mock_env.rs

@@ -1,6 +1,6 @@
 [package]
 name          = "mars-credit-manager"
-version       = { workspace = true }
+version       = "2.2.0"
 authors       = { workspace = true }
 license       = { workspace = true }
 edition       = { workspace = true }

contracts/credit-manager/Cargo.toml

@@ -15,8 +15,8 @@ use crate::{
     query::{
         query_accounts, query_all_coin_balances, query_all_debt_shares,
         query_all_total_debt_shares, query_all_vault_positions, query_all_vault_utilizations,
-        query_config, query_positions, query_total_debt_shares, query_vault_bindings,
-        query_vault_position_value, query_vault_utilization,
+        query_config, query_positions, query_swap_fee, query_total_debt_shares,
+        query_vault_bindings, query_vault_position_value, query_vault_utilization,
     },
     repay::repay_from_wallet,
     update_config::{update_config, update_nft_config, update_owner},
@@ -132,11 +132,12 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> ContractResult<Binary> {
             start_after,
             limit,
         } => to_json_binary(&query_vault_bindings(deps, start_after, limit)?),
+        QueryMsg::SwapFeeRate {} => to_json_binary(&query_swap_fee(deps)?),
     };
     res.map_err(Into::into)
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
-    migrations::v2_1_0::migrate(deps)
+    migrations::v2_2_0::migrate(deps)
 }

contracts/credit-manager/src/contract.rs

@@ -6,9 +6,9 @@ use crate::{
     error::ContractResult,
     state::{
         HEALTH_CONTRACT, INCENTIVES, MAX_SLIPPAGE, MAX_UNLOCKING_POSITIONS, ORACLE, OWNER, PARAMS,
-        RED_BANK, SWAPPER, ZAPPER,
+        RED_BANK, SWAPPER, SWAP_FEE, ZAPPER,
     },
-    utils::assert_max_slippage,
+    utils::{assert_max_slippage, assert_swap_fee},
 };
 
 pub fn store_config(deps: DepsMut, env: Env, msg: &InstantiateMsg) -> ContractResult<()> {
@@ -32,6 +32,8 @@ pub fn store_config(deps: DepsMut, env: Env, msg: &InstantiateMsg) -> ContractRe
     HEALTH_CONTRACT.save(deps.storage, &msg.health_contract.check(deps.api)?)?;
     PARAMS.save(deps.storage, &msg.params.check(deps.api)?)?;
     INCENTIVES.save(deps.storage, &msg.incentives.check(deps.api, env.contract.address)?)?;
+    assert_swap_fee(msg.swap_fee)?;
+    SWAP_FEE.save(deps.storage, &msg.swap_fee)?;
 
     Ok(())
 }

contracts/credit-manager/src/instantiate.rs

@@ -14,6 +14,7 @@ use crate::{
 /// - Exceeds liquidatee's total debt for denom
 /// - Not enough liquidatee request coin balance to match
 /// - The value of the debt repaid exceeds the Maximum Debt Repayable (MDR)
+///
 /// Returns -> (Debt Coin, Liquidator Request Coin, Liquidatee Request Coin)
 /// Difference between Liquidator Request Coin and Liquidatee Request Coin goes to rewards-collector account as protocol fee.
 pub fn calculate_liquidation(

contracts/credit-manager/src/liquidate.rs

@@ -1 +1,2 @@
 pub mod v2_1_0;
+pub mod v2_2_0;

contracts/credit-manager/src/migrations/mod.rs

@@ -1,21 +1,19 @@
 use cosmwasm_std::{DepsMut, Response};
 use cw2::{assert_contract_version, set_contract_version};
 
-use crate::{
-    contract::{CONTRACT_NAME, CONTRACT_VERSION},
-    error::ContractError,
-};
+use crate::{contract::CONTRACT_NAME, error::ContractError};
 
 const FROM_VERSION: &str = "2.0.3";
+const TO_VERSION: &str = "2.1.0";
 
 pub fn migrate(deps: DepsMut) -> Result<Response, ContractError> {
     // make sure we're migrating the correct contract and from the correct version
     assert_contract_version(deps.storage, &format!("crates.io:{CONTRACT_NAME}"), FROM_VERSION)?;
 
-    set_contract_version(deps.storage, format!("crates.io:{CONTRACT_NAME}"), CONTRACT_VERSION)?;
+    set_contract_version(deps.storage, format!("crates.io:{CONTRACT_NAME}"), TO_VERSION)?;
 
     Ok(Response::new()
         .add_attribute("action", "migrate")
         .add_attribute("from_version", FROM_VERSION)
-        .add_attribute("to_version", CONTRACT_VERSION))
+        .add_attribute("to_version", TO_VERSION))
 }

contracts/credit-manager/src/migrations/v2_1_0.rs

@@ -0,0 +1,43 @@
+use cosmwasm_std::{Decimal, DepsMut, Response};
+use cw2::{assert_contract_version, get_contract_version, set_contract_version, VersionError};
+
+use crate::{
+    contract::{CONTRACT_NAME, CONTRACT_VERSION},
+    error::ContractError,
+    state::SWAP_FEE,
+};
+
+const FROM_VERSION: &str = "2.1.0";
+
+pub fn migrate(deps: DepsMut) -> Result<Response, ContractError> {
+    let contract = format!("crates.io:{CONTRACT_NAME}");
+    let version = get_contract_version(deps.storage)?;
+    let from_version = version.version;
+
+    if version.contract != contract {
+        return Err(ContractError::Version(VersionError::WrongContract {
+            expected: contract,
+            found: version.contract,
+        }));
+    }
+
+    if from_version != FROM_VERSION {
+        return Err(ContractError::Version(VersionError::WrongVersion {
+            expected: FROM_VERSION.to_string(),
+            found: from_version,
+        }));
+    }
+
+    assert_contract_version(deps.storage, &contract, FROM_VERSION)?;
+
+    if SWAP_FEE.may_load(deps.storage)?.is_none() {
+        SWAP_FEE.save(deps.storage, &Decimal::zero())?;
+    }
+
+    set_contract_version(deps.storage, format!("crates.io:{CONTRACT_NAME}"), CONTRACT_VERSION)?;
+
+    Ok(Response::new()
+        .add_attribute("action", "migrate")
+        .add_attribute("from_version", from_version)
+        .add_attribute("to_version", CONTRACT_VERSION))
+}