Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

refactor(params): store all params under one key in evm module (backport #1617) #1626

Merged
merged 4 commits into from
Jan 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 23, 2023

This is an automatic backport of pull request #1617 done by Mergify.
Cherry-pick of f07b14f has failed:

On branch mergify/bp/release/v0.21.x/pr-1617
Your branch is up to date with 'origin/release/v0.21.x'.

You are currently cherry-picking commit f07b14f1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/ante/eth.go
	modified:   app/ante/fee_market.go
	modified:   app/ante/fees.go
	modified:   app/ante/interfaces.go
	modified:   app/ante/setup.go
	modified:   app/ante/sigverify.go
	modified:   app/app.go
	modified:   proto/ethermint/evm/v1/evm.proto
	modified:   x/evm/handler_test.go
	modified:   x/evm/keeper/keeper.go
	modified:   x/evm/keeper/migrations.go
	modified:   x/evm/keeper/params.go
	modified:   x/evm/keeper/params_test.go
	modified:   x/evm/keeper/utils_test.go
	modified:   x/evm/migrations/v4/migrate.go
	modified:   x/evm/migrations/v4/migrate_test.go
	deleted:    x/evm/migrations/v4/types/chain_config.go
	modified:   x/evm/migrations/v4/types/evm.pb.go
	deleted:    x/evm/migrations/v4/types/params.go
	new file:   x/evm/migrations/v5/migrate.go
	new file:   x/evm/migrations/v5/migrate_test.go
	new file:   x/evm/migrations/v5/types/evm.pb.go
	modified:   x/evm/module.go
	modified:   x/evm/types/evm.pb.go
	modified:   x/evm/types/key.go
	modified:   x/evm/types/params.go
	new file:   x/evm/types/params_legacy.go
	modified:   x/evm/types/params_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* refactor(params): store all params under one key in evm module

* refactor(params): add changelog entry

* refactor(params): update based on review comments. Remove params getter functions

* refactor(params): refactor params store key

* refactor(params): remove unnecessary store keys

* refactor(params): add paramSetPairs for backwards compatibility

* Update CHANGELOG.md

* refactor(params): add license to params_legacy file

* Apply suggestions from code review

* fix(evm): handle RC1 params during migration (#1624)

* fix(evm): handle RC1 params during migration

* migration

* fix: test case updated for RC1

* v5 migration

* tests

* tests pt2

* comment

* execute make proto-all

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>

* Apply suggestions from code review

* rm dup vars

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>
(cherry picked from commit f07b14f)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner January 23, 2023 18:26
@mergify mergify bot requested review from Vvaradinov and GAtom22 and removed request for a team January 23, 2023 18:26
@mergify mergify bot added the conflicts label Jan 23, 2023
@github-actions github-actions bot added the C:Proto protobuf files (*.pb.go) label Jan 23, 2023
@codecov
Copy link

codecov bot commented Jan 23, 2023

Codecov Report

Merging #1626 (8270854) into release/v0.21.x (00b0d44) will decrease coverage by 0.18%.
The diff coverage is 73.00%.

❗ Current head 8270854 differs from pull request most recent head 693cdd5. Consider uploading reports for the commit 693cdd5 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v0.21.x    #1626      +/-   ##
===================================================
- Coverage            68.31%   68.13%   -0.18%     
===================================================
  Files                  110      112       +2     
  Lines                10174    10131      -43     
===================================================
- Hits                  6950     6903      -47     
- Misses                2820     2824       +4     
  Partials               404      404              
Impacted Files Coverage Δ
x/evm/keeper/migrations.go 77.77% <0.00%> (-22.23%) ⬇️
x/evm/types/key.go 0.00% <ø> (ø)
x/evm/types/params_legacy.go 0.00% <0.00%> (ø)
x/evm/module.go 52.17% <33.33%> (-1.56%) ⬇️
x/evm/keeper/params.go 43.47% <53.84%> (-40.99%) ⬇️
x/evm/migrations/v4/migrate.go 60.00% <66.66%> (-18.58%) ⬇️
app/ante/fees.go 82.83% <85.71%> (+0.39%) ⬆️
x/evm/migrations/v5/migrate.go 92.10% <92.10%> (ø)
app/ante/eth.go 80.17% <100.00%> (+0.08%) ⬆️
app/ante/fee_market.go 76.92% <100.00%> (+0.92%) ⬆️
... and 7 more

@MalteHerrmann MalteHerrmann merged commit 4f48176 into release/v0.21.x Jan 23, 2023
@MalteHerrmann MalteHerrmann deleted the mergify/bp/release/v0.21.x/pr-1617 branch January 23, 2023 19:01
fedekunze added a commit that referenced this pull request Jan 25, 2023
* release: v0.21.0-rc1 changelog (#1606)

* changelog: added rc-1 changelog entry

* fix: typo fix rc1

* fix(rpc): bind default json-rpc listen address to localhost (backport #1613) (#1621)

* fix(rpc): bind default json-rpc listen address to localhost (#1613)

* update nix

* bind default json-rpc to 127.0.0.1

* add change doc

* Update CHANGELOG.md

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 3587015)

# Conflicts:
#	CHANGELOG.md

* address merge conflicts

Co-authored-by: mmsqe <tqd0800210105@gmail.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>

* fix(rpc): align fee history (backport #1611) (#1620)

* fix(rpc): align fee history (#1611)

* update nix

* add next fee in fee history

* fix test

* add change doc

* height + 1 for next fee

* cross check baseFeePerGas len

* Update tests/integration_tests/test_fee_history.py

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

* fix oldestBlock & align earliest input as eth

* update doc

* update nix

* isort test_fee_history.py

* fix test

* align rpc res as eth

* add cross check

* add baseFeePerGas len check

* add oldestBlock check

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

# Conflicts:
#	CHANGELOG.md

* address merge conflicts

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* support customize db opener in `StartCmd` (backport #1615) (#1622)

* support customize db opener in `StartCmd` (#1615)

* support customize db opener in `StartCmd`

* Update CHANGELOG.md

* pass  to dbOpener, so we can control different options through cli flags

* add comments

(cherry picked from commit f1337aa)

# Conflicts:
#	CHANGELOG.md

* conflicts

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

* tests(evm): add benchmark tests setup for params (#1623) (#1627)

* tests: add benchmark tests setup

* fix: localized benchmark tests to keeper

* update benchmark

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

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>

* refactor(params): store all params under one key in evm module (backport #1617) (#1626)

* refactor(params): store all params under one key in evm module (#1617)

* refactor(params): store all params under one key in evm module

* refactor(params): add changelog entry

* refactor(params): update based on review comments. Remove params getter functions

* refactor(params): refactor params store key

* refactor(params): remove unnecessary store keys

* refactor(params): add paramSetPairs for backwards compatibility

* Update CHANGELOG.md

* refactor(params): add license to params_legacy file

* Apply suggestions from code review

* fix(evm): handle RC1 params during migration (#1624)

* fix(evm): handle RC1 params during migration

* migration

* fix: test case updated for RC1

* v5 migration

* tests

* tests pt2

* comment

* execute make proto-all

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>

* Apply suggestions from code review

* rm dup vars

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>
(cherry picked from commit f07b14f)

# Conflicts:
#	CHANGELOG.md

* update changelog

Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
Co-authored-by: MalteHerrmann <malte@evmos.org>

* fix(evm): revert v4 migration changes (#1625) (#1628)

* fix(evm): revert v4 migration changes

* add check for chainID

* fix: renamed vars to avoid duplicate proto

* test

* fix: set default extraEIPs to nil

* fix: updated tests

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
(cherry picked from commit 9bfa1ff)

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

* minor improvement to changelog (#1629)

* adjust year to 2023 for v0.21.0-rc2 release (#1630)

* Update CHANGELOG.md

Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mmsqe <tqd0800210105@gmail.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Tomas Guerra <54514587+GAtom22@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
C:Proto protobuf files (*.pb.go) conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants