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

fix(upgrade): add account number and sequence to migrated IBC escrow accounts #1252

Merged
merged 8 commits into from
Jan 18, 2023

Conversation

GAtom22
Copy link
Contributor

@GAtom22 GAtom22 commented Jan 18, 2023

Description

Add account number and sequence to migrated IBC escrow accounts.
During testing the new changes on the last testnet upgrade, it was observed that the migrated accounts had an account_number == 0

'@type': /cosmos.auth.v1beta1.ModuleAccount
base_account:
  account_number: "0"
  address: evmos1a53udazy8ayufvy0s434pfwjcedzqv345dnt3x
  pub_key: null
  sequence: "0"
name: "ics20-1\0transfer/channel-0"
permissions: []

This PR includes the changes to fix this by using the account_number that belongs to the existing account


Closes ENG-1344

app/upgrades/v11/upgrades.go Fixed Show fixed Hide fixed
app/upgrades/v11/upgrades.go Fixed Show fixed Hide fixed
@GAtom22 GAtom22 marked this pull request as ready for review January 18, 2023 14:25
@GAtom22 GAtom22 requested a review from a team as a code owner January 18, 2023 14:25
@GAtom22 GAtom22 requested review from Vvaradinov, 0a1c, danburck, facs95 and a team and removed request for a team January 18, 2023 14:25
@codecov
Copy link

codecov bot commented Jan 18, 2023

Codecov Report

Merging #1252 (8fd5386) into main (2251dfc) will decrease coverage by 0.08%.
The diff coverage is 25.00%.

❗ Current head 8fd5386 differs from pull request most recent head 7d79ac6. Consider uploading reports for the commit 7d79ac6 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1252      +/-   ##
==========================================
- Coverage   76.33%   76.26%   -0.08%     
==========================================
  Files         149      149              
  Lines        8283     8291       +8     
==========================================
  Hits         6323     6323              
- Misses       1768     1774       +6     
- Partials      192      194       +2     
Impacted Files Coverage Δ
app/upgrades/v11/upgrades.go 42.85% <25.00%> (-2.91%) ⬇️

@linear
Copy link

linear bot commented Jan 18, 2023

ENG-1344 migrated accounts all have account_number 0

@tom I’m reviewing your module account test and wondering why all the module accounts have a account_number: "0" , and all other existing module accounts have a account number that is not zero.

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.

ACK, pending changelog

Copy link
Contributor

@danburck danburck left a comment

Choose a reason for hiding this comment

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

ACK, thanks @GAtom22,

Ileft a minor comment and please add a changelog entry

app/upgrades/v11/upgrades_test.go Outdated Show resolved Hide resolved
@GAtom22 GAtom22 requested a review from danburck January 18, 2023 15:48
@fedekunze
Copy link
Contributor

@GAtom22 can you double-check that we still have 36 addresses and not more?

@github-actions github-actions bot added the docs label Jan 18, 2023
@GAtom22
Copy link
Contributor Author

GAtom22 commented Jan 18, 2023

@GAtom22 can you double-check that we still have 36 addresses and not more?

Updated, we have 37 ATM

Copy link
Contributor

@danburck danburck left a comment

Choose a reason for hiding this comment

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

thanks @GAtom22. LGTM

@danburck danburck enabled auto-merge (squash) January 18, 2023 19:04
@danburck danburck merged commit 1655308 into main Jan 18, 2023
@danburck danburck deleted the GAtom22/fix-acc-num branch January 18, 2023 19:05
@fedekunze
Copy link
Contributor

@Mergifyio backport release/v11.0.x

mergify bot pushed a commit that referenced this pull request Jan 20, 2023
…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)
@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2023

backport release/v11.0.x

✅ Backports have been created

fedekunze added a commit that referenced this pull request Jan 20, 2023
…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>
fedekunze added a commit that referenced this pull request Jan 30, 2023
* chore(upgrade): release v11-rc1 (#1247)

* fix(upgrade): add recovery store on store upgrade (backport #1257) (#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>

* fix(upgrade): add account number and sequence to migrated IBC escrow 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>

* imp(inflation): remove dup store calls and improve perf (backport #1258) (#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>

* fix(inflation): re-add missing key to avoid keys shift (backport #1259) (#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(upgrade): changelog and const (#1264)

* chore (deps): bump Ethermint to v0.21.0-rc2 (backport #1269) (#1270)

* 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>

* chore: v11-rc2 changelog (#1272)

* fix(app): store upgrades for rc3 (#1276)

* 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 (backport #1279) (#1280)

* 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>

* fix(upgrade): remove deletion of recovery module from mainnet upgrade (#1282)

* fix: removed deleted recovery module for mainnet

* run formatting and linting

* upgrade: update olympus-mons distribution (backport #1286) (#1287)

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 (backport #1288) (#1291)

* 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>

* remove rc3 changes

* run go mod tidy

* remove unnecessary variable declaration for v11 upgrade handler

---------

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
fedekunze added a commit that referenced this pull request Feb 7, 2023
* chore(upgrade): release v11-rc1 (#1247)

* fix(upgrade): add recovery store on store upgrade (backport #1257) (#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>

* fix(upgrade): add account number and sequence to migrated IBC escrow 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>

* imp(inflation): remove dup store calls and improve perf (backport #1258) (#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>

* fix(inflation): re-add missing key to avoid keys shift (backport #1259) (#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(upgrade): changelog and const (#1264)

* chore (deps): bump Ethermint to v0.21.0-rc2 (backport #1269) (#1270)

* 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>

* chore: v11-rc2 changelog (#1272)

* fix(app): store upgrades for rc3 (#1276)

* 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 (backport #1279) (#1280)

* 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>

* fix(upgrade): remove deletion of recovery module from mainnet upgrade (#1282)

* fix: removed deleted recovery module for mainnet

* run formatting and linting

* upgrade: update olympus-mons distribution (backport #1286) (#1287)

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 (backport #1288) (#1291)

* 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>

* imp(deps): use informal tendermint (backport #1248) (#1344)

* fix: use informal tendermint (#1248)

(cherry picked from commit 4251d93)

# Conflicts:
#	CHANGELOG.md

* changelog

---------

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* chore (deps): bump Tendermint to `v0.34.25` (backport #1342) (#1345)

* fix(deps): bump Tendermint to `v0.34.25` (#1342)

* bump Tendermint to v0.34.25

* update changelog

* Apply suggestions from code review

* fix

---------

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit e1da176)

# Conflicts:
#	go.mod
#	go.sum

* conflict

---------

Co-authored-by: Freddy Caceres <facs95@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* imp (proto): add GH action to push Protobuf files to the Buf Schema Registry (backport #1312) (#1346)

imp (proto): add GH action to push Protobuf files to the Buf Schema Registry (#1312)

* add GH action to push protos to BSR

* push only when release tags are created

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

---------

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit 9cf3d75)

Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

* fix changelog

* fix

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Freddy Caceres <facs95@gmail.com>
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

3 participants