Commit Graph

5313 Commits

Author SHA1 Message Date
Robert Habermeier
1f885254e1 commit final batch and migrate journaled insertions 2016-07-09 15:22:59 +02:00
Gav Wood
9a70f717ad Merge remote-tracking branch 'origin/master' into dynamic-gas-price 2016-07-09 12:29:23 +02:00
Gav Wood
d4d63a5688 Merge branches 'kill_unwraps' and 'dynamic-gas-price' of github.com:ethcore/parity into dynamic-gas-price 2016-07-09 12:29:06 +02:00
arkpar
f48d030f0b Init public interface with IO message 2016-07-09 11:48:52 +02:00
Tomasz Drwięga
b304ce5838 Uncommenting simple Miner tests (#1571) 2016-07-09 11:23:06 +02:00
Nikolay Volf
5fe14e172e Merge pull request #1558 from ethcore/kill_unwraps
Kill lock unwraps
2016-07-09 00:08:59 +02:00
Gav Wood
9b1d1dc336 Merge remote-tracking branch 'origin/master' into kill_unwraps 2016-07-08 20:42:11 +02:00
Gav Wood
c648171f91 Fix the HTTP client for getting price. 2016-07-08 20:01:20 +02:00
Robert Habermeier
274e7767b4 fix migration tests 2016-07-08 18:28:11 +02:00
Gav Wood
ef0a41c7b3 Merge remote-tracking branch 'origin/master' into dynamic-gas-price 2016-07-08 17:36:21 +02:00
Gav Wood
9afbc9816d Merge branch 'master' into kill_unwraps 2016-07-08 17:31:30 +02:00
Gav Wood
25e6b2b827 Initial implementation of dynamic gas pricer. 2016-07-08 17:26:06 +02:00
Tomasz Drwięga
eef9586c57 Fixing deadlock in miner (#1569)
* Fixing deadlock in miner

* Adding more comments [ci skip]
2016-07-08 17:19:14 +02:00
Robert Habermeier
3b0b1375f2 better error handling, migrate version key as well 2016-07-08 16:45:04 +02:00
Robert Habermeier
aaf9490c91 Merge branch 'master' into accountdb_migration 2016-07-08 16:14:53 +02:00
Robert Habermeier
171e93752c overlay recent v7 migration 2016-07-08 16:07:06 +02:00
Robert Habermeier
fe027e872c added missing licence headers 2016-07-08 15:58:36 +02:00
Robert Habermeier
a160adadaa batch abstraction for migration 2016-07-08 15:37:37 +02:00
Tomasz Drwięga
598ad4d5da Updating node version for appveyor. 2016-07-08 15:25:24 +02:00
Tomasz Drwięga
0467bfc9ed Using parity-ui repository for builds 2016-07-08 13:37:09 +02:00
Robert Habermeier
3e61d6f3f9 migrations mutably borrow self 2016-07-08 13:08:51 +02:00
Gav Wood
57c14eedfa Place ideal peers in the log output. (#1563) 2016-07-07 15:25:58 +02:00
Gav Wood
43d931de12 Minor indent fix. (#1561) 2016-07-07 13:18:09 +02:00
Nikolay Volf
f023d7a17f Merge pull request #1559 from ethcore/client-ipc-tests
Enum variants serialisation test&fix
2016-07-07 14:15:46 +04:00
Gav Wood
d7077c8ef7 Fix build. 2016-07-07 11:28:33 +02:00
NikVolf
b33cb32a11 Merge branch 'master' into client-ipc-tests 2016-07-07 11:16:57 +03:00
NikVolf
3c046556b5 fix test url 2016-07-07 11:14:37 +03:00
NikVolf
326ea59258 enum fix & block query test 2016-07-07 11:07:27 +03:00
Tomasz Drwięga
7af366c5b1 Supporting /api/ping for dapps server (#1543)
* Refactoring dapps to support API endpoints.

* Using ContentHandler for unauthorized requests

* Extracting url stuff

* Adding ping endpoint

* CORS support for ping request

* Fixing url.is_none()

* minor formatting fix

[ci:skip]
2016-07-07 09:42:49 +02:00
Gav Wood
9f43526c88 Merge branch 'master' into kill_unwraps 2016-07-07 09:40:12 +02:00
Nikolay Volf
8282c7dd50 Client IPC Interface (#1493)
* btree map serializer

* serde tests

* state diff serialization

* basic layout

* more missing serializaers

* uncle returns rlp

* block queue info

* sorting with transaction result

* sorting out util imports

* transaction import result sorting also

* sorting filters & ranges

* error sorting out

* deriving ipc service compiling

* rpc & sync recompile

* sorting rpc using uncles

* fix compilation

* fix merging bugs

* fix unused imports

* fix all warnings

* tests stub

* some merge bugs

* ethcore compilation

* fix rpc compilation

* deriving attribute

* tests (and fixes)

* rpc test working

* fix warnings again

* rs.in -> rs

* missing attribute

* refactored tree changes

* paste reformat mess fix

* pub mod actually

* intendation fix
2016-07-07 09:39:32 +02:00
Gav Wood
3b662c285f Switch out .X().unwrap() for .unwrapped_X 2016-07-07 09:37:31 +02:00
NikVolf
1f1b420230 Merge branch 'client-ipc-refact' into client-ipc-tests 2016-07-07 10:00:41 +03:00
Gav Wood
456ad9e21b Remove .lock().unwrap() idiom into locked(). 2016-07-06 19:52:34 +02:00
NikVolf
f06cff48b9 intendation fix 2016-07-06 20:33:20 +03:00
NikVolf
b1ca41dea8 pub mod actually 2016-07-06 20:31:48 +03:00
NikVolf
5dd5983568 paste reformat mess fix 2016-07-06 20:25:42 +03:00
NikVolf
2abf1df667 Merge branch 'master' into client-ipc-refact 2016-07-06 20:20:44 +03:00
Arkadiy Paronyan
d7e225c0af Kill timers when removing IO handler (#1554) 2016-07-06 19:14:53 +02:00
NikVolf
1ac2987437 refactored tree changes 2016-07-06 20:07:24 +03:00
Gav Wood
cd7b046d80 Fix and add info messages (#1552)
* Display information on journal database on startup.

* Minor restyling.

* Client handles the enode message to avoid repeats.

* Avoid unneeded copies *and* reduce code.

* Fix up typo.
2016-07-06 18:28:11 +02:00
Gav Wood
095e51c39c Fix indent of #1541 (#1555) 2016-07-06 17:42:01 +02:00
Nipunn Koorapati
4a9b9dc305 Update sealing just once when externally importing many blocks (#1541)
Fixes Issue #1372
2016-07-06 17:15:59 +02:00
NikVolf
baababea02 missing attribute 2016-07-06 14:49:27 +03:00
NikVolf
b25a37eb38 Merge branch 'master' into client-ipc-refact 2016-07-06 14:43:36 +03:00
Robert Habermeier
f8b56317b4 Merge pull request #1548 from ethcore/remove-soft
Remove soft-fork stuff.
2016-07-06 13:05:43 +02:00
Robert Habermeier
4b93773c4f Merge pull request #1550 from ethcore/fix-warning
fix codegen warning
2016-07-06 12:46:06 +02:00
Robert Habermeier
aaad0e87ae merge with latest master 2016-07-06 12:26:03 +02:00
Robert Habermeier
a7103e2870 different migrations based on pruning 2016-07-06 12:15:03 +02:00
Robert Habermeier
e151fbb071 fix comments and hash address instead of hash 2016-07-06 12:15:03 +02:00