feat: Cosmos SDK `v0.46.0` #914

aljo242 · 2022-07-27T13:12:59Z

Updates the Cosmos SDK to v0.46.0. Please review this PR after the other onces I have submitted are completed.

This PR builds off of those, and will be much more manageable to review if the other PRs are already merged.

makes changes according to the changelog

This PR introduces temporary replace clauses in our go.mod for the following packages:

github.com/cosmos/ibc-go/v5 => github.com/aljo242/ibc-go/v5 v5.1.0
github.com/tendermint/fundraising => github.com/aljo242/fundraising v0.1.2-0.20220726203752-c39abf16b02d

Once the respective repos are updated, we can remove these lines. I have an open PR for x/fundraising and ibc-go is near completion.

Part of #909

Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

Include tests
Respect code style and lint
Update documentation (*.md) (if needed)

codecov · 2022-07-27T13:29:42Z

Codecov Report

Merging #914 (bfdf277) into develop (e8a2f9c) will decrease coverage by 0.00%.
The diff coverage is 8.16%.

@@             Coverage Diff             @@
##           develop     #914      +/-   ##
===========================================
- Coverage    10.56%   10.55%   -0.01%     
===========================================
  Files          327      327              
  Lines        75191    75202      +11     
===========================================
- Hits          7944     7941       -3     
- Misses       67059    67072      +13     
- Partials       188      189       +1

Impacted Files	Coverage Δ
pkg/types/consensus_state.go	`100.00% <ø> (ø)`
pkg/types/monitoring.pb.go	`0.79% <ø> (ø)`
pkg/types/validator_set.go	`92.30% <ø> (ø)`
x/campaign/types/events.pb.go	`0.55% <ø> (ø)`
x/campaign/types/mainnet_account.pb.go	`0.75% <ø> (ø)`
x/campaign/types/params.pb.go	`0.88% <ø> (ø)`
x/campaign/types/query.pb.go	`0.66% <ø> (ø)`
x/claim/keeper/mission_delegation_hooks.go	`0.00% <0.00%> (ø)`
x/claim/types/claim_record.pb.go	`0.83% <ø> (ø)`
x/claim/types/mission.pb.go	`1.01% <ø> (ø)`
... and 35 more

lumtis · 2022-07-27T13:59:48Z

What difference with #906?

Is it with the final imports for IBC and fundraising?

aljo242 · 2022-07-27T14:17:27Z

What difference with #906?

That PR included all of the changes that I made in the previous PRs to prepare for v0.46.0. It would have been a mess to review. I have closed #906 now.

This PR also fixes tests that were broken by the upgrade.

Is it with the final imports for IBC and fundraising?

These are the final imports for a temporary solution. My update to fundraising works, but I'm just waiting for them to approve. We will still need to make a PR later that removes the replace lines in the go.mod once the dependencies are fixed.

lumtis

Great work

I put some initial comments. I need to do some experimentation and check further the IBC part

cmd/genaccounts.go

x/claim/keeper/mission_delegation_hooks.go

x/mint/keeper/integration_test.go

Co-authored-by: Lucas Btd <[email protected]>

lumtis · 2022-07-28T13:30:29Z

Supporting the proto changes will be part of ignite/cli#2156

aljo242 · 2022-07-28T14:19:44Z

Supporting the proto changes will be part of ignite/cli#2156

Sounds good. If that's the only outstanding issue, are we good to try to get this approved?

lumtis · 2022-07-28T14:42:47Z

Supporting the proto changes will be part of ignite/cli#2156

Sounds good. If that's the only outstanding issue, are we good to try to get this approved?

I think this is better if we can merge it once we can run it with ignite c serve and use ignite c build.

If we need the new version for spn dependency in ignite, maybe we can temporarily update spn dep in ignite to this branch?

aljo242 · 2022-07-28T14:46:52Z

Supporting the proto changes will be part of ignite/cli#2156

Sounds good. If that's the only outstanding issue, are we good to try to get this approved?

I think this is better if we can merge it once we can run it with ignite c serve and use ignite c build.

If we need the new version for spn dependency in ignite, maybe we can temporarily update spn dep in ignite to this branch?

