Add Staking Tier Discount on Fees (#36)

* Add Fee rate change

* Remove log statements

* format

* add validation tests and remove unwanted comments

* update lints check and tier config

* update types

* update schema

* remove unwanted comments

* comment fixes

* update fmt and add swap account tests

* update account tests

* add fee tier config query

* add migration

* fmt

* fix migration tests

* Fix PR Comments

Author: Subham2804

Cargo.lock

@@ -25,6 +25,7 @@ members  = [
   "contracts/mock-pyth",
   "contracts/mock-red-bank",
   "contracts/mock-vault",
+  "contracts/mock-governance",
   "contracts/mock-lst-oracle",
 
   # packages
@@ -153,6 +154,7 @@ mars-mock-red-bank              = { path = "./contracts/mock-red-bank" }
 mars-mock-vault                 = { path = "./contracts/mock-vault" }
 mars-mock-lst-oracle            = { path = "./contracts/mock-lst-oracle" }
 mars-mock-rover-health          = { path = "./contracts/mock-health" }
+mars-mock-governance            = { path = "./contracts/mock-governance" }
 mars-swapper-mock               = { path = "./contracts/swapper/mock" }
 mars-zapper-mock                = { path = "./contracts/v2-zapper/mock" }
 

Cargo.toml

@@ -161,6 +161,7 @@ impl MockEnvBuilder {
                         perps: "n/a".to_string(),
                         keeper_fee_config: Default::default(),
                         perps_liquidation_bonus_ratio: Decimal::percent(60),
+                        governance: "n/a".to_string(),
                     },
                 },
                 &[],

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

@@ -1,7 +1,7 @@
 [package]
 name          = "mars-address-provider"
 description   = "A smart contract that holds addresses of Mars Red Bank contracts"
-version       = "2.3.2"
+version       = "2.4.0"
 authors       = { workspace = true }
 edition       = { workspace = true }
 license       = { workspace = true }

contracts/address-provider/Cargo.toml

@@ -176,5 +176,6 @@ pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, Co
     match msg {
         MigrateMsg::V2_2_0ToV2_2_2 {} => migrations::v2_2_2::migrate(deps),
         MigrateMsg::V2_2_2ToV2_3_2 {} => migrations::v2_3_2::migrate(deps),
+        MigrateMsg::V2_3_2ToV2_4_0 {} => migrations::v2_4_0::migrate(deps),
     }
 }

contracts/address-provider/src/contract.rs

@@ -1,2 +1,3 @@
 pub mod v2_2_2;
 pub mod v2_3_2;
+pub mod v2_4_0;

contracts/address-provider/src/migrations/mod.rs

@@ -0,0 +1,22 @@
+use cosmwasm_std::{DepsMut, Response};
+use cw2::{assert_contract_version, set_contract_version};
+
+use crate::{
+    contract::{CONTRACT_NAME, CONTRACT_VERSION},
+    error::ContractError,
+};
+
+pub const FROM_VERSION: &str = "2.3.2";
+
+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)?;
+
+    // this is a standard migration with no state changes
+    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))
+}

contracts/address-provider/src/migrations/v2_4_0.rs

@@ -4,4 +4,5 @@ mod test_addresses;
 mod test_instantiate;
 mod test_migration_v2;
 mod test_migration_v2_3_2;
+mod test_migration_v2_4_0;
 mod test_update_owner;

contracts/address-provider/tests/tests/mod.rs

@@ -0,0 +1,73 @@
+use cosmwasm_std::{attr, testing::mock_env, Event};
+use cw2::{ContractVersion, VersionError};
+use mars_address_provider::{
+    contract::{migrate, CONTRACT_NAME, CONTRACT_VERSION},
+    error::ContractError,
+    migrations::v2_4_0::FROM_VERSION,
+};
+use mars_testing::mock_dependencies;
+use mars_types::address_provider::MigrateMsg;
+
+#[test]
+fn wrong_contract_name() {
+    let mut deps = mock_dependencies(&[]);
+    cw2::set_contract_version(deps.as_mut().storage, "contract_xyz", FROM_VERSION).unwrap();
+
+    let err = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_3_2ToV2_4_0 {}).unwrap_err();
+
+    assert_eq!(
+        err,
+        ContractError::Version(VersionError::WrongContract {
+            expected: format!("crates.io:{CONTRACT_NAME}"),
+            found: "contract_xyz".to_string()
+        })
+    );
+}
+
+#[test]
+fn wrong_contract_version() {
+    let mut deps = mock_dependencies(&[]);
+    cw2::set_contract_version(deps.as_mut().storage, format!("crates.io:{CONTRACT_NAME}"), "4.1.0")
+        .unwrap();
+
+    let err = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_3_2ToV2_4_0 {}).unwrap_err();
+
+    assert_eq!(
+        err,
+        ContractError::Version(VersionError::WrongVersion {
+            expected: FROM_VERSION.to_string(),
+            found: "4.1.0".to_string()
+        })
+    );
+}
+
+#[test]
+fn successful_migration() {
+    let mut deps = mock_dependencies(&[]);
+    cw2::set_contract_version(
+        deps.as_mut().storage,
+        format!("crates.io:{CONTRACT_NAME}"),
+        FROM_VERSION,
+    )
+    .unwrap();
+
+    let res = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_3_2ToV2_4_0 {}).unwrap();
+
+    assert_eq!(res.messages, vec![]);
+    assert_eq!(res.events, vec![] as Vec<Event>);
+    assert!(res.data.is_none());
+    assert_eq!(
+        res.attributes,
+        vec![
+            attr("action", "migrate"),
+            attr("from_version", FROM_VERSION),
+            attr("to_version", CONTRACT_VERSION)
+        ]
+    );
+
+    let new_contract_version = ContractVersion {
+        contract: format!("crates.io:{CONTRACT_NAME}"),
+        version: CONTRACT_VERSION.to_string(),
+    };
+    assert_eq!(cw2::get_contract_version(deps.as_ref().storage).unwrap(), new_contract_version);
+}

contracts/address-provider/tests/tests/test_migration_v2_4_0.rs

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