Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: cosmos-sdk 0.46 is not used #828

Merged
merged 34 commits into from
Aug 15, 2022
Merged

Conversation

yihuang
Copy link
Collaborator

@yihuang yihuang commented Aug 8, 2022

👮🏻👮🏻👮🏻 !!!! REFERENCE THE PROBLEM YOUR ARE SOLVING IN THE PR TITLE AND DESCRIBE YOUR SOLUTION HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

  • fix build
  • fix go lint
  • fix unit tests
  • fix integration tests
  • fix sim tests

PR Checklist:

  • Have you read the CONTRIBUTING.md?
  • Does your PR follow the C4 patch requirements?
  • Have you rebased your work on top of the latest master?
  • Have you checked your code compiles? (make)
  • Have you included tests for any non-trivial functionality?
  • Have you checked your code passes the unit tests? (make test)
  • Have you checked your code formatting is correct? (go fmt)
  • Have you checked your basic code style is fine? (golangci-lint run)
  • If you added any dependencies, have you checked they do not contain any known vulnerabilities? (go list -json -m all | nancy sleuth)
  • If your changes affect the client infrastructure, have you run the integration test?
  • If your changes affect public APIs, does your PR follow the C4 evolution of public contracts?
  • If your code changes public APIs, have you incremented the crate version numbers and documented your changes in the CHANGELOG.md?
  • If you are contributing for the first time, please read the agreement in CONTRIBUTING.md now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thank you for your code, it's appreciated! :)

app/test_helpers.go Outdated Show resolved Hide resolved
app/test_helpers.go Outdated Show resolved Hide resolved
.golangci.yml Outdated
Comment on lines 20 to 24
issues:
exclude-rules:
- text: "Use of weak random number generator"
linters:
- gosec
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may no need to exclude globally, but just on the relevant places?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Comment on lines 19 to 20
// StoreKey is the default store key for NFT
StoreKey = ModuleName
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't there be a conflict on the store?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as long as we don't enable the SDK module, it might be fine?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we will want to migrate to it / enable it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, maybe do that in another PR: #829

@codecov
Copy link

codecov bot commented Aug 9, 2022

Codecov Report

Merging #828 (4f0cf37) into master (71f66aa) will decrease coverage by 1.21%.
The diff coverage is 36.00%.

@@            Coverage Diff             @@
##           master     #828      +/-   ##
==========================================
- Coverage   20.26%   19.05%   -1.22%     
==========================================
  Files          99       94       -5     
  Lines       11457    11941     +484     
==========================================
- Hits         2322     2275      -47     
- Misses       8647     9179     +532     
+ Partials      488      487       -1     
Flag Coverage Δ
integration_tests 16.78% <40.90%> (-1.43%) ⬇️
unit_tests 7.02% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
app/export.go 0.00% <0.00%> (ø)
app/state.go 0.00% <0.00%> (ø)
app/test_helpers.go 0.00% <0.00%> (ø)
x/chainmain/client/cli/genaccounts.go 12.19% <0.00%> (-0.21%) ⬇️
x/chainmain/client/cli/testnet.go 9.35% <0.00%> (-0.10%) ⬇️
x/chainmain/keeper/keeper.go 80.00% <ø> (ø)
x/icaauth/keeper/keeper.go 25.00% <ø> (ø)
x/icaauth/module.go 71.87% <ø> (ø)
x/icaauth/module_ibc.go 7.69% <ø> (ø)
x/nft/keeper/keeper.go 79.71% <0.00%> (-2.90%) ⬇️
... and 34 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@yihuang yihuang marked this pull request as ready for review August 9, 2022 11:50
@yihuang yihuang requested a review from a team as a code owner August 9, 2022 11:50
@yihuang yihuang requested a review from devashishdxt August 9, 2022 11:51
@devashishdxt
Copy link
Collaborator

devashishdxt commented Aug 9, 2022

