Skip to content

Commit

Permalink
Update to tendermint-rs v0.28.0 and ibc-proto v0.24.0 (informalsy…
Browse files Browse the repository at this point in the history
  • Loading branch information
romac authored Dec 14, 2022
1 parent 79fb5b0 commit 92020e7
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2944-ibc-proto-0.24.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Update to `ibc-proto` 0.24.0. ([#2944](https://github.com/informalsystems/hermes/issues/2944))

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Update to `tendermint-rs` 0.28.0, which contains a security fix for the
Tendermint light client. This security fix is not critical to the operation of
Hermes. ([#2944](https://github.com/informalsystems/hermes/issues/2944))
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions crates/chain-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ description = """
"""

[dependencies]
ibc-proto = { version = "0.23.0" }
ibc-proto = { version = "0.24.0" }
ibc-relayer-types = { version = "0.20.0", path = "../relayer-types", features = ["std"] }
tendermint-rpc = { version = "0.28.0", features = ["http-client", "websocket-client"] }

async-trait = "0.1.57"
flex-error = { version = "0.4.4", default-features = false }
Expand All @@ -24,7 +25,3 @@ serde = "1.0.149"
serde_json = "1"
tokio = "1.17.0"
tracing = "0.1.36"

[dependencies.tendermint-rpc]
version = "0.27"
features = ["http-client", "websocket-client"]
6 changes: 3 additions & 3 deletions crates/relayer-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ tracing = "0.1.36"
tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}

[dependencies.tendermint]
version = "0.27.0"
version = "0.28.0"
features = ["secp256k1"]

[dependencies.tendermint-rpc]
version = "0.27.0"
version = "0.28.0"
features = ["http-client", "websocket-client"]

[dependencies.tendermint-light-client-verifier]
version = "0.27.0"
version = "0.28.0"

[dependencies.abscissa_core]
version = "=0.6.0"
Expand Down
16 changes: 8 additions & 8 deletions crates/relayer-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mocks = ["tendermint-testgen", "clock", "std"]

[dependencies]
# Proto definitions for all IBC-related interfaces, e.g., connections or channels.
ibc-proto = { version = "0.23.0", default-features = false }
ibc-proto = { version = "0.24.0", default-features = false }
ics23 = { version = "=0.9.0", default-features = false, features = ["host-functions"] }
time = { version = ">=0.3.0, <0.3.18", default-features = false }
serde_derive = { version = "1.0.104", default-features = false }
Expand All @@ -47,25 +47,25 @@ dyn-clone = "1.0.8"
num-rational = "0.4.1"

[dependencies.tendermint]
version = "0.27.0"
version = "0.28.0"
default-features = false

[dependencies.tendermint-proto]
version = "0.27.0"
version = "0.28.0"
default-features = false

# Temporary, until this change makes it into a tendermint-rs release:
# https://github.com/informalsystems/tendermint-rs/pull/1204
[dependencies.tendermint-rpc]
version = "0.27.0"
version = "0.28.0"
default-features = false

[dependencies.tendermint-light-client-verifier]
version = "0.27.0"
version = "0.28.0"
default-features = false

[dependencies.tendermint-testgen]
version = "0.27.0"
version = "0.28.0"
optional = true
default-features = false

Expand All @@ -75,5 +75,5 @@ 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"] }
modelator = "0.4.2"
tendermint-rpc = { version = "0.27.0", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "0.27.0" } # Needed for generating (synthetic) light blocks.
tendermint-rpc = { version = "0.28.0", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "0.28.0" } # Needed for generating (synthetic) light blocks.
12 changes: 6 additions & 6 deletions crates/relayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ profiling = []
telemetry = ["ibc-telemetry"]

[dependencies]
ibc-proto = { version = "0.23.0" }
ibc-proto = { version = "0.24.0" }
ibc-telemetry = { version = "0.20.0", path = "../telemetry", optional = true }
ibc-relayer-types = { version = "0.20.0", path = "../relayer-types", features = ["mocks"] }

Expand Down Expand Up @@ -78,20 +78,20 @@ version = "0.4.1"
features = ["num-bigint", "serde"]

[dependencies.tendermint]
version = "0.27.0"
version = "0.28.0"
features = ["secp256k1"]

[dependencies.tendermint-rpc]
version = "0.27.0"
version = "0.28.0"
features = ["http-client", "websocket-client"]

[dependencies.tendermint-light-client]
version = "0.27.0"
version = "0.28.0"
default-features = false
features = ["rpc-client", "secp256k1", "unstable"]

[dependencies.tendermint-light-client-verifier]
version = "0.27.0"
version = "0.28.0"
default-features = false

[dev-dependencies]
Expand All @@ -102,4 +102,4 @@ tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "jso
test-log = { version = "0.2.10", features = ["trace"] }

# Needed for generating (synthetic) light blocks.
tendermint-testgen = { version = "0.27.0" }
tendermint-testgen = { version = "0.28.0" }
2 changes: 1 addition & 1 deletion crates/telemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ serde_json = "1.0.87"
serde = "1.0.149"

[dependencies.tendermint]
version = "0.27.0"
version = "0.28.0"
default-features = false
4 changes: 2 additions & 2 deletions tools/query-events/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"

[dependencies]
tendermint = { version = "0.27" }
tendermint-rpc = { version = "0.27", features = ["http-client"] }
tendermint = { version = "0.28.0" }
tendermint-rpc = { version = "0.28.0", features = ["http-client"] }

clap = { version = "3.2", features = ["derive"] }
futures = "0.3.25"
Expand Down
4 changes: 2 additions & 2 deletions tools/test-framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ description = """
ibc-relayer-types = { version = "=0.20.0", path = "../../crates/relayer-types" }
ibc-relayer = { version = "=0.20.0", path = "../../crates/relayer" }
ibc-relayer-cli = { version = "=1.1.0", path = "../../crates/relayer-cli" }
ibc-proto = { version = "0.23.0" }
tendermint-rpc = { version = "0.27.0", features = ["http-client", "websocket-client"] }
ibc-proto = { version = "0.24.0" }
tendermint-rpc = { version = "0.28.0", features = ["http-client", "websocket-client"] }

http = "0.2.8"
tokio = { version = "1.0", features = ["full"] }
Expand Down
4 changes: 2 additions & 2 deletions tools/test-framework/src/types/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub struct Wallet {
pub address: WalletAddress,

// TODO: Parameterize this type on `SigningKeyPair`
/// The wallet key information in the form of [`SigningKeyPair`]
/// The wallet key information in the form of `SigningKeyPair`
/// that is used by the relayer.
pub key: Secp256k1KeyPair,
}
Expand Down Expand Up @@ -81,7 +81,7 @@ pub trait TaggedWallet<Chain> {
/// Get the [`WalletAddress`] tagged with the given `Chain`.
fn address(&self) -> MonoTagged<Chain, &WalletAddress>;

/// Get the [`SigningKeyPair`] tagged with the given `Chain`.
/// Get the `SigningKeyPair` tagged with the given `Chain`.
fn key(&self) -> MonoTagged<Chain, &Secp256k1KeyPair>;
}

Expand Down

0 comments on commit 92020e7

Please sign in to comment.