Commit Graph

2111 Commits

Author SHA1 Message Date
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
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
ac0ca94230 Merge branch 'master' into secret-store-enc 2016-02-16 17:02:08 +03:00
Nikolay Volf
50b6c6d4ad Merge pull request #448 from ethcore/master-upgrade
Master upgrade
2016-02-16 15:06:43 +03:00
Nikolay Volf
feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
Nikolay Volf
6bafb34586 Merge pull request #447 from ethcore/rmcontrib
Remove contributing stuff now that we have CLA bot.
2016-02-16 13:20:18 +03:00
Nikolay Volf
b7c5b0a3c1 script for full test suite 2016-02-16 13:12:29 +03:00
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
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
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
Nikolay Volf
31762095b7 Merge branch 'master' into secret-store 2016-02-15 17:19:04 +03: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
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
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
Nikolay Volf
304173f595 preserving root cargo lock 2016-02-14 19:35:45 +03:00
Nikolay Volf
3389606c7b crypto section fails checks 2016-02-14 19:09:36 +03:00
Nikolay Volf
75383199d6 kdf params error checking 2016-02-14 18:22:42 +03:00
Nikolay Volf
c50a687213 Merge branch 'master' into net 2016-02-14 17:53:39 +03:00
Nikolay Volf
ae5ec6bad9 Merge branch 'master' into secret-store 2016-02-14 16:01:29 +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