Commit Graph

944 Commits

Author SHA1 Message Date
Gav Wood 9c58ebf2d2 Merge branch 'master' into clone-work 2016-06-30 13:16:48 +02:00
Arkadiy Paronyan ff29c82c9e Merge pull request #1495 from ethcore/work-notify
Workaround for hyper panic
2016-06-30 13:14:24 +02:00
Gav Wood dff7d9603c Fix for fake new work packages. 2016-06-30 13:12:15 +02:00
Gav Wood 9c07e5c355 Optionally clone block behind work-package. 2016-06-30 12:56:58 +02:00
arkpar 51c6b85f80 Workaround hyper panic 2016-06-30 10:07:33 +02:00
Gav Wood 5a794b21cf Make output less green. 2016-06-30 08:20:34 +02:00
Gav Wood 6ca2e6b29b Remove extraneous messages. 2016-06-30 08:20:34 +02:00
Gav Wood 93a89049ed More colour! 2016-06-30 08:20:34 +02:00
Gav Wood 92edf7f511 Safe coloured logging. 2016-06-30 08:20:34 +02:00
Gav Wood 4a6206c514 Log for when we mine a block with lots of info.
Fixes #1468
2016-06-30 08:20:34 +02:00
Arkadiy Paronyan 60270083e5 Merge pull request #1491 from ethcore/work-notify
Work notification over HTTP
2016-06-30 08:19:45 +02:00
Gav Wood 86ba6f1912 Fix test compilation. 2016-06-29 22:05:00 +02:00
arkpar ee01ad1324 Shortcut sealed block into the chain 2016-06-29 21:49:22 +02:00
Gav Wood f24ba94fbd Merge branch 'work-notify' of github.com:ethcore/parity into work-notify 2016-06-29 20:14:32 +02:00
Gav Wood dc24448900 Include number in eth_getWork. 2016-06-29 20:09:13 +02:00
arkpar b3f37f3cb4 HTTP work notifier 2016-06-29 20:07:21 +02:00
Gav Wood e24f9c9936 Add CLI option and route to MinerOptions. 2016-06-29 20:06:03 +02:00
arkpar 5958c87e56 HTTP work notifier 2016-06-29 20:04:52 +02:00
Robert Habermeier 83c967c082 Merge pull request #1487 from ethcore/vm-fact
vm factory to mining client
2016-06-29 18:00:54 +02:00
Gav Wood 98ae9cad6f Minor additions to allow resetting of code. (#1482)
* Minor additions to allow resetting of code.

* Add test.
2016-06-29 16:29:04 +02:00
Gav Wood 5d1ff3d7ba Introduce options for fine-grained management of work queue. (#1484)
* Introduce options for fine-grained management of work queue.

- Minimum reseal period between non-mandatory (transaction) reseals.
- Maximum historical cached block size.

Defaults changed to reflect real-world scenarios (2s, 20 blocks).

* Fix test bug.

* 50 -> 20.
2016-06-29 16:26:19 +02:00
NikVolf 580913fa7d vm factory to mining client 2016-06-29 17:23:29 +03:00
Gav Wood 7c27f9dfed Add CLI option and route to MinerOptions. 2016-06-29 15:37:11 +02:00
Gav Wood c096c087df Ensure we don't reject our own transactions for gasprice. (#1485)
* Ensure we don't reject our own transactions for gasprice.

* Add test.
2016-06-29 15:23:41 +02:00
debris 2462193df8 Merge branch 'master' of github.com:ethcore/parity into tests_for_views 2016-06-28 14:28:54 +02:00
debris 0b86723e68 tests for HeaderView and BlockView, fixed #144 2016-06-28 14:28:42 +02:00
Marek Kotewicz af891f65a7 verifier is no longer a template type of client (#1467)
* verifier is no longer a template type of client

* added missing ,
2016-06-28 13:23:15 +02:00
debris 4ecf23df9a tests for TransactionView 2016-06-28 12:08:30 +02:00
Gav Wood 599a6104b7 Minor renaming. 2016-06-28 10:40:35 +02:00
Gav Wood 31de739122 U256 instead of Option<U256>. Fix up tests. 2016-06-28 10:21:29 +02:00
Gav Wood af935df553 Merge branch 'master' into miner-improvements 2016-06-28 10:02:33 +02:00
Gav Wood c221f69ccd Clean up some of the FP stuff. 2016-06-28 10:00:28 +02:00
Gav Wood 495e56034f Merge branch 'master' into miner-improvements 2016-06-27 21:02:55 +02:00
arkpar 150d7c1c78 Merge remote-tracking branch 'origin/master' into db-config-ext 2016-06-27 20:33:07 +02:00
Gav Wood 10aa32b0f5 Include RPC configurability for max tx gas limit.
Also Move the gas limit into the transaction queue from the miner.
2016-06-27 20:19:01 +02:00
Arkadiy Paronyan 60b70dada1 Reduced IO messages; removed panics on IO notifications (#1457) 2016-06-27 19:30:13 +02:00
Gav Wood 2a51a30d41 Fix up the pending set stuff. 2016-06-27 19:06:54 +02:00
Nikolay Volf 9f4bfd9e7a fix tests 2016-06-27 18:47:50 +02:00
Gav Wood 1667808ecb More miner options.
- Optional limit for the amount of gas transactions may have;
- option to restruct transactions returned/queried to only those
which have been executed.
2016-06-27 18:27:06 +02:00
Gav Wood 6c1802e412 Allow configuration of when to reseal blocks. 2016-06-27 17:23:54 +02:00
Arkadiy Paronyan 6859152c21 Fixed losing queued blocks on ancient block error (#1453) 2016-06-27 15:59:45 +02:00
Nikolay Volf 2e5d5f12dd ethcore client config 2016-06-27 13:58:12 +02:00
Tomasz Drwięga 6bbaced3cd Merge branch 'master' into miner-no-default
Conflicts:
	ethcore/src/miner/miner.rs
	parity/main.rs
2016-06-26 22:44:34 +02:00
Arkadiy Paronyan a72d8ee0e7 v1.3.0 (#1421) 2016-06-25 10:32:05 +02:00
Arkadiy Paronyan 3c63244c00 Merge pull request #1418 from ethcore/newblocknumber
Update SF blocknumber to 1800000.
2016-06-24 17:50:03 +02:00
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