Commit Graph

3080 Commits

Author SHA1 Message Date
Danny Ryan 0827fbd7d5
Merge branch 'fork-choice-epoch' into checkpoints 2019-06-25 15:00:04 -06:00
Danny Ryan c64289677f
fix gethead tests 2019-06-25 14:47:46 -06:00
Danny Ryan 228195d89d
get head tests 2019-06-25 11:48:55 -06:00
Danny Ryan ac06362716
Merge branch 'fork-choice-epoch' into checkpoints 2019-06-25 10:37:04 -06:00
Danny Ryan 846ca649aa
properly construct genesis latest block header in tests 2019-06-25 10:36:11 -06:00
Danny Ryan b8c0985e60
merge in fork choice. tests pass 2019-06-24 22:12:55 -06:00
Danny Ryan bacd4b1e89
Merge branch 'fork-choice-epoch' into checkpoints 2019-06-24 21:26:28 -06:00
Danny Ryan d9b97578c0
lint 2019-06-24 21:23:24 -06:00
Danny Ryan 751738f411
enhance fork choice testing 2019-06-24 21:01:15 -06:00
Danny Ryan 0e362d36b1
pr feedback 2019-06-24 17:18:22 -06:00
Danny Ryan d54be2b45f
Merge branch 'dev' into fork-choice-epoch 2019-06-24 16:52:31 -06:00
Danny Ryan b5581983f3
Merge pull request #1213 from ethereum/ralexstokes-patch-2
Clarify comment on phase 0 transfers
2019-06-24 16:43:50 -06:00
Alex Stokes 82167ff0a3
Clarify comment on phase 0 transfers
The comment seems to imply conjunction over each case, but the code implies disjunction; at the very least it is ambiguous.

This PR makes the comment less ambiguous.
2019-06-24 15:40:37 -07:00
Justin bb0a492fea
Cleanups 2019-06-23 11:18:24 +02:00
Justin 1e2bb08a74
Cosmetic fix for consistency 2019-06-23 11:09:09 +02:00
Justin Drake 2342c787c9 Cleanup 2019-06-22 22:54:07 +02:00
Justin Drake 98692bf9d6 Fix ToC 2019-06-22 22:52:37 +02:00
Justin Drake e6e90c7736 Minor reorg 2019-06-22 22:51:04 +02:00
Justin Drake 181a2a876a Cleanups 2019-06-22 22:49:53 +02:00
Danny Ryan 8a732fbbcf
pass on checkpoints working in testing 2019-06-22 12:00:26 -06:00
Diederik Loerakker b007d5aa92 Add note on default zero-values, and be explicit with state-root (#1208)
* Add note on default zero-values, and be explicit with state-root
2019-06-22 17:38:30 +02:00
Diederik Loerakker c86108de00
Merge pull request #1207 from ethereum/fix_make_lint
Fix `make lint`
2019-06-22 17:07:00 +02:00
Justin Drake 1e1a3e5311 Avoid substraction in comparison 2019-06-22 07:34:02 +02:00
Justin Drake 613380bff4 Shorter in-line comments 2019-06-22 07:29:25 +02:00
Hsiao-Wei Wang 183fa3c776
Make linter happy 2019-06-21 23:09:11 -06:00
Hsiao-Wei Wang 99df7da94a
Add `&&` between the commands 2019-06-21 22:53:02 -06:00
Danny Ryan de5b9cc823
convert _root/_epoch tuples to Checkpoint obj in beacon spec 2019-06-21 16:33:43 -06:00
Diederik Loerakker 65bcb8884f
Merge pull request #1204 from ethereum/minimal_max-epochs-per-crosslink
reduce MAX_EPOCHS_PER_CROSSLINK in minimal config
2019-06-21 23:42:11 +02:00
Danny Ryan e15a649f37
reduce MAX_EPOCHS_PER_CROSSLINK in minimal config for testing purposes 2019-06-21 15:34:36 -06:00
Hsiao-Wei Wang f55499c0ba Fix Gwei value table (#1203) 2019-06-21 14:30:22 -06:00
Danny Ryan f12c32a690
Xdist tests for parallelism (#1201)
* add xdist parallelization

* reduce circleci cpus to 8

* reduce cpus to 4

* reduce circleci cpus to 2

* circleci back to 4 cpus
2019-06-21 14:18:28 -06:00
Danny Ryan 1b66a1a2bd
rework forkchoice to use Checkpoints 2019-06-21 12:55:55 -06:00
Danny Ryan 74eeb87936
Merge branch 'dev' into fork-choice-epoch 2019-06-21 11:43:01 -06:00
Danny Ryan 0031eaa96a
Merge pull request #1185 from ethereum/executable_fork_choice
Executable fork choice
2019-06-21 11:27:31 -06:00
Danny Ryan acbccbc2a8
minor typo 2019-06-21 11:18:24 -06:00
Justin Drake b46e047baa Minor simplification from #1198 2019-06-21 12:57:30 +01:00
Carl Beekhuizen 0e59c6676a
Stop yielding from fork-choie tests 2019-06-21 13:00:42 +02:00
Carl Beekhuizen f90469ea25
Move block timing assertion 1st 2019-06-21 12:19:08 +02:00
Carl Beekhuizen e88a96c45e
Apply suggestions from @drjtwo's code review
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-21 12:13:22 +02:00
Danny Ryan fb9a5f0bc5
one more rootslot fix 2019-06-20 14:57:53 -06:00
Danny Ryan c5143ccefa
modify fork choice to utilize epochs as first class citizens 2019-06-20 14:48:10 -06:00
Carl Beekhuizen c26fffc154
Moves copy into SSZ container 2019-06-20 20:55:28 +02:00
Carl Beekhuizen 5f8edd6b55
Genesis block store uses genesis time
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-06-20 20:50:17 +02:00
Justin Drake d73aa31ef6 Cleanups 2019-06-20 11:58:05 +01:00
Carl Beekhuizen e0d814df32
Merge branch 'dev' into executable_fork_choice
* dev:
  Increase historical length and cleanups (#1196)
2019-06-19 22:43:14 +02:00
Carl Beekhuizen 241fe34da7
Workaround for python3.6 2019-06-19 22:37:51 +02:00
Danny Ryan 29dbe1b880 Increase historical length and cleanups (#1196)
* increase historical length and a few cleanups
2019-06-19 20:59:44 +01:00
Carl Beekhuizen 3418c3506f
Merge dev and resolve conflicts (please let the CI tests pass with the new dev) 2019-06-19 20:27:54 +02:00
Carl Beekhuizen 61a51417ed
Unbreak things again 2019-06-18 23:00:30 +02:00
Hsiao-Wei Wang 04c7c43874
kick deposit contract cache 2019-06-18 14:36:49 -06:00