c38d15ad4d
Merge branch 'master' of github.com:ethcore/parity into beta
2016-06-30 16:11:56 +02:00
24e73f3aec
Merge pull request #1497 from ethcore/clone-work
...
Optionally clone block behind work-package
2016-06-30 15:50:27 +02:00
6ae467252c
Fix no colour on windows. ( #1498 )
2016-06-30 15:49:00 +02:00
9c58ebf2d2
Merge branch 'master' into clone-work
2016-06-30 13:16:48 +02:00
ff29c82c9e
Merge pull request #1495 from ethcore/work-notify
...
Workaround for hyper panic
2016-06-30 13:14:24 +02:00
dff7d9603c
Fix for fake new work packages.
2016-06-30 13:12:15 +02:00
9c07e5c355
Optionally clone block behind work-package.
2016-06-30 12:56:58 +02:00
5665083e20
UsingQueue can clone rather than just take.
2016-06-30 12:21:04 +02:00
30fad64621
Merge pull request #1488 from ethcore/notification-on-mine
...
Colourful notification on mine
2016-06-30 11:42:43 +02:00
51c6b85f80
Workaround hyper panic
2016-06-30 10:07:33 +02:00
af65945b58
Specifying max open files ( #1494 )
2016-06-30 08:24:01 +02:00
5a794b21cf
Make output less green.
2016-06-30 08:20:34 +02:00
6ca2e6b29b
Remove extraneous messages.
2016-06-30 08:20:34 +02:00
93a89049ed
More colour!
2016-06-30 08:20:34 +02:00
92edf7f511
Safe coloured logging.
2016-06-30 08:20:34 +02:00
4a6206c514
Log for when we mine a block with lots of info.
...
Fixes #1468
2016-06-30 08:20:34 +02:00
60270083e5
Merge pull request #1491 from ethcore/work-notify
...
Work notification over HTTP
2016-06-30 08:19:45 +02:00
34155730ff
Merge pull request #1492 from ethcore/v1.2.1
...
v1.2.1 in beta
2016-06-30 08:13:17 +02:00
946c1fd76a
Merge pull request #1478 from ethcore/seal-import
...
Sealed block importing and propagation optimization
2016-06-30 08:13:07 +02:00
2df737bebf
v1.2.1
2016-06-29 22:27:49 +02:00
9885bdcf0a
Merge remote-tracking branch 'origin/master' into beta
2016-06-29 22:14:42 +02:00
86ba6f1912
Fix test compilation.
2016-06-29 22:05:00 +02:00
ee01ad1324
Shortcut sealed block into the chain
2016-06-29 21:49:22 +02:00
f24ba94fbd
Merge branch 'work-notify' of github.com:ethcore/parity into work-notify
2016-06-29 20:14:32 +02:00
dc24448900
Include number in eth_getWork.
2016-06-29 20:09:13 +02:00
b3f37f3cb4
HTTP work notifier
2016-06-29 20:07:21 +02:00
e24f9c9936
Add CLI option and route to MinerOptions.
2016-06-29 20:06:03 +02:00
19d83a9074
Merge branch 'work-notify' of github.com:ethcore/parity into work-notify
2016-06-29 20:05:11 +02:00
5958c87e56
HTTP work notifier
2016-06-29 20:04:52 +02:00
83c967c082
Merge pull request #1487 from ethcore/vm-fact
...
vm factory to mining client
2016-06-29 18:00:54 +02:00
aec4130dca
topbar dialog fix ( #1479 )
...
* topbar dialog fix
* push goldylucks changes to ethcore umbrella
2016-06-29 17:19:04 +02:00
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
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
580913fa7d
vm factory to mining client
2016-06-29 17:23:29 +03:00
05927eba1f
Include number in eth_getWork.
2016-06-29 15:43:34 +02:00
7c27f9dfed
Add CLI option and route to MinerOptions.
2016-06-29 15:37:11 +02:00
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
78ebc8b975
Merge pull request #1481 from ethcore/av-signing
...
Signing parity executable & windows installer in appveyor
2016-06-29 10:39:33 +02:00
e3214c63c6
Rearrange fork CLI options. ( #1476 )
...
* Rearrange fork CLI options.
* Fixed compilation
2016-06-29 09:28:56 +02:00
2138a53067
Merge branch 'master' into av-signing
2016-06-29 02:02:02 +03:00
72771bd833
signing executable also
2016-06-29 01:58:15 +03:00
91aee536ca
Merge pull request #1475 from ethcore/appveyor_choking
...
give appveyor some breath
2016-06-29 02:35:12 +04:00
09e1970bbf
Merge with master
2016-06-28 20:04:00 +02:00
ebcbb19aef
sign command
2016-06-28 21:02:15 +03:00
e3ca87c4d1
Updating WS version
2016-06-28 19:40:23 +02:00
1fcf5c7cc2
Fixing HTTP file serving on ws-rs
2016-06-28 19:40:22 +02:00
dd0e681847
Using stable version of ws-rs
2016-06-28 19:40:22 +02:00
c006f446a4
Reduced IO messages; removed panics on IO notifications
2016-06-28 19:39:59 +02:00
9a16e593e2
Update configuration.rs
2016-06-28 19:39:31 +02:00
5ef767f7f2
Update cli.rs
...
[ci:skip]
2016-06-28 19:39:31 +02:00
arkpar
Gav Wood
Tomasz Drwięga
Robert Habermeier
Adam Goldman
NikVolf
Tomasz Drwięga