Finschia / finschia-sdk

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

fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) (backport #1313) #1320

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

mergify[bot] commented 4 months ago

Cherry-pick of 01762150b8c857d62f76b172113129eb2c1b96e0 has failed:

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

You are currently cherry-picking commit 01762150b.
  (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:   types/coin.go
    modified:   types/coin_test.go
    modified:   x/auth/vesting/types/vesting_account.go
    modified:   x/gov/types/params.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 4 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 (3209db2). Report is 8 commits behind head on release/v0.48.x.

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320/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/1320?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 #1320 +/- ## ================================================ Coverage 69.78% 69.78% ================================================ Files 646 646 Lines 67507 67525 +18 ================================================ + Hits 47109 47122 +13 - Misses 18212 18215 +3 - Partials 2186 2188 +2 ``` | [Files](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [types/coin.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320?src=pr&el=tree&filepath=types%2Fcoin.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-dHlwZXMvY29pbi5nbw==) | `95.56% <100.00%> (+0.97%)` | :arrow_up: | | [x/auth/vesting/types/vesting\_account.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320?src=pr&el=tree&filepath=x%2Fauth%2Fvesting%2Ftypes%2Fvesting_account.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9hdXRoL3Zlc3RpbmcvdHlwZXMvdmVzdGluZ19hY2NvdW50Lmdv) | `87.18% <ø> (ø)` | | | [x/gov/types/params.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320?src=pr&el=tree&filepath=x%2Fgov%2Ftypes%2Fparams.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9nb3YvdHlwZXMvcGFyYW1zLmdv) | `5.94% <ø> (ø)` | | ... and [3 files with indirect coverage changes](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1320/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)