Commit Graph

2170 Commits

Author SHA1 Message Date
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
Nikolay Volf 89c5d9f6f6 tests and serialization fixes 2016-02-12 20:09:24 +03:00
Nikolay Volf f198e53891 documentation effort 2016-02-12 18:39:47 +03: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
Nikolay Volf 1c57214786 constructor rename 2016-02-12 12:52:42 +03: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
Nikolay Volf 6cdc220406 key directory 2016-02-12 01:43:37 +03: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
Nikolay Volf d9b6ab1128 flush 2016-02-11 19:48:47 +03:00
Nikolay Volf 02990290c6 json generation 2016-02-11 18:25:00 +03:00
Nikolay Volf e61376565e parsing tests 2016-02-11 16:17:38 +03: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
Gav Wood 3bfe8bea45 Deps script. 2016-02-11 11:55:49 +01:00
Arkadiy Paronyan 7b47635879 Merge pull request #408 from ethcore/noinitnodes
Option for no init nodes.
2016-02-11 11:15:07 +01:00
Gav Wood 439e99d32b Option for no init nodes. 2016-02-11 10:46:55 +01:00