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

chore(store): upgrade iavl to v0.19.0 (backport #12626) #12653

Merged
merged 3 commits into from
Jul 21, 2022
Merged

chore(store): upgrade iavl to v0.19.0 (backport #12626) #12653

merged 3 commits into from
Jul 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 20, 2022

This is an automatic backport of pull request #12626 done by Mergify.
Cherry-pick of 6f63115 has failed:

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

You are currently cherry-picking commit 6f631156f.
  (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:   CHANGELOG.md
	modified:   store/iavl/store.go
	modified:   store/iavl/store_test.go
	modified:   store/iavl/tree.go
	modified:   store/iavl/tree_test.go
	modified:   store/rootmulti/proof_test.go
	modified:   store/rootmulti/store.go
	modified:   store/tools/ics23/iavl/cmd/testgen-iavl/main.go
	modified:   store/tools/ics23/iavl/create.go
	modified:   store/tools/ics23/iavl/create_test.go
	modified:   store/tools/ics23/iavl/helpers/helpers.go
	modified:   store/types/iterator_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   UPGRADING.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   store/tools/ics23/go.mod

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

@mergify mergify bot requested a review from a team as a code owner July 20, 2022 12:25
@mergify mergify bot added the conflicts label Jul 20, 2022
@amaury1093
Copy link
Contributor

@p0mvn Do you have push rights to the SDK repo? If so, would you mind fixing the conflicts here?

julienrbrt
julienrbrt reviewed Jul 20, 2022
View reviewed changes
UPGRADING.md Outdated Show resolved Hide resolved
@julienrbrt
Copy link
Member

@Mergifyio rebase

@p0mvn @mergify
chore(store): upgrade iavl to v0.19.0 (#12626)
1fb9e5b 
## Description

Closes: #XXXX

Upgrading IAVL to v0.19. This version includes the fast index optimization and errors propagated up top.

Currently, SDK panics on any db error, leaving the proper error handling and refactoring to future work.

Similar change in Osmosis fork, ref: osmosis-labs#108

### 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...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
- [x] provided a link to the relevant issue or specification
- [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules)
- [x] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing)
- [x] added a changelog entry to `CHANGELOG.md`
- [x] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [x] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] 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](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) 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)

(cherry picked from commit 6f63115)

# Conflicts:
#	UPGRADING.md
#	go.mod
#	go.sum
#	store/tools/ics23/go.mod
@mergify
Copy link
Contributor Author

mergify bot commented Jul 20, 2022

rebase

✅ Branch has been successfully rebased

@likhita-809 likhita-809 force-pushed the mergify/bp/release/v0.46.x/pr-12626 branch from 4c278c3 to 1fb9e5b Compare July 20, 2022 21:23
@julienrbrt
Copy link
Member

@p0mvn Do you have push rights to the SDK repo? If so, would you mind fixing the conflicts here?

Done for you ;)

p0mvn
p0mvn approved these changes Jul 20, 2022
View reviewed changes
Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for rebasing for me @julienrbrt

@amaury1093 amaury1093 merged commit e28ac18 into release/v0.46.x Jul 21, 2022
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.46.x/pr-12626 branch July 21, 2022 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amaury1093 amaury1093 amaury1093 approved these changes

@julienrbrt julienrbrt julienrbrt approved these changes

@p0mvn p0mvn p0mvn approved these changes

Assignees
No one assigned
Labels
C:Store
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@amaury1093 @julienrbrt @p0mvn