Skip to content

fix(privval): re-enable some vote extension-related sanity checks when signing a vote (backport #3649)#4789

Merged
mergify[bot] merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-3649
Jan 13, 2025
Merged

fix(privval): re-enable some vote extension-related sanity checks when signing a vote (backport #3649)#4789
mergify[bot] merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-3649

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2025

Closes #3642

When vote extensions are disabled, we still need to (sanity-)check that:

  • Prevotes don't contain an extension signature
  • nil precommits don't contain an extension signature

This PR is re-enabling those checks, in alignment with #3565 in v0.38.x


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
  • Title follows the Conventional Commits spec

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

…n signing a vote (#3649)

Closes #3642

When vote extensions are disabled, we still need to (sanity-)check that:

* Prevotes don't contain an extension signature
* `nil` precommits don't contain an extension signature

This PR is re-enabling those checks, in alignment with #3565 in
`v0.38.x`

---

#### PR checklist

- ~[ ] Tests written/updated~
- [x] 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~
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit a33b8ac)

# Conflicts:
#	.changelog/v1.0.0/bug-fixes/3642-re-enable-vote-extension-checks.md
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts label Jan 11, 2025
@mergify mergify bot requested a review from a team as a code owner January 11, 2025 07:39
@mergify mergify bot requested a review from a team January 11, 2025 07:39
@mergify
Copy link
Contributor Author

mergify bot commented Jan 11, 2025

Cherry-pick of a33b8ac has failed:

On branch mergify/bp/v1.x/pr-3649
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit a33b8acd.
  (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:   types/vote.go
	modified:   types/vote_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v1.0.0/bug-fixes/3642-re-enable-vote-extension-checks.md
	both modified:   go.mod
	both modified:   go.sum

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

@melekes melekes removed the conflicts label Jan 13, 2025
@mergify mergify bot merged commit d3a1309 into v1.x Jan 13, 2025
@mergify mergify bot deleted the mergify/bp/v1.x/pr-3649 branch January 13, 2025 06:16
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.

2 participants