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

deps: migrate to cometbft v0.37 (backport #3175) #3242

Merged
merged 4 commits into from
Mar 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 6, 2023

This is an automatic backport of pull request #3175 done by Mergify.
Cherry-pick of 143e5d8 has failed:

On branch mergify/bp/release/v7.0.x/pr-3175
Your branch is up to date with 'origin/release/v7.0.x'.

You are currently cherry-picking commit 143e5d85.
  (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:   Makefile
	modified:   RELEASES.md
	modified:   SECURITY.md
	modified:   modules/apps/27-interchain-accounts/host/client/cli/query.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/module.go
	modified:   modules/apps/27-interchain-accounts/module_test.go
	modified:   modules/apps/29-fee/keeper/escrow_test.go
	modified:   modules/apps/29-fee/keeper/events_test.go
	modified:   modules/apps/29-fee/keeper/grpc_query_test.go
	modified:   modules/apps/29-fee/keeper/keeper.go
	modified:   modules/apps/29-fee/module.go
	modified:   modules/apps/29-fee/types/fee_test.go
	modified:   modules/apps/29-fee/types/genesis_test.go
	modified:   modules/apps/29-fee/types/msgs_test.go
	modified:   modules/apps/transfer/keeper/keeper.go
	modified:   modules/apps/transfer/module.go
	modified:   modules/core/02-client/abci_test.go
	modified:   modules/core/02-client/keeper/keeper_test.go
	modified:   modules/core/02-client/types/genesis_test.go
	modified:   modules/core/03-connection/types/msgs_test.go
	modified:   modules/core/04-channel/keeper/keeper.go
	modified:   modules/core/04-channel/types/msgs_test.go
	modified:   modules/core/05-port/keeper/keeper.go
	modified:   modules/core/05-port/keeper/keeper_test.go
	modified:   modules/core/23-commitment/types/commitment_test.go
	modified:   modules/core/23-commitment/types/merkle_test.go
	modified:   modules/core/23-commitment/types/utils_test.go
	modified:   modules/core/client/query.go
	modified:   modules/core/genesis_test.go
	modified:   modules/core/module.go
	modified:   modules/light-clients/07-tendermint/fraction.go
	modified:   modules/light-clients/07-tendermint/header_test.go
	modified:   modules/light-clients/07-tendermint/migrations/expected_keepers.go
	modified:   modules/light-clients/07-tendermint/misbehaviour_handle_test.go
	modified:   modules/light-clients/07-tendermint/misbehaviour_test.go
	modified:   modules/light-clients/07-tendermint/tendermint.pb.go
	modified:   modules/light-clients/07-tendermint/tendermint_test.go
	modified:   modules/light-clients/07-tendermint/update_test.go
	modified:   proto/buf.lock
	modified:   proto/buf.yaml
	modified:   proto/ibc/lightclients/tendermint/v1/tendermint.proto
	modified:   testing/app.go
	modified:   testing/coordinator.go
	modified:   testing/mock/mock.go
	modified:   testing/mock/privval.go
	modified:   testing/mock/privval_test.go
	modified:   testing/simapp/app.go
	modified:   testing/simapp/export.go
	modified:   testing/simapp/genesis_account_test.go
	modified:   testing/simapp/sim_bench_test.go
	modified:   testing/simapp/sim_test.go
	modified:   testing/simapp/simd/cmd/genaccounts_test.go
	modified:   testing/simapp/simd/cmd/root.go
	modified:   testing/simapp/state.go
	modified:   testing/simapp/test_helpers.go
	modified:   testing/simapp/types.go
	modified:   testing/simapp/utils.go
	modified:   testing/utils.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/dev/go-style-guide.md
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	deleted by us:   e2e/semverutil/semver.go
	deleted by us:   e2e/testconfig/testconfig.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	both modified:   modules/apps/transfer/keeper/mbt_relay_test.go
	both modified:   modules/apps/transfer/types/trace.go
	both modified:   modules/core/02-client/client/utils/utils.go
	both modified:   modules/core/02-client/keeper/keeper.go
	both modified:   modules/core/03-connection/keeper/keeper.go
	both modified:   modules/core/04-channel/types/acknowledgement_test.go
	both modified:   modules/core/23-commitment/types/merkle.go
	both modified:   modules/core/23-commitment/types/utils.go
	both modified:   modules/light-clients/07-tendermint/client_state.go
	both modified:   modules/light-clients/07-tendermint/consensus_state.go
	both modified:   modules/light-clients/07-tendermint/header.go
	both modified:   modules/light-clients/07-tendermint/misbehaviour.go
	both modified:   modules/light-clients/07-tendermint/misbehaviour_handle.go
	both modified:   modules/light-clients/07-tendermint/update.go
	both modified:   testing/README.md
	both modified:   testing/chain.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


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 143e5d8)

# Conflicts:
#	docs/dev/go-style-guide.md
#	e2e/go.mod
#	e2e/go.sum
#	e2e/semverutil/semver.go
#	e2e/testconfig/testconfig.go
#	go.mod
#	go.sum
#	modules/apps/27-interchain-accounts/controller/keeper/keeper.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/types/trace.go
#	modules/core/02-client/client/utils/utils.go
#	modules/core/02-client/keeper/keeper.go
#	modules/core/03-connection/keeper/keeper.go
#	modules/core/04-channel/types/acknowledgement_test.go
#	modules/core/23-commitment/types/merkle.go
#	modules/core/23-commitment/types/utils.go
#	modules/light-clients/07-tendermint/client_state.go
#	modules/light-clients/07-tendermint/consensus_state.go
#	modules/light-clients/07-tendermint/header.go
#	modules/light-clients/07-tendermint/misbehaviour.go
#	modules/light-clients/07-tendermint/misbehaviour_handle.go
#	modules/light-clients/07-tendermint/update.go
#	testing/README.md
#	testing/chain.go
@damiannolan
Copy link
Member

We should add the e2e directory to gitignore on release branches

@colin-axner colin-axner self-assigned this Mar 7, 2023
@colin-axner colin-axner removed their assignment Mar 7, 2023
Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

Thanks @colin-axner ❤️

@colin-axner colin-axner merged commit 9551252 into release/v7.0.x Mar 7, 2023
@colin-axner colin-axner deleted the mergify/bp/release/v7.0.x/pr-3175 branch March 7, 2023 16:52
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.

3 participants