arkpar
9885bdcf0a
Merge remote-tracking branch 'origin/master' into beta
2016-06-29 22:14:42 +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
Adam Goldman
aec4130dca
topbar dialog fix ( #1479 )
...
* topbar dialog fix
* push goldylucks changes to ethcore umbrella
2016-06-29 17:19:04 +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
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
Arkadiy Paronyan
78ebc8b975
Merge pull request #1481 from ethcore/av-signing
...
Signing parity executable & windows installer in appveyor
2016-06-29 10:39:33 +02:00
Gav Wood
e3214c63c6
Rearrange fork CLI options. ( #1476 )
...
* Rearrange fork CLI options.
* Fixed compilation
2016-06-29 09:28:56 +02:00
NikVolf
2138a53067
Merge branch 'master' into av-signing
2016-06-29 02:02:02 +03:00
NikVolf
72771bd833
signing executable also
2016-06-29 01:58:15 +03:00
Nikolay Volf
91aee536ca
Merge pull request #1475 from ethcore/appveyor_choking
...
give appveyor some breath
2016-06-29 02:35:12 +04:00
arkpar
09e1970bbf
Merge with master
2016-06-28 20:04:00 +02:00
NikVolf
ebcbb19aef
sign command
2016-06-28 21:02:15 +03:00
Tomasz Drwięga
e3ca87c4d1
Updating WS version
2016-06-28 19:40:23 +02:00
Tomasz Drwięga
1fcf5c7cc2
Fixing HTTP file serving on ws-rs
2016-06-28 19:40:22 +02:00
Tomasz Drwięga
dd0e681847
Using stable version of ws-rs
2016-06-28 19:40:22 +02:00
arkpar
c006f446a4
Reduced IO messages; removed panics on IO notifications
2016-06-28 19:39:59 +02:00
Gav Wood
9a16e593e2
Update configuration.rs
2016-06-28 19:39:31 +02:00
Gav Wood
5ef767f7f2
Update cli.rs
...
[ci:skip]
2016-06-28 19:39:31 +02:00
Nikolay Volf
071da2eec5
fix tests
2016-06-28 19:39:31 +02:00
Nikolay Volf
a3f165cf48
cli config
2016-06-28 19:39:31 +02:00
Nikolay Volf
93facbf854
ethcore client config
2016-06-28 19:39:31 +02:00
Nikolay Volf
42f5d7f897
jdb to new settings config
2016-06-28 19:39:31 +02:00
Nikolay Volf
97e553f1bf
extra helpers for prefix
2016-06-28 19:38:48 +02:00
Nikolay Volf
8caa859111
compaction struct and helpers
2016-06-28 19:38:48 +02:00
Gav Wood
a3758161ac
Ensure we always get the latest work when mining on submitted. ( #1469 )
...
* Ensure we always get the latest work when mining on submitted.
* Build fix.
* Smaller timeslices for the wait.
2016-06-28 18:46:09 +02:00
Marek Kotewicz
38870fb3e4
Merge pull request #1471 from ethcore/tests_for_views
...
Tests for views
2016-06-28 17:37:27 +02:00
NikVolf
3ae8ccf8c6
signing installer
2016-06-28 18:13:21 +03:00
Nikolay Volf
477fdefb55
json ipc version bump ( #1470 )
...
* bump version once
* version bump 2
2016-06-28 16:22:05 +02:00
debris
8dbf182618
give appveyor some breath
2016-06-28 16:10:21 +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
Arkadiy Paronyan
39307b2bea
Merge pull request #1460 from ethcore/miner-improvements
...
Allow configuration of when to reseal blocks.
2016-06-28 13:11:24 +02:00
debris
4ecf23df9a
tests for TransactionView
2016-06-28 12:08:30 +02:00
Marek Kotewicz
4f56f8b27c
removed unsafe code ( #1466 )
2016-06-28 11:52:59 +02:00
Tomasz Drwięga
6895a56099
Adding default for value ( #1465 )
2016-06-28 11:10:39 +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
d0cec2434e
Merge branch 'miner-improvements' of github.com:ethcore/parity into miner-improvements
2016-06-28 10:00:51 +02:00
Gav Wood
c221f69ccd
Clean up some of the FP stuff.
2016-06-28 10:00:28 +02:00
Arkadiy Paronyan
a3a68a20f4
Merge pull request #1461 from ethcore/db-repair
...
Attempt DB repair if corrupted
2016-06-28 07:37:49 +02:00
Arkadiy Paronyan
993f707fbe
Merge pull request #1454 from ethcore/db-config-ext
...
Database configuration extended
2016-06-28 07:07:05 +02:00
Gav Wood
ff788e4199
Fix another typo
...
[ci:skip]
2016-06-27 21:06:40 +02:00
Gav Wood
5919c660e5
Fix typo
...
[ci:skip]
2016-06-27 21:06:10 +02:00
Gav Wood
495e56034f
Merge branch 'master' into miner-improvements
2016-06-27 21:02:55 +02:00
arkpar
ed153995f9
Attempt DB repair if corrupted
2016-06-27 20:41:02 +02:00
arkpar
150d7c1c78
Merge remote-tracking branch 'origin/master' into db-config-ext
2016-06-27 20:33:07 +02:00