Danny Ryan
|
23c9b8b2d1
|
Merge branch 'dev-master-conflicts' into finality-testing
|
2019-04-23 12:46:52 -06:00 |
|
Danny Ryan
|
d97447272f
|
Merge branch 'master' into dev-master-conflicts
|
2019-04-23 12:43:00 -06:00 |
Carl Beekhuizen
|
fe01b6f231
|
Merges dev into carl-patch-1
|
2019-04-23 13:39:19 +02:00 |
|
Danny Ryan
|
e13cec1466
|
increase MAX_TRANSFERS for transfer test
|
2019-04-22 10:02:31 -06:00 |
|
Danny Ryan
|
0079c635b6
|
Merge pull request #924 from ethereum/JustinDrake-patch-11
Remove serialization from consensus
|
2019-04-22 09:41:30 -06:00 |
Justin
|
39d0822602
|
Sane SSZ object default values (#963)
|
2019-04-19 18:26:54 +10:00 |
Hsiao-Wei Wang
|
408ef7e6eb
|
Merge branch 'dev' into carl-patch-1
|
2019-04-19 14:50:48 +08:00 |
|
Danny Ryan
|
523800819b
|
Merge branch 'dev' into vbuterin-patch-2
|
2019-04-18 21:17:29 -06:00 |
|
Danny Ryan
|
9f4e59b0bc
|
enhance finality testing -- case 1, 2, 4
|
2019-04-18 18:33:06 -06:00 |
|
Carl Beekhuizen
|
26afa077fd
|
Resolves conflicts and merges in dev
|
2019-04-18 23:17:53 +02:00 |
|
Danny Ryan
|
faa6a46f15
|
Merge branch 'dev' into JustinDrake-patch-11
|
2019-04-18 11:45:45 -06:00 |
|
Carl Beekhuizen
|
cb5c95b84e
|
Fixes tests
|
2019-04-18 12:35:22 +02:00 |
|
Justin
|
6975288254
|
Merge branch 'dev' into carl-patch-1
|
2019-04-18 17:52:56 +10:00 |
|
Danny Ryan
|
8c5f7a571d
|
Merge branch 'dev' into prev-cur-crosslinks
|
2019-04-17 20:27:25 -06:00 |
|
Danny Ryan
|
d118eb03c9
|
Merge branch 'dev' into carl-patch-1
|
2019-04-17 11:18:29 -06:00 |
|
Danny Ryan
|
2cb8f1c520
|
Merge branch 'dev' into start-at-zero
|
2019-04-17 08:39:25 -06:00 |
|
Danny Ryan
|
ef14396532
|
Merge branch 'dev' into prev-cur-crosslinks
|
2019-04-17 08:33:13 -06:00 |
protolambda
|
90cf8738bf
|
Move pytests for faster dev iteration
|
2019-04-17 17:47:56 +10:00 |