diff --git a/Cargo.lock b/Cargo.lock index 9f61c79ca..f1af4b88f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1247,7 +1247,7 @@ dependencies = [ "rlp", "secp256k1", "serde_json", - "tendermint-rpc", + "tendermint-rpc 0.33.0", "tiny-keccak", "tokio", ] @@ -2007,6 +2007,16 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +dependencies = [ + "pkcs8", + "signature 2.1.0", +] + [[package]] name = "ed25519-consensus" version = "2.1.0" @@ -2027,7 +2037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", "serde_bytes", @@ -3494,7 +3504,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tendermint-rpc", + "tendermint-rpc 0.33.0", "tokio", "tracing", ] @@ -3528,7 +3538,7 @@ dependencies = [ "prost", "serde", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.30.0", "tonic", ] @@ -3553,7 +3563,7 @@ dependencies = [ "cstr_core", "digest 0.10.6", "dirs-next", - "ed25519", + "ed25519 1.5.3", "ed25519-dalek", "ed25519-dalek-bip32", "env_logger 0.10.0", @@ -3598,10 +3608,10 @@ dependencies = [ "strum", "subtle-encoding", "tempfile", - "tendermint", + "tendermint 0.30.0", "tendermint-light-client", "tendermint-light-client-verifier", - "tendermint-rpc", + "tendermint-rpc 0.33.0", "tendermint-testgen", "test-log", "thiserror", @@ -3650,9 +3660,9 @@ dependencies = [ "serde_json", "signal-hook", "subtle-encoding", - "tendermint", + "tendermint 0.30.0", "tendermint-light-client-verifier", - "tendermint-rpc", + "tendermint-rpc 0.33.0", "tokio", "tracing", "tracing-subscriber", @@ -3709,10 +3719,10 @@ dependencies = [ "serde_derive", "serde_json", "subtle-encoding", - "tendermint", + "tendermint 0.30.0", "tendermint-light-client-verifier", - "tendermint-proto", - "tendermint-rpc", + "tendermint-proto 0.30.0", + "tendermint-rpc 0.33.0", "tendermint-testgen", "test-log", "thiserror", @@ -3738,7 +3748,7 @@ dependencies = [ "rouille", "serde", "serde_json", - "tendermint", + "tendermint 0.30.0", ] [[package]] @@ -3766,7 +3776,7 @@ dependencies = [ "serde_yaml 0.9.19", "sha2 0.10.6", "subtle-encoding", - "tendermint-rpc", + "tendermint-rpc 0.33.0", "tokio", "toml 0.5.11", "tonic", @@ -5421,8 +5431,8 @@ dependencies = [ "clap 3.2.23", "futures", "itertools", - "tendermint", - "tendermint-rpc", + "tendermint 0.30.0", + "tendermint-rpc 0.33.0", "tokio", "tracing", "tracing-subscriber", @@ -6829,7 +6839,7 @@ checksum = "b90c3c1e32352551f0f1639ce765e4c66ce250c733d4b9ba1aff81130437465c" dependencies = [ "bytes", "digest 0.10.6", - "ed25519", + "ed25519 1.5.3", "ed25519-consensus", "flex-error", "futures", @@ -6847,7 +6857,36 @@ dependencies = [ "signature 1.6.4", "subtle", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.30.0", + "time", + "zeroize", +] + +[[package]] +name = "tendermint" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d550db02d6bec4ebcbbebc4301ec22181bc489c37fb3f167e64b14c1be8321" +dependencies = [ + "bytes", + "digest 0.10.6", + "ed25519 2.2.1", + "ed25519-consensus", + "flex-error", + "futures", + "num-traits", + "once_cell", + "prost", + "prost-types", + "serde", + "serde_bytes", + "serde_json", + "serde_repr", + "sha2 0.10.6", + "signature 2.1.0", + "subtle", + "subtle-encoding", + "tendermint-proto 0.33.0", "time", "zeroize", ] @@ -6861,7 +6900,21 @@ dependencies = [ "flex-error", "serde", "serde_json", - "tendermint", + "tendermint 0.30.0", + "toml 0.5.11", + "url", +] + +[[package]] +name = "tendermint-config" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a787b139f314c92756becbcae855bef6772227d97d8ecee948ad90327fe6e7" +dependencies = [ + "flex-error", + "serde", + "serde_json", + "tendermint 0.33.0", "toml 0.5.11", "url", ] @@ -6881,9 +6934,9 @@ dependencies = [ "serde_cbor", "serde_derive", "static_assertions", - "tendermint", + "tendermint 0.30.0", "tendermint-light-client-verifier", - "tendermint-rpc", + "tendermint-rpc 0.30.0", "time", "tokio", ] @@ -6897,7 +6950,7 @@ dependencies = [ "derive_more", "flex-error", "serde", - "tendermint", + "tendermint 0.30.0", "time", ] @@ -6919,11 +6972,63 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-proto" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1834fa2eb884ba69b9c0eea55f0178270bed421217596ca4e54c19ef75dcb660" +dependencies = [ + "bytes", + "flex-error", + "num-derive", + "num-traits", + "prost", + "prost-types", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + [[package]] name = "tendermint-rpc" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d79bd426571d6a805be5c0b6749707ede6c6ee5e55dd45baef46857a1baa9f54" +dependencies = [ + "async-trait", + "bytes", + "flex-error", + "futures", + "getrandom 0.2.8", + "http", + "hyper", + "hyper-proxy", + "hyper-rustls 0.22.1", + "peg", + "pin-project", + "semver", + "serde", + "serde_bytes", + "serde_json", + "subtle", + "subtle-encoding", + "tendermint 0.30.0", + "tendermint-config 0.30.0", + "thiserror", + "time", + "tokio", + "tracing", + "url", + "uuid 0.8.2", + "walkdir", +] + +[[package]] +name = "tendermint-rpc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f8ff62948110e58d6df12c3bb73a00e74553384255d6413deed4c21d7480bf" dependencies = [ "async-trait", "async-tungstenite", @@ -6943,8 +7048,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint", - "tendermint-config", + "tendermint 0.33.0", + "tendermint-config 0.33.0", + "tendermint-proto 0.33.0", "thiserror", "time", "tokio", @@ -6966,7 +7072,7 @@ dependencies = [ "serde_json", "simple-error", "tempfile", - "tendermint", + "tendermint 0.30.0", "time", ] diff --git a/crates/chain-registry/Cargo.toml b/crates/chain-registry/Cargo.toml index fa684831d..a0b626159 100644 --- a/crates/chain-registry/Cargo.toml +++ b/crates/chain-registry/Cargo.toml @@ -14,7 +14,7 @@ description = """ [dependencies] ibc-proto = { version = "0.28.0" } ibc-relayer-types = { version = "0.23.0", path = "../relayer-types", features = ["std"] } -tendermint-rpc = { version = "0.30.0", features = ["http-client", "websocket-client"] } +tendermint-rpc = { version = "0.33.0", features = ["http-client", "websocket-client"] } async-trait = "0.1.67" flex-error = { version = "0.4.4", default-features = false } diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml index a8e12798b..4f37422bf 100644 --- a/crates/relayer-cli/Cargo.toml +++ b/crates/relayer-cli/Cargo.toml @@ -62,7 +62,7 @@ version = "0.30.0" features = ["secp256k1"] [dependencies.tendermint-rpc] -version = "0.30.0" +version = "0.33.0" features = ["http-client", "websocket-client"] [dependencies.tendermint-light-client-verifier] diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml index 24e4a515b..815407369 100644 --- a/crates/relayer-types/Cargo.toml +++ b/crates/relayer-types/Cargo.toml @@ -77,5 +77,5 @@ env_logger = "0.10.0" tracing = { version = "0.1.36", default-features = false } tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"] } test-log = { version = "0.2.10", features = ["trace"] } -tendermint-rpc = { version = "0.30.0", features = ["http-client", "websocket-client"] } +tendermint-rpc = { version = "0.33.0", features = ["http-client", "websocket-client"] } tendermint-testgen = { version = "0.30.0" } # Needed for generating (synthetic) light blocks. diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 9176b3c67..179ddb675 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -106,7 +106,7 @@ version = "0.30.0" features = ["secp256k1"] [dependencies.tendermint-rpc] -version = "0.30.0" +version = "0.33.0" features = ["http-client", "websocket-client"] [dependencies.tendermint-light-client] diff --git a/tools/ckb4ibc-test/Cargo.toml b/tools/ckb4ibc-test/Cargo.toml index 2c0a78c1f..7d8d770f6 100644 --- a/tools/ckb4ibc-test/Cargo.toml +++ b/tools/ckb4ibc-test/Cargo.toml @@ -10,7 +10,7 @@ ckb-types = "0.106.0" hex = "0.4" relayer = {version = "*", package = "ibc-relayer", path = "../../crates/relayer"} -tendermint-rpc = {version = "0.30.0", features = ["http-client", "websocket-client"]} +tendermint-rpc = {version = "0.33.0", features = ["http-client", "websocket-client"]} tokio = { version = "1.0", features = ["rt-multi-thread", "time", "sync", "parking_lot"] } reqwest = { version = "0.11", features = ["json"]} diff --git a/tools/query-events/Cargo.toml b/tools/query-events/Cargo.toml index 3df87de5f..156c3834b 100644 --- a/tools/query-events/Cargo.toml +++ b/tools/query-events/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] tendermint = { version = "0.30.0" } -tendermint-rpc = { version = "0.30.0", features = ["http-client"] } +tendermint-rpc = { version = "0.33.0", features = ["http-client"] } clap = { version = "3.2", features = ["derive"] } futures = "0.3.27" diff --git a/tools/test-framework/Cargo.toml b/tools/test-framework/Cargo.toml index 5ab788198..2a52fff8f 100644 --- a/tools/test-framework/Cargo.toml +++ b/tools/test-framework/Cargo.toml @@ -18,7 +18,7 @@ ibc-relayer-types = { version = "=0.23.0", path = "../../crates/relayer-type ibc-relayer = { version = "=0.23.0", path = "../../crates/relayer" } ibc-relayer-cli = { version = "=1.4.0", path = "../../crates/relayer-cli" } ibc-proto = { version = "0.28.0" } -tendermint-rpc = { version = "0.30.0", features = ["http-client", "websocket-client"] } +tendermint-rpc = { version = "0.33.0", features = ["http-client", "websocket-client"] } http = "0.2.9" tokio = { version = "1.0", features = ["full"] }