Commit Graph

2065 Commits

Author SHA1 Message Date
arkpar
986448ce7a Merge branch 'net' into discovery 2016-02-14 18:27:31 +01:00
arkpar
d496523021 Merge branch 'net' of github.com:ethcore/parity into net 2016-02-14 18:09:11 +01:00
arkpar
8b0ec51c0f Update last imported number on new block 2016-02-14 18:08:30 +01:00
arkpar
76590d5a82 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-14 17:50:14 +01:00
arkpar
debf1ed934 Propagate only one last hash for peers that are too far behind 2016-02-14 17:49:20 +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
arkpar
fc7483ab87 Propagate only one last hash for peers that are too far behind 2016-02-14 17:10:55 +01:00
Nikolay Volf
c50a687213 Merge branch 'master' into net 2016-02-14 17:53:39 +03:00
Nikolay Volf
c1ab00d915 Merge pull request #432 from ethcore/nightly-fix
Nightly fix
2016-02-14 15:53:47 +03:00
debris
9e0cfa1fad ignore transition tests for now, make travis build green again 2016-02-14 13:31:51 +01:00
debris
0502951b1c Merge branch 'master' of github.com:ethcore/parity into nightly-fix 2016-02-14 13:27:39 +01:00
debris
3ffaed9857 fixed util benches on nighly 2016-02-14 13:25:12 +01:00
Gav Wood
ef059911dc Merge pull request #431 from ethcore/nightly-fix
nightly fixes
2016-02-14 13:12:40 +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
Nikolay Volf
398a83971f Merge pull request #429 from ethcore/homesteaddelay
Delay Homestead transition from 1,000,000.
2016-02-14 14:07:41 +03:00
Gav Wood
b821412f72 Delay in test frontier file. 2016-02-14 12:02:44 +01:00
Gav Wood
48f657c031 Delay Homestead transition from 1,000,000. 2016-02-14 12:01: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
Marek Kotewicz
e1cd5186c6 Merge pull request #428 from ethcore/fix-nightly-2
Nightly fix effort (still should fail)
2016-02-14 03:36:17 +01:00
arkpar
2d89708ea8 Reduced thread contention 2016-02-14 02:11:55 +01:00
arkpar
9768fddb19 Homestead block set to 1100000 2016-02-14 01:05:54 +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
2205b80703 trigger build 2016-02-13 18:11:46 +03:00
Marek Kotewicz
254b855963 Merge pull request #425 from ethcore/fix-nightly
clippy version update, docopt-macro moving to fork
2016-02-13 14:17:41 +01:00
debris
3a09b2f226 fixed build 2016-02-13 13:15:46 +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
48924f490b Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-12 15:52:00 +01:00
arkpar
fcd0dafbe4 Fixed random failing test 2016-02-12 15:48:26 +01:00
arkpar
34b465a125 Check for peer registration 2016-02-12 14:20:18 +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
Gav Wood
23d2899e54 Merge pull request #416 from ethcore/net
Network/Sync fixes and optimizations
2016-02-12 09:18:37 +01:00
Gav Wood
3575e6bbc1 Update main.rs 2016-02-12 00:24:10 +01:00
arkpar
01d9ffcd9b Minor fixes 2016-02-11 22:14:06 +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
Gav Wood
0a41dedc05 Merge pull request #414 from ethcore/state
Use latest era instead of end era as journal marker
2016-02-11 18:44:52 +01:00
arkpar
aed348ce8b Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 18:36:45 +01:00
arkpar
f4d8070bda Fixed one extra block/header being requested 2016-02-11 18:36:26 +01:00
Arkadiy Paronyan
6c8f82d865 Merge pull request #402 from ethcore/jsonrpc2
api changes
2016-02-11 18:35:15 +01:00
arkpar
64b15cdbc0 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 14:08:56 +01:00
arkpar
6281d18227 net-key option 2016-02-11 14:08:52 +01:00
arkpar
0d0441a186 Use latest era instead of end era as journal marker 2016-02-11 13:32:27 +01:00
Gav Wood
413502e7f6 Merge branch 'master' of github.com:ethcore/parity 2016-02-11 11:56:09 +01:00