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

feat: support message based proposals (backport #1372) #1373

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

Description

closes: #XXXX

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

mergify[bot] commented 4 months ago

Cherry-pick of 97570b2d5868b100233debc09598f00daf65aa45 has failed:

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

You are currently cherry-picking commit 97570b2d5.
  (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:   docs/core/proto-docs.md
    modified:   proto/lbm/fswap/v1/fswap.proto
    modified:   proto/lbm/fswap/v1/tx.proto
    modified:   simapp/app.go
    modified:   x/fswap/client/cli/tx.go
    deleted:    x/fswap/client/proposal_handler.go
    deleted:    x/fswap/codec/codec.go
    deleted:    x/fswap/handler.go
    modified:   x/fswap/keeper/keeper.go
    modified:   x/fswap/keeper/keeper_test.go
    modified:   x/fswap/keeper/msg_server.go
    modified:   x/fswap/keeper/msg_server_test.go
    deleted:    x/fswap/keeper/proposal_test.go
    deleted:    x/fswap/proposal_handler_test.go
    modified:   x/fswap/types/codec.go
    modified:   x/fswap/types/fswap.go
    modified:   x/fswap/types/fswap.pb.go
    modified:   x/fswap/types/genesis.go
    modified:   x/fswap/types/msgs.go
    deleted:    x/fswap/types/proposal.go
    modified:   x/fswap/types/tx.pb.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    deleted by them: x/fswap/keeper/proposal.go

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

Attention: Patch coverage is 38.50267% with 115 lines in your changes are missing coverage. Please review.

Project coverage is 68.87%. Comparing base (defb3ad) to head (f13f678). Report is 1 commits behind head on release/v0.49.x.

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373/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/1373?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.49.x #1373 +/- ## ================================================ Coverage 68.86% 68.87% ================================================ Files 675 671 -4 Lines 69204 69197 -7 ================================================ - Hits 47660 47657 -3 + Misses 19264 19260 -4 Partials 2280 2280 ``` | [Files](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [simapp/app.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=simapp%2Fapp.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-c2ltYXBwL2FwcC5nbw==) | `82.23% <100.00%> (-0.05%)` | :arrow_down: | | [x/fswap/types/fswap.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Ftypes%2Ffswap.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC90eXBlcy9mc3dhcC5nbw==) | `4.76% <ø> (+0.84%)` | :arrow_up: | | [x/fswap/types/codec.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Ftypes%2Fcodec.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC90eXBlcy9jb2RlYy5nbw==) | `57.89% <88.88%> (+17.89%)` | :arrow_up: | | [x/fswap/types/genesis.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Ftypes%2Fgenesis.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC90eXBlcy9nZW5lc2lzLmdv) | `25.00% <0.00%> (-7.00%)` | :arrow_down: | | [x/fswap/keeper/msg\_server.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Fkeeper%2Fmsg_server.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC9rZWVwZXIvbXNnX3NlcnZlci5nbw==) | `43.18% <0.00%> (-12.71%)` | :arrow_down: | | [x/fswap/types/msgs.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Ftypes%2Fmsgs.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC90eXBlcy9tc2dzLmdv) | `0.00% <0.00%> (ø)` | | | [x/fswap/keeper/keeper.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373?src=pr&el=tree&filepath=x%2Ffswap%2Fkeeper%2Fkeeper.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9mc3dhcC9rZWVwZXIva2VlcGVyLmdv) | `46.57% <44.92%> (-2.01%)` | :arrow_down: | ... and [2 files with indirect coverage changes](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1373/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)
jaeseung-bae commented 4 months ago

@jaeseung-bae , please check lint ci error.

I've checked. This branch use different lint version(v3) to main's one(v6). I could fix it but code will be different to code in original PR.

zemyblue commented 4 months ago

@jaeseung-bae , please check lint ci error.

I've checked. This branch use different lint version(v3) to main's one(v6). I could fix it but code will be different to code in original PR.

I think this is a problem pr. https://github.com/Finschia/finschia-sdk/pull/1355 :)

How about pushing and completing PR whitch matches the lint version first and then solving this?

zemyblue commented 4 months ago

Oh. https://github.com/Finschia/finschia-sdk/pull/1374 PR is registered.

zemyblue commented 4 months ago

If we want to fix golang-lint error, we need to modify the golangci setting of this file. https://github.com/Finschia/finschia-sdk/blob/release/v0.49.x/.golangci.yml

Let's fix it later PR.