Finschia / finschia-sdk

A framework for building blockchains based Finschia Mainnet that is forked from cosmos-sdk
Apache License 2.0
62 stars 29 forks source link

fix: app-hash mismatch if upgrade migration commit is interrupted(backport cosmos/cosmos-sdk#13530) (backport #1310) #1318

Closed mergify[bot] closed 6 months ago

mergify[bot] commented 6 months ago

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

mergify[bot] commented 6 months ago

Cherry-pick of 9105ff4be9ae75612df62bc89944e4e310057c0b has failed:

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

You are currently cherry-picking commit 9105ff4be.
  (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:   store/rootmulti/store.go
    modified:   store/rootmulti/store_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   CHANGELOG.md

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

codecov[bot] commented 6 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 69.78%. Comparing base (1f8e902) to head (1139b35). Report is 6 commits behind head on release/v0.48.x.

:exclamation: Current head 1139b35 differs from pull request most recent head f965188. Consider uploading reports for the commit f965188 to get more accurate results

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1318/graphs/tree.svg?width=650&height=150&src=pr&token=m16qfzIPO7&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1318?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) ```diff @@ Coverage Diff @@ ## release/v0.48.x #1318 +/- ## ================================================ Coverage 69.78% 69.78% ================================================ Files 646 646 Lines 67507 67515 +8 ================================================ + Hits 47109 47116 +7 - Misses 18212 18213 +1 Partials 2186 2186 ``` | [Files](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1318?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [store/rootmulti/store.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1318?src=pr&el=tree&filepath=store%2Frootmulti%2Fstore.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-c3RvcmUvcm9vdG11bHRpL3N0b3JlLmdv) | `74.92% <100.00%> (+0.29%)` | :arrow_up: | ... and [1 file with indirect coverage changes](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1318/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)