Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

More backports into stable #6061

Merged
merged 2 commits into from
Jul 14, 2017
Merged

More backports into stable #6061

merged 2 commits into from
Jul 14, 2017

Conversation

arkpar
Copy link
Collaborator

@arkpar arkpar commented Jul 14, 2017

No description provided.

sjmackenzie and others added 2 commits July 14, 2017 19:59
* Ethereum Classic Monetary Policy

Create a new parameter `ecip1017EraRounds`. When the block number
passes one era rounds, the reward is reduced by 20%.

See https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md

* Update rewards for uncle miners for ECIP1017

In the monetary policy, the rewards are changed from "up to 7/8 of the
reward" to "1/32 of the reward".

* Fix an off-by-one error in ECIP1017 era calculation

According to
https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md,
when in block number 5,000,000, it should still be in Era 1 (which in
our code `era == 0`). So we need to check whether the `rem` equals to
zero and act accordingly when calculating the era.

* `ecip1017_era_rounds` missing from EthashParams when run in build bot

* strip out ecip1017_eras_block_reward function and add unit test
@arkpar arkpar added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Jul 14, 2017
@arkpar arkpar merged commit aa7dfdf into stable Jul 14, 2017
@arkpar arkpar deleted the stable-backporting branch July 14, 2017 18:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants