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

chore: sync main with v11.0.x branch #1292

Merged
merged 19 commits into from
Jan 30, 2023
Merged

Conversation

MalteHerrmann
Copy link
Contributor

Description

This PR merges the release branch v11.0.x into the main branch.


Closes ENG-1415

fedekunze and others added 13 commits January 13, 2023 14:56
…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
upgrade: update olympus-mons distribution (#1286)

* fix; updated olympus mons distribution

* fix: formatter and linter

(cherry picked from commit ca36b98)

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
* 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>
@linear
Copy link

linear bot commented Jan 27, 2023

ENG-1415 Release v11 final

  • Bump Ethermint dependency to v0.21 final ENG-1414
  • Update new values for testnet distribution (@vlad)
  • Update Changelog
  • Release
  • Merge release branch back to main

app/app.go Outdated Show resolved Hide resolved
app/upgrades/v11/constants.go Outdated Show resolved Hide resolved
@github-actions github-actions bot added the docs label Jan 27, 2023
@masterfung
Copy link
Contributor

Will need this information for the new docs @MalteHerrmann on the docs repo.

@MalteHerrmann MalteHerrmann marked this pull request as ready for review January 30, 2023 07:57
Copy link
Contributor

@fedekunze fedekunze left a comment

Choose a reason for hiding this comment

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

LGTM, 1 comment

app/app.go Outdated Show resolved Hide resolved
@fedekunze fedekunze merged commit e96c909 into main Jan 30, 2023
@fedekunze fedekunze deleted the malte/sync-main-with-v11.0.x branch January 30, 2023 21:26
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.

None yet

5 participants