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

[ECIP-1041] Difficulty bomb diffusion implementation #409

Merged
merged 12 commits into from
Feb 20, 2018
Merged

Conversation

whilei
Copy link
Contributor

@whilei whilei commented Nov 16, 2017

Configures fork for implementation in #408. Made up the name "Paradise" out of the blue.

Rel ethereumproject/ECIPs#87

@whilei whilei changed the title configure: Difficulty bomb defusion implementation Difficulty bomb defusion implementation Nov 16, 2017
@whilei whilei changed the title Difficulty bomb defusion implementation Difficulty bomb diffusion implementation Nov 16, 2017
@@ -26774,6 +26774,18 @@
}
}
]
},
{
"name": "Paradise",
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't like words Paradise and Bomb used together here, because it's well known combination from Islamic Jihad. What people will think? Let's use just "Diffuse Difficulty Bomb" instead

Copy link
Member

Choose a reason for hiding this comment

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

yikes, i had no idea...

@@ -112,6 +112,18 @@
}
}
]
},
{
"name": "Paradise",
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's use just "Diffuse Difficulty Bomb" instead

},
{
"name": "Paradise",
"block": 2452163,
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe something closer? like 2150721

@whilei
Copy link
Contributor Author

whilei commented Nov 20, 2017

@splix -- your suggested changes have been addressed

@whilei whilei changed the title Difficulty bomb diffusion implementation [ECIP-1041] Difficulty bomb diffusion implementation Jan 19, 2018
@whilei
Copy link
Contributor Author

whilei commented Feb 16, 2018

@splix PTAL -- ok to approve and merge ASAP? (Given ethereumproject/ECIPs#87 is merged, and passing test demo https://github.com/ETCDEVTeam/ecip1041test)

/cc @tzdybal

@whilei whilei merged commit 3ff6d6e into master Feb 20, 2018
@whilei whilei deleted the defused-enabled branch February 20, 2018 01:18
@tzdybal tzdybal restored the defused-enabled branch March 27, 2018 12:30
@tzdybal tzdybal deleted the defused-enabled branch March 27, 2018 12:36
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.

5 participants