b8c0985e60
merge in fork choice. tests pass
2019-06-24 22:12:55 -06:00
bacd4b1e89
Merge branch 'fork-choice-epoch' into checkpoints
2019-06-24 21:26:28 -06:00
d9b97578c0
lint
2019-06-24 21:23:24 -06:00
751738f411
enhance fork choice testing
2019-06-24 21:01:15 -06:00
0e362d36b1
pr feedback
2019-06-24 17:18:22 -06:00
d54be2b45f
Merge branch 'dev' into fork-choice-epoch
2019-06-24 16:52:31 -06:00
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
bb0a492fea
Cleanups
2019-06-23 11:18:24 +02:00
1e2bb08a74
Cosmetic fix for consistency
2019-06-23 11:09:09 +02:00
2342c787c9
Cleanup
2019-06-22 22:54:07 +02:00
98692bf9d6
Fix ToC
2019-06-22 22:52:37 +02:00
e6e90c7736
Minor reorg
2019-06-22 22:51:04 +02:00
181a2a876a
Cleanups
2019-06-22 22:49:53 +02:00
8a732fbbcf
pass on checkpoints working in testing
2019-06-22 12:00:26 -06:00
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
c86108de00
Merge pull request #1207 from ethereum/fix_make_lint
...
Fix `make lint`
2019-06-22 17:07:00 +02:00
1e1a3e5311
Avoid substraction in comparison
2019-06-22 07:34:02 +02:00
613380bff4
Shorter in-line comments
2019-06-22 07:29:25 +02:00
183fa3c776
Make linter happy
2019-06-21 23:09:11 -06:00
de5b9cc823
convert _root/_epoch tuples to Checkpoint obj in beacon spec
2019-06-21 16:33:43 -06:00
f55499c0ba
Fix Gwei value table ( #1203 )
2019-06-21 14:30:22 -06:00
1b66a1a2bd
rework forkchoice to use Checkpoints
2019-06-21 12:55:55 -06:00
74eeb87936
Merge branch 'dev' into fork-choice-epoch
2019-06-21 11:43:01 -06:00
acbccbc2a8
minor typo
2019-06-21 11:18:24 -06:00
b46e047baa
Minor simplification from #1198
2019-06-21 12:57:30 +01:00
0e59c6676a
Stop yielding from fork-choie tests
2019-06-21 13:00:42 +02:00
f90469ea25
Move block timing assertion 1st
2019-06-21 12:19:08 +02:00
e88a96c45e
Apply suggestions from @drjtwo's code review
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-21 12:13:22 +02:00
fb9a5f0bc5
one more rootslot fix
2019-06-20 14:57:53 -06:00
c5143ccefa
modify fork choice to utilize epochs as first class citizens
2019-06-20 14:48:10 -06:00
c26fffc154
Moves copy into SSZ container
2019-06-20 20:55:28 +02:00
5f8edd6b55
Genesis block store uses genesis time
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-06-20 20:50:17 +02:00
d73aa31ef6
Cleanups
2019-06-20 11:58:05 +01:00
e0d814df32
Merge branch 'dev' into executable_fork_choice
...
* dev:
Increase historical length and cleanups (#1196 )
2019-06-19 22:43:14 +02:00
29dbe1b880
Increase historical length and cleanups ( #1196 )
...
* increase historical length and a few cleanups
2019-06-19 20:59:44 +01:00
3418c3506f
Merge dev and resolve conflicts (please let the CI tests pass with the new dev)
2019-06-19 20:27:54 +02:00
61a51417ed
Unbreak things again
2019-06-18 23:00:30 +02:00
060041945c
remove unnecessary cast
2019-06-18 22:00:22 +02:00
346e61dfeb
make epoch pattern similar to exit-epoch loop
2019-06-18 21:59:16 +02:00
7a71919c53
Test removing all the Bytes objects
2019-06-18 21:55:41 +02:00
d804cb307b
Removes defaults from Store to try get CI to pass
2019-06-18 21:50:40 +02:00
3bcddf5e49
Removes defaults from Store to try get CI to pass
2019-06-18 20:59:17 +02:00
dd79a0edb5
Merge branch 'dev' into mypy
2019-06-18 08:24:23 -06:00
28a3e54db0
Actually resolve some merge conflicts
2019-06-18 15:13:04 +02:00
31a4700223
Merge conflicts on `dev`
2019-06-17 22:09:43 -04:00
02954e84fe
Merge branch 'dev' into JustinDrake-patch-14
2019-06-17 16:33:59 -06:00
e80d363eed
Merge pull request #1157 from ethereum/JustinDrake-patch-13
...
Set MIN_ATTESTATION_INCLUSION_DELAY to 1
2019-06-17 16:29:55 -06:00
7298b3e290
Merge pull request #1191 from ethereum/constats-config
...
split constants vs configuration
2019-06-17 16:18:34 -06:00
89d9d80b1c
move BASE_REWARDS_PER_EPOCH to constants
2019-06-17 16:12:47 -06:00
01e9f18713
Merge branch 'dev' into mypy
2019-06-17 17:51:46 -04:00
Danny Ryan
Alex Stokes
Justin
Diederik Loerakker
Hsiao-Wei Wang
Carl Beekhuizen