I think it would be better the other way around. If this upgrade fully works, then the only remaining issue is with ignite. So it makes more sense to upgrade spn, then fix ignite after.

After all, we have now modified our dependencies so that:

ignite imports spn
spn no longer imports ignite

lumtis · 2022-07-28T14:55:41Z

What does it change if we do go get github.com/tendermint/spn@6bff6689d24b74fd3d6c2786db475e5250708ef9 on Ignite?

This will remove the circular dep, then we just need to update again spn dep on Ignite once ignite/cli#2673 is finished.
I can't test everything on the changes without using Ignite

aljo242 · 2022-07-28T15:02:29Z

What does it change if we do go get github.com/tendermint/spn@6bff6689d24b74fd3d6c2786db475e5250708ef9 on Ignite?

This will remove the circular dep, then we just need to update again spn dep on Ignite once ignite/cli#2673 is finished. I can't test everything on the changes without using Ignite

Good point - I was thinking this would introduce a fork in the go.mod but my branch is on here. I'll go ahead and do that.

ilgooz · 2022-07-29T15:17:56Z

There could be one problem with that because that commit hash wouldn't be guaranteed to be kept forever on Github.

The reason for this, once we merge this PR, all the commits here will be squashed into a single commit and the commit that has mentioned will not have a reference on develop PR and also in the base branch of this PR since the branch will be deleted after merging.

I suggest merging this PR first and using the commit hash added to the develop branch instead.

ilgooz · 2022-07-29T15:18:47Z

But if we plan to change the commit hash again after we finish work then np.

aljo242 · 2022-07-29T15:21:03Z

Ah - I see what you mean. I just need some approvals and we can merge

lumtis · 2022-07-29T16:46:17Z

There could be one problem with that because that commit hash wouldn't be guaranteed to be kept forever on Github.

The reason for this, once we merge this PR, all the commits here will be squashed into a single commit and the commit that has mentioned will not have a reference on develop PR and also in the base branch of this PR since the branch will be deleted after merging.

I suggest merging this PR first and using the commit hash added to the develop branch instead.

It will be temporary, the time the serve command works CLI side for 0.46 we don't need to wait for the full 0.46 PR to be merged CLI side

lumtis · 2022-07-29T16:46:40Z

And as soon as this PR is merged we can change it

ilgooz · 2022-07-29T18:04:26Z

In that case there should be no problem. 👍

* add .clang-format * setup buf * add scripts and update Makefile * make proto-format * make proto-gen

scripts/protocgen2.sh

* cosmos proto Int * remaining cosmos scalar annotations * proto format

* add missing param * fix init channel * update key info

lumtis

Tested all the features

aljo242 added 18 commits July 26, 2022 12:36

add cosmsocmd code

fad0985

remove cosmoscmd

764cf66

go mod tidy

c88bbc6

format

b08a0aa

re-format

13e7e4a

fix imports

f0f3457

change ibc to v5

9bbf9a9

use storetypes package

6be36fb

fix New command

829bf9e

resolve app.go

6f411a9

update hooks signatures

5edac7d

fix initializer keeper calls

df1ac93

update sim utils

19c5ae9

update cli util code

19c7abf

Merge branch 'develop' into feat/v0.46.0

df7b6d5

remaining fixes

4f70d89

merge

13f9338

fix claim suite

c08712b

aljo242 requested review from ilgooz, lumtis and giunatale as code owners July 27, 2022 13:12

Alex Johnson and others added 2 commits July 27, 2022 09:23

Merge branch 'develop' into feat/v0.46.0

4d6df54

fix go.sum

bdd58ae

lumtis reviewed Jul 27, 2022

View reviewed changes

cmd/genaccounts.go Outdated Show resolved Hide resolved

x/claim/keeper/mission_delegation_hooks.go Outdated Show resolved Hide resolved

x/mint/keeper/integration_test.go Outdated Show resolved Hide resolved

Alex Johnson and others added 3 commits July 27, 2022 11:27

Update cmd/genaccounts.go

81c5721

Co-authored-by: Lucas Btd <[email protected]>

