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

refactor!: reimplement PreFinalizeBlockHook as PreBlocker #17713

Merged
merged 14 commits into from
Sep 15, 2023
Merged

refactor!: reimplement PreFinalizeBlockHook as PreBlocker #17713

merged 14 commits into from
Sep 15, 2023

Conversation

mmsqe
Copy link
Contributor

@mmsqe mmsqe commented Sep 13, 2023 •
edited
Loading

Description

Updates #17421

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • run make lint and make test
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@mmsqe mmsqe changed the title fix: merge preFinalizeBlockHook into preBlock fix: reimplement PreFinalizeBlockHook as PreBlocker Sep 13, 2023
@mmsqe mmsqe marked this pull request as ready for review September 13, 2023 13:04
@mmsqe mmsqe requested a review from a team as a code owner September 13, 2023 13:04
@julienrbrt julienrbrt added the backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release label Sep 13, 2023
julienrbrt
julienrbrt reviewed Sep 13, 2023
View reviewed changes
types/abci.go Outdated Show resolved Hide resolved
@julienrbrt julienrbrt requested review from alexanderbez and facundomedica and removed request for kocubinski and samricotta September 13, 2023 13:11
@julienrbrt julienrbrt removed the backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release label Sep 13, 2023
@julienrbrt
Copy link
Member

julienrbrt commented Sep 13, 2023 •
edited
Loading

Removed the backport label, I will cherry-pick the merge commit in #17712
Nvm, let's merge the other one before, it is blocking other backports otherwise.

@julienrbrt
Copy link
Member

Slightly unrelated, but noticing when fixing conflicts on #17712.
Could you add a under x/upgrade/CHANGELOG.md an entry explaining the addition of PreBlock in 17712?

julienrbrt
julienrbrt reviewed Sep 13, 2023
View reviewed changes
x/upgrade/CHANGELOG.md Outdated Show resolved Hide resolved
@mmsqe @julienrbrt
Update x/upgrade/CHANGELOG.md
b1ae029 
Co-authored-by: Julien Robert <julien@rbrt.fr>
@julienrbrt julienrbrt added the backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release label Sep 13, 2023
alexanderbez
alexanderbez reviewed Sep 13, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
types/abci.go Outdated Show resolved Hide resolved
alexanderbez and others added 2 commits September 13, 2023 12:51
@alexanderbez
Merge branch 'main' into pre-begin-merge
77c1e37
@mmsqe @alexanderbez
Update CHANGELOG.md
021ead2 
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
@julienrbrt julienrbrt changed the title fix: reimplement PreFinalizeBlockHook as PreBlocker refactor!: reimplement PreFinalizeBlockHook as PreBlocker Sep 13, 2023
@julienrbrt julienrbrt mentioned this pull request Sep 13, 2023
Closed
15 tasks
julienrbrt
julienrbrt approved these changes Sep 13, 2023
View reviewed changes
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

facundomedica
facundomedica reviewed Sep 14, 2023
View reviewed changes
docs/architecture/adr-064-abci-2.0.md
Comment on lines +362 to +364
if rsp.ConsensusParamsChanged {
app.finalizeBlockState.ctx = ctx.WithConsensusParams(app.GetConsensusParams(ctx))
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: Might be a silly one but... Why do we need this, couldn't we just always do it? Or are there cases in which we want to update params but not make those changes available until the next block?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we only need reload when consensus params get modified in preBlocker

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but what difference would it make in practice to always reload the consensus params? That way we could discard ResponsePreBlock

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I realize I'm late to the party. This was in the previous PR, and I only thought of this now 🤦

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this is a rare case and should in reality only happen in upgrades

julienrbrt
julienrbrt reviewed Sep 14, 2023
View reviewed changes
UPGRADING.md Outdated Show resolved Hide resolved
julienrbrt
julienrbrt reviewed Sep 14, 2023
View reviewed changes
x/upgrade/go.mod Outdated Show resolved Hide resolved
mmsqe
mmsqe commented Sep 14, 2023
View reviewed changes
UPGRADING.md Outdated Show resolved Hide resolved
@julienrbrt julienrbrt added this pull request to the merge queue Sep 15, 2023
Merged via the queue into cosmos:main with commit f99a624 Sep 15, 2023
45 of 47 checks passed
mergify bot pushed a commit that referenced this pull request Sep 15, 2023
@mmsqe @mergify
refactor!: reimplement PreFinalizeBlockHook as PreBlocker (#17713)
2a214d8 
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit f99a624)

# Conflicts:
#	CHANGELOG.md
#	docs/architecture/adr-064-abci-2.0.md
@mergify mergify bot mentioned this pull request Sep 15, 2023
Merged
julienrbrt added a commit that referenced this pull request Sep 15, 2023
@mergify @mmsqe @julienrbrt
refactor!: reimplement PreFinalizeBlockHook as PreBlocker (backport #…
4955776 
…17713) (#17754)

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
@poorphd poorphd mentioned this pull request Jun 26, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@facundomedica facundomedica facundomedica left review comments

@tac0turtle tac0turtle tac0turtle left review comments

@julienrbrt julienrbrt julienrbrt approved these changes

@alexanderbez alexanderbez alexanderbez approved these changes

Assignees
No one assigned
Labels
backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release C:x/upgrade Type: ADR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mmsqe @julienrbrt @alexanderbez @facundomedica @tac0turtle