Marek Kotewicz
|
cdce3697e0
|
Merge pull request #446 from ethcore/mordenboot
Add Morden bootnode.
|
2016-02-16 11:06:16 +01:00 |
|
Gav Wood
|
672518ba36
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-02-16 11:01:12 +01:00 |
|
Gav Wood
|
714f01fda7
|
Remove contributing stuff now that we have CLA bot.
|
2016-02-16 11:00:38 +01:00 |
|
Gav Wood
|
425350aa65
|
Add Morden bootnode.
|
2016-02-16 10:53:28 +01:00 |
|
Nikolay Volf
|
26e992ad2e
|
encrypting any bytes covertible now via hashmap
|
2016-02-16 11:30:22 +03:00 |
|
Nikolay Volf
|
67058123ba
|
Merge branch 'master' into secret-store-enc
|
2016-02-16 09:17:28 +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
|
c5ca293d72
|
Merge branch 'master' of github.com:ethcore/parity into discovery
|
2016-02-16 02:31:31 +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
|
dbf3691c22
|
Return nothing on state requests instead of panicing
|
2016-02-16 01:13:13 +01:00 |
|
arkpar
|
fb0b5b2e5b
|
Raise fd limit in linux
|
2016-02-16 00:22:44 +01:00 |
|
Arkadiy Paronyan
|
dc6790915e
|
Merge pull request #441 from ethcore/beta-backmerge
beta fixes to master
|
2016-02-16 00:08:41 +01:00 |
|
Nikolay Volf
|
6bbe551ce8
|
returing beta dot-tags
|
2016-02-16 01:39:58 +03:00 |
|
Nikolay Volf
|
29980d3e96
|
travis fix
|
2016-02-16 01:07:39 +03:00 |
|
Nikolay Volf
|
453d880999
|
resolving frontier conflicts
|
2016-02-16 01:01:03 +03: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 |
|
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 |
|
arkpar
|
30968925ee
|
Merge branch 'master' of github.com:ethcore/parity into discovery
|
2016-02-15 16:03: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 |
|
Nikolay Volf
|
31762095b7
|
Merge branch 'master' into secret-store
|
2016-02-15 17:19:04 +03:00 |
|
arkpar
|
cf45d5914a
|
Node table tests
|
2016-02-15 14:39:56 +01:00 |
|
Marek Kotewicz
|
e1fe4a3871
|
Merge pull request #438 from ethcore/currecttransition
Use 1100000 as the homestead transition, fix build instructions.
|
2016-02-15 14:21:48 +01:00 |
|
Gav Wood
|
75197f4586
|
Update keys_directory.rs
|
2016-02-15 14:21:45 +01:00 |
|
Gav Wood
|
9f03640a06
|
Merge pull request #420 from ethcore/net
More sync and propagation fixes
|
2016-02-15 14:06:36 +01:00 |
|
Gav Wood
|
38a568e426
|
Use 1100000 as the homestead transition, fix build instructions.
|
2016-02-15 13:49:44 +01:00 |
|
arkpar
|
f141e69671
|
Added test for restart on malformed block
|
2016-02-15 13:34:58 +01:00 |
|
arkpar
|
b503fb5de8
|
Merge branch 'master' of github.com:ethcore/parity into net
|
2016-02-15 12:57:19 +01:00 |
|
Marek Kotewicz
|
e7864c301c
|
Merge pull request #436 from ethcore/cargo_packages
back to cargo crates
|
2016-02-15 11:58:02 +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 |
|
Marek Kotewicz
|
d62d78a0fc
|
Merge pull request #435 from ethcore/clippy_warnings
Fixing clippy warnings
|
2016-02-15 10:48:47 +01:00 |
|
debris
|
874dcdd840
|
back to cargo crates
|
2016-02-15 10:47:56 +01:00 |
|
Tomusdrw
|
2c4700f4c1
|
Fixing clippy warnings
|
2016-02-15 00:55:45 +01:00 |
|
Gav Wood
|
5b6e47c56f
|
Merge pull request #434 from ethcore/cargo-lock
preserving root cargo lock
|
2016-02-14 20:26:41 +01:00 |
|
Nikolay Volf
|
3c82e4865d
|
ignore updates
|
2016-02-14 20:49:36 +03:00 |
|
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 |
|