Gav Wood
60d259c9d5
Update SF blocknumber to 1800000.
2016-06-24 14:20:50 +02:00
Arkadiy Paronyan
4e0d6f735a
Merge pull request #1405 from ethcore/sfedgecase
...
Configurable gas limit cap.
2016-06-24 13:36:40 +02:00
Gav Wood
84ce5af2b0
max/min incorrect
2016-06-24 11:40:25 +02:00
Tomasz Drwięga
dc7c53d59a
Fixing json tests
2016-06-24 10:57:44 +02:00
Tomasz Drwięga
34c89e5841
fixing json_tests
2016-06-24 10:49:13 +02:00
Tomasz Drwięga
6edb981bfa
Merge branch 'master' into miner-no-default
...
Conflicts:
sync/src/lib.rs
2016-06-23 21:18:43 +02:00
Nikolay Volf
1d31cee524
Merge pull request #1406 from ethcore/jit
...
Fixing jit compilation
2016-06-23 18:32:14 +03:00
Tomasz Drwięga
19585947a5
Fixing jit compilation
2016-06-23 14:46:33 +02:00
Gav Wood
bca9e1f31a
Merge branch 'master' into sfedgecase
2016-06-23 14:43:42 +02:00
Gav Wood
41e0769e63
Fix tests,
2016-06-23 14:43:20 +02:00
Gav Wood
8fcec20398
Gas limit ceiling option.
2016-06-23 14:29:16 +02:00
Robert Habermeier
082294fe81
Merge pull request #1403 from ethcore/bump-clippy
...
Bump clippy
2016-06-23 14:23:46 +02:00
Arkadiy Paronyan
f3486c48ea
Merge pull request #1401 from ethcore/sfedgecase
...
Shortcut SF condition when canon known
2016-06-23 13:08:30 +02:00
Robert Habermeier
fb7ca8539e
Merge pull request #1402 from ethcore/txqueue-assert
...
Additional assertions for internal state of queue
2016-06-23 12:52:56 +02:00
Tomasz Drwięga
5bf906625b
Fixing warnings
2016-06-23 12:19:38 +02:00
Gav Wood
129ce97ad5
Constants for SF# and update.
2016-06-23 11:30:48 +02:00
Gav Wood
4f39fb2551
Merge branch 'master' into sfedgecase
2016-06-23 11:19:19 +02:00
keorn
be8f922b3f
Replace deprecated hashdb trait names ( #1394 )
...
* replace deprecated hashdb method names
* spaces -> tabs
2016-06-23 11:16:11 +02:00
Tomasz Drwięga
a76e3a134f
Bumping clippy
2016-06-23 10:54:25 +02:00
Gav Wood
fc9ceb9131
Merge branch 'master' into sfedgecase
2016-06-22 21:38:56 +02:00
Gav Wood
1602906b56
Shortcut SF condition when canon known
2016-06-22 21:37:29 +02:00
Gav Wood
230c6c889a
Ensure judging the SF trigger by relative branch ( #1399 )
...
Rather than just the canon chain.
2016-06-22 21:33:10 +02:00
Tomasz Drwięga
9a1e1b7c89
Signer with Unlocked Account ( #1398 )
2016-06-22 21:32:26 +02:00
Gav Wood
5302a7dd58
Ensure judging the SF trigger by relative branch
...
Rather than just the canon chain.
2016-06-22 19:49:07 +02:00
Gav Wood
353b9e91e6
Update SF to latest spec ( #1386 )
...
* Introduce whitelist for softfork
* Use extradata for fork id.
* Fix condition.
2016-06-22 15:37:25 +02:00
Tomasz Drwięga
e2de1987c7
Fixing order of if statements to avoid overflows. ( #1384 )
...
* Removing old transactions
* Explanation comment [ci skip]
2016-06-22 11:15:22 +02:00
Arkadiy Paronyan
7c94b1495e
Merge pull request #1329 from ethcore/softforktrigger
...
Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
Arkadiy Paronyan
613d4c95f6
Merge pull request #1364 from ethcore/miner-lock
...
Fix lock order when updating sealing
2016-06-21 17:41:44 +02:00
Tomasz Drwięga
fe09d8d291
Merge branch 'master' into txqueue-assert
...
Conflicts:
ethcore/src/miner/transaction_queue.rs
2016-06-21 16:35:18 +02:00
Arkadiy Paronyan
b2891fcdda
Update sealing on new transactions ( #1365 )
2016-06-21 16:00:34 +02:00
Arkadiy Paronyan
bca4e23df6
Fixed panic on aborted connection ( #1370 )
2016-06-21 15:56:00 +02:00
Gav Wood
840f961dc2
don't bother assigning queue.
2016-06-21 14:34:22 +02:00
Tomasz Drwięga
e0b4eab819
Fixing replacing transaction with lower gas_price in one of the edge cases ( #1343 )
2016-06-21 13:55:26 +02:00
Tomasz Drwięga
3de482a431
Additional assertions for internal state of queue
2016-06-21 12:31:50 +02:00
arkpar
b667378820
Release lock while pushing transactions
2016-06-21 11:26:43 +02:00
arkpar
c912bb8c17
Fix lock order
2016-06-20 23:48:47 +02:00
Arkadiy Paronyan
f58e211b11
Merge pull request #1335 from ethcore/tx_perf
...
Transaction processing queue
2016-06-20 23:47:35 +02:00
Arkadiy Paronyan
7e424d2713
Merge pull request #1359 from ethcore/lastnonce-fix
...
Fixing last nonce values in case transaction is replaced
2016-06-20 23:03:09 +02:00
Arkadiy Paronyan
855ae91c4c
Merge pull request #1354 from ethcore/warnings-fix
...
Fixing clippy warnings
2016-06-20 21:21:51 +02:00
Gav Wood
72debeebcf
Update code hash.
2016-06-20 20:47:07 +02:00
arkpar
09b8116cde
TX processing queue
2016-06-20 18:42:50 +02:00
Tomasz Drwięga
8fa9a240cc
Fixing last nonce values in case transaction is replaced
2016-06-20 18:37:59 +02:00
Arkadiy Paronyan
8b845e56da
Merge pull request #1348 from ethcore/db-cache-size
...
Configurable rocksdb cache size
2016-06-20 17:29:18 +02:00
Marek Kotewicz
75a38500f1
Merge pull request #1346 from ethcore/txqueue-future
...
Fixing future order and errors when reaching limit.
2016-06-20 15:31:39 +02:00
Marek Kotewicz
e9900be6ea
Merge pull request #1342 from ethcore/txqueue-local-noprio
...
Removing priority on local transactions
2016-06-20 15:31:06 +02:00
Tomasz Drwięga
da7b30628b
Fixing warnings
2016-06-20 15:20:55 +02:00
Nikolay Volf
c6616431b0
fix tests
2016-06-20 14:20:13 +03:00
Nikolay Volf
7e452ab2e0
configurable cache size
2016-06-20 13:42:04 +03:00
Tomasz Drwięga
c348508b40
Fixing future order and drops because of limit errors
2016-06-20 12:14:19 +02:00
Tomasz Drwięga
edd43cd5c3
Fixing local transactions prioritization
2016-06-20 11:32:29 +02:00
arkpar
1dd87a39f5
Fixed tests
2016-06-20 10:44:15 +02:00
Tomasz Drwięga
d0b2df07db
Removing priority on local transactions
2016-06-20 10:32:52 +02:00
Tomasz Drwięga
a2f24a0083
Removing Default from Miner
2016-06-20 10:28:38 +02:00
Gav Wood
3ee3171b8c
Merge branch 'master' into softforktrigger
2016-06-20 00:37:40 +02:00
Marek Kotewicz
6b074e8fb2
secret store separated from util ( #1304 )
...
* bump rust-crypto
* initial version of account provider utilizing secret store
* update lazy_static to latest version
* AccountProvider accounts method
* new AccountProvider tests in progress
* basic tests for new AccountProvider
* ethcore compiles with new account provider and secret store
* ethcore-rpc build now compiling with new AccountProvider
* most rpc tests passing with new accounts_provider
* fixed basic_authority tests
* fixed eth_transaction_count rpc test
* fixed mocked/eth.rs tests
* fixed personal tests
* fixed personal signer rpc tests
* removed warnings
* parity compiling fine with new sstore
* fixed import direction
* do not unlock temporarily when we have the password
* removed TODO in account import
* display warning on auto account import failure
* fixed compiling of ethstore on windows
* ethstore as a part of parity repo
* added ethkey
2016-06-20 00:10:34 +02:00
Gav Wood
08522eec37
--geth prevent getTransactionReceipt from using pending. ( #1325 )
...
This mimics the fucntionality of Geth and the current unratified
JSONRPC spec (but not the functionality of eth and the ratified
spec).
2016-06-19 14:51:51 +02:00
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
Tomasz Drwięga
8fad728e9b
Fixing locks order ( #1328 )
2016-06-19 12:33:50 +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