Merge branch 'sean/fix/client-recovery-consensus' of https://github.c…

…om/cosmos/ibc-rs into sean/fix/client-recovery-consensus
cosmos · Apr 25, 2024 · 76643e2 · 76643e2
2 parents c1c8165 + 18375cb
commit 76643e2
Show file tree

Hide file tree

Showing 23 changed files with 388 additions and 699 deletions.
diff --git a/.changelog/unreleased/breaking-changes/1193-bump-msrv.md b/.changelog/unreleased/breaking-changes/1193-bump-msrv.md
@@ -0,0 +1,2 @@
+- [ibc] Update minimum supported Rust version to 1.72.
+  ([\#1193](https://github.com/cosmos/ibc-rs/issues/1193))
diff --git a/.changelog/unreleased/improvements/1108-fallible-conversion-of-ics23-types.md b/.changelog/unreleased/improvements/1108-fallible-conversion-of-ics23-types.md
@@ -0,0 +1,2 @@
+- [ibc-core-commitment-types] Fallible conversion for `ProofSpec`, `LeafOp` and
+  `InnerSpec`. ([\#1108](https://github.com/cosmos/ibc-rs/issues/1108))
diff --git a/.changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md b/.changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md
@@ -1,2 +1,2 @@
 - Update `ibc-proto` to v0.43.0 and `tendermint` dependencies to v0.35.0.
-  ([#1171](https://github.com/cosmos/ibc-rs/issues/1171))
+  ([\#1171](https://github.com/cosmos/ibc-rs/issues/1171))
diff --git a/.github/workflows/code-quality.yml → .github/workflows/code-quality.yaml b/.github/workflows/code-quality.yml → .github/workflows/code-quality.yaml
@@ -1,8 +1,6 @@
 name: Code Quality Checks
 on:
   pull_request:
-  merge_group:
-    types: [checks_requested]
 
 jobs:
   code-quality:

diff --git a/.github/workflows/coverage.yml → .github/workflows/coverage.yaml b/.github/workflows/coverage.yml → .github/workflows/coverage.yaml
@@ -2,9 +2,9 @@ name: Coverage
 on:
   pull_request:
     paths:
-      - .codecov.yml
-      - .github/workflows/rust.yml
-      - .github/workflows/coverage.yml
+      - .codecov.yaml
+      - .github/workflows/rust.yaml
+      - .github/workflows/coverage.yaml
       - Cargo.toml
       - ci/**
       - ibc/**
@@ -24,7 +24,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: rust-ci-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
@@ -43,10 +43,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Install cargo-nextest

diff --git a/.github/workflows/cw-check.yaml b/.github/workflows/cw-check.yaml
@@ -2,18 +2,7 @@ name: CosmWasm Compilation Check
 on:
   pull_request:
     paths:
-      - .github/workflows/cw-check.yml
-      - Cargo.toml
-      - Cargo.lock
-      - ci/cw-check/**
-  push:
-    tags:
-      - v[0-9]+.*
-    branches:
-      - "release/*"
-      - main
-    paths:
-      - .github/workflows/cw-check.yml
+      - .github/workflows/cw-check.yaml
       - Cargo.toml
       - Cargo.lock
       - ci/cw-check/**
@@ -25,17 +14,49 @@ on:
       - ibc-clients/**
       - ibc-primitives/**
       - ibc-derive/**
-  merge_group:
-    types: [checks_requested]
+  push:
+    tags:
+      - v[0-9]+.*
+    branches:
+      - "release/*"
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
 
 jobs:
   cw-check:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Run cw-check
+
+      # only for caching cargo build artifacts from `cosmwasm/optimizer`
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Create mount directories
+        run: mkdir -p "${HOME}/.cargo/registry" "$(pwd)"/target
+
+      - name: Compile `cw-check`
+        run: |
+          docker run \
+          -v "$(pwd)":/code \
+          -v "$(pwd)"/target:/target \
+          -v "${HOME}/.cargo/registry":/usr/local/cargo/registry \
+          cosmwasm/optimizer:0.15.1 ./ci/cw-check
+
+      - name: Fix permissions
+        run: |
+          sudo chown -R $(id -u):$(id -g) "$(pwd)"/target
+          sudo chown -R $(id -u):$(id -g) "${HOME}/.cargo/registry"
+
+      - name: Install `cosmwasm-check` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cosmwasm-check
+
+      - name: Check compiled CosmWasm contract
+        working-directory: artifacts
         run: |
-          cd ci/cw-check
-          nix-shell --run "cw-check"
+          sha256sum -c checksums.txt
+          cosmwasm-check cw_check.wasm
diff --git a/.github/workflows/markdown-link-check.yml → .github/workflows/markdown-link-check.yaml b/.github/workflows/markdown-link-check.yml → .github/workflows/markdown-link-check.yaml
@@ -3,11 +3,7 @@ name: Check Markdown links
 on:
   schedule:
     - cron: "0 0 * * *" # At 00:00
-  push:
-    branches: main
   pull_request:
-  merge_group:
-    types: [checks_requested]
 
 jobs:
   md-link-check:

diff --git a/.github/workflows/no-std.yaml b/.github/workflows/no-std.yaml
@@ -2,7 +2,7 @@ name: no_std check
 on:
   pull_request:
     paths:
-      - .github/workflows/no-std.yml
+      - .github/workflows/no-std.yaml
       - Cargo.toml
       - Cargo.lock
       - ci/no-std-check/**
@@ -15,33 +15,25 @@ on:
       - ibc-primitives/**
       - ibc-derive/**
   push:
-    branches: main
-    paths:
-      - .github/workflows/no-std.yml
-      - Cargo.toml
-      - Cargo.lock
-      - ci/no-std-check/**
-      - ci/**
-      - ibc/**
-      - ibc-core/**
-      - ibc-apps/**
-      - ibc-data-types/**
-      - ibc-clients/**
-      - ibc-primitives/**
-      - ibc-derive/**
-  merge_group:
-    types: [checks_requested]
+    tags:
+      - v[0-9]+.*
+    branches:
+      - "release/*"
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
 
 jobs:
   check-no-std-panic-conflict:
     name: Check no_std panic conflict
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          override: true
       - run: |
           cd ci/no-std-check
           make check-no-std
@@ -51,11 +43,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-2024-02-24
           target: wasm32-unknown-unknown
-          override: true
       - run: |
           cd ci/no-std-check
           make check-substrate
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,10 +27,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Install cargo-release
-        run: cargo install cargo-release
-      - name: Cache cargo dependencies
-        uses: Swatinem/rust-cache@v2
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install `cargo-release` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-release
       - name: Publish crates (dry run)
         run: make check-release
 
@@ -41,10 +44,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Install cargo-release
-        run: cargo install cargo-release
-      - name: Cache cargo dependencies
-        uses: Swatinem/rust-cache@v2
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install `cargo-release` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-release
       - name: Publish crates
         run: yes | make release
         env: