Commit Graph

404 Commits

Author SHA1 Message Date
Nikolay Volf
61a3e687f5 store extra interface 2016-02-22 20:08:16 +03:00
Gav Wood
5917290562 Remove unneeded code, fix minor potential issue with length. 2016-02-22 13:59:25 +01:00
arkpar
764f6e9347 Merge branch 'db' of github.com:ethcore/parity into db 2016-02-22 13:48:43 +01:00
arkpar
077c5662a8 Fixed a warning 2016-02-22 13:47:25 +01:00
arkpar
61949d0ed4 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-22 13:44:25 +01:00
debris
5e27e1b9aa Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 11:08:51 +01:00
Gav Wood
e63aba73c5 Remove "unknown" from version string. 2016-02-22 09:04:44 +01:00
debris
155404bf92 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 08:50:03 +01:00
Gav Wood
fbee46d69d Fix netstats. 2016-02-21 21:45:56 +01:00
Nikolay Volf
a8f4d24dad Merge branch 'master' into geth-import 2016-02-21 23:44:52 +03:00
Nikolay Volf
8bc0b7c77c import pub 2016-02-21 23:44:12 +03:00
Nikolay Volf
5b05cbb128 extended keys with accont meta 2016-02-21 23:23:46 +03:00
Gav Wood
0c832853b6 Avoid the dep = "*" 2016-02-21 21:22:11 +01:00
Gav Wood
ea187253a2 Include git commit date & hash. 2016-02-21 21:14:09 +01:00
Gav Wood
63bbd0ccd8 Use proper version string. 2016-02-21 20:00:45 +01:00
Gav Wood
75129613c5 Merge pull request #480 from ethcore/network
Networking fixes
2016-02-21 18:57:10 +01:00
arkpar
67cd29f4e1 Whitespaces 2016-02-21 16:58:56 +01:00
arkpar
91276ad82e Added comments 2016-02-21 16:52:25 +01:00
arkpar
fe84eb4ff6 Fix locking 2016-02-21 14:04:10 +01:00
Nikolay Volf
bcc4ca48ab to new namespace 2016-02-21 15:19:08 +03:00
Nikolay Volf
a6316b1e20 Merge branch 'master' into db 2016-02-21 15:05:36 +03:00
arkpar
93d259e8cb Merge branch 'master' of github.com:ethcore/parity into network 2016-02-21 00:11:32 +01:00
Gav Wood
6448d073a7 Merge pull request #481 from ethcore/warnings
Squash more warnings
2016-02-20 22:00:08 +01:00
Gav Wood
26ad918e03 Merge pull request #477 from ethcore/temp-path
dev/test/build tools to separate crate
2016-02-20 21:59:59 +01:00
arkpar
7bc2853de9 Removed TODO 2016-02-20 15:14:54 +01:00
arkpar
8bd052b986 Fixed warnings 2016-02-20 11:54:12 +01:00
arkpar
b1bfd00875 Zombie connections 2016-02-20 11:47:39 +01:00
arkpar
69df91de68 Deregister handshake properly when converting to session 2016-02-20 01:36:08 +01:00
arkpar
00f2c6e3e4 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-20 00:48:36 +01:00
arkpar
5572d1792d Back to original slab crate 2016-02-19 18:43:55 +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
arkpar
ab233a941f Slightly improved tests 2016-02-19 16:34:31 +01: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
arkpar
beab90c707 Added is_valid_node_url 2016-02-19 14:13:20 +01:00
debris
8113c689fc Merge branch 'master' into jsonrpc2 2016-02-19 14:07:11 +01:00
arkpar
f15275bb5b Merge branch 'master' of github.com:ethcore/parity into db 2016-02-19 13:52:07 +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
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
debris
ef8055f900 Merge branch 'master' into jsonrpc2 2016-02-19 12:52:16 +01: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
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
arkpar
68795ea031 Fixed typos 2016-02-18 21:40:17 +01:00
arkpar
99600ba370 DB Test 2016-02-18 21:15:56 +01:00
Gav Wood
8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Nikolay Volf
8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
Nikolay Volf
198119466b forking heapsize 2016-02-18 19:21:24 +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
arkpar
e99f604133 rocksdb abstraction layer 2016-02-18 03:46:34 +01:00
arkpar
68d606b5f0 rocksdb abstraction layer 2016-02-18 03:46:24 +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
debris
ed880b3b58 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-17 15:59:36 +01:00
arkpar
0cfc4cbb34 More tests 2016-02-17 14:07:26 +01:00
arkpar
c9f3f5e544 Tweaked connection limits to be a bit more aggressive 2016-02-17 14:07:11 +01:00
arkpar
eef193e8bd Don't add useless peers to table 2016-02-17 14:06:19 +01: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
arkpar
e4baf37bf8 Fixed adding boot nodes to discovery table; Ping optimization 2016-02-17 02:55:46 +01:00
arkpar
a179722542 Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-17 01:39:27 +01:00
arkpar
39a98cd555 Prevent connection deletion until unregister is called; minor tweaks 2016-02-17 01:39:16 +01:00
Nikolay Volf
0b916e0a51 Merge branch 'master' into discovery 2016-02-17 03:21:41 +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
arkpar
b6ccbdb694 Lower max handshakes to reduce network load 2016-02-16 23:37:24 +01:00
arkpar
7e0dfb41d0 Minor test tweaks and code cleanup 2016-02-16 23:33:32 +01:00
Manish Goregaokar
8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
arkpar
fbe06d3f2f More tests 2016-02-16 21:25:01 +01:00
arkpar
217cbec50e Disconnect test 2016-02-16 19:08:58 +01:00
Nikolay Volf
9895f00e5e warnings, docs, and finding bugs 2016-02-16 20:52:36 +03:00
arkpar
f4fa747cd0 ip_utils tests 2016-02-16 17:55:37 +01:00
arkpar
a4ea0737b2 Fixed some tests 2016-02-16 17:54:34 +01:00
arkpar
d95e971030 Prevent deadlocks 2016-02-16 17:53:31 +01:00
Nikolay Volf
a649d6f131 first vector up 2016-02-16 19:19:32 +03:00
Nikolay Volf
ac0ca94230 Merge branch 'master' into secret-store-enc 2016-02-16 17:02:08 +03:00
Nikolay Volf
feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
Nikolay Volf
26e992ad2e encrypting any bytes covertible now via hashmap 2016-02-16 11:30:22 +03:00
arkpar
33e8d749d2 Max handhsakes reached is now a debug warning 2016-02-16 03:05:05 +01:00
arkpar
fa316c21ae Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 02:31:53 +01:00
arkpar
58fdfe77d3 Handle pinning and enable_discovery options 2016-02-16 02:31:17 +01:00
arkpar
f771306867 Get public address/UPNP refactoring 2016-02-16 02:05:45 +01:00
arkpar
203947388b Get public address/UPNP refactoring 2016-02-16 02:05:36 +01:00
arkpar
681350b03d Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 01:36:23 +01:00
arkpar
fb0b5b2e5b Raise fd limit in linux 2016-02-16 00:22:44 +01:00
Nikolay Volf
734652d913 work in progress 2016-02-16 00:56:25 +03:00
arkpar
64913d5009 Additional address filter 2016-02-15 21:43:30 +01:00
debris
9e760e9fb8 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 21:39:38 +01:00
arkpar
0bef355494 Removed temp test code 2016-02-15 20:34:05 +01:00
arkpar
a2c0508792 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-15 20:30:08 +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
arkpar
01a83e6031 Populate discovery from node table 2016-02-15 20:28:27 +01:00
arkpar
4b9c7f7517 Add incoming connection to node table 2016-02-15 19:54:27 +01:00
arkpar
0e1e80477a Save key to a file 2016-02-15 18:36:34 +01:00
Nikolay Volf
017a1adb24 fixing issues and moving 2016-02-15 18:01:52 +03:00
arkpar
4d40991c1a Discovery test 2016-02-15 16:01:45 +01:00
debris
fb4901cbcf Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 15:22:43 +01:00
arkpar
cf45d5914a Node table tests 2016-02-15 14:39:56 +01:00
arkpar
b503fb5de8 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-15 12:57:19 +01:00
arkpar
ba95260113 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-15 11:56:36 +01:00
arkpar
186c7585d2 Node table persistency 2016-02-15 11:54:38 +01:00
debris
4c474d8d91 Merge branch 'master' into jsonrpc2 2016-02-15 10:53:01 +01:00
Tomusdrw
2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
arkpar
986448ce7a Merge branch 'net' into discovery 2016-02-14 18:27:31 +01:00
arkpar
76590d5a82 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-14 17:50:14 +01:00
arkpar
38f4a06f1d Fixed panic on accessing expired node 2016-02-14 17:45:00 +01:00
arkpar
61c52f15a3 Fixed panic on accessing expired node 2016-02-14 17:42:03 +01:00
debris
3ffaed9857 fixed util benches on nighly 2016-02-14 13:25:12 +01:00
debris
f1b39ee1e5 nightly fixes 2016-02-14 12:54:27 +01:00
arkpar
dee375bfac Handle session creation error 2016-02-14 12:11:18 +01:00
arkpar
7503d6695a Fixed panic on session creation 2016-02-14 11:54:08 +01:00
arkpar
718646f943 Refactored host to use different containers for handshakes and sessions 2016-02-14 11:34:59 +01:00
debris
2748e770e4 Merge branch 'master' into jsonrpc2 2016-02-14 11:13:22 +01:00
arkpar
2d89708ea8 Reduced thread contention 2016-02-14 02:11:55 +01:00
arkpar
76ea030b78 Small refactoring 2016-02-14 01:03:48 +01:00
Nikolay Volf
9ff3155a64 clippy, returing docopt 2016-02-14 00:58:41 +03:00
arkpar
62b9f4b91d UDP discovery working 2016-02-13 22:57:39 +01:00
Nikolay Volf
84c752583a clippy version update, docopt-macro moving to fork 2016-02-13 13:17:16 +03:00
arkpar
2af379d4b1 Merge branch 'net' of github.com:ethcore/parity into discovery 2016-02-12 15:52:11 +01:00
arkpar
f74c5dc921 More sync and propagation fixes 2016-02-12 13:07:02 +01:00
arkpar
09b6503795 Discovery packets 2016-02-12 09:52:32 +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
debris
2cf0f1b5f3 moved chainfilter from util to ethcore, blockchain stores block blooms 2016-02-11 14:35:03 +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