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

Cherry pick thanos #1474

Merged
merged 2 commits into from
Oct 19, 2020
Merged

Conversation

shemnon
Copy link
Contributor

@shemnon shemnon commented Oct 19, 2020

PR description

Fixed Issue(s)

Changelog

…r#1421)

* Add genesis config parameter ecip1099Block

Signed-off-by: Edward Mack <ed@edwardmack.com>

* add stub for epoch activation config

Signed-off-by: Edward Mack <ed@edwardmack.com>

* add stubs for EtcBesuControllerBuilder

that will handle ECIP 1099 Colibrate Epoch Duration functionality

Signed-off-by: Edward Mack <ed@edwardmack.com>

* introduce EtcHashMinerExecutor

Signed-off-by: Edward Mack <ed@edwardmack.com>

* implement EtcHashMinerExecutor

Signed-off-by: Edward Mack <ed@edwardmack.com>

* remove ecip1099 genesis config option

Signed-off-by: Edward Mack <ed@edwardmack.com>

* apply spotless to code

Signed-off-by: Edward Mack <ed@edwardmack.com>

* add test for Etc Hash epoch calculation

Signed-off-by: Edward Mack <ed@edwardmack.com>

* cleanup comments, apply spotless

Signed-off-by: Edward Mack <ed@edwardmack.com>

* make needed variables final

Signed-off-by: Edward Mack <ed@edwardmack.com>

* update changelog

Signed-off-by: Edward Mack <ed@edwardmack.com>

* refactor code to add epochCalculator to EthHash

As suggested in comment removed EtcHash series of classes to keep
existing controller.

Signed-off-by: Edward Mack <ed@edwardmack.com>

* use gas limit calculator

Signed-off-by: Edward Mack <ed@edwardmack.com>

* fix imports

Signed-off-by: Edward Mack <ed@edwardmack.com>

* run spotless apply

Signed-off-by: Edward Mack <ed@edwardmack.com>

* fix imports

Signed-off-by: Edward Mack <ed@edwardmack.com>

* fix comments

Signed-off-by: Edward Mack <ed@edwardmack.com>

* add ecip1099Block option to asMap method

Signed-off-by: Edward Mack <ed@edwardmack.com>

(cherry picked from commit 787871a)
Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
…r#1462)

* rename genesis config option Ecip1099Block to ThanosBlock

Signed-off-by: Edward Mack <ed@edwardmack.com>

* add changelog entry

Signed-off-by: Edward Mack <ed@edwardmack.com>

(cherry picked from commit 2d7cdf0)
Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
@shemnon shemnon merged commit 3ae79e7 into hyperledger:release-20.10.0 Oct 19, 2020
@shemnon shemnon deleted the cherryPickThanos branch February 26, 2022 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants