diff --git a/Cargo.lock b/Cargo.lock index 903c15e..fde1071 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -206,7 +206,6 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time", "winapi", ] @@ -264,12 +263,6 @@ dependencies = [ "syn", ] -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation" version = "0.9.2" @@ -288,12 +281,12 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cosmos-sdk-proto" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "676c5bae3939f3a7cbda3ff160fdcf85bbc997cb95dde092c2709099077564d8" +checksum = "edb5204c6ddc4352c74297638b5561f2929d6334866c156e5f3c75e1e1a1436a" dependencies = [ - "prost 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-types", "tendermint-proto", "tonic", ] @@ -309,9 +302,9 @@ dependencies = [ [[package]] name = "crc" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c2722795460108a7872e1cd933a85d6ec38abc4baecad51028f702da28889f" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" dependencies = [ "crc-catalog", ] @@ -432,10 +425,8 @@ version = "0.99.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", "syn", ] @@ -568,9 +559,9 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "flex-error" @@ -977,6 +968,19 @@ dependencies = [ "tokio", "tokio-rustls", "webpki", + "webpki-roots", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", ] [[package]] @@ -1028,15 +1032,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.1" @@ -1330,9 +1325,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.36" +version = "0.10.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +checksum = "2bc6b9e4403633698352880b22cbe2f0e45dd0177f6fabe4585536e56a3e4f75" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1350,9 +1345,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.67" +version = "0.9.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" +checksum = "1c571f25d3f66dd427e417cebf73dbe2361d6125cf6e3a70d143fdf97c9f5150" dependencies = [ "autocfg", "cc", @@ -1434,20 +1429,11 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - [[package]] name = "petgraph" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", "indexmap", @@ -1545,90 +1531,51 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] [[package]] name = "prost" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" -dependencies = [ - "bytes", - "prost-derive 0.7.0", -] - -[[package]] -name = "prost" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive 0.8.0", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" -dependencies = [ - "bytes", - "heck", - "itertools 0.9.0", - "log", - "multimap", - "petgraph", - "prost 0.7.0", - "prost-types 0.7.0", - "tempfile", - "which", -] - -[[package]] -name = "prost-build" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", - "itertools 0.10.1", + "itertools", + "lazy_static", "log", "multimap", "petgraph", - "prost 0.8.0", - "prost-types 0.8.0", + "prost", + "prost-types", + "regex", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" -dependencies = [ - "anyhow", - "itertools 0.9.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools 0.10.1", + "itertools", "proc-macro2", "quote", "syn", @@ -1636,22 +1583,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" -dependencies = [ - "bytes", - "prost 0.7.0", -] - -[[package]] -name = "prost-types" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.8.0", + "prost", ] [[package]] @@ -1826,15 +1763,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver", -] - [[package]] name = "rustls" version = "0.19.1" @@ -1924,24 +1852,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.130" @@ -2090,9 +2000,9 @@ dependencies = [ "libloading", "log", "num-rational", - "prost 0.7.0", - "prost-build 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-build", + "prost-types", "rust_decimal", "serde_json", "solo-machine-core", @@ -2101,7 +2011,7 @@ dependencies = [ "termcolor", "tokio", "tonic", - "tonic-build 0.4.2", + "tonic-build", ] [[package]] @@ -2117,8 +2027,8 @@ dependencies = [ "hex", "k256", "num-rational", - "prost 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-types", "rand 0.8.4", "regex", "ripemd160", @@ -2133,7 +2043,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tonic", - "tonic-build 0.5.2", + "tonic-build", "urlencoding", ] @@ -2158,7 +2068,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" dependencies = [ - "itertools 0.10.1", + "itertools", "nom", "unicode_categories", ] @@ -2330,9 +2240,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -2367,9 +2277,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5354dfcc3bbd8bf3b000b9cfb19afcb4e1bbaed9d6b2d6bc2fa05e027bd7e1" +checksum = "50d1cdb0236becb17ab35a2ed1566503e412fd910944dc940239857bb7663652" dependencies = [ "async-trait", "bytes", @@ -2380,8 +2290,8 @@ dependencies = [ "futures", "num-traits", "once_cell", - "prost 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-types", "serde", "serde_bytes", "serde_json", @@ -2391,18 +2301,30 @@ dependencies = [ "subtle", "subtle-encoding", "tendermint-proto", - "time", + "zeroize", +] + +[[package]] +name = "tendermint-config" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1f94250d30e3011130a09756b05985d8dbfbd562cf261b5a17e36d89a37992" +dependencies = [ + "flex-error", + "serde", + "serde_json", + "tendermint", "toml", "url", - "zeroize", ] [[package]] name = "tendermint-light-client" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67bd8950fa29cd53f482ae3030700c74235260d9143bf634563136b5da5224c" +checksum = "10698a05e70e337626f463077aec0699a51561ce4a06cd5c5634a3437e23ebdd" dependencies = [ + "chrono", "contracts", "crossbeam-channel 0.4.4", "derive_more", @@ -2419,17 +2341,17 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c36f58bd68be7a6e3221c49cc1a14cbc619c189bb26a43425f544831922d2be" +checksum = "ff16a7b42bdbcf31c8cd10a4cffc7631f2a301360ba3a3f71dde48eabfa5bced" dependencies = [ "bytes", "chrono", "flex-error", "num-derive", "num-traits", - "prost 0.7.0", - "prost-types 0.7.0", + "prost", + "prost-types", "serde", "serde_bytes", "subtle-encoding", @@ -2437,9 +2359,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ca84e07a1ca78193a81854685a9cb99c17080674442c4fe10ee53f4d2195169" +checksum = "c7842dcd5edb60b077572aa92ff8b29fc810b9b463310f9810a2607474130db4" dependencies = [ "async-trait", "bytes", @@ -2458,6 +2380,7 @@ dependencies = [ "serde_json", "subtle-encoding", "tendermint", + "tendermint-config", "tendermint-proto", "thiserror", "tokio", @@ -2505,17 +2428,6 @@ dependencies = [ "syn", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "tinyvec" version = "1.5.0" @@ -2548,6 +2460,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "tokio-io-timeout" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" +dependencies = [ + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-macros" version = "1.5.0" @@ -2616,9 +2538,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.4.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac42cd97ac6bd2339af5bcabf105540e21e45636ec6fa6aae5e85d44db31be0" +checksum = "24203b79cf2d68909da91178db3026e77054effba0c5d93deb870d3ca7b35afa" dependencies = [ "async-stream", "async-trait", @@ -2630,16 +2552,18 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.7.0", - "prost-derive 0.7.0", + "prost", + "prost-derive", "rustls-native-certs", "tokio", "tokio-rustls", "tokio-stream", "tokio-util", "tower", + "tower-layer", "tower-service", "tracing", "tracing-futures", @@ -2647,24 +2571,12 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c695de27302f4697191dda1c7178131a8cb805463dda02864acb80fe1322fdcf" -dependencies = [ - "proc-macro2", - "prost-build 0.7.0", - "quote", - "syn", -] - -[[package]] -name = "tonic-build" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" +checksum = "88358bb1dcfeb62dcce85c63006cafb964b7be481d522b7e09589d4d1e718d2a" dependencies = [ "proc-macro2", - "prost-build 0.8.0", + "prost-build", "quote", "syn", ] @@ -2757,12 +2669,6 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - [[package]] name = "unicode-bidi" version = "0.3.7" diff --git a/solo-machine-core/Cargo.toml b/solo-machine-core/Cargo.toml index 5804b65..06dd8cf 100644 --- a/solo-machine-core/Cargo.toml +++ b/solo-machine-core/Cargo.toml @@ -10,14 +10,14 @@ edition = "2021" anyhow = "1.0.44" async-trait = "0.1.51" bech32 = "0.8.1" -chrono = "0.4.19" -cosmos-sdk-proto = "0.7.0" -ed25519-dalek = "1.0.1" +chrono = { version = "0.4.19", default-features = false } +cosmos-sdk-proto = "0.8.0" +ed25519-dalek = { version = "1.0.1", features = ["serde"] } hex = { version = "0.4.3", features = ["serde"] } k256 = { version = "0.9.6", features = ["ecdsa"] } num-rational = { version = "0.4.0", features = ["serde"] } -prost = "0.7.0" -prost-types = "0.7.0" +prost = "0.9.0" +prost-types = "0.9.0" rand = "0.8.4" regex = "1.5.4" ripemd160 = "0.9.1" @@ -33,15 +33,15 @@ sqlx = { version = "0.5.9", features = [ "sqlite", "chrono", ] } -tendermint = "0.22.0" -tendermint-light-client = "0.22.0" -tendermint-rpc = { version = "0.22.0", features = ["http-client"] } +tendermint = "0.23.0" +tendermint-light-client = "0.23.0" +tendermint-rpc = { version = "0.23.0", features = ["http-client"] } tokio = { version = "1.12.0", features = ["sync"] } -tonic = { version = "0.4.3", features = ["tls", "tls-roots"] } +tonic = { version = "0.6.1", features = ["tls", "tls-roots"] } urlencoding = "2.1.0" [build-dependencies] -tonic-build = "0.5.2" +tonic-build = "0.6.0" [features] default = ["solomachine-v2"] diff --git a/solo-machine-core/build.rs b/solo-machine-core/build.rs index 802a400..25252cd 100644 --- a/solo-machine-core/build.rs +++ b/solo-machine-core/build.rs @@ -27,7 +27,7 @@ fn main() -> Result<(), Box> { "::cosmos_sdk_proto::ibc::core::channel::v1", ) .build_server(false) - .compile(&files, &["proto".into()])?; + .compile(&files, &["proto"])?; Ok(()) } diff --git a/solo-machine-core/src/ibc/client/ics07_tendermint/consensus_state.rs b/solo-machine-core/src/ibc/client/ics07_tendermint/consensus_state.rs index a1f9862..36ca173 100644 --- a/solo-machine-core/src/ibc/client/ics07_tendermint/consensus_state.rs +++ b/solo-machine-core/src/ibc/client/ics07_tendermint/consensus_state.rs @@ -16,7 +16,7 @@ impl IConsensusState for ConsensusState { root: Some(MerkleRoot { hash: header.app_hash.value(), }), - timestamp: Some(Timestamp::from(SystemTime::from(header.time))), + timestamp: Some(Timestamp::from(SystemTime::from(header.time.0))), next_validators_hash: header.next_validators_hash.as_bytes().to_vec(), } } diff --git a/solo-machine/Cargo.toml b/solo-machine/Cargo.toml index 72c411e..731788a 100644 --- a/solo-machine/Cargo.toml +++ b/solo-machine/Cargo.toml @@ -21,18 +21,18 @@ k256 = { version = "0.9.6", features = ["ecdsa"] } libloading = "0.7.1" log = "0.4.14" num-rational = "0.4.0" -prost = "0.7.0" -prost-types = "0.7.0" +prost = "0.9.0" +prost-types = "0.9.0" rust_decimal = "1.17.0" serde_json = "1.0.68" solo-machine-core = { path = "../solo-machine-core", features = [ "solomachine-v2", ] } structopt = "0.3.25" -tendermint = "0.22.0" +tendermint = "0.23.0" termcolor = "1.1.2" tokio = { version = "1.12.0", features = ["fs", "macros", "rt-multi-thread"] } -tonic = { version = "0.4.3", features = ["tls", "tls-roots"] } +tonic = { version = "0.6.1", features = ["tls", "tls-roots"] } [features] default = [] @@ -40,5 +40,5 @@ ethermint = ["solo-machine-core/ethermint"] postgres = ["solo-machine-core/postgres"] [build-dependencies] -prost-build = "0.7.0" -tonic-build = "0.4.2" +prost-build = "0.9.0" +tonic-build = "0.6.0" diff --git a/solo-machine/build.rs b/solo-machine/build.rs index f6923cd..02a72fe 100644 --- a/solo-machine/build.rs +++ b/solo-machine/build.rs @@ -20,7 +20,7 @@ fn main() -> Result<(), Box> { tonic_build::configure() .build_client(false) - .compile_with_config(config, &files, &["proto".into()])?; + .compile_with_config(config, &files, &["proto"])?; Ok(()) }