Commit Graph

165 Commits

Author SHA1 Message Date
Tomusdrw
22e2458ce5 Adding rustfmt_skip and fixing couple of places that have troubles after formatting. 2016-02-16 11:01:04 +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
arkpar
b503fb5de8 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-15 12:57:19 +01:00
Tomusdrw
2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
arkpar
76590d5a82 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-14 17:50:14 +01:00
debris
f1b39ee1e5 nightly fixes 2016-02-14 12:54:27 +01:00
arkpar
f74c5dc921 More sync and propagation fixes 2016-02-12 13:07:02 +01:00
arkpar
62ac80d53f Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 21:10:47 +01:00
arkpar
84732d4b94 Sync fixes 2016-02-11 21:10:41 +01:00
arkpar
0d0441a186 Use latest era instead of end era as journal marker 2016-02-11 13:32:27 +01:00
Gav Wood
0e679fbee5 Revert collecting trie stats. 2016-02-10 18:26:39 +01:00
Gav Wood
637ca97dc6 Synchronous UPnP. 2016-02-10 18:11:10 +01:00
Gav Wood
39d5b68785 Merge branch 'master' of github.com:ethcore/parity 2016-02-10 17:21:07 +01:00
Gav Wood
35374ac09c Start of UPnP. 2016-02-10 16:45:54 +01:00
Tomusdrw
96dda7b73a Forwarding panics from threads 2016-02-10 16:35:52 +01:00
Tomusdrw
7925642b1b Removing overengineered stuff 2016-02-10 15:28:43 +01:00
Tomusdrw
0d121dd51a Removing unecessary locks causing dead-locks 2016-02-10 14:49:31 +01:00
Tomusdrw
6b0cc0c8fa Merge branch 'master' into close_gently
Conflicts:
	parity/main.rs
2016-02-10 13:13:04 +01:00
Tomusdrw
2a498fc3eb Implementing PanicHandlers for all places when new thread is spawned. Handling Client panics 2016-02-10 12:50:27 +01:00
Gav Wood
015aaad2c4 Merge pull request #388 from ethcore/options
--chain option for setting which network to go on.
2016-02-09 16:50:31 +01:00
Tomusdrw
0757ac1493 PanicHandler - work in progress 2016-02-09 16:47:21 +01:00
Gav Wood
8be5340385 Tabs! 2016-02-09 16:19:12 +01:00
Gav Wood
e987a492dc --chain option for setting which network to go on.
Add contents function to util.
2016-02-09 15:51:48 +01:00
debris
fd18be4317 change CLIENT_DB_VER_STR instead of DB_VERSION 2016-02-09 13:21:32 +01:00
debris
e911e64704 db_version 2 2016-02-09 10:19:04 +01:00
debris
bb3ffe5764 Merge branch 'master' of github.com:ethcore/parity into jsonrpc 2016-02-09 10:13:35 +01:00
arkpar
b411a3d55d Check for handshake expiration before attempting replace 2016-02-08 15:03:44 +01:00
debris
90f965cf53 Merge branch 'master' of github.com:ethcore/parity into jsonrpc 2016-02-08 11:59:03 +01:00
debris
b2c083ce56 fixed U256 serialization, tests for transaction serialization 2016-02-08 11:58:47 +01:00
arkpar
0772cb6d42 Panic on missing counters; Client cleanup 2016-02-07 23:07:36 +01:00
arkpar
63f2f42035 Restored trace 2016-02-07 22:16:58 +01:00
arkpar
6c36a7e1a6 Apply all removes after updating all counters 2016-02-07 21:33:24 +01:00
arkpar
28dd73e340 Updated counter comment 2016-02-07 18:28:47 +01:00
arkpar
976b10a4ef Removed warning supression 2016-02-07 18:28:47 +01:00
arkpar
b2f69a08ca Clarified counters 2016-02-07 18:28:47 +01:00
arkpar
f2ed89be46 Fixed an issue with forked counters 2016-02-07 18:28:47 +01:00
Gav Wood
105f4262dd Merge pull request #354 from ethcore/license
License
2016-02-05 14:06:10 +01:00
debris
c90d64662a added license in every *.rs file 2016-02-05 13:40:41 +01:00
debris
bc267f8412 prepare for adding licenses 2016-02-05 13:36:30 +01:00
arkpar
a87edc2557 Style 2016-02-05 02:08:17 +01:00
arkpar
75ebac36a3 Cleanup 2016-02-05 01:49:06 +01:00
arkpar
048c27237a Counters in JournalDB 2016-02-04 21:33:30 +01:00
arkpar
af07852080 Merge branch 'sync' of github.com:ethcore/parity into state 2016-02-04 16:02:03 +01:00
arkpar
6b3390f034 Refactored JournalDB 2016-02-04 02:40:35 +01:00
Nikolay Volf
3f3ebdbfa1 nodes specs 2016-02-03 21:44:49 +03:00
arkpar
b9af3f9260 State copy optimization 2016-02-03 19:34:51 +01:00
Nikolay Volf
ec30a0a591 connection read tests 2016-02-03 21:01:39 +03:00
Nikolay Volf
e154e3e7fa fixed indents 2016-02-03 19:06:16 +03:00
Nikolay Volf
f85b9eb75b Merge branch 'master' into nvolf 2016-02-03 19:00:05 +03:00