Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v0.38.x' into osmo/v0.38.12
Browse files Browse the repository at this point in the history
  • Loading branch information
PaddyMc committed Sep 27, 2024
2 parents fc8a51f + cf7836a commit 309bfe3
Show file tree
Hide file tree
Showing 90 changed files with 1,515 additions and 1,727 deletions.
4 changes: 4 additions & 0 deletions .changelog/unreleased/dependencies/4059-update-cometbft-db.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- `[go/runtime]` Bump Go version to 1.22
([\#4073](https://github.com/cometbft/cometbft/pull/4073))
- Bump cometbft-db version to v0.12.0
([\#4073](https://github.com/cometbft/cometbft/pull/4073))

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[light]` Cross-check proposer priorities in retrieved validator sets
([\#ASA-2024-009](https://github.com/cometbft/cometbft/security/advisories/GHSA-g5xx-c4hv-9ccc))
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- `[privval]` Ignore duplicate privval listen when already connected ([\#3828](https://github.com/cometbft/cometbft/issues/3828)
4 changes: 4 additions & 0 deletions .changelog/v0.38.12/dependencies/3728-update-btcec-v2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- `[crypto/secp256k1]` Adjust to breaking interface changes in
`btcec/v2` latest release, while avoiding breaking changes to
local CometBFT functions
([\#3728](https://github.com/cometbft/cometbft/pull/3728))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[types]` Check that proposer is one of the validators in `ValidateBasic`
([\#ASA-2024-009](https://github.com/cometbft/cometbft/security/advisories/GHSA-g5xx-c4hv-9ccc))
2 changes: 2 additions & 0 deletions .changelog/v0.38.12/improvements/3819-e2e-log-level.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[e2e]` Add `log_level` option to manifest file
([#3819](https://github.com/cometbft/cometbft/pull/3819)).
2 changes: 2 additions & 0 deletions .changelog/v0.38.12/improvements/3836-e2e-log-format.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[e2e]` Add `log_format` option to manifest file
([#3836](https://github.com/cometbft/cometbft/issues/3836)).
4 changes: 4 additions & 0 deletions .changelog/v0.38.12/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*September 3, 2024*

This release includes a security fix for the light client and is recommended
for all users.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[metrics]` Call unused `rejected_txs` metric in mempool
([\#4019](https://github.com/cometbft/cometbft/pull/4019))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[metrics]` Add `evicted_txs` metric to mempool
([\#4019](https://github.com/cometbft/cometbft/pull/4019))
2 changes: 2 additions & 0 deletions .changelog/v0.38.8/improvements/4123-mempool-is-full-log.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[log]` Change "mempool is full" log to debug level
([\#4123](https://github.com/cometbft/cometbft/pull/4123))
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -65,7 +65,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"

- uses: actions/checkout@v4

Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"

- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cometbft-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Publish to Docker Hub
uses: docker/build-push-action@v6.6.1
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./DOCKER/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-manual-multiversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- uses: actions/checkout@v4

Expand Down
77 changes: 0 additions & 77 deletions .github/workflows/e2e-nightly-34x.yml

This file was deleted.

77 changes: 0 additions & 77 deletions .github/workflows/e2e-nightly-37x.yml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/e2e-nightly-main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: '1.22'
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- uses: actions/checkout@v4

Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Notify Slack on failure
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v1.27.0
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: '1.22'
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
Expand Down
Loading

0 comments on commit 309bfe3

Please sign in to comment.