Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update osmosis v37.x branch with upstream changes #6

Closed
wants to merge 96 commits into from
Closed

chore: update osmosis v37.x branch with upstream changes #6

wants to merge 96 commits into from

Conversation

faddat
Copy link
Member

@faddat faddat commented Feb 25, 2024 •
edited
Loading

Hi @czarcas7ic -- I noticed that this branch was fairly out of date from upstream, and figured that it might be helpful to bring it up to date. Please feel free to close this, if it is not.

I'm also going to test out:

with an osmosis node, if I can backport it successfully.

I've also included the changes from osmo/v0.37.4 in this PR.

commits below

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

mergify bot and others added 30 commits June 19, 2023 14:54
@mergify @sergio-mena
Add CMT_HOME (or remove it?) (backport cometbft#983) (cometbft#999)
3e0cd1a 
* Add `CMT_HOME` (or remove it?) (cometbft#983)

Closes cometbft#982

Added `CMT_HOME` everywhere `CMTHOME` is used.

### Notes to reviewers

This could be fixed the opposite way, by removing the only reference to `CMT_HOME` in the code, and also the reference in `UPGRADING.md` (two lines of code).

However, the reference in `UPGRADING.md`, which is part of our documentation, is already present in `v0.34.x` (not in `v0.37.x` though!). That's why this PR introduces `CMT_HOME` to work in equal conditions as `CMTHOME`.

If reviewers lean toward removing `CMT_HOME` from the doc in `v0.34.x` (and unreleased `v0.38.x` and `main`), I can do it easily.

---

#### PR checklist

- [x] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments

(cherry picked from commit b7be568)

# Conflicts:
#	UPGRADING.md
#	cmd/cometbft/commands/root_test.go

* Revert "Add `CMT_HOME` (or remove it?) (cometbft#983)"

* Add `CMT_HOME` (or remove it?) (cometbft#983)

Closes cometbft#982

Added `CMT_HOME` everywhere `CMTHOME` is used.

This could be fixed the opposite way, by removing the only reference to `CMT_HOME` in the code, and also the reference in `UPGRADING.md` (two lines of code).

However, the reference in `UPGRADING.md`, which is part of our documentation, is already present in `v0.34.x` (not in `v0.37.x` though!). That's why this PR introduces `CMT_HOME` to work in equal conditions as `CMTHOME`.

If reviewers lean toward removing `CMT_HOME` from the doc in `v0.34.x` (and unreleased `v0.38.x` and `main`), I can do it easily.

---

- [x] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.21.0 to 1.22.0 (co…
36ceb60 
…metbft#1029)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mergify @stevenferrer
docs: Added double quotes to /abci_query path param (cometbft#1015) (c…
b60b805 
…ometbft#1046)

Closes cometbft#666

This PR adds double quotes to `path` param of `/abci_query` endpoint.

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments

(cherry picked from commit f6f13b1)

Co-authored-by: Steven Ferrer <steven.r.ferrer@gmail.com>
@mergify @lasarojc
Clarifies that processProposal may be called for set of transactions …
5806f5a 
…different from the one returned in the preceding prepareProposal (backport cometbft#1033) (cometbft#1053)

* Clarifies that processProposal may be called for set of transactions different from the one returned in the preceding prepareProposal (cometbft#1033)

If a proposer fails after calling prepareProposal and before calling processProposal, then the following may happen upon restarting:
- if failed before signing another message, then will invoke prepareProposal again, sign a new block, probably empty, and propose it;
- if failed after signing a proposal but before writing the  proposal message into the WAL, then will invoke prepareProposal and produce a new, probably empty block, [fail to sign it](https://github.com/cometbft/cometbft/blob/2789a59a9cc61c6ea56a6b266eeadf0f26ca2456/consensus/state.go#L1221), and not invoke processProposal; prevote timeouts will ensure the CometBFT is not stuck;
- if failed after writing the proposal message to the WAL, then will invoke prepareProposal, produce a new, probably empty block, fail to sign it, and invoke processProposal with the block signed before crashing.

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code comments

(cherry picked from commit b23ef56)

# Conflicts:
#	spec/abci/abci++_basic_concepts.md
#	spec/abci/abci++_comet_expected_behavior.md

* solving cherry pick conflicts

* solving cherry pick conflicts

---------

Co-authored-by: Lasaro <lasaro@informal.systems>
@cason @josef-widder
@lasarojc @sergio-mena
v0.37.x: backport of new content on spec/p2p (cometbft#1004)
75f090d 
This is backport of three PRs originally merged against main:

* spec/p2p: Specify the operation of a Reactor (cometbft#714)
* spec/p2p: document the p2p API used by Reactors (cometbft#851)
* spec/p2p: new structure for the p2p specification (cometbft#966)

Co-authored-by: Josef Widder <44643235+josef-widder@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Sergio Mena <sergio@informal.systems>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.22.0 to 1.23.1 (co…
c7eed7e 
…metbft#1063)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.22.0 to 1.23.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.22.0...v1.23.1)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/setup-buildx-action from 2.7.0 to 2.8.0 (com…
c6d6c7c 
…etbft#1062)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2.7.0...v2.8.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/setup-buildx-action from 2.8.0 to 2.9.0 (com…
e94a9dd 
…etbft#1104)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2.8.0...v2.9.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/setup-buildx-action from 2.9.0 to 2.9.1 (com…
edffdc5 
…etbft#1129)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2.9.0...v2.9.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.23.1 to 1.24.0 (co…
75b81ab 
…metbft#1130)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.23.1 to 1.24.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.23.1...v1.24.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mergify
p2p: Remove UPnP functionality (backport cometbft#1114) (cometbft#1126)
f689a1c
@Pitasi
crypto/sr25519: upgrade to go-schnorrkel@v1.0.0 (cometbft#1151)
20f3c57
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.24.0 to 1.25.0 (co…
3f79321 
…metbft#1158)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.25.0 to 1.25.1 (co…
7c001da 
…metbft#1219)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.25.0 to 1.25.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.25.0...v1.25.1)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mergify @chillyvee @sergio-mena
Close evidence.db OnStop (cometbft#1210) (cometbft#1225)
83ff5be 
* CV OnStop close evidenceStore

* CV OnStop print db close

* CV add changelog

* CV update changelog with attribution

(cherry picked from commit 48335a0)

Co-authored-by: Chill Validation <92176880+chillyvee@users.noreply.github.com>
Co-authored-by: Sergio Mena <sergio@informal.systems>
@mergify @sergio-mena
Log proposer's address when correctly accepting a proposal (backport c…
88ce9ee 
…ometbft#1079) (cometbft#1221)

* Log proposer's address when correctly accepting a proposal (cometbft#1079)

* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

(cherry picked from commit cf23082)

# Conflicts:
#	consensus/state.go

* Revert "Log proposer's address when correctly accepting a proposal (cometbft#1079)"

This reverts commit b2aaa8f.

* Log proposer's address when correctly accepting a proposal (cometbft#1079)

* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.25.1 to 1.26.0 (co…
4560c11 
…metbft#1237)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.25.1 to 1.26.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.25.1...v1.26.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.26.0 to 1.26.1 (co…
80cfaed 
…metbft#1274)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.26.0...v1.26.1)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/setup-buildx-action from 2.9.1 to 2.10.0 (co…
cfc87ac 
…metbft#1301)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.9.1 to 2.10.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2.9.1...v2.10.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@yihuang
feat: make handshake cancelable (backport cometbft#857) (cometbft#1013)
790d57e 
it'll make the handshake work with graceful shutdown(see: cosmos/cosmos-sdk#16202)

handshake could be a long running process if there are many local blocks to replay, for example we use it to do profiling.

Hope we can backport this to 0.34.x.

---

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments
@dependabot
build(deps): Bump docker/build-push-action from 4.1.1 to 4.2.1 (comet…
11f2dcc 
…bft#1314)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v4.1.1...v4.2.1)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @sergio-mena
build(deps): Bump actions/checkout from 3 to 4 (cometbft#1315)
11f6090 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sergio Mena <sergio@informal.systems>
@p-offtermatt
Fix typo: exent -> event (cometbft#1329)
be0df2e
@dependabot
build(deps): Bump docker/build-push-action from 4.2.1 to 5.0.0 (comet…
63ef8c8 
…bft#1356)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.2.1 to 5.0.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v4.2.1...v5.0.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/login-action from 2.2.0 to 3.0.0 (cometbft#1359
bf8fd8c 
)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v2.2.0...v3.0.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump docker/setup-buildx-action from 2.10.0 to 3.0.0 (co…
24d3670 
…metbft#1358)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.10.0 to 3.0.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2.10.0...v3.0.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @sergio-mena
build(deps): Bump goreleaser/goreleaser-action from 4 to 5 (cometbft#…
46df7b5 
…1357)

Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 4 to 5.
- [Release notes](https://github.com/goreleaser/goreleaser-action/releases)
- [Commits](goreleaser/goreleaser-action@v4...v5)

---
updated-dependencies:
- dependency-name: goreleaser/goreleaser-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sergio Mena <sergio@informal.systems>
@mergify @alijnmerchant21
Update to string (cometbft#1385) (cometbft#1390)
8d18d1d 
(cherry picked from commit dad1253)

Co-authored-by: Aliasgar Merchant <44069404+alijnmerchant21@users.noreply.github.com>
@mergify @cason
doc: improve documentation of BlockParams.MaxBytes (backport cometbft…
cd9d6d7 
…#1405) (cometbft#1410)

* doc: improve documentation of BlockParams.MaxBytes (cometbft#1405)

* spec: comment on BlockParams.MaxBytes and timeouts

* spec/abci: link to consensus timeouts doc fixed

* spec/abci: comment on timeout parameters moved down

* spec: advice to wind down default BlockParams.MaxBytes

* spec: more on winding down default BlockParams.MaxBytes

* spec: fixes on winding down default BlockParams.MaxBytes

* spec: nit pic on winding down default BlockParams.MaxBytes

* Applying @sergio-mena suggestion

Co-authored-by: Sergio Mena <sergio@informal.systems>

* Applying @sergio-mena suggestion

Co-authored-by: Sergio Mena <sergio@informal.systems>

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: glnro <8335464+glnro@users.noreply.github.com>

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: glnro <8335464+glnro@users.noreply.github.com>
(cherry picked from commit 80648c4)

# Conflicts:
#	spec/abci/abci++_app_requirements.md

* spec/abci: fix conflicts when backporting

* Fixing typo on backported file

---------

Co-authored-by: Daniel <daniel.cason@informal.systems>
@mergify @alijnmerchant21 @lasarojc
update language (backport cometbft#1263) (cometbft#1268)
fb5f179 
* update language (cometbft#1263)

Using "a validator should" instead of 'we'

(cherry picked from commit 3d1c36d)

# Conflicts:
#	docs/core/configuration.md

* resolves the conflicts

---------

Co-authored-by: Aliasgar Merchant <44069404+alijnmerchant21@users.noreply.github.com>
Co-authored-by: lasaro <lasaro@informal.systems>
dependabot bot and others added 25 commits January 29, 2024 15:35
@dependabot
build(deps): Bump bufbuild/buf-setup-action from 1.28.1 to 1.29.0 (co…
14aabc3 
…metbft#2168)

Bumps
[bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action)
from 1.28.1 to 1.29.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/bufbuild/buf-setup-action/releases">bufbuild/buf-setup-action's
releases</a>.</em></p>
<blockquote>
<h2>v1.29.0</h2>
<p>Release v1.29.0</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/bufbuild/buf-setup-action/commit/88db93f5d74ffa329bb43e42aa95cd822697d214"><code>88db93f</code></a>
Release v1.29.0 (<a
href="https://redirect.github.com/bufbuild/buf-setup-action/issues/181">#181</a>)</li>
<li>See full diff in <a
href="https://github.com/bufbuild/buf-setup-action/compare/v1.28.1...v1.29.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=bufbuild/buf-setup-action&package-manager=github_actions&previous-version=1.28.1&new-version=1.29.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump slackapi/slack-github-action from 1.24.0 to 1.25.0 (c…
7b08918 
…ometbft#2167)

Bumps
[slackapi/slack-github-action](https://github.com/slackapi/slack-github-action)
from 1.24.0 to 1.25.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/slackapi/slack-github-action/releases">slackapi/slack-github-action's
releases</a>.</em></p>
<blockquote>
<h2>Slack Send V1.25.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update payload integration test to escape invalid characters by <a
href="https://github.com/hello-ashleyintech"><code>@​hello-ashleyintech</code></a>
in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/207">slackapi/slack-github-action#207</a></li>
<li><a
href="https://redirect.github.com/slackapi/slack-github-action/issues/204">#204</a>:
Handle proxies when using Slack WebClient by <a
href="https://github.com/raihle"><code>@​raihle</code></a> in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/205">slackapi/slack-github-action#205</a></li>
<li>README: clarify limitations to workflow builder approach by <a
href="https://github.com/ryan-williams"><code>@​ryan-williams</code></a>
in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/228">slackapi/slack-github-action#228</a></li>
<li>Add instructions for developing with a local version of the action
by <a href="https://github.com/zimeg"><code>@​zimeg</code></a> in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/250">slackapi/slack-github-action#250</a></li>
<li>Pass secrets to approved workflow jobs by <a
href="https://github.com/zimeg"><code>@​zimeg</code></a> in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/258">slackapi/slack-github-action#258</a></li>
<li>build(node): bump the runtime version to node 20 by <a
href="https://github.com/zimeg"><code>@​zimeg</code></a> in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/267">slackapi/slack-github-action#267</a></li>
<li>ci(security): require access checks to pass before running unit
tests by <a href="https://github.com/zimeg"><code>@​zimeg</code></a> in
<a
href="https://redirect.github.com/slackapi/slack-github-action/pull/279">slackapi/slack-github-action#279</a></li>
<li>ci(security): check for pull_request_target events in the access
check by <a href="https://github.com/zimeg"><code>@​zimeg</code></a> in
<a
href="https://redirect.github.com/slackapi/slack-github-action/pull/282">slackapi/slack-github-action#282</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/raihle"><code>@​raihle</code></a> made
their first contribution in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/205">slackapi/slack-github-action#205</a></li>
<li><a
href="https://github.com/ryan-williams"><code>@​ryan-williams</code></a>
made their first contribution in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/228">slackapi/slack-github-action#228</a></li>
<li><a href="https://github.com/zimeg"><code>@​zimeg</code></a> made
their first contribution in <a
href="https://redirect.github.com/slackapi/slack-github-action/pull/250">slackapi/slack-github-action#250</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/slackapi/slack-github-action/compare/v1.24.0...v1.25.0">https://github.com/slackapi/slack-github-action/compare/v1.24.0...v1.25.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/6c661ce58804a1a20f6dc5fbee7f0381b469e001"><code>6c661ce</code></a>
Automatic compilation</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/2a8087d4af6f83146a87539a70defe909fe6dbe6"><code>2a8087d</code></a>
v1.25.0</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/a678e5895f7ecf8ceef4ae0d60ff94943d6c559d"><code>a678e58</code></a>
ci(security): check for pull_request_target events in the access check
(<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/282">#282</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/84a8f7dc295123812a19af49e72b54768921b60e"><code>84a8f7d</code></a>
ci(security): require access checks to pass before running unit tests
(<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/279">#279</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/f6aff2ffc901ab1d21ccbaf09093093f979714f1"><code>f6aff2f</code></a>
Bump eslint from 8.54.0 to 8.56.0 (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/275">#275</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/372e934439356661e2a5ae575863e845135ff2d6"><code>372e934</code></a>
Bump eslint-plugin-import from 2.29.0 to 2.29.1 (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/274">#274</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/bac28df31139b168d2feabae98f35ae251d4b96b"><code>bac28df</code></a>
Bump <code>@​slack/web-api</code> from 6.9.1 to 6.11.1 (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/277">#277</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/0474a451d1ec1d933ca8772954195c0f604f059f"><code>0474a45</code></a>
Unit tests in GitHub CI should test the PR/branch (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/276">#276</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/34ae0b46d6d643ee3739caa37f4d4c88bb8b5b24"><code>34ae0b4</code></a>
Bump <code>@​actions/github</code> from 5.1.1 to 6.0.0 (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/265">#265</a>)</li>
<li><a
href="https://github.com/slackapi/slack-github-action/commit/e7f384011cbed2dde5150ed0c2ccb2b4f39835b0"><code>e7f3840</code></a>
Bump whatwg-url from 13.0.0 to 14.0.0 (<a
href="https://redirect.github.com/slackapi/slack-github-action/issues/263">#263</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/slackapi/slack-github-action/compare/v1.24.0...v1.25.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=slackapi/slack-github-action&package-manager=github_actions&previous-version=1.24.0&new-version=1.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): Bump styfle/cancel-workflow-action from 0.12.0 to 0.12.1 (…
bd21a66 
…cometbft#2166)

Bumps
[styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action)
from 0.12.0 to 0.12.1.

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nicolaslara
Merge tag 'v0.37.2-v21-osmo-1' into nicolas/v0.37.4-v23-osmo-1
bb065ae
@nicolaslara
implementing missing interface
95b5f92
@mergify @dependabot @mzabaluev
build(deps): Bump github.com/cloudflare/circl from 1.3.3 to 1.3.7 (ba…
f379190 
…ckport cometbft#2253) (cometbft#2256)

This is an automatic backport of pull request cometbft#2253 done by
[Mergify](https://mergify.com).
Cherry-pick of db7a70c has failed:
```
On branch mergify/bp/v0.37.x/pr-2253
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit db7a70c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")
```


To fix up this pull request, you can check it out locally. See
documentation:
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mikhail Zabaluev <mikhail@informal.systems>
@mergify @cason
@sergio-mena @andynog @melekes
feat(consensus): additional sanity checks for the size of proposed bl…
0401888 
…ocks (backport cometbft#1408) (cometbft#2140)

This is an automatic backport of pull request cometbft#1408 done by
[Mergify](https://mergify.com).
Cherry-pick of 28ad4d2 has failed:
```
On branch mergify/bp/v0.37.x/pr-1408
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 28ad4d2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   consensus/state.go
	modified:   crypto/merkle/proof.go
	modified:   evidence/pool_test.go
	modified:   state/execution_test.go
	modified:   types/part_set.go
	modified:   types/part_set_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/consensus/errors.go
	deleted by us:   internal/consensus/state_test.go
	deleted by us:   internal/state/store_test.go
	deleted by us:   internal/store/store_test.go
	both modified:   types/event_bus_test.go

```


To fix up this pull request, you can check it out locally. See
documentation:
https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: Daniel <daniel.cason@informal.systems>
Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: Andy Nogueira <me@andynogueira.dev>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
@dependabot
build(deps): Bump golangci/golangci-lint-action from 3 to 4 (cometbft…
ad304d0 
…#2297)

Bumps
[golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action)
from 3 to 4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/golangci/golangci-lint-action/releases">golangci/golangci-lint-action's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Documentation</h3>
<ul>
<li>docs: update examples by <a
href="https://github.com/KunalSin9h"><code>@​KunalSin9h</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/826">golangci/golangci-lint-action#826</a></li>
<li>docs: update section about GitHub Annotations by <a
href="https://github.com/JustinDFuller"><code>@​JustinDFuller</code></a>
in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/931">golangci/golangci-lint-action#931</a></li>
</ul>
<h3>Dependencies</h3>
<ul>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.3.0 to 6.4.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/829">golangci/golangci-lint-action#829</a></li>
<li>build(deps-dev): bump eslint-plugin-import from 2.28.0 to 2.28.1 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/830">golangci/golangci-lint-action#830</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.5.0 to 20.5.1 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/827">golangci/golangci-lint-action#827</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.3.0 to 6.4.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/831">golangci/golangci-lint-action#831</a></li>
<li>build(deps-dev): bump prettier from 3.0.1 to 3.0.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/828">golangci/golangci-lint-action#828</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.5.1 to 20.5.7 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/833">golangci/golangci-lint-action#833</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.4.0 to 6.4.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/834">golangci/golangci-lint-action#834</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.4.0 to 6.4.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/835">golangci/golangci-lint-action#835</a></li>
<li>build(deps-dev): bump eslint from 8.47.0 to 8.48.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/837">golangci/golangci-lint-action#837</a></li>
<li>build(deps-dev): bump typescript from 5.1.6 to 5.2.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/836">golangci/golangci-lint-action#836</a></li>
<li>build(deps): bump <code>@​types/semver</code> from 7.5.0 to 7.5.1 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/838">golangci/golangci-lint-action#838</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.4.1 to 6.5.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/839">golangci/golangci-lint-action#839</a></li>
<li>build(deps-dev): bump prettier from 3.0.2 to 3.0.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/842">golangci/golangci-lint-action#842</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.4.1 to 6.5.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/840">golangci/golangci-lint-action#840</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.5.7 to 20.5.9 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/841">golangci/golangci-lint-action#841</a></li>
<li>chore: bump to use node20 runtime, actions/checkout to v4 by <a
href="https://github.com/chenrui333"><code>@​chenrui333</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/843">golangci/golangci-lint-action#843</a></li>
<li>build(deps): bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/845">golangci/golangci-lint-action#845</a></li>
<li>build(deps-dev): bump eslint from 8.48.0 to 8.49.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/846">golangci/golangci-lint-action#846</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.5.9 to 20.6.0 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/847">golangci/golangci-lint-action#847</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.5.0 to 6.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/848">golangci/golangci-lint-action#848</a></li>
<li>build(deps-dev): bump <code>@​vercel/ncc</code> from 0.36.1 to
0.38.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/850">golangci/golangci-lint-action#850</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.5.0 to 6.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/849">golangci/golangci-lint-action#849</a></li>
<li>build(deps): bump <code>@​types/semver</code> from 7.5.1 to 7.5.2 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/853">golangci/golangci-lint-action#853</a></li>
<li>build(deps): bump <code>@​types/tmp</code> from 0.2.3 to 0.2.4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/854">golangci/golangci-lint-action#854</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.6.0 to 6.7.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/855">golangci/golangci-lint-action#855</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.6.0 to 20.6.2 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/857">golangci/golangci-lint-action#857</a></li>
<li>build(deps): bump <code>@​actions/core</code> from 1.10.0 to 1.10.1
by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>
in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/856">golangci/golangci-lint-action#856</a></li>
<li>build(deps-dev): bump eslint from 8.49.0 to 8.50.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/859">golangci/golangci-lint-action#859</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.6.2 to 20.6.5 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/860">golangci/golangci-lint-action#860</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.6.0 to 6.7.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/861">golangci/golangci-lint-action#861</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.7.0 to 6.7.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/862">golangci/golangci-lint-action#862</a></li>
<li>build(deps): bump <code>@​types/semver</code> from 7.5.2 to 7.5.3 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/864">golangci/golangci-lint-action#864</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.7.2 to 6.7.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/865">golangci/golangci-lint-action#865</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.6.5 to 20.8.0 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/867">golangci/golangci-lint-action#867</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.7.2 to 6.7.3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/866">golangci/golangci-lint-action#866</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.7.3 to 6.7.4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/868">golangci/golangci-lint-action#868</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.8.0 to 20.8.3 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/869">golangci/golangci-lint-action#869</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.7.3 to 6.7.4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/870">golangci/golangci-lint-action#870</a></li>
<li>build(deps-dev): bump eslint from 8.50.0 to 8.51.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/871">golangci/golangci-lint-action#871</a></li>
<li>build(deps): bump <code>@​actions/http-client</code> from 2.1.1 to
2.2.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/872">golangci/golangci-lint-action#872</a></li>
<li>build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.7.4 to 6.7.5 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/874">golangci/golangci-lint-action#874</a></li>
<li>build(deps): bump <code>@​types/node</code> from 20.8.3 to 20.8.6 by
<a href="https://github.com/dependabot"><code>@​dependabot</code></a> in
<a
href="https://redirect.github.com/golangci/golangci-lint-action/pull/875">golangci/golangci-lint-action#875</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/3cfe3a4abbb849e10058ce4af15d205b6da42804"><code>3cfe3a4</code></a>
build(deps): bump <code>@​actions/cache</code> from 3.2.3 to 3.2.4 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/963">#963</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/cbc59cf0d18a8aa6b4806cab8d5a6ad3622f57fe"><code>cbc59cf</code></a>
build(deps-dev): bump prettier from 3.2.4 to 3.2.5 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/960">#960</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/459a04b021b544b77372de9a6e429e0d3c136fac"><code>459a04b</code></a>
build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.19.1 to 6.20.0 ...</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/e2315b67db0fd76598007338449373a42c572b25"><code>e2315b6</code></a>
build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.19.1 to 6.20.0 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/961">#961</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/d6173a45d0441c7db097b6014862dde0ddc9b579"><code>d6173a4</code></a>
build(deps): bump <code>@​types/node</code> from 20.11.10 to 20.11.16
(<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/962">#962</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/0e8f5bf773dd8000d6aeb01936f3090976982f33"><code>0e8f5bf</code></a>
build(deps): bump <code>@​types/node</code> from 20.11.5 to 20.11.10 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/958">#958</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/349d20632dbaed38f0a492cc991152e3d351e854"><code>349d206</code></a>
build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.19.0 to 6.19.1 ...</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/2221aee28499deb9551e403a0d876df4b0e70067"><code>2221aee</code></a>
build(deps-dev): bump <code>@​typescript-eslint/parser</code> from
6.18.1 to 6.19.1 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/954">#954</a>)</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/3b44ae5b24a084588d4051d37ccb95e8a709a9a3"><code>3b44ae5</code></a>
build(deps-dev): bump <code>@​typescript-eslint/eslint-plugin</code>
from 6.18.1 to 6.19.0 ...</li>
<li><a
href="https://github.com/golangci/golangci-lint-action/commit/323b871bbc74bdc20959d979cb52c68910b77f37"><code>323b871</code></a>
build(deps-dev): bump prettier from 3.2.2 to 3.2.4 (<a
href="https://redirect.github.com/golangci/golangci-lint-action/issues/950">#950</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/golangci/golangci-lint-action/compare/v3...v4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golangci/golangci-lint-action&package-manager=github_actions&previous-version=3&new-version=4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@melekes @czarcas7ic
perf(internal/blocksync): avoid double-calling types.BlockFromProto (…
502a382 
…cometbft#2016)

for performance reasons.
Closes cometbft#1964

---

- [ ] ~~Tests written/updated~~
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
@melekes @czarcas7ic
perf(internal/blocksync): do not ValidateBlock twice (cometbft#2026)
e9fe425 
The first time we validate the block is by calling `ValidateBlock`. Then
we were calling `ApplyBlock`, which also calls `ValidateBlock`. The
solution is to introduce a new method - `ApplyVerifiedBlock`, which
skips validation.

Closes cometbft#1830

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
@mergify @andynog
docs: images not rendering properly in docs (backport cometbft#2331) (c…
d954826 
…ometbft#2339)

This is an automatic backport of pull request cometbft#2331 done by
[Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
@czarcas7ic
add mergify
610bd6a
@melekes @czarcas7ic
ci: fix failing golangci-lint action (cometbft#1833)
d8bf8df 
* use latest golangci-lint-action

* make the linter run on workflow changes too

* disable 3 linters for now

until we fix all the errors

* comment out goconst as well

* reenable depguard
@czarcas7ic
Merge branch 'osmo/v0.37.4' into adam/avoid-double-call-block-proto
19e0dd9
@czarcas7ic
Merge branch 'osmo/v0.37.4' into adam/avoid-val-block-twice
86c135f
@czarcas7ic
vulncheck
93f2fd5
@czarcas7ic
Merge branch 'osmo/v0.37.4' into adam/avoid-val-block-twice
4756f52
@czarcas7ic
Merge branch 'osmo/v0.37.4' into adam/avoid-double-call-block-proto
0219c4a
@czarcas7ic
Merge pull request cometbft#3 from osmosis-labs/adam/avoid-double-cal…
2629de9 
…l-block-proto

perf(internal/blocksync): avoid double-calling `types.BlockFromProto`…
@czarcas7ic
Merge pull request cometbft#4 from osmosis-labs/adam/avoid-val-block-…
6e2a1c3 
…twice

perf(internal/blocksync): do not `ValidateBlock` twice (cometbft#2026)
@faddat
Merge remote-tracking branch 'origin/v0.37.x' into HEAD
1bea8b5
@faddat
add the apphash error channel to the no-op mempool
3f935bf
@faddat
Merge remote-tracking branch 'osmosis/osmo/v0.37.4' into faddat/updat…
75f9d4f 
…e-from-upstream
@faddat
adjust a few small values
4107396
@faddat
Revert "adjust a few small values"
a06442b 
This reverts commit 4107396.
@czarcas7ic
Copy link
Member

Hey, for branch management purposes we are treating osmo/v0.37.4 as our primary branch and if there is anything useful upstream in v0.37.x we move it to osmo.v0.37.4. With that being said we can merge this, but just wanted you to know for future PRs.

@faddat
Copy link
Member Author

faddat commented Mar 1, 2024 via email

@github-actions GitHub Actions
Copy link

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the Stale label Mar 12, 2024
@github-actions github-actions bot closed this Mar 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Stale
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.