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 |
|
Nikolay Volf
|
304173f595
|
preserving root cargo lock
|
2016-02-14 19:35:45 +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 |
|
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 |
|
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 |
|
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 |
|
Gav Wood
|
25e2e382ea
|
Add contributing agreement.
|
2016-02-11 10:34:52 +01:00 |
|
debris
|
b0f2ae147b
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
|
2016-02-11 10:20:15 +01:00 |
|
Nikolay Volf
|
50a6e90e3d
|
Merge pull request #406 from ethcore/net
Fixed block_bodies not returning a list
|
2016-02-11 04:32:19 +03:00 |
|
Arkadiy Paronyan
|
83c4a05d31
|
Merge pull request #405 from ethcore/cliopt
Fix test.
|
2016-02-11 02:08:36 +01:00 |
|
arkpar
|
7bb661e21c
|
Fixed block_bodies not returning a list
|
2016-02-11 02:07:46 +01:00 |
|
Nikolay Volf
|
ebe3990d0d
|
fixing tests and build
|
2016-02-11 03:40:22 +03:00 |
|
Gav Wood
|
5f742c9142
|
Fix test.
|
2016-02-11 00:38:19 +01:00 |
|
Arkadiy Paronyan
|
61c8f7b00b
|
Merge pull request #404 from ethcore/cliopt
Allow path to be configured.
|
2016-02-10 23:55:48 +01:00 |
|
Gav Wood
|
b4faad8469
|
Merge branch 'master' into cliopt
|
2016-02-10 23:51:22 +01:00 |
|
debris
|
e577431051
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
|
2016-02-10 23:06:03 +01:00 |
|
debris
|
4fe86a4419
|
eth_getBlockByNumber
|
2016-02-10 22:54:12 +01:00 |
|
debris
|
93975be5e3
|
transaction by block number and index
|
2016-02-10 22:36:59 +01:00 |
|
debris
|
df0fa06e8a
|
applied client interface changes to sync tests
|
2016-02-10 22:16:25 +01:00 |
|
debris
|
484a4d8bdd
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
|
2016-02-10 21:52:52 +01:00 |
|
Gav Wood
|
3e49c960a0
|
Install both rocksdb deps.
|
2016-02-10 21:31:21 +01:00 |
|
Gav Wood
|
cb09768145
|
Fix deps script again.
|
2016-02-10 21:22:24 +01:00 |
|