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

HF Muir Glacier Difficulty bomb delay #87

Merged
merged 3 commits into from
Dec 15, 2019
Merged

Conversation

evertonfraga
Copy link
Contributor

@evertonfraga evertonfraga commented Dec 12, 2019

This PR delays the difficulty bomb, as specified by https://eips.ethereum.org/EIPS/eip-2384.

Should be tested in conjunction with ethereumjs/ethereumjs-common#75.

Closes #79.

@holgerd77
Copy link
Member

Can you squash these commits into 2-3 logically fitting commits once ready so that we have a cleaner commit history?

Also we have to again decide what we want to do along the still unpublished 3.0 release, see #74.

Would you want to give this a try to integrate the 3.0 release into the VM along the changes here on a relatively short-term basis (sorry, I still don't have the capacity, this will get better from mid-January onwards) - so until early next week or so?

Or should we backport these changes analogue to what Sina did here #77 for the v2.2.1 release? If I get this right, this would mean to branch off from the release/v2.2.1 branch and do a PR with bumped release version, changelog and the changes from here and the do a release from the PR branch without merging.

@evertonfraga
Copy link
Contributor Author

evertonfraga commented Dec 12, 2019

Re commits: absolutely. In fact I can rebase from master and just add the relevant commits on top of it. I imported this PR from the old one and GH web interface messed with the history.

I will look into the history and will try to have a solution by early next week.

Thanks for being responsive!

@@ -46,7 +46,7 @@
"homepage": "https://github.com/ethereumjs/ethereumjs-block#readme",
"dependencies": {
"@types/bn.js": "^4.11.5",
"ethereumjs-common": "^1.3.0",
"ethereumjs-common": "^1.5.0",
Copy link
Contributor Author

@evertonfraga evertonfraga Dec 13, 2019

Choose a reason for hiding this comment

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

1.5.0 has the definitions for HF Muir Glacier

Copy link
Member

@holgerd77 holgerd77 left a comment

Choose a reason for hiding this comment

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

Looks good, will approve and merge, thanks!

@holgerd77 holgerd77 merged commit 2e6f25b into master Dec 15, 2019
@holgerd77 holgerd77 deleted the eip2384-bomb-delay branch December 15, 2019 08:48
@holgerd77
Copy link
Member

Or should we backport these changes analogue to what Sina did here #77 for the v2.2.1 release? If I get this right, this would mean to branch off from the release/v2.2.1 branch and do a PR with bumped release version, changelog and the changes from here and the do a release from the PR branch without merging.

Had again another look at the commit history, and I would still have a tendency to do this as a v2.2.2 release within a process as described above, the v3.0.0 release is really a beast with updates necessary on the blockchain library + requiring major releases there and for the VM. Think this would be very much too much squeezed into this last week and at the same time I think the more important thing is to get a MuirGlacier release out before Christmas, this is already a bit tight with this patch release version (very much manageable though).

Eventually we even want to do this a bit on a quick-and-dirty level and not include all these CI changes on these old branch but just take/cherry-pick the 2 out of 3 content commits from this PR and put them on top of the branch and see if the Travis Node tests are working together with a confirmation note from along PR submission that browser tests have been successfully run locally.

@evertonfraga What do you think? Does this make sense? Can you then prepare a PR accordingly?

@evertonfraga
Copy link
Contributor Author

Makes sense, I’ll prepare them on Monday.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[EIP 2384]: Implement difficulty bomb delay
2 participants