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.

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

feat: introduce PreBlock (backport #17421) #17712

Merged
merged 6 commits into from
Sep 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2023

This is an automatic backport of pull request #17421 done by Mergify.
Cherry-pick of 4eb0185 has failed:

On branch mergify/bp/release/v0.50.x/pr-17421
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 4eb018541.
  (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:   baseapp/abci.go
	modified:   baseapp/baseapp.go
	modified:   baseapp/baseapp_test.go
	modified:   baseapp/options.go
	modified:   docs/architecture/README.md
	modified:   docs/architecture/adr-063-core-module-api.md
	new file:   docs/architecture/adr-068-preblock.md
	modified:   docs/docs/build/building-apps/01-app-go-v2.md
	new file:   docs/docs/build/building-modules/17-preblock.md
	modified:   docs/docs/develop/beginner/00-app-anatomy.md
	modified:   go.mod
	modified:   go.sum
	modified:   runtime/app.go
	modified:   simapp/app.go
	modified:   simapp/app_config.go
	modified:   testutil/configurator/configurator.go
	modified:   types/abci.go
	modified:   x/circuit/go.mod
	modified:   x/circuit/go.sum
	modified:   x/evidence/go.mod
	modified:   x/evidence/go.sum
	modified:   x/feegrant/go.sum
	modified:   x/nft/go.mod
	modified:   x/nft/go.sum
	modified:   x/upgrade/module.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   UPGRADING.md
	both modified:   docs/docs/build/building-apps/03-app-upgrade.md
	both modified:   docs/docs/build/building-modules/01-module-manager.md
	both modified:   docs/docs/develop/advanced/00-baseapp.md
	both modified:   runtime/builder.go
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/go.sum
	both modified:   testutil/mock/types_mock_appmodule.go
	both modified:   types/module/module.go
	both modified:   types/module/module_test.go
	both modified:   x/feegrant/go.mod
	both modified:   x/upgrade/abci.go
	both modified:   x/upgrade/abci_test.go
	both modified:   x/upgrade/go.mod
	both modified:   x/upgrade/go.sum

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


Mergify commands and options

More conditions and actions can be found in the documentation.

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 you can:

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

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

(cherry picked from commit 4eb0185)

# Conflicts:
#	CHANGELOG.md
#	UPGRADING.md
#	docs/docs/build/building-apps/03-app-upgrade.md
#	docs/docs/build/building-modules/01-module-manager.md
#	docs/docs/develop/advanced/00-baseapp.md
#	runtime/builder.go
#	simapp/go.mod
#	simapp/go.sum
#	simapp/gomod2nix.toml
#	tests/go.mod
#	tests/go.sum
#	tests/starship/tests/go.mod
#	tests/starship/tests/go.sum
#	testutil/mock/types_mock_appmodule.go
#	types/module/module.go
#	types/module/module_test.go
#	x/feegrant/go.mod
#	x/upgrade/abci.go
#	x/upgrade/abci_test.go
#	x/upgrade/go.mod
#	x/upgrade/go.sum
Comment on lines 727 to +733
}
}

if err := app.preBlock(); err != nil {
return nil, err
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:660)

@julienrbrt julienrbrt self-assigned this Sep 13, 2023
@julienrbrt julienrbrt marked this pull request as draft September 13, 2023 12:36
simapp/go.mod Show resolved Hide resolved
@julienrbrt julienrbrt removed their assignment Sep 13, 2023
@julienrbrt julienrbrt marked this pull request as ready for review September 13, 2023 16:15
@julienrbrt julienrbrt merged commit 4c083c6 into release/v0.50.x Sep 13, 2023
46 of 48 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17421 branch September 13, 2023 17:40
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants