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

Install trigger for DAO-rescue soft-fork. #1329

Merged
merged 12 commits into from
Jun 21, 2016
Merged

Install trigger for DAO-rescue soft-fork. #1329

merged 12 commits into from
Jun 21, 2016

Conversation

gavofyork
Copy link
Contributor

@gavofyork gavofyork commented Jun 18, 2016

Soft-fork should only be primed to trigger if the gas-limit of
block #1760000 is at most 4,000,000.

To accomplish this we pass in the gas limit of that block to
EnvInfo so it can inform Schedule. This gets marshalled through
OpenBlock/ClosedBlock and the enact functions much like
last_hashes. block.rs's env_info() takes care to ensure
that if the current block happens to be #1760000, then we
populate with the current gas_limit.

This is a pretty awful altertation to the codebase. However, is has one huge mitigating factor:

We can revert it after block #1760000.

Soft-fork should only be primed to trigger if the gas-limit of
block #1760000 is at most 4,000,000.

To accomplish this we pass in the gas limit of that block to
EnvInfo so it can inform Schedule. This gets marshalled through
`OpenBlock`/`ClosedBlock` and the `enact` functions much like
`last_hashes`. `block.rs`'s `env_info()` takes care to ensure
that if the current block happens to be #1760000, then we
populate with the current `gas_limit`.
@gavofyork gavofyork added the A0-pleasereview 🤓 Pull request needs code review. label Jun 18, 2016
@debris debris mentioned this pull request Jun 18, 2016
@debris debris added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 18, 2016
@debris
Copy link
Collaborator

debris commented Jun 18, 2016

tests failing

@debris debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Jun 19, 2016
@taoeffect
Copy link

taoeffect commented Jun 19, 2016

Wait, what is going on?

Please tell me I am just misunderstanding and you are not unilaterally installing a SF into Parity without any EIP and zero calls for public discussion.

Because that would be dumb. Very dumb. I'm already having to field tweets like this and seeing tweets like this. Please don't embarrass us more.

Soft-fork will remain default behaviour, but you can now disable
either the whole mechanism (you'll lose money if you mine with this
when the majority network doesn't) or just vote against it but
otherwise go with the flow.
@gavofyork
Copy link
Contributor Author

The soft fork is already in. This PR ensures it only activates if there is consensus among the Ethereum community by requiring it to trigger only if the majority form a consensus around it.

If you want to run Parity and vote against the soft-fork which prevents ETH from being drained from broken DAO contracts (i.e. you wish to help the attacker), run with --assist-dao-attack. If you would prefer to stick to the original Homestead Yellow Paper spec, even if the rest of the network goes with the soft-fork, run with --dogmatic.

@gavofyork gavofyork added A0-pleasereview 🤓 Pull request needs code review. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Jun 19, 2016
@taoeffect
Copy link

@gavofyork, like many, I bought into Ethereum because of the message that you and others were selling.

Here you are giving a lecture where you describe Ethereum as a "system that cannot care":

https://www.youtube.com/watch?v=2TXk-VczNL0

And I was at Cryptoeconomicon where you gave a similar lecture pushing the same message.

Now that this system suddenly inconveniences you, you decide to do the exact opposite and change the rules so that things work out in your favor?

This is unacceptable. What do you say to those of us who supported you and Ethereum based on the message you were only just recently pushing?

@gavofyork
Copy link
Contributor Author

Pease do not abuse PR threads for non-code-related matters. If you want to debate the finer points of consensus, pick a time when I'm less busy and have more beer.

@openethereum openethereum locked and limited conversation to collaborators Jun 19, 2016
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jun 20, 2016
@arkpar arkpar added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Jun 21, 2016
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Jun 21, 2016
@arkpar arkpar merged commit 7c94b14 into master Jun 21, 2016
@debris debris deleted the softforktrigger branch June 21, 2016 22:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants