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.

Sign up for GitHub

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

Jump to bottom

Backport/for v5.0.8 #1011

Merged
merged 3 commits into from
Oct 8, 2021
Merged

Backport/for v5.0.8 #1011

merged 3 commits into from
Oct 8, 2021

Conversation

yaruwangway
Copy link
Contributor

@yaruwangway yaruwangway commented Oct 5, 2021 •
edited
Loading

Closes: #999
Backport v5.0.7 is already released. Changes in v5.0.7: bump cosmos-sdk version to v0.42.10.
Backport v5.0.8 will include the following changes:

Description

For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

For admin use:

  • Added appropriate labels to PR (ex. WIP, R4R, docs, etc)
  • Reviewers assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

@okwme
Copy link
Contributor

okwme commented Oct 5, 2021

looks like go mod tidy needs to be run to fix the conflicts in the go.sum file

@yaruwangway
Copy link
Contributor Author

looks like go mod tidy needs to be run to fix the conflicts in the go.sum file

I ran go mod tidy, but no changes in go.sum

@okwme
Copy link
Contributor

okwme commented Oct 7, 2021

there are still some conflicts in go.sum @yaruwangway want to try locally merging release/v5.0.x into backport/for_v5.0.8, resolve the conflicts and then push?

@yaruwangway
Copy link
Contributor Author

yaruwangway commented Oct 7, 2021 •
edited
Loading

there are still some conflicts in go.sum @yaruwangway want to try locally merging release/v5.0.x into backport/for_v5.0.8, resolve the conflicts and then push?

Not sure what happened, but I rebased, should be fine now.

@codecov
Copy link

codecov bot commented Oct 7, 2021 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release/v5.0.x@f6f354d). Click here to learn what that means.
The diff coverage is n/a.

@@                Coverage Diff                @@
##             release/v5.0.x    #1011   +/-   ##
=================================================
  Coverage                  ?   11.59%           
=================================================
  Files                     ?       11           
  Lines                     ?      966           
  Branches                  ?        0           
=================================================
  Hits                      ?      112           
  Misses                    ?      849           
  Partials                  ?        5

@okwme okwme merged commit 23f6ee2 into release/v5.0.x Oct 8, 2021
@okwme okwme deleted the backport/for_v5.0.8 branch October 8, 2021 14:13
yaruwangway added a commit that referenced this pull request Oct 14, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge Rcn/v5.0.8 to release/v5.0.8 (#1022)
b6732bb 
* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* CHANGELOG: release v5.0.8

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>
yaruwangway added a commit that referenced this pull request Oct 14, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge Rcn/v5.0.8 to release/v5.0.8 (#1023)
b72cc99 
* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* CHANGELOG: release v5.0.8

* fix: link

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>
okwme added a commit that referenced this pull request Nov 16, 2021
@yaruwangway @okwme
@faddat @alexanderbez @tac0turtle
merge release/v5.0.8 to release/v5.0.x (#1052)
df0f62e 
* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* merge Rcn/v5.0.8 to release/v5.0.8 (#1022)

* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* CHANGELOG: release v5.0.8

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

* merge Rcn/v5.0.8 to release/v5.0.8 (#1023)

* Release/v5.0.6 (#1001)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* 5.0.7 conflict (#1009)

* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* chore: update changelog

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

* Backport/for v5.0.8 (#1011)

* feat: add ibc-antehandler to the default handlers

* fix: testnet cli command update genesis supply

* chore: fix lint

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>

* CHANGELOG: release v5.0.8

* fix: link

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Marko Baricevic <markobaricevic@Fergalicious.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okwme okwme okwme approved these changes

@crodriguezvega crodriguezvega crodriguezvega approved these changes

@colin-axner colin-axner colin-axner approved these changes

@alessio alessio Awaiting requested review from alessio

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

@jgimeno jgimeno Awaiting requested review from jgimeno

@zmanian zmanian Awaiting requested review from zmanian zmanian is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yaruwangway @okwme @crodriguezvega @colin-axner