I was hoping to do these changes in multiple steps (so that code review is easier):

  1. Remove wasmd
  2. Change release scripts to not include dlls
  3. Create an alpha release with cosmos-sdk 0.45.7 and ibc-go 4.0.0 (for croeseid-5)
  4. Upgrade cosmos-sdk to v0.46.0 and ibc-go to v5.0.0 (without enabling native NFT module)
  5. Add new functionality from cosmos-sdk to chain-main (e.g., x/group)
  6. Migrate from custom NFT module to native NFT module

@yihuang @tomtau Can we wait to merge this until next alpha release? Otherwise, we'll have to do duplicate work on release/v4 branch.

@tomtau
Copy link
Contributor

tomtau commented Aug 10, 2022

@devashishdxt fine to break it down in that sequence, but is there a need to wait for ibc-go 4.0.0? or is rc2 ok?

(similarly with v5.0.0 -- is the beta ok for now?)

@devashishdxt
Copy link
Collaborator

@devashishdxt fine to break it down in that sequence, but is there a need to wait for ibc-go 4.0.0? or is rc2 ok?

Final version will use SDK v0.45.7 (which has fixes for non-determinism in simulation tests).

@tomtau
Copy link
Contributor

tomtau commented Aug 10, 2022

@devashishdxt fine to break it down in that sequence, but is there a need to wait for ibc-go 4.0.0? or is rc2 ok?

Final version will use SDK v0.45.7 (which has fixes for non-determinism in simulation tests).

that could be achieved with replace or a fork of ibc-go; no need to wait for the final release here (given it's for the alpha testnet?)

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

@yihuang can you rebase on the latest branch?

conflicts fixed.

@tomtau
Copy link
Contributor

tomtau commented Aug 15, 2022

/runsim

@github-actions
Copy link

Simulation tests started and triggered by /runsim.
Will update here when it succeeds or fails.
Can further check progress here

@github-actions
Copy link

/runsim simulation test has failed 😅
Can further check here

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

/runsim

@github-actions
Copy link

Simulation tests started and triggered by /runsim.
Will update here when it succeeds or fails.
Can further check progress here

@github-actions
Copy link

/runsim simulation test has failed 😅
Can further check here

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

the timeout change seems don't have effect

@tomtau
Copy link
Contributor

tomtau commented Aug 15, 2022

maybe the timeout change may need to be merged to the upstream branch first?

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

maybe the timeout change may need to be merged to the upstream branch first?

maybe, I'm running locally.

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

/runsim

@github-actions
Copy link

Simulation tests started and triggered by /runsim.
Will update here when it succeeds or fails.
Can further check progress here

@github-actions
Copy link

/runsim simulation test has failed 😅
Can further check here

@tomtau
Copy link
Contributor

tomtau commented Aug 15, 2022

#839

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

/runsim

@github-actions
Copy link

Simulation tests started and triggered by /runsim.
Will update here when it succeeds or fails.
Can further check progress here

@github-actions
Copy link

/runsim simulation test has succeeded 🎉
Can further check here

@yihuang
Copy link
Collaborator Author

yihuang commented Aug 15, 2022

all tests passed, ready to be merged anytime @devashishdxt

Copy link
Contributor

@tomtau tomtau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are conflicts with the latest branch, can you rebase it?

app/app.go Show resolved Hide resolved
@tomtau
Copy link
Contributor

tomtau commented Aug 15, 2022

oh, squash and merge should work

@tomtau tomtau merged commit b087b51 into crypto-org-chain:master Aug 15, 2022
@yihuang yihuang deleted the sdk-46 branch August 15, 2022 08:50
devashishdxt pushed a commit to devashishdxt/chain-main that referenced this pull request Sep 23, 2022
Solution:
- changed app and modules based on the API breaking changes in 0.46
(the new modules are not yet added)
tomtau pushed a commit that referenced this pull request Sep 23, 2022
Solution:
- changed app and modules based on the API breaking changes in 0.46
(the new modules are not yet added)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants