Add revenue share to Rewards Collector

.cargo/audit.toml

@@ -2,6 +2,6 @@
 
 [advisories]
 # Ignore the following advisory IDs.
-# Reported vulnerabilities relate to test-tube which is only used for testing.
+# Reported vulnerabilities relate to test-tube and cw-it which is only used for testing.
 # RUSTSEC-2024-0344 - no newer dependency fixing the issue in cosmwasm
-ignore = ["RUSTSEC-2024-0003", "RUSTSEC-2024-0006", "RUSTSEC-2024-0019", "RUSTSEC-2024-0332", "RUSTSEC-2024-0336", "RUSTSEC-2024-0344", "RUSTSEC-2024-0421"]
+ignore = ["RUSTSEC-2024-0003", "RUSTSEC-2024-0006", "RUSTSEC-2024-0019", "RUSTSEC-2024-0332", "RUSTSEC-2024-0336", "RUSTSEC-2024-0344", "RUSTSEC-2024-0421", "RUSTSEC-2024-0437", "RUSTSEC-2025-0009"]

contracts/address-provider/Cargo.toml

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

contracts/address-provider/src/contract.rs

@@ -171,5 +171,5 @@ fn query_all_addresses(
 
 #[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_1_1::migrate(deps)
 }

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

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

contracts/address-provider/src/migrations/v2_1_1.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,
+};
+
+const FROM_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)?;
+
+    // add new address
+    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/tests/tests/test_migration_v2.rs

@@ -6,7 +6,7 @@ use mars_testing::mock_dependencies;
 #[test]
 fn wrong_contract_name() {
     let mut deps = mock_dependencies(&[]);
-    cw2::set_contract_version(deps.as_mut().storage, "contract_xyz", "2.0.0").unwrap();
+    cw2::set_contract_version(deps.as_mut().storage, "contract_xyz", "2.1.0").unwrap();
 
     let err = migrate(deps.as_mut(), mock_env(), Empty {}).unwrap_err();
 
@@ -30,7 +30,7 @@ fn wrong_contract_version() {
     assert_eq!(
         err,
         ContractError::Version(VersionError::WrongVersion {
-            expected: "2.0.0".to_string(),
+            expected: "2.1.0".to_string(),
             found: "4.1.0".to_string()
         })
     );
@@ -39,7 +39,7 @@ fn wrong_contract_version() {
 #[test]
 fn successful_migration() {
     let mut deps = mock_dependencies(&[]);
-    cw2::set_contract_version(deps.as_mut().storage, "crates.io:mars-address-provider", "2.0.0")
+    cw2::set_contract_version(deps.as_mut().storage, "crates.io:mars-address-provider", "2.1.0")
         .unwrap();
 
     let res = migrate(deps.as_mut(), mock_env(), Empty {}).unwrap();
@@ -49,12 +49,12 @@ fn successful_migration() {
     assert!(res.data.is_none());
     assert_eq!(
         res.attributes,
-        vec![attr("action", "migrate"), attr("from_version", "2.0.0"), attr("to_version", "2.1.0")]
+        vec![attr("action", "migrate"), attr("from_version", "2.1.0"), attr("to_version", "2.1.1")]
     );
 
     let new_contract_version = ContractVersion {
         contract: "crates.io:mars-address-provider".to_string(),
-        version: "2.1.0".to_string(),
+        version: "2.1.1".to_string(),
     };
     assert_eq!(cw2::get_contract_version(deps.as_ref().storage).unwrap(), new_contract_version);
 }