Update x/claim/keeper/mission_delegation_hooks.go

78f1b73

Co-authored-by: Lucas Btd <[email protected]>

move util to testutil

e9c0c18

This was referenced Jul 28, 2022

feat: upgrade Cosmos SDK version to v0.46.0 ignite/cli#2156

Closed

Cosmos SDK v0.46.0 upgrade tracking issue ignite/cli#2673

Closed

Alex Johnson and others added 2 commits July 31, 2022 22:31

feat: buf proto generation (#917)

1fac165

* add .clang-format * setup buf * add scripts and update Makefile * make proto-format * make proto-gen

update fundraising dep

6225f03

aljo242 self-assigned this Jul 31, 2022

remove ibc fork

6737a26

ilgooz reviewed Aug 1, 2022

View reviewed changes

scripts/protocgen2.sh Show resolved Hide resolved

use ibc beta release

b3f8e9e

aljo242 mentioned this pull request Aug 4, 2022

Remove unnecessary cosmoscmd logic #912

Closed

feat: cosmos proto annotations (#918)

e234cf5

* cosmos proto Int * remaining cosmos scalar annotations * proto format

lumtis mentioned this pull request Aug 5, 2022

feat(participation): decay support #915

Merged

lumtis added 2 commits August 5, 2022 17:25

fix(localnet): add missing staking param for 0.46 (#919)

0cb1b07

* add missing param * fix init channel * update key info

chore: set binary name in config_2.yml (#921)

568e8c5

lumtis linked an issue Aug 9, 2022 that may be closed by this pull request

Prepare for Cosmos SDK v0.46.x #909

Closed

5 tasks

conflicts

bfdf277

lumtis approved these changes Aug 10, 2022

View reviewed changes

lumtis merged commit 9366849 into develop Aug 10, 2022

lumtis deleted the feat/v0.46.0 branch August 10, 2022 11:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Cosmos SDK `v0.46.0` #914

feat: Cosmos SDK `v0.46.0` #914

aljo242 commented Jul 27, 2022 •

edited

Loading

codecov bot commented Jul 27, 2022 •

edited

Loading

lumtis commented Jul 27, 2022 •

edited

Loading

aljo242 commented Jul 27, 2022 •

edited

Loading

lumtis left a comment

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022 •

edited

Loading

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022

ilgooz commented Jul 29, 2022 •

edited

Loading

ilgooz commented Jul 29, 2022 •

edited

Loading

aljo242 commented Jul 29, 2022

lumtis commented Jul 29, 2022

lumtis commented Jul 29, 2022

ilgooz commented Jul 29, 2022

lumtis left a comment

feat: Cosmos SDK v0.46.0 #914

feat: Cosmos SDK v0.46.0 #914

Conversation

aljo242 commented Jul 27, 2022 • edited Loading

Checklist

codecov bot commented Jul 27, 2022 • edited Loading

Codecov Report

lumtis commented Jul 27, 2022 • edited Loading

aljo242 commented Jul 27, 2022 • edited Loading

lumtis left a comment

Choose a reason for hiding this comment

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022 • edited Loading

lumtis commented Jul 28, 2022

aljo242 commented Jul 28, 2022

ilgooz commented Jul 29, 2022 • edited Loading

ilgooz commented Jul 29, 2022 • edited Loading

aljo242 commented Jul 29, 2022

lumtis commented Jul 29, 2022

lumtis commented Jul 29, 2022

ilgooz commented Jul 29, 2022

lumtis left a comment

Choose a reason for hiding this comment

feat: Cosmos SDK `v0.46.0` #914

feat: Cosmos SDK `v0.46.0` #914

aljo242 commented Jul 27, 2022 •

edited

Loading

codecov bot commented Jul 27, 2022 •

edited

Loading

lumtis commented Jul 27, 2022 •

edited

Loading

aljo242 commented Jul 27, 2022 •

edited

Loading

aljo242 commented Jul 28, 2022 •

edited

Loading

ilgooz commented Jul 29, 2022 •

edited

Loading

ilgooz commented Jul 29, 2022 •

edited

Loading