-
Notifications
You must be signed in to change notification settings - Fork 834
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
chore: sync main with v11.0.x branch #1292
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…1261) * fix(upgrade): add recovery store on store upgrade (#1257) * fix(upgrade): add recovery store on store upgrade * fix(upgrade): add changelog entry (cherry picked from commit 2f9b1da) # Conflicts: # CHANGELOG.md * conflict Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
…accounts (backport #1252) (#1263) fix(upgrade): add account number and sequence to migrated IBC escrow accounts (#1252) * fix(upgrade): add account number and sequence to migrated escrow accounts * fix(upgrade): small changes * fix(upgrade): fix linting issues * fix(upgrade) add changelog entry * fix(upgrade) apply review comments * fix(upgrade): add note on docs about escrow accounts * fix(upgrade): update open channels to 37 * fix(upgrade): fix md linting issues (cherry picked from commit 1655308) Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
…) (#1262) * imp(inflation): remove dup store calls and improve perf (#1258) * imp(inflation): remove dup store calls and improve perf * changelog * add logger * tests (cherry picked from commit 76dcaf8) # Conflicts: # CHANGELOG.md # x/inflation/migrations/v3/migrate_test.go * conflict * changelog Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
… (#1260) * fix(inflation): re-add missing key to avoid keys shift (#1259) * fix: added correct int type for periods in store migration * fix: added error checking * fix: removed old param getting * Update x/inflation/migrations/v3/migrate.go Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * fix: revert removal of missing key * Changelog entry Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> (cherry picked from commit 127ac76) # Conflicts: # CHANGELOG.md * conflict Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
* chore (deps): bump Ethermint to v0.21.0-rc2 (#1269) * bump Ethermint to v0.21.0-rc2 * update ethermintserver syntax in root.go * lint * update based on review comments Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com> * update changelog entry * update PR number * fix md link Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
* fix(app): store upgrades for rc3 * c++ * fix: test changes deleting module and renaming * fix: recovery added and deleted * fix: rename module * update store loader * fix: finished store_loader * Update app/app.go Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com> * fix: app.go customStoreLoader * fix: execute replaced first * Update app/store_loader.go Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com> * fix: original plan of deleting and readding module * rm loader, update keys * lint * c++ * Apply suggestions from code review Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com> Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com> Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
* chore(deps): bump SDK to v0.46.8-ledger (#1279) * chore(deps): bump SDK to v0.46.8-ledger * c++ (cherry picked from commit ef71537) # Conflicts: # CHANGELOG.md # go.mod # go.sum * Apply suggestions from code review * conflicts Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
…#1282) * fix: removed deleted recovery module for mainnet * run formatting and linting
* chore (deps): bump ethermint to v0.21.0 (#1288) * bump ethermint to v0.21.0 * add changelog entry (cherry picked from commit efe9cc7) # Conflicts: # CHANGELOG.md * fix merge conflicts in changelog * update release on changelog Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Co-authored-by: MalteHerrmann <malte@evmos.org>
MalteHerrmann
commented
Jan 27, 2023
Will need this information for the new docs @MalteHerrmann on the docs repo. |
fedekunze
approved these changes
Jan 30, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, 1 comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR merges the release branch v11.0.x into the main branch.
Closes ENG-1415