Merge remote-tracking branch 'origin/dev' into feat/DRP-367_granular_…

…core_pause

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y pkg-config libssl-dev
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-12-21
           profile: minimal
           override: true
       - name: Install cargo-tarpaulin

Cargo.toml

@@ -18,6 +18,7 @@ members = [
     "contracts/staker",
     "contracts/strategy",
     "contracts/token",
+    "contracts/val-ref",
     "contracts/splitter",
     "contracts/price-provider",
     "contracts/validators-stats",

contracts/core/src/tests.rs

@@ -613,6 +613,7 @@ fn test_tick_idle_unbonding_close() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -755,6 +756,7 @@ fn test_tick_idle_claim_wo_unbond() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -916,6 +918,7 @@ fn test_tick_idle_claim_with_unbond_transfer() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -1074,6 +1077,7 @@ fn test_tick_idle_staking_bond() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -1224,6 +1228,7 @@ fn test_tick_idle_unbonding() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -1427,6 +1432,7 @@ fn test_tick_idle_unbonding_failed() {
                 drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper_address".to_string(),
                     weight: 1,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -3088,6 +3094,7 @@ fn test_bond_lsm_share_increase_exchange_rate() {
                 validator: Some(drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper1".to_string(),
                     weight: 1u64,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -3289,6 +3296,7 @@ fn test_bond_lsm_share_ok() {
                 validator: Some(drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper1".to_string(),
                     weight: 1u64,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -3400,6 +3408,7 @@ fn test_bond_lsm_share_ok_with_low_ratio() {
                 validator: Some(drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper1".to_string(),
                     weight: 1u64,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -3522,6 +3531,7 @@ fn test_bond_lsm_share_ok_with_low_ratio_pending_already_there() {
                 validator: Some(drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: "valoper1".to_string(),
                     weight: 1u64,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,
@@ -4149,6 +4159,7 @@ mod check_denom {
                         validator: Some(drop_staking_base::state::validatorset::ValidatorInfo {
                             valoper_address: "valoper12345".to_string(),
                             weight: 1u64,
+                            on_top: Uint128::zero(),
                             last_processed_remote_height: None,
                             last_processed_local_height: None,
                             last_validated_height: None,

contracts/factory/src/tests.rs

@@ -612,6 +612,7 @@ fn test_update_config_validators_set_unauthorized() {
     let new_validator_set_config = drop_staking_base::state::validatorset::ConfigOptional {
         stats_contract: Some("validator_stats_contract".to_string()),
         provider_proposals_contract: Some("provider_proposals_contract1".to_string()),
+        val_ref_contract: Some("val_ref_contract1".to_string()),
     };
     let res = execute(
         deps.as_mut().into_empty(),
@@ -640,6 +641,7 @@ fn test_update_config_validators_set() {
     let new_validator_set_config = drop_staking_base::state::validatorset::ConfigOptional {
         stats_contract: Some("validator_stats_contract".to_string()),
         provider_proposals_contract: Some("provider_proposals_contract1".to_string()),
+        val_ref_contract: Some("val_ref_contract1".to_string()),
     };
     let res = execute(
         deps.as_mut().into_empty(),
@@ -690,10 +692,12 @@ fn test_proxy_validators_set_update_validators_unauthorized() {
                     drop_staking_base::msg::validatorset::ValidatorData {
                         valoper_address: "valoper_address1".to_string(),
                         weight: 10u64,
+                        on_top: Uint128::zero(),
                     },
                     drop_staking_base::msg::validatorset::ValidatorData {
                         valoper_address: "valoper_address2".to_string(),
                         weight: 10u64,
+                        on_top: Uint128::zero(),
                     },
                 ],
             },
@@ -725,10 +729,12 @@ fn test_proxy_validators_set_update_validators() {
                     drop_staking_base::msg::validatorset::ValidatorData {
                         valoper_address: "valoper_address1".to_string(),
                         weight: 10u64,
+                        on_top: Uint128::zero(),
                     },
                     drop_staking_base::msg::validatorset::ValidatorData {
                         valoper_address: "valoper_address2".to_string(),
                         weight: 10u64,
+                        on_top: Uint128::zero(),
                     },
                 ],
             },
@@ -747,10 +753,12 @@ fn test_proxy_validators_set_update_validators() {
                                 drop_staking_base::msg::validatorset::ValidatorData {
                                     valoper_address: "valoper_address1".to_string(),
                                     weight: 10u64,
+                                    on_top: Uint128::zero(),
                                 },
                                 drop_staking_base::msg::validatorset::ValidatorData {
                                     valoper_address: "valoper_address2".to_string(),
                                     weight: 10u64,
+                                    on_top: Uint128::zero(),
                                 },
                             ],
                         })

contracts/strategy/src/contract.rs

@@ -144,6 +144,7 @@ fn prepare_delegation_data(
     let mut delegations: Vec<drop_staking_base::msg::distribution::Delegation> = Vec::new();
     let mut total_delegations: Uint128 = Uint128::zero();
     let mut total_weight: u64 = 0;
+    let mut total_on_top = Uint128::zero();
     let delegation_validator_map: HashMap<_, _> = account_delegations
         .delegations
         .delegations
@@ -161,19 +162,20 @@ fn prepare_delegation_data(
         let delegation = drop_staking_base::msg::distribution::Delegation {
             valoper_address: validator.valoper_address.clone(),
             stake: validator_denom_delegation,
-            on_top: Uint128::zero(),
             weight: validator.weight,
+            on_top: validator.on_top,
         };
 
         total_delegations += validator_denom_delegation;
         total_weight += validator.weight;
+        total_on_top += validator.on_top;
         delegations.push(delegation);
     }
 
     Ok(drop_staking_base::msg::distribution::Delegations {
         total_stake: total_delegations,
-        total_on_top: Uint128::zero(),
         total_weight,
+        total_on_top,
         delegations,
     })
 }

contracts/strategy/src/tests.rs

@@ -146,6 +146,7 @@ fn validator_set_query(_deps: Deps, _env: Env, msg: ValidatorSetQueryMsg) -> Std
                 let validator = drop_staking_base::state::validatorset::ValidatorInfo {
                     valoper_address: format!("valoper{}", i),
                     weight: 100,
+                    on_top: Uint128::zero(),
                     last_processed_remote_height: None,
                     last_processed_local_height: None,
                     last_validated_height: None,

contracts/val-ref/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+schema = "run --bin drop-val-ref-schema"

contracts/val-ref/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+authors = ["Murad Karammaev <[email protected]>"]
+description = "Contract module which stores validator's referral codes and their on_top stake"
+edition = "2021"
+name = "drop-val-ref"
+version = "1.0.0"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+backtraces = ["cosmwasm-std/backtraces"]
+library = []
+
+[dependencies]
+cosmwasm-std = { workspace = true }
+neutron-sdk = { workspace = true }
+drop-staking-base = { workspace = true }
+cw2 = { workspace = true }
+cw-ownable = { workspace = true }
+drop-helpers = { workspace = true }
+thiserror = { workspace = true }
+semver = { workspace = true }
+cw-storage-plus = { workspace = true }
+cosmwasm-schema = { workspace = true }

contracts/val-ref/README.md

@@ -0,0 +1 @@
+# Val ref contract

contracts/val-ref/src/bin/drop-val-ref-schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+
+use drop_staking_base::msg::val_ref::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        query: QueryMsg,
+        execute: ExecuteMsg,
+        migrate: MigrateMsg
+    }
+}