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

chore: sync main with v0.21.x branch #1636

Merged
merged 12 commits into from
Jan 25, 2023
Merged

Conversation

MalteHerrmann
Copy link
Contributor

Description

This PR merges the latest changes on the release branch back into main.


Closes: ENG-1361

Vvaradinov and others added 9 commits January 13, 2023 12:15
* changelog: added rc-1 changelog entry

* fix: typo fix rc1
…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 <[email protected]>

Co-authored-by: Federico Kunze Küllmer <[email protected]>
(cherry picked from commit 3587015)

# Conflicts:
#	CHANGELOG.md

* address merge conflicts

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>
* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Federico Kunze Küllmer <[email protected]>
(cherry picked from commit 47fdfd3)

# Conflicts:
#	CHANGELOG.md

* address merge conflicts

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>
Co-authored-by: Federico Kunze Küllmer <[email protected]>
* 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 <[email protected]>
Co-authored-by: Federico Kunze Küllmer <[email protected]>
* tests: add benchmark tests setup

* fix: localized benchmark tests to keeper

* update benchmark

Co-authored-by: Federico Kunze Küllmer <[email protected]>
(cherry picked from commit 9305788)

Co-authored-by: Vladislav Varadinov <[email protected]>
…ort #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 <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>

* Apply suggestions from code review

* rm dup vars

Co-authored-by: Federico Kunze Küllmer <[email protected]>
Co-authored-by: Vladislav Varadinov <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>
(cherry picked from commit f07b14f)

# Conflicts:
#	CHANGELOG.md

* update changelog

Co-authored-by: Tomas Guerra <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>
Co-authored-by: MalteHerrmann <[email protected]>
* 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 <[email protected]>
(cherry picked from commit 9bfa1ff)

Co-authored-by: Federico Kunze Küllmer <[email protected]>
@MalteHerrmann MalteHerrmann marked this pull request as ready for review January 25, 2023 13:00
@MalteHerrmann MalteHerrmann requested a review from a team as a code owner January 25, 2023 13:00
@MalteHerrmann MalteHerrmann requested review from Vvaradinov and facs95 and removed request for a team January 25, 2023 13:00
CHANGELOG.md Show resolved Hide resolved
@fedekunze fedekunze enabled auto-merge (squash) January 25, 2023 16:38
@fedekunze fedekunze disabled auto-merge January 25, 2023 16:39
@fedekunze fedekunze merged commit 7ee11cf into main Jan 25, 2023
@fedekunze fedekunze deleted the malte/sync-main-with-v0.21-rc2 branch January 25, 2023 16:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants