Skip to content

Commit

Permalink
Merge branch 'main' into release/v5.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sainoe committed Jul 16, 2024
2 parents 16ea5c7 + 3e7cd06 commit fba7219
Show file tree
Hide file tree
Showing 125 changed files with 1,112 additions and 1,019 deletions.
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2013-bump-comet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [CometBFT](https://github.com/cometbft/cometbft) to
[v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2013-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v8.2.1](https://github.com/cosmos/ibc-go/releases/tag/v8.2.1).
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
3 changes: 3 additions & 0 deletions .changelog/unreleased/dependencies/2013-bump-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.50.7](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.7)
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/2013-bump-comet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [CometBFT](https://github.com/cometbft/cometbft) to
[v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/2013-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v8.2.1](https://github.com/cosmos/ibc-go/releases/tag/v8.2.1).
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
3 changes: 3 additions & 0 deletions .changelog/unreleased/state-breaking/2013-bump-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.50.7](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.7)
([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
2 changes: 2 additions & 0 deletions .changelog/v4.3.0/bug-fixes/1921-write-stderr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Write unbonding period advisory to stderr instead of stdout
([\#1921](https://github.com/cosmos/interchain-security/pull/1921))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Apply audit suggestions that include a bug fix in the way we compute the
maximum capped power.
([\#1925](https://github.com/cosmos/interchain-security/pull/1925))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Replace `GetAllConsumerChains` with lightweight version
(`GetAllRegisteredConsumerChainIDs`) that doesn't call into the staking module
([\#1946](https://github.com/cosmos/interchain-security/pull/1946))
3 changes: 3 additions & 0 deletions .changelog/v4.3.0/dependencies/1974-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v7.6.0](https://github.com/cosmos/ibc-go/releases/tag/v7.6.0).
([\#1974](https://github.com/cosmos/interchain-security/pull/1974))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Allow consumer chains to change their PSS parameters.
([\#1932](https://github.com/cosmos/interchain-security/pull/1932))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Only start distributing rewards to validators after they have been validating
for a fixed number of blocks. Introduces the `NumberOfEpochsToStartReceivingRewards` param.
([\#1929](https://github.com/cosmos/interchain-security/pull/1929))
3 changes: 3 additions & 0 deletions .changelog/v4.3.0/state-breaking/1974-bump-ibc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v7.6.0](https://github.com/cosmos/ibc-go/releases/tag/v7.6.0).
([\#1974](https://github.com/cosmos/interchain-security/pull/1974))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Apply audit suggestions that include a bug fix in the way we compute the
maximum capped power. ([\#1925](https://github.com/cosmos/interchain-security/pull/1925))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Only start distributing rewards to validators after they have been validating
for a fixed number of blocks. Introduces the `NumberOfEpochsToStartReceivingRewards` param.
([\#1929](https://github.com/cosmos/interchain-security/pull/1929))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Allow consumer chains to change their PSS parameters.
([\#1932](https://github.com/cosmos/interchain-security/pull/1932))
1 change: 1 addition & 0 deletions .changelog/v4.3.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*June 20, 2024*
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add missing check for the minimum height of evidence in the consumer double-vote handler.
[#2007](https://github.com/cosmos/interchain-security/pull/2007)
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add missing check for the minimum height of evidence in the consumer double-vote handler.
[#2007](https://github.com/cosmos/interchain-security/pull/2007)
1 change: 1 addition & 0 deletions .changelog/v4.3.1/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*July 4, 2024*
12 changes: 6 additions & 6 deletions .coderabbit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ reviews:
- "!docs/"
path_instructions:
- path: "**/*.go"
instructions: "Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations."
instructions: "Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations. Only report issues that you have a high degree of confidence in."
- path: "tests/e2e/*"
instructions: |
"Assess the e2e test code assessing sufficient code coverage for the changes associated in the pull request"
"Assess the e2e test code assessing sufficient code coverage for the changes associated in the pull request. Only report issues that you have a high degree of confidence in."
- path: "tests/integration/*"
instructions: |
"Assess the e2e test code assessing sufficient code coverage for the changes associated in the pull request"
"Assess the e2e test code assessing sufficient code coverage for the changes associated in the pull request. Only report issues that you have a high degree of confidence in."
- path: "**/*_test.go"
instructions: |
"Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request"
"Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request. Only report issues that you have a high degree of confidence in."
- path: "**/*.md"
instructions: |
"Assess the documentation for misspellings, grammatical errors, missing documentation and correctness. Please DO NOT report any missing or superfluous newlines, in particular at the end or beginning of files."
"Assess the documentation for misspellings, grammatical errors, missing documentation and correctness. Please DO NOT report any missing or superfluous newlines, in particular at the end or beginning of files. Only report issues that you have a high degree of confidence in."
- path: ".changelog/*"
instructions: |
"Assess the changes in the changelog for correctness and completeness, particularly flagging missing changes"
"Assess the changes in the changelog for correctness and completeness, particularly flagging missing changes. Only report issues that you have a high degree of confidence in."
auto_review:
enabled: true
ignore_title_keywords:
Expand Down
20 changes: 15 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v4.1.x"
target-branch: "release/v4.2.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -32,17 +32,17 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v4.1.x-lsm"
target-branch: "release/v4.2.x-lsm"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
- dependencies

- package-ecosystem: gomod
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
target-branch: "release/v4.2.x"
target-branch: "release/v4.3.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -52,7 +52,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v4.2.x-lsm"
target-branch: "release/v4.3.x-lsm"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -68,3 +68,13 @@ updates:
labels:
- dependencies

- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
target-branch: "release/v5.1.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
- dependencies

2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
./build_deploy.sh
- name: Deploy 🚀
uses: JamesIves/[email protected].1
uses: JamesIves/[email protected].3
with:
branch: gh-pages
folder: ~/output
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
# multi-platform images and export cache
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0


# Login against a Docker registry except on PR
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.3.0
uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd #v6.4.0
with:
context: .
file: ./Dockerfile
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ on:
merge_group:
permissions:
contents: read

jobs:
golangci:
name: golangci-lint
runs-on: ubuntu-latest
runs-on: Gaia-Runner-medium
steps:
- uses: actions/setup-go@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
statuses: write # for amannn/action-semantic-pull-request to mark status of analyzed PR
runs-on: ubuntu-latest
steps:
- uses: amannn/[email protected].2
- uses: amannn/[email protected].3
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# Run compatibility tests for different consumer (-cv) and provider (-pv) versions.
# Combination of all provider versions with consumer versions are tested.
# For new versions to be tested add/modify -pc/-cv parameters.
run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v5.0.0-rc0 -pv v4.1.1-lsm -pv v3.3.3-lsm -cv latest -cv v5.0.0-rc0 -cv v4.1.1 -cv v3.3.0 -cv v3.2.0
run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v5.0.0-rc0 -pv v3.3.3-lsm -cv latest -cv v5.0.0-rc0 -cv v3.3.0
happy-path-test:
runs-on: ubuntu-latest
timeout-minutes: 20
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.32.2
- uses: bufbuild/buf-setup-action@v1.34.0
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.32.2
- uses: bufbuild/buf-setup-action@v1.34.0
- uses: bufbuild/buf-breaking-action@v1
with:
input: "proto"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:

jobs:
tests:
runs-on: ubuntu-latest
runs-on: Gaia-Runner-medium
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
path: ./profile.out

test-integration:
runs-on: ubuntu-latest
runs-on: Gaia-Runner-medium
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
path: ./integration-profile.out

test-mbt:
runs-on: ubuntu-latest
runs-on: Gaia-Runner-medium
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

test-e2e:
runs-on: ubuntu-latest
runs-on: Gaia-Runner-medium
steps:
- uses: actions/checkout@v4
with:
Expand Down
33 changes: 21 additions & 12 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,39 @@ queue_rules:
- "#approved-reviews-by>1"

pull_request_rules:
- name: Backport patches to the release/v4.1.x branch
- name: Backport patches to the release/v4.2.x branch
conditions:
- base=main
- label=A:backport/v4.1.x
- label=A:backport/v4.2.x
actions:
backport:
branches:
- release/v4.1.x
- name: Backport patches to the release/v4.1.x-lsm branch
- release/v4.2.x
- name: Backport patches to the release/v4.2.x-lsm branch
conditions:
- base=main
- label=A:backport/v4.1.x-lsm
- label=A:backport/v4.2.x-lsm
actions:
backport:
branches:
- release/v4.1.x-lsm
- name: Backport patches to the release/v4.2.x branch
- release/v4.2.x-lsm
pull_request_rules:
- name: Backport patches to the release/v4.3.x branch
conditions:
- base=main
- label=A:backport/v4.2.x
- label=A:backport/v4.3.x
actions:
backport:
branches:
- release/v4.2.x
- name: Backport patches to the release/v4.2.x-lsm branch
- release/v4.3.x
- name: Backport patches to the release/v4.3.x-lsm branch
conditions:
- base=main
- label=A:backport/v4.2.x-lsm
- label=A:backport/v4.3.x-lsm
actions:
backport:
branches:
- release/v4.2.x-lsm
- release/v4.3.x-lsm
- name: Backport patches to the release/v5.x branch
conditions:
- base=main
Expand All @@ -50,3 +51,11 @@ pull_request_rules:
backport:
branches:
- release/v5.x
- name: Backport patches to the release/v5.1.x branch
conditions:
- base=main
- label=A:backport/v5.1.x
actions:
backport:
branches:
- release/v5.1.x
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,28 @@
- Revert `PutUnbondingOnHold` behavior to ICS@v1
([\#1819](https://github.com/cosmos/interchain-security/pull/1819))

## v4.4.0

*July 16, 2024*

### API BREAKING

- Remove soft opt-out feature.
([\#1964](https://github.com/cosmos/interchain-security/pull/1964))

### FEATURES



- Remove soft opt-out feature.

([\#1964](https://github.com/cosmos/interchain-security/pull/1964))

### STATE BREAKING

- Remove soft opt-out feature.
([\#1964](https://github.com/cosmos/interchain-security/pull/1964))

## v4.3.1

*July 4, 2024*
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ If your architecture decision is a simple change, you may contribute directly wi

In certain circumstances, the architecture decision may require changes to the ICS spec. Note that the spec is responsible for defining language-agnostic, implementation-agnostic behaviors for the ICS protocol. Whereas ADRs are responsible for communicating implementation decisions contained within this repo.

To create an ADR, follow the [template](docs/docs/adrs/adr-template.md) and [doc](docs/docs/adrs/intro.md). If you would like to see examples of how these are written, please refer to the current [ADRs](docs/docs/adrs).
To create an ADR, follow the [template](docs/docs/adrs/templates/adr-template.md) and [doc](docs/docs/adrs/intro.md). If you would like to see examples of how these are written, please refer to the current [ADRs](docs/docs/adrs).

### ADR Proposals

Expand Down Expand Up @@ -179,7 +179,7 @@ Additionally, **each PR should only address a single issue**.

### Pull Request Templates

There are three PR templates. The [default template](./.github/PULL_REQUEST_TEMPLATE.md) contains links to the three templates. Please go the the `Preview` tab and select the appropriate sub-template:
There are three PR templates. The [default template](./.github/PULL_REQUEST_TEMPLATE.md) contains links to the three templates. Please go to the `Preview` tab and select the appropriate sub-template:

- The [production template](./.github/PULL_REQUEST_TEMPLATE/production.md) is for types `fix`, `feat`, and `refactor`.
- The [docs template](./.github/PULL_REQUEST_TEMPLATE/docs.md) is for documentation changes.
Expand Down
Loading

0 comments on commit fba7219

Please sign in to comment.