Gav Wood
5ceb1b084c
Add missing args and some new JSONs for testing.
2016-06-19 14:49:06 +02:00
Gav Wood
2245baaaab
Provide CLI options to disable aspects of soft-fork.
...
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.
2016-06-19 13:20:14 +02:00
debris
026bfd6741
fixed incomplete merge
2016-06-19 02:09:17 +02:00
Gav Wood
bff1c5bdcb
Merge branch 'master' into softforktrigger
2016-06-18 20:55:50 +02:00
Gav Wood
d915eae7f7
Remove comment.
2016-06-18 20:54:44 +02:00
Gav Wood
2582253f95
Install trigger for DAO-rescue soft-fork.
...
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`.
2016-06-18 20:26:44 +02:00
Marek Kotewicz
3617923d3c
Merge pull request #1324 from ethcore/renamefield
...
Update default gas limit, rename field
2016-06-18 20:22:05 +02:00
Tomasz Drwięga
81df97a737
Fixing warnings ( #1321 )
2016-06-18 15:11:10 +02:00
Gav Wood
d416e5d9bc
Merge branch 'master' into renamefield
2016-06-18 15:05:43 +02:00
Gav Wood
22e390f922
Rename block_dao -> reject_dao.
2016-06-18 15:00:12 +02:00
Arkadiy Paronyan
591fa9625d
Merge pull request #1313 from ethcore/net
...
Network start/stop
2016-06-18 11:04:24 +02:00
Gav Wood
42478add64
DAO Rescue soft fork ( #1309 )
...
* DAO Rescue soft fork
* Address minor issues.
* Fix tests.
2016-06-18 10:54:15 +02:00
Gav Wood
335bce85e8
Gas price statistics. ( #1291 )
...
* Gas price statistics.
Affects eth_gasPrice.
Added ethcore_gasPriceStatistics.
Closes #1265
* Fix a bug in eth_gasPrice
* Fix tests.
* Revert minor alteration.
* Tests for gas_price_statistics.
- Tests;
- Additional infrastructure for generating test blocks with
transactions.
2016-06-18 10:52:50 +02:00
Gav Wood
16412eb0c9
DAO Rescue soft fork ( #1309 )
...
* DAO Rescue soft fork
* Address minor issues.
* Fix tests.
2016-06-17 22:15:18 +02:00
arkpar
c340d8a34f
Tests
2016-06-17 18:26:54 +02:00
arkpar
b38488dd07
Network shutdown
2016-06-17 12:58:28 +02:00
Gav Wood
88b03580ff
Gas price statistics. ( #1291 )
...
* Gas price statistics.
Affects eth_gasPrice.
Added ethcore_gasPriceStatistics.
Closes #1265
* Fix a bug in eth_gasPrice
* Fix tests.
* Revert minor alteration.
* Tests for gas_price_statistics.
- Tests;
- Additional infrastructure for generating test blocks with
transactions.
2016-06-16 12:44:08 +02:00
Marek Kotewicz
549647b6f2
fixed #1261 , overflow when calculating work ( #1283 )
...
* fixed #1261 , overflow when calculating work
* tests for difficulty_to_boundary
* return !U256::zer() for boundary <= 1
2016-06-15 16:33:38 +02:00
debris
0b8710a2a1
removed redundant if condition
2016-06-14 03:04:06 +02:00
Marek Kotewicz
4ef4819bf9
removed try_seal from MinerClient interface ( #1262 )
2016-06-13 18:51:14 +02:00
debris
12a76597d4
Merge branch 'master' into simplified_block_opening
2016-06-13 15:11:14 +02:00
Tomasz Drwięga
fca22e92ce
Bumping clippy
2016-06-12 11:26:07 +02:00
debris
2a92e10fcd
Merge branch 'master' of github.com:ethcore/parity into simplified_block_opening
2016-06-09 11:09:12 -07:00
Gav Wood
293d9f15d5
Tests for JSON serialisation of statediff/vmtrace ( #1241 )
...
* Splitting RPC Apis into more fine-grained sets
* Remove old code/comment.
* Add test for VMTrace ser.
* Add StateDiff ser test.
2016-06-08 12:40:55 -07:00
Robert Habermeier
13968aaa38
Refactor triedb constructors to error on invalid state root ( #1230 )
...
* add TrieError, refactor Trie DB creation
* remove Result type alias due to glob import conflicts
* fix fallout in state.rs
* add debug, display impl for TrieError
* fix fallout in account.rs
* ethcore::Error::TrieError variant
* fix remaining fallout in ethcore crate
* added From<TrieError> impl for Error, removed map_err calls
* fix test breakages
* fix doc tests
* update docs
[ci skip]
2016-06-07 11:44:09 -07:00
Gav Wood
4efd658577
Merge branch 'master' into txtracingforcall
2016-06-06 19:19:32 -07:00
debris
79919bdc3c
simplified block opening
2016-06-06 14:34:23 +02:00
Tomasz Drwięga
18ffd94674
Fixing warnings
2016-06-06 12:18:17 +02:00
Arkadiy Paronyan
98d9752097
Merge pull request #1219 from ethcore/clippy-bump
...
Clippy bump & fixing warnings
2016-06-06 11:46:59 +02:00
Marek Kotewicz
b93c83b8a0
Merge pull request #1216 from ethcore/serde-bump
...
Bumping serde & syntex
2016-06-06 11:32:13 +02:00
Marek Kotewicz
ba8c7bc959
Merge pull request #1217 from rphmeier/state_at_state_root
...
Verify the state root exists before creating a State
2016-06-06 11:29:39 +02:00
Tomasz Drwięga
a7de430193
Merge branch 'master' into clippy-bump
...
Conflicts:
dapps/Cargo.toml
2016-06-06 10:13:42 +02:00
Tomasz Drwięga
67b9e08ff0
Ignoring tests
2016-06-06 10:13:01 +02:00
Robert Habermeier
64b74eae43
fix travis build
2016-06-05 23:50:27 +02:00
Robert Habermeier
3dff5a9f3f
add early exit for pruned blocks
2016-06-05 22:14:40 +02:00
Robert Habermeier
e6921144dc
simplify conditional in state_at
2016-06-05 22:05:01 +02:00
Gav Wood
4675b7408f
Merge branch 'switchrpcns' into txtracingforcall
2016-06-05 21:35:58 +02:00
Marek Kotewicz
c8c47ebe32
Merge pull request #1206 from ethcore/diffing
...
Integrate state diffing into the ethcore JSONRPC
2016-06-05 21:35:36 +02:00
Gav Wood
d39b9506d2
Minor code refactor.
2016-06-05 18:24:17 +02:00
Gav Wood
4153052148
Fix fn call in miner.rs same as client.rs.
2016-06-05 17:23:27 +02:00
Robert Habermeier
aa465fa2cd
conditional style fix
2016-06-03 12:15:27 +02:00
Robert Habermeier
6f850ebdac
does_pruning -> is_pruned
2016-06-03 12:10:10 +02:00
Gav Wood
4dc9aedfb5
Merge branch 'master' into txtracingforcall
2016-06-03 12:06:39 +02:00
Tomasz Drwięga
3905717d5d
Fixing warnings
2016-06-03 11:36:30 +02:00
Tomasz Drwięga
ae2deaaf72
Bumping clippy version
2016-06-03 11:15:38 +02:00
Robert Habermeier
1e10445f82
exists -> contains
2016-06-02 21:23:43 +02:00
Robert Habermeier
6c6229c963
check if state root is valid for old blocks
2016-06-02 20:52:21 +02:00
Robert Habermeier
d7b79c1274
don't return a state in state_at if the db prunes and the block is before guaranteed history
2016-06-02 20:34:38 +02:00
Robert Habermeier
0318bb9fe9
Have Ext::ret take self by value ( #1187 )
...
* refactor externalities::ret to take self by-value, add GasLeft enum, and alter evm::Result.
* remove unused imports, StopExecutionWithGasLeft variant
* adjust tests
* remove extraneous call to reserve
* update json_tests Ext to match new trait
* adjust executive json_test
* have evms own their memory for their entire lifetime
* make finalize API more friendly
* indentation fix
[ci skip]
2016-06-02 19:04:15 +02:00
Gav Wood
a132fefcc7
Transaction tracing for eth_call.
2016-06-02 13:50:50 +02:00