Merge branch 'main' into 99-osmosis-price-oracle

Author: uint

CHANGELOG.md

@@ -2,7 +2,26 @@
 
 ## [Unreleased](https://github.com/osmosis-labs/mesh-security/tree/HEAD)
 
-[Full Changelog](https://github.com/osmosis-labs/mesh-security/compare/v0.8.0-alpha.1...HEAD)
+[Full Changelog](https://github.com/osmosis-labs/mesh-security/compare/v0.8.1-alpha.1...HEAD)
+
+## [v0.8.1-alpha.1](https://github.com/osmosis-labs/mesh-security/tree/v0.8.1-alpha.1) (2023-11-06)
+
+[Full Changelog](https://github.com/osmosis-labs/mesh-security/compare/v0.8.0-alpha.1...v0.8.1-alpha.1)
+
+**Closed issues:**
+
+- Slashing propagation accounting [\#139](https://github.com/osmosis-labs/mesh-security/issues/139)
+- Slashing-related messages [\#128](https://github.com/osmosis-labs/mesh-security/issues/128)
+- Improve cross-bond/unbond process [\#124](https://github.com/osmosis-labs/mesh-security/issues/124)
+- MVP slashing [\#112](https://github.com/osmosis-labs/mesh-security/issues/112)
+
+**Merged pull requests:**
+
+- 139/slashing proportional burn [\#159](https://github.com/osmosis-labs/mesh-security/pull/159) ([maurolacy](https://github.com/maurolacy))
+- Slashing propagation Consumer accounting [\#158](https://github.com/osmosis-labs/mesh-security/pull/158) ([maurolacy](https://github.com/maurolacy))
+- Slashing propagation acct [\#156](https://github.com/osmosis-labs/mesh-security/pull/156) ([maurolacy](https://github.com/maurolacy))
+- Virtual staking valset updates [\#153](https://github.com/osmosis-labs/mesh-security/pull/153) ([maurolacy](https://github.com/maurolacy))
+- Immediately release stake when possible [\#152](https://github.com/osmosis-labs/mesh-security/pull/152) ([uint](https://github.com/uint))
 
 ## [v0.8.0-alpha.1](https://github.com/osmosis-labs/mesh-security/tree/v0.8.0-alpha.1) (2023-10-19)
 

Cargo.lock

@@ -4,13 +4,14 @@ resolver = "2"
 
 [workspace.package]
 edition       = "2021"
-version       = "0.8.0-alpha.1"
+version       = "0.8.1-alpha.1"
 license       = "MIT"
 repository    = "https://github.com/osmosis-labs/mesh-security"
 
 [workspace.dependencies]
 mesh-apis        = { path = "./packages/apis" }
-mesh-bindings        = { path = "./packages/bindings" }
+mesh-bindings    = { path = "./packages/bindings" }
+mesh-burn        = { path = "./packages/burn" }
 mesh-sync        = { path = "./packages/sync" }
 mesh-virtual-staking-mock = { path = "./packages/virtual-staking-mock" }
 

Cargo.toml

@@ -1,3 +1,8 @@
+# 0.8.1-alpha.1
+
+- Slashing propagation accounting.
+- Improve cross-bond/unbond process.
+
 # 0.8.0-alpha.1
 
 - Add code coverage.

RELEASE_NOTES.md

@@ -34,6 +34,7 @@ serde            = { workspace = true }
 thiserror        = { workspace = true }
 
 [dev-dependencies]
+mesh-burn              = { workspace = true }
 mesh-simple-price-feed = { workspace = true, features = ["mt"] }
 
 cw-multi-test = { workspace = true }

contracts/consumer/converter/Cargo.toml

@@ -154,6 +154,27 @@ impl ConverterContract<'_> {
         }
     }
 
+    /// This is only used for tests.
+    /// Ideally we want conditional compilation of these whole methods and the enum variants
+    #[msg(exec)]
+    fn test_burn(
+        &self,
+        ctx: ExecCtx,
+        validators: Vec<String>,
+        burn: Coin,
+    ) -> Result<Response, ContractError> {
+        #[cfg(any(test, feature = "mt"))]
+        {
+            // This can only ever be called in tests
+            self.burn(ctx.deps, &validators, burn)
+        }
+        #[cfg(not(any(test, feature = "mt")))]
+        {
+            let _ = (ctx, validators, burn);
+            Err(ContractError::Unauthorized)
+        }
+    }
+
     #[msg(query)]
     fn config(&self, ctx: QueryCtx) -> Result<ConfigResponse, ContractError> {
         let config = self.config.load(ctx.deps.storage)?;
@@ -213,6 +234,33 @@ impl ConverterContract<'_> {
         Ok(Response::new().add_message(msg).add_event(event))
     }
 
+    /// This is called by ibc_packet_receive.
+    /// It is pulled out into a method, so it can also be called by test_burn for testing
+    pub(crate) fn burn(
+        &self,
+        deps: DepsMut,
+        validators: &[String],
+        burn: Coin,
+    ) -> Result<Response, ContractError> {
+        let amount = self.normalize_price(deps.as_ref(), burn)?;
+
+        let event = Event::new("mesh-burn")
+            .add_attribute("validators", validators.join(","))
+            .add_attribute("amount", amount.amount.to_string());
+
+        let msg = virtual_staking_api::ExecMsg::Burn {
+            validators: validators.to_vec(),
+            amount,
+        };
+        let msg = WasmMsg::Execute {
+            contract_addr: self.virtual_stake.load(deps.storage)?.into(),
+            msg: to_binary(&msg)?,
+            funds: vec![],
+        };
+
+        Ok(Response::new().add_message(msg).add_event(event))
+    }
+
     fn normalize_price(&self, deps: Deps, amount: Coin) -> Result<Coin, ContractError> {
         let config = self.config.load(deps.storage)?;
         ensure_eq!(

contracts/consumer/converter/src/contract.rs

@@ -214,6 +214,15 @@ pub fn ibc_packet_receive(
                 .add_events(response.events)
                 .add_attributes(response.attributes)
         }
+        ProviderPacket::Burn { validators, burn } => {
+            let response = contract.burn(deps, &validators, burn)?;
+            let ack = ack_success(&UnstakeAck {})?;
+            IbcReceiveResponse::new()
+                .set_ack(ack)
+                .add_submessages(response.messages)
+                .add_events(response.events)
+                .add_attributes(response.attributes)
+        }
         ProviderPacket::TransferRewards {
             rewards, recipient, ..
         } => {

contracts/consumer/converter/src/ibc.rs

@@ -200,6 +200,92 @@ fn ibc_stake_and_unstake() {
     );
 }
 
+#[test]
+fn ibc_stake_and_burn() {
+    let app = App::default();
+
+    let owner = "sunny"; // Owner of the staking contract (i. e. the vault contract)
+    let admin = "theman";
+    let discount = Decimal::percent(40); // 1 OSMO worth of JUNO should give 0.6 OSMO of stake
+    let native_per_foreign = Decimal::percent(50); // 1 JUNO is worth 0.5 OSMO
+
+    let SetupResponse {
+        price_feed: _,
+        converter,
+        virtual_staking,
+    } = setup(
+        &app,
+        SetupArgs {
+            owner,
+            admin,
+            discount,
+            native_per_foreign,
+        },
+    );
+
+    // no one is staked
+    let val1 = "Val Kilmer";
+    let val2 = "Valley Girl";
+    assert!(virtual_staking.all_stake().unwrap().stakes.is_empty());
+    assert_eq!(
+        virtual_staking
+            .stake(val1.to_string())
+            .unwrap()
+            .stake
+            .u128(),
+        0
+    );
+    assert_eq!(
+        virtual_staking
+            .stake(val2.to_string())
+            .unwrap()
+            .stake
+            .u128(),
+        0
+    );
+
+    // let's stake some
+    converter
+        .test_stake(val1.to_string(), coin(1000, JUNO))
+        .call(owner)
+        .unwrap();
+    converter
+        .test_stake(val2.to_string(), coin(4000, JUNO))
+        .call(owner)
+        .unwrap();
+
+    // and burn some
+    converter
+        .test_burn(vec![val2.to_string()], coin(2000, JUNO))
+        .call(owner)
+        .unwrap();
+
+    // and check the stakes (1000 * 0.6 * 0.5 = 300) (2000 * 0.6 * 0.5 = 600)
+    assert_eq!(
+        virtual_staking
+            .stake(val1.to_string())
+            .unwrap()
+            .stake
+            .u128(),
+        300
+    );
+    assert_eq!(
+        virtual_staking
+            .stake(val2.to_string())
+            .unwrap()
+            .stake
+            .u128(),
+        600
+    );
+    assert_eq!(
+        virtual_staking.all_stake().unwrap().stakes,
+        vec![
+            (val1.to_string(), Uint128::new(300)),
+            (val2.to_string(), Uint128::new(600)),
+        ]
+    );
+}
+
 #[test]
 fn valset_update_works() {
     let app = App::default();