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

feat(gov): support v1.Proposal in v1beta1.Proposal.Content #51

Merged
merged 5 commits into from
Jan 5, 2023

Conversation

clevinson
Copy link
Member

Description

As discussed in regen-network/governance#16, this PR back ports a fix from @robert-zaremba into Regen's for of the SDK v0.46.7.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@clevinson
Copy link
Member Author

clevinson commented Jan 4, 2023

@robert-zaremba why did you suggest merge instead of cherry pick of e7dd5e0bdc8aabadb0d4ae13bdb143f92c1cdf4c ?

This strategy adds in 3 other commits besides the one in question. Are these necessary for the gov PR?

@clevinson clevinson marked this pull request as ready for review January 4, 2023 23:12
Copy link
Member

@ryanchristo ryanchristo left a comment

Choose a reason for hiding this comment

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

utACK

Copy link

@robert-zaremba robert-zaremba left a comment

Choose a reason for hiding this comment

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

utACK

@robert-zaremba
Copy link

why did you suggest merge instead of cherry pick of e7dd5e0

You need e641907, which a second commit after 0.46.7
e7dd5e0 contains additional ante handler fix.
Once 0.46.8 will be released you can do a again a normal merge - it will look cleaner when you do linear merges.

Copy link
Member

@ryanchristo ryanchristo left a comment

Choose a reason for hiding this comment

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

@ryanchristo ryanchristo merged commit a96ba57 into release/v0.46.7-regen Jan 5, 2023
@ryanchristo ryanchristo deleted the clev/backport-gov-fix branch January 5, 2023 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants