deps: migrate to cometbft v0.37 #3175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I am not sure what to do with the import paths in |
# Conflicts: # go.mod
# Conflicts: # 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/chain.go
# Conflicts: # e2e/go.mod # e2e/go.sum # go.mod # go.sum
crodriguezvega
changed the title
crodriguezvega
requested review from
colin-axner,
AdityaSripal,
charleenfei,
damiannolan,
chatton and
tmsdkeys
as code owners
colin-axner
approved these changes
Mar 6, 2023
| github.com/sasha-s/go-deadlock v0.3.1 // indirect | ||
| github.com/spf13/afero v1.9.3 // indirect | ||
| github.com/spf13/jwalterweatherman v1.1.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/subosito/gotenv v1.4.2 // indirect | ||
| github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect | ||
| github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect |
There was a problem hiding this comment.
I wonder where this indirect is coming from
There was a problem hiding this comment.
randomly wondered this too (due to seeing the replace), its cometbft-db pulling it in.
mergify bot
pushed a commit
that referenced
this pull request
Mar 6, 2023
(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
mergify bot
pushed a commit
that referenced
this pull request
Mar 6, 2023
(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
This was referenced Mar 6, 2023
colin-axner
added a commit
that referenced
this pull request
Mar 7, 2023
* deps: migrate to cometbft v0.37 (#3175) (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 * remove e2e directory * chore: fix merge conflicts * fix: indentation --------- Co-authored-by: Carlos Rodriguez <[email protected]> Co-authored-by: Colin Axnér <[email protected]>
colin-axner
added a commit
that referenced
this pull request
Mar 7, 2023
* deps: migrate to cometbft v0.37 (#3175) (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 * remove e2e directory * chore: fix merge conflicts * fix: indentation --------- Co-authored-by: Carlos Rodriguez <[email protected]> Co-authored-by: Colin Axnér <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Updating to tip of Cosmos SDK release/v0.47.x. This is still very much work in progress.I will update the branch with the next SDK v0.47 RC when available.
Updated to SDK v0.47-rc3 and CometBFT v0.37-rc3.
closes: #XXXX
Commit Message / Changelog Entry
see the guidelines for commit messages. (view raw markdown for examples)
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.
docs/) or specification (x/<module>/spec/).godoccomments.Files changedin the Github PR explorer.Codecov Reportin the comment section below once CI passes.