Commit Graph

253 Commits

Author SHA1 Message Date
debris
155404bf92 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 08:50:03 +01:00
debris
8db8e5b5f8 unit tests for reset chain head 2016-02-22 08:46:47 +01:00
Gav Wood
6448d073a7 Merge pull request #481 from ethcore/warnings
Squash more warnings
2016-02-20 22:00:08 +01:00
arkpar
8bd052b986 Fixed warnings 2016-02-20 11:54:12 +01:00
Nikolay Volf
84e7ce2758 Merge branch 'master' into temp-path
Conflicts:
	util/Cargo.toml
	util/src/lib.rs
2016-02-19 19:11:24 +03:00
Nikolay Volf
ab0fe65f3f unlisting as dev-dependencies 2016-02-19 18:09:31 +03:00
Nikolay Volf
fed90c126e dev/test tools to separate crate 2016-02-19 17:18:20 +03:00
debris
ec428c070b added trailing , 2016-02-19 14:17:04 +01:00
debris
a760f5263f Merge branch 'jsonrpc2' of github.com:ethcore/parity into jsonrpc2 2016-02-19 14:08:33 +01:00
debris
8113c689fc Merge branch 'master' into jsonrpc2 2016-02-19 14:07:11 +01:00
arkpar
85c842b7fd Restored service test 2016-02-19 13:47:13 +01:00
arkpar
1d60d82698 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:44:57 +01:00
arkpar
d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
debris
ef8055f900 Merge branch 'master' into jsonrpc2 2016-02-19 12:52:16 +01:00
debris
ecde760b42 Merge branch 'master' of github.com:ethcore/parity into rustbeta 2016-02-19 12:40:30 +01:00
debris
b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
Gav Wood
4f6bff1c47 Kill bad test. 2016-02-19 11:39:36 +01:00
Gav Wood
0e10efc727 Update blockchain.rs 2016-02-19 11:33:46 +01:00
arkpar
8fa62130e3 Added TODOs 2016-02-19 00:23:05 +01:00
debris
df3d17789a compiling ethcore on beta 2016-02-19 00:06:06 +01:00
arkpar
af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
Gav Wood
8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Nikolay Volf
beb0da4ff4 and adding actual dependency 2016-02-18 22:56:21 +03:00
Nikolay Volf
8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
debris
80f4f422fc updated heapsizeof 2016-02-18 15:17:26 +01:00
debris
ebe8e19cc0 fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16) 2016-02-18 14:36:59 +01:00
debris
ed880b3b58 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-17 15:59:36 +01:00
debris
046984f7e8 fixed log transaction hashes 2016-02-17 14:57:54 +01:00
debris
49027c529a increase db version 2016-02-17 14:46:23 +01:00
debris
c74c016ce2 moved filter logic from rpc module to ethcore 2016-02-17 14:13:51 +01:00
debris
5826a34ebb storing block receitps in db, client logs method implementation 2016-02-17 12:35:37 +01:00
Nikolay Volf
0b916e0a51 Merge branch 'master' into discovery 2016-02-17 03:21:41 +03:00
Manish Goregaokar
8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
debris
b01652f3e7 LocalizedLogEntry and Filter in ethcore module 2016-02-16 18:21:45 +01:00
arkpar
d95e971030 Prevent deadlocks 2016-02-16 17:53:31 +01:00
debris
7e5e56de40 bloom_filters finally working 2016-02-16 16:54:58 +01:00
debris
d000ad2441 more tests and fixes for blockchains bloom filters 2016-02-16 14:46:21 +01:00
Nikolay Volf
50b6c6d4ad Merge pull request #448 from ethcore/master-upgrade
Master upgrade
2016-02-16 15:06:43 +03:00
debris
0699cdd5d0 tests for blockchain bloomfilters 2016-02-16 11:41:34 +01:00
Nikolay Volf
feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
Marek Kotewicz
cdce3697e0 Merge pull request #446 from ethcore/mordenboot
Add Morden bootnode.
2016-02-16 11:06:16 +01:00
Gav Wood
425350aa65 Add Morden bootnode. 2016-02-16 10:53:28 +01:00
arkpar
fa316c21ae Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 02:31:53 +01:00
arkpar
681350b03d Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 01:36:23 +01:00
arkpar
dbf3691c22 Return nothing on state requests instead of panicing 2016-02-16 01:13:13 +01:00
debris
0a3e8a0fdb more tests for bloomfilter 2016-02-15 21:56:33 +01:00
debris
9e760e9fb8 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 21:39:38 +01:00
debris
6d91852c55 test chainfilter on realdata 2016-02-15 21:32:09 +01:00
Arkadiy Paronyan
482292551b Merge pull request #423 from ethcore/secret-store
Secret store (part1 - key management)
2016-02-15 20:29:54 +01:00
Nikolay Volf
017a1adb24 fixing issues and moving 2016-02-15 18:01:52 +03:00