F/slashing undelegations

contracts/babylon/Cargo.toml

@@ -13,11 +13,13 @@ publish = false
 crate-type = ["cdylib", "rlib"]
 # See https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 bench = false
+doctest = false
 
 [[bin]]
 name = "schema"
 path = "src/bin/schema.rs"
 bench = false
+test = false
 
 [features]
 # Add feature "cranelift" to default if you need 32 bit or ARM support

contracts/babylon/src/ibc.rs

@@ -140,6 +140,7 @@ pub fn ibc_packet_receive(
 pub(crate) mod ibc_packet {
     use super::*;
     use crate::state::config::CONFIG;
+    use babylon_apis::btc_staking_api::SlashedBtcDelegation;
     use babylon_apis::ibc_consumer::{consumer_packet_data, ConsumerPacketData};
     use babylon_apis::{
         btc_staking_api::{
@@ -285,7 +286,14 @@ pub(crate) mod ibc_packet {
                     })
                 })
                 .collect::<StdResult<_>>()?,
-            slashed_del: vec![], // FIXME: Route this
+            slashed_del: btc_staking
+                .slashed_del
+                .iter()
+                .map(|d| SlashedBtcDelegation {
+                    staking_tx_hash: d.staking_tx_hash.clone(),
+                    recovered_fp_btc_sk: d.recovered_fp_btc_sk.clone(),
+                })
+                .collect(),
             unbonded_del: btc_staking
                 .unbonded_del
                 .iter()

contracts/btc-staking/Cargo.toml

@@ -11,10 +11,12 @@ publish = false
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+doctest = false
 
 [[bin]]
 name = "btcstaking-schema"
 path = "src/bin/schema.rs"
+test = false
 
 [features]
 # Add feature "cranelift" to default if you need 32 bit or ARM support

contracts/btc-staking/schema/btc-staking.json

@@ -343,7 +343,7 @@
         "type": "string"
       },
       "BtcUndelegationInfo": {
-        "description": "BTCUndelegationInfo provides all necessary info about the undeleagation",
+        "description": "BTCUndelegationInfo provides all necessary info about the undelegation",
         "type": "object",
         "required": [
           "covenant_slashing_sigs",
@@ -1396,7 +1396,7 @@
           "type": "string"
         },
         "BtcUndelegationInfo": {
-          "description": "BTCUndelegationInfo provides all necessary info about the undeleagation",
+          "description": "BTCUndelegationInfo provides all necessary info about the undelegation",
           "type": "object",
           "required": [
             "covenant_slashing_sigs",
@@ -1527,6 +1527,7 @@
             "end_height",
             "fp_btc_pk_list",
             "params_version",
+            "slashed",
             "slashing_tx",
             "staker_addr",
             "staking_output_idx",
@@ -1576,6 +1577,10 @@
               "format": "uint32",
               "minimum": 0.0
             },
+            "slashed": {
+              "description": "slashed is used to indicate whether a given delegation is related to a slashed FP",
+              "type": "boolean"
+            },
             "slashing_tx": {
               "description": "slashing_tx is the slashing tx",
               "type": "array",

contracts/btc-staking/schema/raw/execute.json

@@ -290,7 +290,7 @@
       "type": "string"
     },
     "BtcUndelegationInfo": {
-      "description": "BTCUndelegationInfo provides all necessary info about the undeleagation",
+      "description": "BTCUndelegationInfo provides all necessary info about the undelegation",
       "type": "object",
       "required": [
         "covenant_slashing_sigs",

contracts/btc-staking/schema/raw/response_to_delegation.json

@@ -118,7 +118,7 @@
       "type": "string"
     },
     "BtcUndelegationInfo": {
-      "description": "BTCUndelegationInfo provides all necessary info about the undeleagation",
+      "description": "BTCUndelegationInfo provides all necessary info about the undelegation",
       "type": "object",
       "required": [
         "covenant_slashing_sigs",

contracts/btc-staking/schema/raw/response_to_delegations.json

@@ -24,6 +24,7 @@
         "end_height",
         "fp_btc_pk_list",
         "params_version",
+        "slashed",
         "slashing_tx",
         "staker_addr",
         "staking_output_idx",
@@ -73,6 +74,10 @@
           "format": "uint32",
           "minimum": 0.0
         },
+        "slashed": {
+          "description": "slashed is used to indicate whether a given delegation is related to a slashed FP",
+          "type": "boolean"
+        },
         "slashing_tx": {
           "description": "slashing_tx is the slashing tx",
           "type": "array",

contracts/btc-staking/src/contract.rs

@@ -246,9 +246,9 @@ fn get_btc_tip_height(deps: &DepsMut) -> Result<u64, ContractError> {
     let babylon_addr = CONFIG.load(deps.storage)?.babylon;
 
     // Query the Babylon contract
-    // TODO: use raw query
+    // TODO: use a raw query for performance / efficiency
     let query_msg = BabylonQueryMsg::BtcTipHeader {};
-    let tip: BtcHeaderResponse = deps.querier.query_wasm_smart(&babylon_addr, &query_msg)?;
+    let tip: BtcHeaderResponse = deps.querier.query_wasm_smart(babylon_addr, &query_msg)?;
 
     Ok(tip.height)
 }
@@ -316,7 +316,7 @@ pub(crate) mod tests {
             total_sat: del.total_sat,
             staking_tx: Binary::new(del.staking_tx.to_vec()),
             slashing_tx: Binary::new(del.slashing_tx.to_vec()),
-            delegator_slashing_sig: Binary::new(vec![]),
+            delegator_slashing_sig: Binary::new(del.delegator_sig.to_vec()),
             covenant_sigs: del
                 .covenant_sigs
                 .iter()
@@ -334,7 +334,9 @@ pub(crate) mod tests {
             undelegation_info: BtcUndelegationInfo {
                 unbonding_tx: Binary::new(btc_undelegation.unbonding_tx.to_vec()),
                 slashing_tx: Binary::new(btc_undelegation.slashing_tx.to_vec()),
-                delegator_unbonding_sig: Binary::new(vec![]),
+                delegator_unbonding_sig: Binary::new(
+                    btc_undelegation.delegator_unbonding_sig.to_vec(),
+                ),
                 delegator_slashing_sig: Binary::new(
                     btc_undelegation.delegator_slashing_sig.to_vec(),
                 ),