Commit Graph

186 Commits

Author SHA1 Message Date
Gav Wood 8747fe2dc9 Merge pull request #449 from ethcore/secret-store-enc
Secret store (part2 - encrypted key/value svc)
2016-02-19 13:30:45 +01:00
Gav Wood d43b23d663 Update directory.rs 2016-02-19 13:30:36 +01:00
Nikolay Volf 63c5a2e58f copy instead of ref-map 2016-02-19 14:52:29 +03:00
Nikolay Volf 25bae2897b [ci skip] merging master 2016-02-19 14:25:51 +03:00
debris f50bf528e6 fixed allow warnings in util 2016-02-19 11:57:52 +01:00
Gav Wood a4846e4aad Update bytes.rs 2016-02-19 11:31:40 +01:00
debris 8831e73d98 ignore panic forwarding tests 2016-02-19 11:05:39 +01:00
debris bef6d5f2a1 fixed insecure rlp uint conversion, and failing json tests 2016-02-19 10:51:35 +01:00
arkpar af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
Nikolay Volf fffd93607d just in case check 2016-02-17 23:38:16 +03:00
Nikolay Volf 95c74dbd30 more func 2016-02-17 23:34:55 +03:00
Nikolay Volf aad49cb19f more functional 2016-02-17 23:25:25 +03:00
Nikolay Volf ca99679d1d fixed test names 2016-02-17 11:57:13 +03:00
Nikolay Volf 14b02ff26f tests and fixes 2016-02-17 11:48:12 +03:00
Nikolay Volf d63f13245f doc typo 2016-02-17 03:17:02 +03:00
Nikolay Volf 4a028f5faf cleanup asserts 2016-02-17 02:49:13 +03:00
Nikolay Volf 63f6ab4e6d resolved with bytes-encodable issue 2016-02-17 02:32:16 +03:00
Manish Goregaokar 8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
Nikolay Volf 9895f00e5e warnings, docs, and finding bugs 2016-02-16 20:52:36 +03:00
Nikolay Volf a649d6f131 first vector up 2016-02-16 19:19:32 +03:00
Nikolay Volf 26e992ad2e encrypting any bytes covertible now via hashmap 2016-02-16 11:30:22 +03:00
Nikolay Volf 734652d913 work in progress 2016-02-16 00:56:25 +03: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