Skip to content

Commit

Permalink
Update to tendermint 0.27 (#260)
Browse files Browse the repository at this point in the history
* Update to tendermint 0.27

* Unpatch ibc-proto

* Changelog entry for #260

* Fix up changelog for #260
  • Loading branch information
mzabaluev authored and hu55a1n1 committed Dec 8, 2022
1 parent 999b74d commit 2294d3f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/breaking-changes/260-tendermint-0.27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Update to changes in tendermint-rs 0.27
([#260](https://github.com/cosmos/ibc-rs/pulls/260))
8 changes: 4 additions & 4 deletions ci/no-std-check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ resolver = "2"

[dependencies]
ibc = { path = "../../crates/ibc", default-features = false }
ibc-proto = { version = "0.22.0", default-features = false }
tendermint = { version = "0.26.0", default-features = false }
tendermint-proto = { version = "0.26.0", default-features = false }
tendermint-light-client-verifier = { version = "0.26.0", default-features = false }
ibc-proto = { version = "0.23.0", default-features = false }
tendermint = { version = "0.27.0", default-features = false }
tendermint-proto = { version = "0.27.0", default-features = false }
tendermint-light-client-verifier = { version = "0.27.0", default-features = false }

sp-core = { version = "5.0.0", default-features = false, optional = true }
sp-io = { version = "5.0.0", default-features = false, optional = true }
Expand Down
14 changes: 7 additions & 7 deletions crates/ibc/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.22.0", default-features = false }
ibc-proto = { version = "0.23.0", default-features = false }
ics23 = { version = "=0.8.1", default-features = false, features = ["host-functions"] }
time = { version = ">=0.3.0, <0.3.17", default-features = false }
serde_derive = { version = "1.0.104", default-features = false }
Expand All @@ -48,19 +48,19 @@ primitive-types = { version = "0.12.0", default-features = false, features = ["s
dyn-clone = "1.0.8"

[dependencies.tendermint]
version = "0.26.0"
version = "0.27"
default-features = false

[dependencies.tendermint-proto]
version = "0.26.0"
version = "0.27"
default-features = false

[dependencies.tendermint-light-client-verifier]
version = "0.26.0"
version = "0.27"
default-features = false

[dependencies.tendermint-testgen]
version = "0.26.0"
version = "0.27"
optional = true
default-features = false

Expand All @@ -70,5 +70,5 @@ tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "jso
test-log = { version = "0.2.10", features = ["trace"] }
modelator = "0.4.2"
sha2 = { version = "0.10.6" }
tendermint-rpc = { version = "0.26.0", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "0.26.0" } # Needed for generating (synthetic) light blocks.
tendermint-rpc = { version = "0.27", features = ["http-client", "websocket-client"] }
tendermint-testgen = { version = "0.27" } # Needed for generating (synthetic) light blocks.
2 changes: 1 addition & 1 deletion crates/ibc/src/core/ics23_commitment/merkle.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::prelude::*;
use tendermint::merkle::proof::Proof as TendermintProof;
use tendermint::merkle::proof::ProofOps as TendermintProof;

use ibc_proto::ibc::core::commitment::v1::MerklePath;
use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
Expand Down

0 comments on commit 2294d3f

Please sign in to comment.