diff --git a/Cargo.lock b/Cargo.lock index 261f6da9..99d88977 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,18 +308,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "blackbox_rs" version = "3.0.3" @@ -356,30 +344,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" -[[package]] -name = "borsh" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" -dependencies = [ - "once_cell", - "proc-macro-crate 2.0.0", - "proc-macro2", - "quote", - "syn 2.0.52", - "syn_derive", -] - [[package]] name = "bs58" version = "0.5.0" @@ -401,28 +365,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "byteorder" version = "1.5.0" @@ -453,12 +395,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "clap" version = "4.5.4" @@ -475,10 +411,8 @@ version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", ] [[package]] @@ -769,7 +703,7 @@ dependencies = [ "ibc-apps-more", "ibc-core-host-types", "ibc-primitives", - "ibc-proto 0.42.2", + "ibc-proto 0.39.1", "num-rational", "parity-scale-codec", "prost", @@ -1056,7 +990,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 2.0.52", ] @@ -1374,12 +1308,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.29" @@ -2018,15 +1946,14 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "c8a8b1356652b9f160f5a010dd6b084675b8a28e163bf2b41ca5abecf27d9701" dependencies = [ "base64 0.21.5", "bytes", "flex-error", "ics23", - "informalsystems-pbjson 0.7.0", "parity-scale-codec", "prost", "scale-info", @@ -2044,7 +1971,7 @@ dependencies = [ "anyhow", "bytes", "hex", - "informalsystems-pbjson 0.6.0", + "informalsystems-pbjson", "prost", "ripemd", "serde", @@ -2124,16 +2051,6 @@ dependencies = [ "serde", ] -[[package]] -name = "informalsystems-pbjson" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d" -dependencies = [ - "base64 0.21.5", - "serde", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2819,26 +2736,6 @@ dependencies = [ "prost", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" version = "1.0.35" @@ -2848,12 +2745,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.5" @@ -2944,15 +2835,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - [[package]] name = "reqwest" version = "0.11.24" @@ -3029,34 +2911,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rust_decimal" version = "1.35.0" @@ -3064,13 +2918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", - "borsh", - "bytes", "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", ] [[package]] @@ -3262,12 +3110,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.7.3" @@ -3492,12 +3334,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - [[package]] name = "slab" version = "0.4.9" @@ -3561,12 +3397,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - [[package]] name = "strum" version = "0.25.0" @@ -3737,18 +3567,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.52", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -3776,12 +3594,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.8.1" @@ -4658,15 +4470,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "zeroize" version = "1.7.0" diff --git a/Cargo.toml b/Cargo.toml index f5a7994f..8e6ee2ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,48 +67,49 @@ env_logger = { version = "0.11.3", default-features = false, features = [ "unstable-kv", ] } hex = { version = "^0.4.3", default-features = false } -enumn = { version = "0.1.13" } +enumn = { version = "0.1.13", default-features = false } prost-build = { version = "^0.12.2" } bech32 = { version = "^0.11.0", default-features = false } cosmwasm-std = { version = "^1.5.3", features = [ "iterator", ], default-features = false } -parity-scale-codec = { version = "^3.6.9", default-features = false } +parity-scale-codec = { version = "3.6.5", default-features = false } cw20 = { version = "^1.1.2", default-features = false } cw-controllers = { version = "^1.1.1", default-features = false } sylvia = { version = "^0.9.1", default-features = false } schemars = { version = "^0.8.16", default-features = false } cosmwasm-schema = { version = "^1.5.3", default-features = false } -serde = { version = "^1.0.197", default-features = false } +serde = { version = "1.0.192", default-features = false } cw-storage-plus = { version = "^1.2.0", features = [ "iterator", ], default-features = false } -itertools = { version = "^0.12.1", default-features = false } +itertools = { version = "0.12.0", default-features = false } cw-multi-test = {version = "^1.0.0", default-features = false} -num-integer = { version = "^0.1.46", default-features = false } +num-integer = { version = "0.1.45", default-features = false } num-rational = {git = "https://github.com/dzmitry-lahoda-forks/num-rational.git", rev = "719b4dbe0afd69b98f5875e3bdf936b9df822522", default-features = false} num-traits = { version = "^0.2.18", default-features = false } -ibc-proto = { version = "^0.42.2", default-features = false } -serde-json-wasm = { version = "^1.0.1", default-features = false } +ibc-proto = { version = "0.39.1", default-features = false } +serde-json-wasm = { version = "1.0.0", default-features = false } -clap = { version = "^4.5.4", features = ["derive"] } +clap = { version = "^4.5.4", features = ["derive"], default-features = false} cosmrs = { version = "^0.16.0", features = [ "cosmwasm", "rpc", "grpc", "bip32", "dev", -] } +], default-features = false } + tokio = { version = "^1.37.0", features = ["full"] } -cosmos-sdk-proto = { version = "^0.21.1", features = ["grpc-transport"] } +cosmos-sdk-proto = { version = "^0.21.1", default-features = false} tonic = { version = "^0.11.0" } rand = { version = "^0.8.5", default-features = false } -rust_decimal = {version = "^1.35" } -rust_decimal_macros = {version = "^1.34.2"} +rust_decimal = {version = "1.33", default-features = false} +rust_decimal_macros = {version = "1.33", default-features = false} rand_distr = "^0.4.3" strum = "^0.25" strum_macros = "^0.25" diff --git a/crates/cvm-route/src/prelude.rs b/crates/cvm-route/src/prelude.rs index 00739275..33857b22 100644 --- a/crates/cvm-route/src/prelude.rs +++ b/crates/cvm-route/src/prelude.rs @@ -1,4 +1,4 @@ -pub use alloc::{boxed::Box, string::String, vec, vec::Vec}; +pub use alloc::{string::String, vec, vec::Vec}; pub use serde::{Deserialize, Serialize}; diff --git a/crates/cvm-runtime/src/cosmwasm/mod.rs b/crates/cvm-runtime/src/cosmwasm/mod.rs index 1d4fbebb..37359e4c 100644 --- a/crates/cvm-runtime/src/cosmwasm/mod.rs +++ b/crates/cvm-runtime/src/cosmwasm/mod.rs @@ -65,7 +65,7 @@ use super::{BindingValue, Bindings}; use crate::OrderedBindings; -use alloc::{fmt::Debug, string::String, vec, vec::Vec}; +use alloc::{fmt::Debug, string::String, vec::Vec}; use cosmwasm_std::{BankMsg, Coin, CosmosMsg, Uint64}; use serde::{Deserialize, Serialize}; diff --git a/crates/cvm/src/prelude.rs b/crates/cvm/src/prelude.rs index 090c01ba..ec74df69 100644 --- a/crates/cvm/src/prelude.rs +++ b/crates/cvm/src/prelude.rs @@ -1,5 +1,4 @@ pub use alloc::{ - format, string::{String, ToString}, vec, vec::Vec, diff --git a/mantis/node/Cargo.toml b/mantis/node/Cargo.toml index 87be164c..ce667683 100644 --- a/mantis/node/Cargo.toml +++ b/mantis/node/Cargo.toml @@ -16,7 +16,7 @@ bip32 = { workspace = true, default-features = false, features = [ ] } bip39 = {version = "2.0.0", features = ["std"]} clap = { workspace = true, features = ["derive", "std"] } -cosmos-sdk-proto = { workspace = true, features = ["grpc-transport"] } +cosmos-sdk-proto = { workspace = true, features = ["grpc-transport", "cosmwasm", "grpc"] } cosmrs = { workspace = true, features = []} cosmwasm-std = { workspace = true, features = []} cw-mantis-order = { workspace = true, features = [