Skip to content

Commit 51453ab

Browse files
rnbguyseanchen1991
rnbguy
and
seanchen1991
authored
chore(deps): ibc-proto 0.44.0 and tendermint 0.36.0 (informalsystems#1206)
* update ibc-proto and tendemrint * compile tests * update cargo lockfiles * downgrade msrv to 1.71.1 zeroize 1.8 with MSRV 1.72 is yanked * ignore patterns for depbot * changelog entry * ignore cw-storage-plus * use consistent cargo-toml * taplo for toml fmt * nit * Align cargo.toml entries * put multiline description in separate section * format toml * exclude tendermint cw contract from publishing --------- Signed-off-by: Rano | Ranadeep <[email protected]> Co-authored-by: Sean Chen <[email protected]>
1 parent dc116da commit 51453ab

File tree

48 files changed

+1303
-1255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1303
-1255
lines changed

‎.changelog/unreleased/improvements/1212-update-ibc-proto-and-tendermint-deps.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- Update `ibc-proto` to v0.44.0 and `tendermint` dependencies to v0.36.0.
2+
([\#1212](https://github.com/cosmos/ibc-rs/issues/1212))
3+
- Revert Rust minimum supported version to `1.71.1`.
4+
([\#1206](https://github.com/cosmos/ibc-rs/pull/1206))

‎.github/dependabot.yml

+15
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,26 @@ updates:
77
directory: "/"
88
schedule:
99
interval: "weekly"
10+
ignore:
11+
- dependency-name: "tendermint*"
12+
- dependency-name: "ibc*"
13+
- dependency-name: "cosmwasm*"
14+
- dependency-name: "cw*"
1015
- package-ecosystem: "cargo"
1116
directory: "ci/no-std-check"
1217
schedule:
1318
interval: "weekly"
19+
ignore:
20+
- dependency-name: "tendermint*"
21+
- dependency-name: "ibc*"
22+
- dependency-name: "cosmwasm*"
23+
- dependency-name: "cw*"
1424
- package-ecosystem: "cargo"
1525
directory: "ci/cw-check"
1626
schedule:
1727
interval: "weekly"
28+
ignore:
29+
- dependency-name: "tendermint*"
30+
- dependency-name: "ibc*"
31+
- dependency-name: "cosmwasm*"
32+
- dependency-name: "cw*"

‎.github/workflows/code-quality.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
FD_VERSION: 9.0.0
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414

1515
- name: Whitestapace lints
1616
run: bash ci/code-quality/whitespace-lints.sh
@@ -19,3 +19,9 @@ jobs:
1919
uses: crate-ci/[email protected] # NOTE: Newer versions detect false positives. Test locally before upgrading.
2020
with:
2121
config: ./.github/typos.toml
22+
23+
- uses: actions-rust-lang/setup-rust-toolchain@v1
24+
- uses: baptiste0928/cargo-install@v3
25+
with:
26+
crate: taplo-cli
27+
- run: taplo fmt --check

‎.github/workflows/rust.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
timeout-minutes: 30
137137
env:
138138
CARGO_MSRV_VERSION: 0.16.0-beta.20
139-
MSRV: 1.72
139+
MSRV: 1.71.1
140140
strategy:
141141
matrix:
142142
param:

‎Cargo.toml

+79-79
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,91 @@
22
resolver = "2"
33
# members sorted by publishing order to `crates.io`
44
members = [
5-
"ibc-derive",
6-
"ibc-primitives",
7-
"ibc-core/ics24-host/types",
8-
"ibc-core/ics26-routing/types",
9-
"ibc-core/ics23-commitment/types",
10-
"ibc-core/ics02-client/types",
11-
"ibc-core/ics03-connection/types",
12-
"ibc-core/ics04-channel/types",
13-
"ibc-core/ics25-handler/types",
14-
"ibc-core/ics02-client/context",
15-
"ibc-core/ics24-host",
16-
"ibc-core/ics26-routing",
17-
"ibc-core/ics02-client",
18-
"ibc-core/ics03-connection",
19-
"ibc-core/ics04-channel",
20-
"ibc-core/ics25-handler",
21-
"ibc-core",
22-
"ibc-clients/ics07-tendermint/types",
23-
"ibc-clients/ics07-tendermint",
24-
"ibc-clients/ics08-wasm/types",
25-
"ibc-clients/cw-context",
26-
"ibc-clients/ics07-tendermint/cw-contract",
27-
"ibc-clients",
28-
"ibc-apps/ics20-transfer/types",
29-
"ibc-apps/ics20-transfer",
30-
"ibc-apps/ics721-nft-transfer/types",
31-
"ibc-apps/ics721-nft-transfer",
32-
"ibc-apps",
33-
"ibc-core/ics24-host/cosmos",
34-
"ibc-data-types",
35-
"ibc",
36-
"ibc-query",
37-
"ibc-testkit",
5+
"ibc-derive",
6+
"ibc-primitives",
7+
"ibc-core/ics24-host/types",
8+
"ibc-core/ics26-routing/types",
9+
"ibc-core/ics23-commitment/types",
10+
"ibc-core/ics02-client/types",
11+
"ibc-core/ics03-connection/types",
12+
"ibc-core/ics04-channel/types",
13+
"ibc-core/ics25-handler/types",
14+
"ibc-core/ics02-client/context",
15+
"ibc-core/ics24-host",
16+
"ibc-core/ics26-routing",
17+
"ibc-core/ics02-client",
18+
"ibc-core/ics03-connection",
19+
"ibc-core/ics04-channel",
20+
"ibc-core/ics25-handler",
21+
"ibc-core",
22+
"ibc-clients/ics07-tendermint/types",
23+
"ibc-clients/ics07-tendermint",
24+
"ibc-clients/ics08-wasm/types",
25+
"ibc-clients/cw-context",
26+
"ibc-clients/ics07-tendermint/cw-contract",
27+
"ibc-clients",
28+
"ibc-apps/ics20-transfer/types",
29+
"ibc-apps/ics20-transfer",
30+
"ibc-apps/ics721-nft-transfer/types",
31+
"ibc-apps/ics721-nft-transfer",
32+
"ibc-apps",
33+
"ibc-core/ics24-host/cosmos",
34+
"ibc-data-types",
35+
"ibc",
36+
"ibc-query",
37+
"ibc-testkit",
3838
]
3939
exclude = [
40-
"ci/cw-check",
41-
"ci/no-std-check",
40+
"ci/cw-check",
41+
"ci/no-std-check",
4242
]
4343

4444
[workspace.package]
4545
version = "0.52.0"
4646
license = "Apache-2.0"
4747
edition = "2021"
48-
rust-version = "1.72"
48+
rust-version = "1.71.1"
4949
readme = "README.md"
5050
repository = "https://github.com/cosmos/ibc-rs"
51-
authors = ["Informal Systems <[email protected]>"]
51+
authors = [ "Informal Systems <[email protected]>" ]
5252

5353
[workspace.dependencies]
5454
# external dependencies
55-
base64 = { version = "0.21", default-features = false }
56-
borsh = { version = "0.10", default-features = false }
57-
displaydoc = { version = "0.2", default-features = false }
58-
prost = { version = "0.12", default-features = false }
59-
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display", "try_into"] }
60-
rstest = "0.18.2"
61-
schemars = { version = "0.8.15" }
62-
sha2 = { version = "0.10.8", default-features = false }
63-
serde = { version = "1.0", default-features = false }
64-
serde_json = { package = "serde-json-wasm", version = "1.0.1", default-features = false }
65-
subtle-encoding = { version = "0.5", default-features = false }
55+
base64 = { version = "0.21", default-features = false }
56+
borsh = { version = "0.10", default-features = false }
57+
displaydoc = { version = "0.2", default-features = false }
58+
prost = { version = "0.12", default-features = false }
59+
derive_more = { version = "0.99.17", default-features = false, features = [ "from", "into", "display", "try_into" ] }
60+
rstest = { version = "0.18.2" }
61+
schemars = { version = "0.8.15" }
62+
sha2 = { version = "0.10.8", default-features = false }
63+
serde = { version = "1.0", default-features = false }
64+
serde_json = { package = "serde-json-wasm", version = "1.0.1", default-features = false }
65+
subtle-encoding = { version = "0.5", default-features = false }
6666

6767
# ibc dependencies
68-
ibc = { version = "0.52.0", path = "./ibc", default-features = false }
69-
ibc-core = { version = "0.52.0", path = "./ibc-core", default-features = false }
70-
ibc-clients = { version = "0.52.0", path = "./ibc-clients", default-features = false }
71-
ibc-apps = { version = "0.52.0", path = "./ibc-apps", default-features = false }
72-
ibc-primitives = { version = "0.52.0", path = "./ibc-primitives", default-features = false }
73-
ibc-testkit = { version = "0.52.0", path = "./ibc-testkit", default-features = false }
68+
ibc = { version = "0.52.0", path = "./ibc", default-features = false }
69+
ibc-core = { version = "0.52.0", path = "./ibc-core", default-features = false }
70+
ibc-clients = { version = "0.52.0", path = "./ibc-clients", default-features = false }
71+
ibc-apps = { version = "0.52.0", path = "./ibc-apps", default-features = false }
72+
ibc-primitives = { version = "0.52.0", path = "./ibc-primitives", default-features = false }
73+
ibc-testkit = { version = "0.52.0", path = "./ibc-testkit", default-features = false }
7474

75-
ibc-derive = { version = "0.7.0", path = "./ibc-derive" }
75+
ibc-derive = { version = "0.7.0", path = "./ibc-derive" }
7676

77-
ibc-core-client = { version = "0.52.0", path = "./ibc-core/ics02-client", default-features = false }
78-
ibc-core-connection = { version = "0.52.0", path = "./ibc-core/ics03-connection", default-features = false }
79-
ibc-core-channel = { version = "0.52.0", path = "./ibc-core/ics04-channel", default-features = false }
80-
ibc-core-host = { version = "0.52.0", path = "./ibc-core/ics24-host", default-features = false }
81-
ibc-core-handler = { version = "0.52.0", path = "./ibc-core/ics25-handler", default-features = false }
82-
ibc-core-router = { version = "0.52.0", path = "./ibc-core/ics26-routing", default-features = false }
77+
ibc-core-client = { version = "0.52.0", path = "./ibc-core/ics02-client", default-features = false }
78+
ibc-core-connection = { version = "0.52.0", path = "./ibc-core/ics03-connection", default-features = false }
79+
ibc-core-channel = { version = "0.52.0", path = "./ibc-core/ics04-channel", default-features = false }
80+
ibc-core-host = { version = "0.52.0", path = "./ibc-core/ics24-host", default-features = false }
81+
ibc-core-handler = { version = "0.52.0", path = "./ibc-core/ics25-handler", default-features = false }
82+
ibc-core-router = { version = "0.52.0", path = "./ibc-core/ics26-routing", default-features = false }
8383

84-
ibc-client-cw = { version = "0.52.0", path = "./ibc-clients/cw-context", default-features = false }
85-
ibc-client-tendermint = { version = "0.52.0", path = "./ibc-clients/ics07-tendermint", default-features = false }
86-
ibc-client-tendermint-cw = { version = "0.52.0", path = "./ibc-clients/ics07-tendermint/cw-contract", default-features = false }
84+
ibc-client-cw = { version = "0.52.0", path = "./ibc-clients/cw-context", default-features = false }
85+
ibc-client-tendermint = { version = "0.52.0", path = "./ibc-clients/ics07-tendermint", default-features = false }
86+
ibc-client-tendermint-cw = { version = "0.52.0", path = "./ibc-clients/ics07-tendermint/cw-contract", default-features = false }
8787

88-
ibc-app-transfer = { version = "0.52.0", path = "./ibc-apps/ics20-transfer", default-features = false }
89-
ibc-app-nft-transfer = { version = "0.52.0", path = "./ibc-apps/ics721-nft-transfer", default-features = false }
88+
ibc-app-transfer = { version = "0.52.0", path = "./ibc-apps/ics20-transfer", default-features = false }
89+
ibc-app-nft-transfer = { version = "0.52.0", path = "./ibc-apps/ics721-nft-transfer", default-features = false }
9090

9191
ibc-core-client-context = { version = "0.52.0", path = "./ibc-core/ics02-client/context", default-features = false }
9292
ibc-core-client-types = { version = "0.52.0", path = "./ibc-core/ics02-client/types", default-features = false }
@@ -102,25 +102,25 @@ ibc-client-wasm-types = { version = "0.52.0", path = "./ibc-clients/ics08-
102102
ibc-app-transfer-types = { version = "0.52.0", path = "./ibc-apps/ics20-transfer/types", default-features = false }
103103
ibc-app-nft-transfer-types = { version = "0.52.0", path = "./ibc-apps/ics721-nft-transfer/types", default-features = false }
104104

105-
ibc-proto = { version = "0.43.0", default-features = false }
105+
ibc-proto = { version = "0.44.0", default-features = false }
106106

107107
# cosmos dependencies
108-
tendermint = { version = "0.35.0", default-features = false }
109-
tendermint-light-client = { version = "0.35.0", default-features = false }
110-
tendermint-light-client-verifier = { version = "0.35.0", default-features = false }
111-
tendermint-proto = { version = "0.35.0", default-features = false }
112-
tendermint-rpc = { version = "0.35.0", default-features = false }
113-
tendermint-testgen = { version = "0.35.0", default-features = false }
108+
tendermint = { version = "0.36.0", default-features = false }
109+
tendermint-light-client = { version = "0.36.0", default-features = false }
110+
tendermint-light-client-verifier = { version = "0.36.0", default-features = false }
111+
tendermint-proto = { version = "0.36.0", default-features = false }
112+
tendermint-rpc = { version = "0.36.0", default-features = false }
113+
tendermint-testgen = { version = "0.36.0", default-features = false }
114114

115115
# cosmwasm dependencies
116116
### Note: Kept at the following version to match the CosmWasm module version
117117
### used by chains supporting the wasm-enabled version of ibc-go v7.3
118118
### (This is the min version of `ibc-go` that supports `08-wasm` light clients)
119-
cosmwasm-schema = { version = "1.5.4" }
120-
cosmwasm-std = { version = "1.5.4" }
121-
cosmwasm-vm = { version = "1.5.4" }
122-
cw-storage-plus = { version = "1.2.0" }
119+
cosmwasm-schema = { version = "1.5.4" }
120+
cosmwasm-std = { version = "1.5.4" }
121+
cosmwasm-vm = { version = "1.5.4" }
122+
cw-storage-plus = { version = "1.2.0" }
123123

124124
# parity dependencies
125-
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["full"] }
126-
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
125+
parity-scale-codec = { version = "3.6.5", default-features = false, features = [ "full" ] }
126+
scale-info = { version = "2.10.0", default-features = false, features = [ "derive" ] }

‎Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ install-tools: ## Install development tools including nightly rustfmt, cargo-hac
88
rustup component add rustfmt --toolchain nightly
99
cargo install cargo-hack
1010
cargo install cargo-release
11-
cargo install typos-cli
11+
cargo install typos-cli taplo-cli
1212

1313
lint: ## Lint the code using rustfmt, clippy and whitespace lints.
1414
cargo +nightly fmt --all --check
1515
cargo clippy --all-targets --all-features
1616
cargo clippy --all-targets --no-default-features
1717
typos --config $(CURDIR)/.github/typos.toml
1818
bash ./ci/code-quality/whitespace-lints.sh
19+
taplo fmt --check
1920

2021
check-features: ## Check that project compiles with all combinations of features.
2122
cargo hack check --workspace --feature-powerset --exclude-features default
@@ -36,10 +37,10 @@ test: ## Run tests with all features and without default features.
3637
cargo test --all-targets --no-default-features
3738

3839
check-release: ## Check that the release build compiles.
39-
cargo release --workspace --no-push --no-tag --no-publish --exclude ibc-derive
40+
cargo release --workspace --no-push --no-tag --no-publish --exclude ibc-derive --exclude ibc-client-tendermint-cw
4041

4142
release: ## Perform an actual release and publishes to crates.io.
42-
cargo release --workspace --no-push --no-tag --exclude ibc-derive --allow-branch HEAD --execute
43+
cargo release --workspace --no-push --no-tag --exclude ibc-derive --exclude ibc-client-tendermint-cw --allow-branch HEAD --execute
4344

4445
build-tendermint-cw: ## Build the WASM file for the ICS-07 Tendermint light client.
4546
@echo "Building the WASM file for the ICS-07 Tendermint light client"

0 commit comments

Comments
 (0)