osmosis-labs / cosmos-sdk

:chains: A Framework for Building High Value Public Blockchains :sparkles:
https://cosmos.network/
Apache License 2.0
14 stars 31 forks source link

fix: iavl grow issue (backport #535) #536

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

This is an automatic backport of pull request #535 done by Mergify. Cherry-pick of 1434d548a938399772b52a1e9736a4f64fd3b051 has failed:

On branch mergify/bp/osmo-v23/v0.47.5/pr-535
Your branch is up to date with 'origin/osmo-v23/v0.47.5'.

You are currently cherry-picking commit 1434d548a.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    both modified:   go.mod
    both modified:   go.sum
    both modified:   simapp/go.mod
    both modified:   simapp/go.sum
    both modified:   store/cache/cache_test.go
    both modified:   store/iavl/store.go
    both modified:   store/iavl/store_test.go
    both modified:   store/iavl/tree_test.go
    both modified:   store/prefix/store_test.go
    deleted by us:   store/wrapper/tmdb.go
    both modified:   tests/go.mod
    both modified:   tests/go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com