keorn 44f42ac7d3 Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet ...

Conflicts:
	ethcore/src/state/mod.rs
	ethcore/src/tests/mod.rs

2016-10-12 18:39:31 +01:00

..

ethereum

Update json test suite (#2574)

2016-10-12 10:06:23 +02:00

authority_round.json

block time in decimal

2016-09-27 16:06:13 +01:00

basic_authority.json

add new engine to spec

2016-09-08 12:28:59 +02:00

instant_seal.json

Instant sealing engine (#1767)

2016-07-30 14:42:31 -07:00

null_morden.json

Fix state not using "account_starting_nonce" (#1830)

2016-08-04 18:17:39 +02:00

null.json

Gas price statistics. (#1291)

2016-06-18 10:52:50 +02:00