Changes related to neutron sdk update

Author: deniszagumennov

Cargo.lock

@@ -34,24 +34,24 @@ members = [
 ]
 
 [workspace.dependencies]
-cosmwasm-std = { version = "1.5.4", default-features = false, features = [
+cosmwasm-std = { version = "2.1.0", default-features = false, features = [
+    "std",
     "stargate",
     "cosmwasm_1_2",
 ] }
-neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/proposal-votes" }
-
+neutron-sdk = { version = "0.11.0" }
 cosmos-sdk-proto = { version = "0.20.0", default-features = false }
-cw-ownable = { version = "0.5.1", default-features = false }
+cw-ownable = { version = "2.1.0", default-features = false }
 prost = { version = "0.12.3", default-features = false }
 prost-types = { version = "0.12.3", default-features = false }
-tendermint-proto = { version = "0.34.0", default-features = false }
-cosmwasm-schema = { version = "1.5.4", default-features = false }
-cw-storage-plus = { version = "1.2.0", default-features = false }
-cw2 = { version = "1.1.2", default-features = false }
+tendermint-proto = { version = "0.34.1", default-features = false }
+cosmwasm-schema = { version = "2.1.0", default-features = false }
+cw-storage-plus = { version = "2.0.0", default-features = false }
+cw2 = { version = "2.0.0", default-features = false }
 cw721 = { version = "0.18.0", default-features = false }
 cw721-base = { version = "0.18.0", features = ["library"] }
 cw-multi-test = { version = "0.20.0", default-features = false }
-cw-utils = { version = "1.0.3", default-features = false }
+cw-utils = { version = "2.0.0", default-features = false }
 serde = { version = "1.0.195", default-features = false }
 serde-json-wasm = { version = "1.0.0", default-features = false }
 sha2 = { version = "0.10.8", default-features = false }

Cargo.toml

@@ -19,8 +19,6 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 

contracts/astroport-exchange-handler/Cargo.toml

@@ -9,7 +9,6 @@ version = "1.0.0"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]

contracts/auto-withdrawer/Cargo.toml

@@ -26,7 +26,7 @@ mod bondings {
         }
     }
 
-    pub fn map<'a>() -> IndexedMap<'a, &'a str, BondingRecord, BondingRecordIndexes<'a>> {
+    pub fn map() -> IndexedMap<&'static str, BondingRecord, BondingRecordIndexes<'a>> {
         IndexedMap::new(
             "bondings",
             BondingRecordIndexes {

contracts/auto-withdrawer/src/store.rs

@@ -17,8 +17,6 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 

contracts/core/Cargo.toml

@@ -464,7 +464,7 @@ fn execute_update_withdrawn_amount(
     let config = CONFIG.load(deps.storage)?;
     let addrs =
         drop_helpers::get_contracts!(deps, config.factory_contract, withdrawal_manager_contract);
-    if info.sender != addrs.withdrawal_manager_contract {
+    if info.sender.to_string() != addrs.withdrawal_manager_contract {
         return Err(ContractError::Unauthorized {});
     }
 
@@ -1269,8 +1269,11 @@ fn get_unbonding_msg<T>(
     {
         let current_exchange_rate = query_exchange_rate(deps.as_ref(), config)?;
         attrs.push(attr("exchange_rate", current_exchange_rate.to_string()));
-        let expected_native_asset_amount =
-            unbond.total_dasset_amount_to_withdraw * current_exchange_rate;
+        let expected_native_asset_amount = current_exchange_rate
+            .checked_mul(unbond.total_dasset_amount_to_withdraw.into())
+            .unwrap()
+            .atomics()
+            .into();
 
         let calc_withdraw_query_result: Result<Vec<(String, Uint128)>, StdError> =
             deps.querier.query_wasm_smart(
@@ -1431,6 +1434,7 @@ pub mod check_denom {
         denom: impl Into<String>,
     ) -> StdResult<QueryDenomTraceResponse> {
         let denom = denom.into();
+        #[allow(deprecated)]
         deps.querier
             .query(&QueryRequest::Stargate {
                 path: "/ibc.applications.transfer.v1.Query/DenomTrace".to_string(),

contracts/core/src/contract.rs

@@ -17,8 +17,6 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 

contracts/distribution/Cargo.toml

@@ -17,8 +17,6 @@ exclude = [
 crate-type = ["cdylib", "rlib"]
 
 [features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 

contracts/factory/Cargo.toml

@@ -1,9 +1,6 @@
 use std::collections::HashMap;
 
-use cosmwasm_std::{
-    attr, instantiate2_address, to_json_binary, Binary, CodeInfoResponse, CosmosMsg, Deps, DepsMut,
-    Env, HexBinary, MessageInfo, Response, StdResult, Uint128, WasmMsg,
-};
+use cosmwasm_std::{attr, instantiate2_address, to_json_binary, Binary, CodeInfoResponse, CosmosMsg, Deps, DepsMut, Env, HexBinary, MessageInfo, Response, StdResult, Uint128, WasmMsg, Decimal};
 use drop_helpers::answer::response;
 use drop_helpers::phonebook::{
     CORE_CONTRACT, DISTRIBUTION_CONTRACT, LSM_SHARE_BOND_PROVIDER_CONTRACT,
@@ -674,7 +671,7 @@ fn get_proxied_message<T: cosmwasm_schema::serde::Serialize>(
 
 fn get_code_checksum(deps: Deps, code_id: u64) -> NeutronResult<HexBinary> {
     let CodeInfoResponse { checksum, .. } = deps.querier.query_wasm_code_info(code_id)?;
-    Ok(checksum)
+    Ok(HexBinary::from(checksum.as_slice()))
 }
 
 fn get_contract_label(base: &str) -> String {
@@ -704,7 +701,10 @@ fn get_splitter_receivers(
 ) -> ContractResult<Vec<(String, cosmwasm_std::Uint128)>> {
     match fee_params {
         Some(fee_params) => {
-            let fee_weight = PERCENT_PRECISION * fee_params.fee;
+            let fee_weight = fee_params.fee
+                .checked_mul(Decimal::from_ratio(PERCENT_PRECISION, Uint128::from(1u128)))
+                .unwrap()
+                .atomics();
             let bond_provider_weight = PERCENT_PRECISION - fee_weight;
             Ok(vec![
                 (bond_provider_address, bond_provider_weight),