Robert Habermeier
|
d0194f3ad3
|
Merge branch 'master' into lightsync
|
2016-12-23 13:39:06 +01:00 |
|
Robert Habermeier
|
10c56acff6
|
revert tests submodule
|
2016-12-23 13:21:29 +01:00 |
Igor Artamonov
|
be75cbfaaa
|
set CHAIN_ID for Classic (#3934)
* configurable CHAIN_ID
* set CHAIN_ID for Ethereum Classic
|
2016-12-22 13:10:58 +01:00 |
Nikolay Volf
|
af501e6467
|
Custom attribute for binary serialization (#3922)
* derive(Binary) -> binary
* ethcore types refact
* fixup ethcore
* make binary optional
* fix common types
* fix updater
* remove condition
|
2016-12-21 15:09:35 +01:00 |
|
Robert Habermeier
|
01b494ca2c
|
Merge branch 'master' into lightsync
|
2016-12-21 13:42:07 +01:00 |
Gav Wood
|
cd8af0a497
|
Merge pull request #3904 from ethcore/new-dirs
Fixed upgrading keys on the first run
|
2016-12-19 22:24:37 +01:00 |
|
Gav Wood
|
18965be047
|
Merge pull request #3903 from ethcore/test-mem-limit-deadlock
fix deadlock in queue drop
|
2016-12-19 22:23:56 +01:00 |
|
Gav Wood
|
5ba16e4867
|
Merge pull request #3897 from ethcore/single-provider-functions
require only simpler methods on Provider
|
2016-12-19 22:23:39 +01:00 |
|
Robert Habermeier
|
70d53dcfd6
|
Merge branch 'master' into lightsync
|
2016-12-19 18:53:52 +01:00 |
|
Robert Habermeier
|
ae8f77bc7c
|
fix deadlock in queue drop
|
2016-12-19 18:10:26 +01:00 |
arkpar
|
ddb242c969
|
Fixed upgrading keys on the first run
|
2016-12-19 17:41:55 +01:00 |
|
Gav Wood
|
1f8a1cac22
|
Merge pull request #3896 from ethcore/timestamp-ignore
Allow retry for future blocks
|
2016-12-19 15:21:05 +01:00 |
|
Robert Habermeier
|
4c7dc9f2d8
|
require only simpler methods on Provider
|
2016-12-19 14:54:10 +01:00 |
|
arkpar
|
d3486b45c5
|
Allow retry for future blocks
|
2016-12-19 14:47:48 +01:00 |
keorn
|
46662899da
|
make spec naming consistent
|
2016-12-19 14:15:39 +01:00 |
|
Robert Habermeier
|
a48435ca60
|
Merge branch 'master' into lightsync
|
2016-12-19 13:15:37 +01:00 |
|
Robert Habermeier
|
ccdf5d5873
|
increase tick timer and limit peers to one req
|
2016-12-19 12:28:42 +01:00 |
|
Gav Wood
|
e755c09446
|
Merge pull request #3884 from ethcore/fix-diff-adj
Fix difficulty adjustment.
|
2016-12-17 16:35:20 +01:00 |
|
Gav Wood
|
023d413610
|
Fix difficulty adjustment.
Closes #3861
|
2016-12-17 15:53:06 +01:00 |
|
arkpar
|
b34d3ee5a2
|
Fixin racy test
|
2016-12-17 12:28:31 +01:00 |
|
Robert Habermeier
|
2c0f456e4d
|
guard import order
|
2016-12-16 23:53:20 +01:00 |
|
Robert Habermeier
|
a7505be627
|
fix deadlocks
|
2016-12-16 22:09:29 +01:00 |
|
Gav Wood
|
83e6e03dd6
|
Merge pull request #3865 from ethcore/tx-block
Delayed transactions
|
2016-12-16 20:28:18 +01:00 |
|
Robert Habermeier
|
f85313fbff
|
Merge branch 'master' into lightsync
|
2016-12-16 15:29:11 +01:00 |
|
Gav Wood
|
b89d10239b
|
Update tests, gitlabci
|
2016-12-16 15:12:35 +01:00 |
|
arkpar
|
65f07e5aa7
|
Renamed some functions
|
2016-12-16 14:54:26 +01:00 |
|
arkpar
|
6c9de9e6f8
|
Merge branch 'master' of github.com:ethcore/parity into tx-block
|
2016-12-16 13:36:07 +01:00 |
|
arkpar
|
f967713d08
|
Added a test
|
2016-12-16 13:27:14 +01:00 |
|
Gav Wood
|
72f278efed
|
Merge pull request #3868 from ethcore/new-dirs
Base directory option
|
2016-12-16 13:04:31 +01:00 |
|
Gav Wood
|
6e5a583cb4
|
Merge pull request #3505 from ethcore/check-updates
Auto-updating
|
2016-12-16 13:01:49 +01:00 |
|
keorn
|
d8470cc5ca
|
revert slack
|
2016-12-16 00:07:07 +01:00 |
|
Robert Habermeier
|
a1f32de2d9
|
Merge branch 'master' into lightsync
|
2016-12-15 23:55:04 +01:00 |
|
keorn
|
447196398a
|
fix start_step
|
2016-12-15 23:36:06 +01:00 |
|
Gav Wood
|
ca0d87da10
|
125 -> 69.
|
2016-12-15 22:05:54 +01:00 |
|
arkpar
|
e2371632c5
|
Base dir option
|
2016-12-15 21:56:45 +01:00 |
|
Robert Habermeier
|
9c7340307e
|
handle events, minimal state machine
|
2016-12-15 21:51:08 +01:00 |
|
arkpar
|
060cc799a6
|
Minor tweaks
|
2016-12-15 21:44:31 +01:00 |
|
arkpar
|
27580586e0
|
Minor tweaks
|
2016-12-15 20:09:05 +01:00 |
|
keorn
|
b7b531ca75
|
more slack in test
|
2016-12-15 19:54:28 +01:00 |
|
keorn
|
b88d50dc9b
|
fix naming collision
|
2016-12-15 19:27:06 +01:00 |
|
Robert Habermeier
|
72f7391551
|
add BasicContext trait for handler ticking
|
2016-12-15 19:25:52 +01:00 |
|
arkpar
|
f8961484c1
|
Merge branch 'master' of github.com:ethcore/parity into tx-block
|
2016-12-15 19:10:33 +01:00 |
|
Robert Habermeier
|
5346539ef8
|
minimal header import and client service
|
2016-12-15 18:47:26 +01:00 |
|
Gav Wood
|
c12702fc51
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-15 18:23:02 +01:00 |
|
arkpar
|
2952ea1b85
|
Delayed transactions
|
2016-12-15 18:19:19 +01:00 |
|
Gav Wood
|
d455ac4a40
|
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
|
2016-12-15 17:12:18 +01:00 |
|
Gav Wood
|
db2e1dd01a
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-15 17:11:22 +01:00 |
|
Gav Wood
|
2e02db2d3e
|
Merge pull request #3860 from ethcore/fix-channel
Fix flaky test
|
2016-12-15 17:10:41 +01:00 |
|
keorn
|
ee653bc262
|
unused import
|
2016-12-15 16:53:28 +01:00 |
|
keorn
|
9bfa69c6bd
|
fix channel
|
2016-12-15 16:52:39 +01:00 |