DAO hard-fork #1483

Merged
merged 15 commits into from Jul 16, 2016

Projects

None yet

2 participants

@gavofyork
Member
gavofyork commented Jun 29, 2016 edited

In accordance with the specification given on https://gist.github.com/gavofyork/856b27cf1a482585692359e28d3ae4cb

gavofyork added some commits Jun 29, 2016
@gavofyork gavofyork Minor additions to allow resetting of code.
3516c6a
@gavofyork gavofyork Add test.
8d98ead
@gavofyork gavofyork Provisional DAO hard-fork proposal.
fd9d10a
@gavofyork gavofyork locked and limited conversation to collaborators Jun 29, 2016
@gavofyork gavofyork added A8-onice and removed A8-onice labels Jun 29, 2016
gavofyork added some commits Jul 11, 2016
@gavofyork gavofyork Merge branch 'master' into dao-hf 5704dfc
@gavofyork gavofyork Change to reflect latest HF spec.
0ab7648
@gavofyork gavofyork Include extradata restrictions and overrides.
c785f43
@gavofyork gavofyork Introduce new tests.
1fe1886
@gavofyork gavofyork changed the title from Provisional DAO hard-fork proposal. to DAO hard-fork Jul 11, 2016
gavofyork added some commits Jul 12, 2016
@gavofyork gavofyork Update tests to new spec format.
e6189e0
@gavofyork gavofyork Allow JSON chain spec fields to be optional.
be7c9af
@arkpar
Member
arkpar commented Jul 14, 2016

Since DAO params are optional it would be nice to remove them from morden and other unrelated spec files

@arkpar arkpar commented on the diff Jul 14, 2016
ethcore/src/ethereum/ethash.rs
@@ -119,10 +128,27 @@ impl Engine for Ethash {
(header.gas_used * 6.into() / 5.into()) / bound_divisor))
}
};
+ if header.number >= self.ethash_params.dao_hardfork_transition &&
+ header.number <= self.ethash_params.dao_hardfork_transition + 9 {
@arkpar
arkpar Jul 14, 2016 Member

Might cause an overflow panic if header number is 0xffffffffffffffffff. Is it guaranteed that no invalid headers are input to this function?

@gavofyork
gavofyork Jul 14, 2016 Member

yeah that's a bit fragile in any case. will just use a smaller number :)

@arkpar arkpar added A4-grumble and removed A0-pleasereview labels Jul 14, 2016
gavofyork added some commits Jul 14, 2016
@gavofyork gavofyork Add missing file. 2230b46
@gavofyork gavofyork Remove old flag. b0712d0
@gavofyork gavofyork Update to latest address set.
333c591
@arkpar arkpar added A7-looksgood and removed A0-pleasereview labels Jul 14, 2016
@gavofyork gavofyork added A8-onice and removed A7-looksgood labels Jul 14, 2016
@gavofyork gavofyork Update tests and test spec to latest.
Change the mining default to release only on own transactions.
666ac8f
@gavofyork gavofyork added A7-looksgood and removed A8-onice labels Jul 16, 2016
@gavofyork gavofyork merged commit 799c69c into master Jul 16, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls First build on master at 76.281%
Details
@gavofyork gavofyork deleted the dao-hf branch Jul 16, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.