diff --git a/Cargo.lock b/Cargo.lock index 09af01a2..705c9830 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -575,9 +575,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "k256" @@ -595,9 +595,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "lido-interchain-interceptor" @@ -672,6 +672,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "lido-token" +version = "1.0.0" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "cw-utils", + "cw2", + "neutron-sdk", + "thiserror", +] + [[package]] name = "lido-validators-stats" version = "1.0.0" @@ -797,7 +810,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -865,9 +878,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schemars" @@ -957,7 +970,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1060,9 +1073,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" dependencies = [ "proc-macro2", "quote", @@ -1104,7 +1117,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fb3f1c7d..9fd1aad2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,11 +17,12 @@ prost = "0.12.1" prost-types = "0.12.1" protobuf = "3.2.0" tendermint-proto = "0.34.0" -cosmwasm-schema = { version = "1.3.1" } -cosmwasm-std = { version = "1.2.1" } -cw-storage-plus = { version = "1.0.1" } -cw2 = { version = "1.0.1" } +cosmwasm-std = { version = "1.5.0", default-features = false } +cosmwasm-schema = { version = "1.5.0", default-features = false } +cw-storage-plus = { version = "1.2.0", default-features = false } +cw2 = { version = "1.1.2", default-features = false } cw20 = { version = "1.0.1" } +cw-utils = { version = "1.0.3", default-features = false } schemars = "0.8" serde = { version = "1.0.127", default-features = false, features = ["derive"] } serde-json-wasm = { version = "1.0.0" } @@ -42,12 +43,3 @@ panic = 'abort' incremental = false overflow-checks = true -[workspace.dependencies] -cosmwasm-std = { version = "1.5.0", default-features = false } -cosmwasm-schema = { version = "1.5.0", default-features = false } -cw-storage-plus = { version = "1.2.0", default-features = false } -cw2 = { version = "1.1.2", default-features = false } -cw-utils = { version = "1.0.3", default-features = false } -neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "sdk/47", default-features = false } -cw-ownable = "0.5.1" -thiserror = "1.0.50" diff --git a/contracts/validators-stats/src/contract.rs b/contracts/validators-stats/src/contract.rs index e4e78b2a..eac599ae 100644 --- a/contracts/validators-stats/src/contract.rs +++ b/contracts/validators-stats/src/contract.rs @@ -152,9 +152,9 @@ pub fn sudo_kv_query_result( let interchain_query_result = get_raw_interchain_query_result(deps.as_ref(), query_id)?; if optional_query_id == validator_profile_query_id { - return validator_info_sudo(deps, _env, interchain_query_result); + return sudo_validator_info(deps, _env, interchain_query_result); } else if optional_query_id == signing_info_query_id { - return signing_info_sudo(deps, _env, interchain_query_result); + return sudo_signing_info(deps, _env, interchain_query_result); } else { deps.api.debug(&format!( "WASMDEBUG: sudo_kv_query_result query_id: {:?}", @@ -165,7 +165,7 @@ pub fn sudo_kv_query_result( Ok(Response::default()) } -fn validator_info_sudo( +fn sudo_validator_info( deps: DepsMut, env: Env, interchain_query_result: QueryRegisteredQueryResultResponse, @@ -229,7 +229,7 @@ fn commission_in_range(rate: Decimal, min: Decimal, max: Decimal) -> bool { rate >= min && rate <= max } -fn signing_info_sudo( +fn sudo_signing_info( deps: DepsMut, env: Env, interchain_query_result: QueryRegisteredQueryResultResponse,