Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2024

Description

Currently, test chains carry the same block proposer for every block. This can lead to a situation where the block proposer isn't part of the validator set, such as after being jailed. This can cause the validation of validator sets to fail in CometBFT v0.38.12, see ValidateBasic.

This PR addresses the issue by incrementing the validator proposer priority in test chains, ensuring that the block proposer is updated in line with changes to the validator set.

closes: #XXXX


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

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

* Introduce two following changes to the `commitBlock` method in testing:
* increment the proposer priority of validators
* update the proposer address in the current header

* fix linter

(cherry picked from commit 64f33e0)

# Conflicts:
#	testing/chain.go
@mergify mergify bot added the conflicts label Oct 14, 2024
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

Cherry-pick of 64f33e0 has failed:

On branch mergify/bp/release/v8.5.x/pr-7430
Your branch is up to date with 'origin/release/v8.5.x'.

You are currently cherry-picking commit 64f33e09.
  (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:   CHANGELOG.md
	modified:   testing/chain_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/chain.go

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

@DimitrisJim DimitrisJim force-pushed the mergify/bp/release/v8.5.x/pr-7430 branch from c1e2e5e to 00bff7f Compare October 14, 2024 14:18
@DimitrisJim DimitrisJim removed their assignment Oct 14, 2024
@colin-axner
Copy link
Contributor

Thank you @DimitrisJim for picking up mergify's slack!

@damiannolan damiannolan merged commit a55c271 into release/v8.5.x Oct 14, 2024
19 checks passed
@damiannolan damiannolan deleted the mergify/bp/release/v8.5.x/pr-7430 branch October 14, 2024 19:08
arnabmitra added a commit to provenance-io/ibc-go that referenced this pull request Mar 5, 2025
* Update CHANGELOG.md

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic (backport cosmos#6436) (cosmos#6520)

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic (cosmos#6436)

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic due to AllowUnresolvable field

* add changelog entry

* Apply suggestions from code review

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit a16c549)

# Conflicts:
#	CHANGELOG.md

* fix conflicts in changelog.

---------

Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* deps(release/v8.3.x): bump SDK to v0.50.7 (cosmos#6614)

* deps: bump SDK to v0.50.7

* add changelog

* update changelog before v8.3.2 release

* Update CHANGELOG.md

* events: add channel ordering to write acknowledgement event (cosmos#6867) (cosmos#6871)

* docs: remove ordering from write ack event and non-hex data atrributes

* rever doc changes

* add ordering to write acknowledgement event

* Update events.md

(cherry picked from commit 352ba6e)

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* (feat) Add possibility to transfer entire balance. (backport cosmos#6877) (cosmos#6930)

* (feat) Add possibility to transfer entire balance. (cosmos#6877)

* Add possibility to transfer entire balance.

* Added entry to the Changelog.

* Added e2e test

* Added forwarding

* Update modules/apps/transfer/keeper/relay.go

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* Move UnboundedSpendLimit to token.go

* add documentation

* add test to compatibility matrices

* PR Feedback.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit 92e1f38)

# Conflicts:
#	.github/compatibility-test-matrices/main/transfer-v2-multidenom-chain-a.json
#	.github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json
#	.github/compatibility-test-matrices/unreleased/transfer-v2-multidenom.json
#	CHANGELOG.md
#	docs/docs/02-apps/01-transfer/04-messages.md
#	docs/docs/02-apps/01-transfer/10-ICS20-v1/04-messages.md
#	e2e/tests/transfer/base_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/types/token.go
#	modules/apps/transfer/types/transfer_authorization.go

* fix conflicts

* remove unused code

---------

Co-authored-by: Nikolas De Giorgis <nikolas.degiorgis@interchain.io>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* fix(state!): check upgrade compatibility in channel upgrade confirm (backport cosmos#6935) (cosmos#6944)

* fix(state!): check upgrade compatibility in channel upgrade confirm (cosmos#6935)

(cherry picked from commit 3a192be)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* update changelog before v8.4.0 release

* retract v8.2.x and v8.3.x (cosmos#6965)

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* backport-v8.5.x: self client/consensus state removal from connection handshake (cosmos#7129)

* refactor: remove client/consensus state validation from connection handshake

* chore: generate proto deprecation notice

* add changelog

* refactor: remove unpacking from msg server

* deps(release/v8.5.x): bump ics23 to v0.11.0 (cosmos#7222)

* deps: bump ics23 to v0.11.0-rc.0

* deps: bump ics23 to v0.11.0

* deps: bump cosmos-sdk to v0.50.9 (backport cosmos#6828) (cosmos#7227)

* deps: bump cosmos-sdk to v0.50.9 (cosmos#6828)

* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 3425726)

# Conflicts:
#	CHANGELOG.md
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/CHANGELOG.md
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/capability/CHANGELOG.md
#	modules/capability/go.mod
#	modules/light-clients/08-wasm/CHANGELOG.md
#	modules/light-clients/08-wasm/go.mod
#	modules/light-clients/08-wasm/go.sum
#	simapp/go.mod
#	simapp/go.sum

* fix conflicts

* callbacks: go mod tidy

* tidy

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* Update CHANGELOG.md

* Update CHANGELOG.md

* fix: attempt to fix panics for unresolvable imports by using GogoResolver (backport cosmos#7277) (cosmos#7281)

* fix: attempt to fix panics for unresolvable imports by using GogoResolver (cosmos#7277)

* fix: attempt to fix panics for unresolvable imports by using GogoResolver

* chore: add changelog

* chore: amend changelog

(cherry picked from commit 79ddda5)

# Conflicts:
#	CHANGELOG.md

* chore: address merge conflicts in changelog

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

* prepare changelog for v8.5.1 release

* Update CHANGELOG.md

* fix: avoid invalid identifier error when validate genesis (backport cosmos#7397) (cosmos#7403)

* fix: avoid invalid identifier error when validate genesis (cosmos#7397)

* fix: avoid invalid identifier error when validate genesis

that contains localhost client

* Apply suggestions from code review

* skip

(cherry picked from commit ff2b668)

# Conflicts:
#	CHANGELOG.md
#	modules/core/03-connection/types/genesis.go
#	modules/core/03-connection/types/genesis_test.go

* chore: changelog cleanup

* chore: fix imports

---------

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Colin Axnér <25233464+colin-axner@users.noreply.github.com>

* test: update block proposer in testing (backport cosmos#7430) (cosmos#7453)

* test: update block proposer in testing (cosmos#7430)

* Introduce two following changes to the `commitBlock` method in testing:
* increment the proposer priority of validators
* update the proposer address in the current header

* fix linter

(cherry picked from commit 64f33e0)

# Conflicts:
#	testing/chain.go

* why did you fail us here, mergify my boy

---------

Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* Updating changelog for v8.5.2 (cosmos#7536)

* chore: backport json tags for Height for ibc client proto (cosmos#7868)

* chore: update changelog for v8.5.3 (cosmos#7876)

* Chore/revert ibc proto updates (cosmos#7887)

* Revert "chore: update changelog for v8.5.3 (cosmos#7876)"

This reverts commit c3af326.

* Revert "chore: backport json tags for Height for ibc client proto (cosmos#7868)"

This reverts commit b589a85.

* chore: retract v8.5.3 (cosmos#7888)

* chore: retract v8.5.3

* fix retract statement

* chore: update changelog and redact

* Merge commit from fork

rm test case

* chore: update redacted

* fix: remove packet data remarshaling (cosmos#8065)

* fix: remove packet data remarshaling

* chore: update upload artifact

* chore: update download artifact

* redact 8.6.0

* ignoring packages that have no tests, else make test and make test-all fail.

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Nikolas De Giorgis <nikolas.degiorgis@interchain.io>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Simon Noetzlin <simon.ntz@gmail.com>
Co-authored-by: Cian Hatton <cian@interchain.io>
Co-authored-by: PaddyMc <paddymchale@hotmail.com>
Co-authored-by: Gjermund Garaba <gjermund@garaba.net>
Co-authored-by: Aditya <14364734+AdityaSripal@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants