Skip to content

Commit 1abf751

Browse files
committed
Merge branch 'main' into feat/refactor-testkit
2 parents 74203fb + 04520a8 commit 1abf751

File tree

147 files changed

+1876
-1588
lines changed

Some content is hidden

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

147 files changed

+1876
-1588
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- [ibc] Refactor client relevant APIs for improved modularity and allow
2+
standalone ICS-02 integration
3+
([\#1114](https://github.com/cosmos/ibc-rs/issues/1114))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [ibc] Increase minimum supported Rust version to 1.71.1
2+
([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [ibc-client-tendermint-types] Check ics23 proof specs for empty depth range.
2+
([\#1100](https://github.com/cosmos/ibc-rs/issues/1100))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [types] Refactor `Default` implementations with concrete names
2+
([\#1074](https://github.com/cosmos/ibc-rs/issues/1074))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [ibc-primitives] Use `let-else` over `downcast!()` and remove `utils/macros`
2+
module as a result ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [ibc-core] Remove unnecessary shadowing with same value
2+
([\#1120](https://github.com/cosmos/ibc-rs/issues/1120))

.github/workflows/coverage.yml

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
- ibc-clients/**
1515
- ibc-primitives/**
1616
- ibc-query/**
17+
- ibc-testkit/**
18+
- ibc-derive/**
1719
push:
1820
branches:
1921
- main

.github/workflows/cw-check.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
pull_request:
44
paths:
55
- .github/workflows/cw-check.yml
6+
- Cargo.toml
7+
- Cargo.lock
68
- ci/cw-check/**
79
push:
810
tags:
@@ -22,7 +24,6 @@ on:
2224
- ibc-data-types/**
2325
- ibc-clients/**
2426
- ibc-primitives/**
25-
- ibc-query/**
2627
- ibc-derive/**
2728
jobs:
2829
cw-check:

.github/workflows/no-std.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- ibc-data-types/**
1414
- ibc-clients/**
1515
- ibc-primitives/**
16+
- ibc-derive/**
1617
push:
1718
branches: main
1819
paths:
@@ -27,6 +28,7 @@ on:
2728
- ibc-data-types/**
2829
- ibc-clients/**
2930
- ibc-primitives/**
31+
- ibc-derive/**
3032
jobs:
3133
check-no-std-panic-conflict:
3234
name: Check no_std panic conflict

.github/workflows/rust.yml

+45
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,48 @@ jobs:
157157
with:
158158
command: test
159159
args: --no-default-features --no-fail-fast --no-run
160+
161+
test-msrv:
162+
timeout-minutes: 30
163+
env:
164+
CARGO_MSRV_VERSION: 0.16.0-beta.20
165+
MSRV: 1.71.1
166+
strategy:
167+
matrix:
168+
param:
169+
[
170+
{ os: ubuntu-latest, system: unknown-linux-gnu },
171+
{ os: macos-latest, system: apple-darwin },
172+
]
173+
runs-on: ${{ matrix.param.os }}
174+
steps:
175+
- uses: actions/checkout@v2
176+
177+
- name: Download cargo-msrv
178+
uses: dsaltares/fetch-gh-release-asset@master
179+
with:
180+
repo: foresterre/cargo-msrv
181+
version: "tags/v${{ env.CARGO_MSRV_VERSION }}"
182+
file: "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
183+
184+
- uses: actions-rs/toolchain@v1
185+
with:
186+
toolchain: ${{ env.MSRV }}
187+
override: true
188+
- uses: Swatinem/rust-cache@v1
189+
190+
- name: Install cargo-msrv
191+
run: |
192+
tar -xzf "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
193+
mv "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}/cargo-msrv" ~/.cargo/bin
194+
cargo msrv --version
195+
196+
- name: Calculate MSRV
197+
run: cargo msrv --output-format minimal --min 1.64.0
198+
199+
- name: Build with MSRV
200+
uses: actions-rs/cargo@v1
201+
with:
202+
toolchain: ${{ env.MSRV }}
203+
command: build
204+
args: --all-features

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ exclude = [
4343
version = "0.50.0"
4444
license = "Apache-2.0"
4545
edition = "2021"
46-
rust-version = "1.64"
46+
rust-version = "1.71.1"
4747
readme = "README.md"
4848
repository = "https://github.com/cosmos/ibc-rs"
4949
authors = ["Informal Systems <[email protected]>"]

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
[![Build Status][build-image]][build-link]
1717
[![Code Coverage][codecov-image]][codecov-link]
1818
[![Apache 2.0 Licensed][license-image]][license-link]
19-
![Rust Stable][rustc-image]
20-
![Rust 1.64+][rustc-version]
21-
![Lines of Code][loc-image]
19+
![Version][crates-io-version]
20+
![Downloads][crates-io-downloads]
21+
![Rust Stable][msrv-image]
2222

2323
</div>
2424
</div>
@@ -94,11 +94,11 @@ specific language governing permissions and limitations under the License.
9494
[build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
9595
[codecov-image]: https://codecov.io/gh/cosmos/ibc-rs/branch/main/graph/badge.svg?token=wUm2aLCOu
9696
[codecov-link]: https://codecov.io/gh/cosmos/ibc-rs
97-
[loc-image]: https://tokei.rs/b1/github/cosmos/ibc-rs
98-
[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
97+
[license-image]: https://img.shields.io/crates/l/ibc
9998
[license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
100-
[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
101-
[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
99+
[crates-io-version]: https://img.shields.io/crates/v/ibc.svg
100+
[crates-io-downloads]: https://img.shields.io/crates/d/ibc.svg
101+
[msrv-image]: https://img.shields.io/crates/msrv/ibc
102102

103103
[//]: # (general links)
104104
[ibc]: https://github.com/cosmos/ibc

ci/cw-check/rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2023-03-09"
2+
channel = "nightly-2024-02-24"
33
targets = [
44
"wasm32-unknown-unknown",
55
]

ci/no-std-check/Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clippy.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ disallowed-types = [
77
disallowed-methods = [
88
"std::time::Duration::as_secs_f64",
99
]
10+
msrv = "1.71.1"

docs/architecture/adr-005-handlers-redesign.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ trait ValidationContext {
296296
/// Function required by ICS 03. Returns the list of all possible versions that the connection
297297
/// handshake protocol supports.
298298
fn get_compatible_versions(&self) -> Vec<Version> {
299-
get_compatible_versions()
299+
ConnectionVersion::compatibles()
300300
}
301301

302302
/// Function required by ICS 03. Returns one version out of the supplied list of versions, which the

0 commit comments

Comments
 (0)