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 |
|
debris
|
f1b39ee1e5
|
nightly fixes
|
2016-02-14 12:54:27 +01:00 |
|
Marek Kotewicz
|
4cfb7a2eb2
|
Merge pull request #430 from ethcore/delayhomestead
Delay homestead transition
|
2016-02-14 12:21:20 +01:00 |
|
Gav Wood
|
00992069c5
|
Delat Homestead transition.
|
2016-02-14 12:18:26 +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 |
|
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 |
|
Nikolay Volf
|
9ff3155a64
|
clippy, returing docopt
|
2016-02-14 00:58:41 +03: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 |
|
Nikolay Volf
|
91c6b6e2c1
|
coverage fix
|
2016-02-13 01:29:28 +03:00 |
|
Nikolay Volf
|
7fa0fd2440
|
garbage collection
|
2016-02-13 01:12:32 +03:00 |
|
Nikolay Volf
|
19e1f63909
|
issues with loading and more tests
|
2016-02-12 23:27:09 +03:00 |
|