status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,681 Commits 49 Branches 0 Tags 29 MiB
Commit Graph

2614 Commits

Author SHA1 Message Date
Hsiao-Wei Wang d0009b0980
Pass `genesis_eth1_block_hash` instead of `genesis_eth1_data` 2019-06-30 01:12:25 +08:00
Danny Ryan bc8df3cba3
minor typo 
Co-Authored-By: Alex Stokes <r.alex.stokes@gmail.com>
 2019-06-29 12:04:56 -05:00
Justin Drake f0a8e39243 WIP 2019-06-29 17:29:21 +01:00
Hsiao-Wei Wang 7fdf59d012
`active_validator_count >= GENESIS_ACTIVE_VALIDATOR_COUNT`: per Eth1 block 2019-06-29 18:09:05 +08:00
protolambda 4f31207b7f
reword merkleize with limit / length 2019-06-28 22:45:20 +02:00
Dankrad Feist 6a2d2c84a8
Bitlist for attestation doc 2019-06-28 20:49:57 +01:00
dankrad fa84c49659
Update specs/core/0_beacon-chain.md 
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
 2019-06-28 20:23:34 +01:00
Hsiao-Wei Wang cb2bfd67dc
Apply Proto's feedback of list(map(...)) 2019-06-29 02:27:48 +08:00
Hsiao-Wei Wang 4dc526fbb7
In the end, `get_merkle_root` is back 2019-06-29 02:16:49 +08:00
Danny Ryan b88ab250fa
Merge branch 'dev' into committee-roots 2019-06-28 12:07:50 -06:00
Danny Ryan 9993a28796
lint 2019-06-28 11:26:05 -06:00
Danny Ryan b40e2284a0
use active index root for generate seed mix in 2019-06-28 11:20:24 -06:00
Danny Ryan 5a8f3e495a
set committees root for next epoch rather tahn ACTIVaTION_EXIT_DELAY in the future 2019-06-28 11:10:17 -06:00
protolambda 5f0e58364f
resolved merge conflicts, take attesters seq->set change from dev, take bits rework from bitlistvector PR 2019-06-28 18:17:13 +02:00
protolambda 25db397550
fix line length lint problem in checkpoint 2019-06-28 17:34:31 +02:00
protolambda 128bbbc665
fix slicing, and support partial slice bounds 2019-06-28 17:27:59 +02:00
Danny Ryan dcb0244a4f get_attesting_indices set instead of sorted (#1225) 2019-06-28 16:19:59 +01:00
protolambda 5ff13dd81a
be explicit about limiting for HTR and chunk padding 2019-06-28 17:07:36 +02:00
Justin 05842f8371
Update 0_beacon-chain.md 2019-06-28 15:26:02 +01:00
Justin 2739767a71
Hardened Eth 1.0 voting strategy (#1218) 2019-06-28 14:43:44 +01:00
vbuterin c764202a57 Slashing penalty calculation change (#1217) 
If the exit queue is very long, then a validator may take many months to exit. With the code as currently written, however, self-slashing is a potentially lucrative route to get one's money out faster, because one can exit in 36 days.

This PR changes it so that slashing can only extend your withdrawal time, not contract it. Also, instead of the slashed balances used to calculate one's slashing penalty being those in `[withdrawal - 54 days ... withdrawal - 18 days]`, we now run the penalization algorithm once every 36 days that a validator is slashed but not withdrawn, so that it covers the 36-day period where the validator was actually slashed.  It also moves the minimum slashing penalty to the `slash_validator` function so that it is only applied once.

We also simplify the `slashed_balances` logic to be per-epoch.
 2019-06-28 14:35:26 +01:00
Justin Drake e36593b155 Add comment 2019-06-28 12:35:50 +01:00
Justin Drake 6f9d37485d Cleanups 2019-06-28 12:34:01 +01:00
Justin Drake 196ac42025 Cleanup naming 2019-06-28 12:23:22 +01:00
Carl Beekhuizen 0ba933e088
Merge pull request #1209 from ethereum/early_secret_test 
Resolves issue in early_secret_reveal() testing
 2019-06-28 11:58:40 +02:00
Dankrad Feist 2622548ba7
Merge remote-tracking branch 'origin/dev' into dankrad-patch-8 
# Conflicts:
#	specs/core/0_beacon-chain.md
 2019-06-28 08:36:45 +01:00
Danny Ryan 140c69f2ec
Merge branch 'dev' into checkpoints 2019-06-27 21:02:48 -06:00
Dankrad Feist 237b41df5b
Slice notation for justification_bitfield shift 2019-06-28 00:18:54 +01:00
Danny Ryan 990cc55db7
fix committee typing error 2019-06-27 16:32:10 -06:00
Justin Drake 853f5fc3f0 Apply Danny's suggestions 2019-06-27 19:05:27 +01:00
Carl Beekhuizen 543729cad4
Merge pull request #1198 from ethereum/fork-choice-epoch 
modify fork choice to utilize epochs properly
 2019-06-27 19:14:19 +02:00
Dankrad Feist 93ce168862
More linting fixes 2019-06-27 16:47:48 +01:00
Dankrad Feist f57387cc83
Justification bitvector length to constant 2019-06-27 13:09:48 +01:00
Dankrad Feist 80c680e614
Phase 1 to Bitvector/Bitlist 2019-06-27 12:41:22 +01:00
Dankrad Feist becb7a032a
justification_bitfield -> Bitvector[4] 2019-06-27 12:15:31 +01:00
Dankrad Feist 67c50cb197
Changed attestation and custody bitfields 2019-06-27 12:15:29 +01:00
Justin Drake d641e94151 Cleanups 2019-06-27 11:44:33 +01:00
Justin Drake ee712ecdde Make HW happy :) 2019-06-27 11:21:45 +01:00
Dankrad Feist 02f6ba36f0
Add Bitvector and Bitlist 
Bool, Bit -> boolean, bit
Fix simple-serialize.md
 2019-06-27 09:51:06 +01:00
Justin Drake bcfe383e25 WIP 2019-06-27 08:44:44 +01:00
protolambda a0c2f5c6b5
fix genesis testing code, add missing constant temporarily, fix py Generator/map/list problems 2019-06-27 01:57:30 +02:00
vbuterin dbb697dadd
Small update to typing in BLS spec file 
[uint384] -> Tuple[uint384, uint384]
 2019-06-26 19:40:11 -04:00
protolambda a62d0261ca
merge with dev, fixed now 2019-06-27 01:31:10 +02:00
Alex Stokes 23909ca727
Fix line lengths 2019-06-26 17:06:34 -06:00
Alex Stokes 10e257490f
Clarify `get_randao_mix` accessor 
We avoid a genesis underflow by taking the randao epoch in `generate_seed` to be `+ EPOCHS_PER_HISTORICAL_VECTOR`.

This conflicts with the expected epoch bounds noted  in `get_randao_mix` and this PR attempts to clarify the situation by leaving a note.
 2019-06-26 16:33:23 -06:00
Diederik Loerakker d587c4fe61 Critical fix: introduce back total-value check (#1220) 
This was dropped in a376b6607f, as improvement in dust checking.
Now that dust-checking is done, we still need to check if the sender has the minimum value, as decrease balance just clips to 0.
See be86f966f8 for older dust-creation problem work around, which was dropped in the above.

The bug enabled you to transfer your full balance to someone else, and pay the same amount in fee, possibly to a puppet proposer to collect back funds.
Effectively enabling printing of money. Silly bug, good to fix and introduce tests for.
 2019-06-26 20:21:17 +01:00
Justin Drake ccda508254 Fix deposit root, add min_genesis_time, per-block processing 2019-06-26 15:34:54 +01:00
Justin Drake 8c34aa8c5f Initial draft 2019-06-26 13:20:04 +01:00
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
Alex Stokes 4986311d5b
Update 0_beacon-chain.md 
fix typo w/ refactor
 2019-06-25 10:24:14 -06:00
Carl Beekhuizen f29b693a9c
Merge dev -> early_spec_test 2019-06-25 17:11:04 +02:00
Danny Ryan df2a9e1b54
Merge pull request #1180 from ethereum/list-rework 
pyspec-SSZ: lists-rework (enable static generalized indices) + fully python class based now.
 2019-06-25 07:38:50 -06:00
JSON 20602bc92b phase 0 doc standardization b4 spec freeze (#1212) 2019-06-25 14:32:56 +01:00
Alex Stokes 37b1872634 Remove duplicate custom type definitions (#1214) 
Seems to be an accidental duplication of the type defs
 2019-06-25 14:30:59 +01: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
protolambda 054a157953
get rid of TypingList, add MutableSequence 2019-06-25 02:58:10 +02:00
Diederik Loerakker 45dbf5a107
Remove old Deltas reference 
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
 2019-06-25 02:41:02 +02: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
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
protolambda 9fb5806764
be explicit about input for balance sum 2019-06-25 00:24:13 +02:00
protolambda 8b88c3f43c
Merge remote-tracking branch 'origin' into list-rework 2019-06-24 23:58:00 +02:00
protolambda 5989e5cd23
use Bool as base name, make Bit an alias 2019-06-24 23:56:26 +02:00
protolambda 82ae180490
clean up list limit constants 2019-06-24 23:38:36 +02: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
vbuterin 7e3318318d
Updated to newer SSZ 2019-06-23 00:29:45 -04:00
protolambda 1408a1ee0d
undo tuple wrapping 2019-06-23 00:17:54 +02:00
Justin Drake a3f8f50bee Initialise deposit root properly 2019-06-22 23:34: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
protolambda f95e7315b4
fix get_active_validator_indices typing usage 2019-06-22 18:34:33 +02:00
protolambda 00aae07d46
type annotation clean up 2019-06-22 18:12:42 +02: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
protolambda 16093eb8ce
Merge branch 'dev' into list-rework 2019-06-22 17:11:59 +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
Carl Beekhuizen a5b22e13b8
Resolves make masker sign mask 2019-06-22 16:56:16 +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 6aef6c5634
Clean up 2019-06-21 22:26:15 -06:00
Hsiao-Wei Wang b51011568a
Merge branch 'dev' into test_genesis 2019-06-21 22:13:46 -06:00
Hsiao-Wei Wang 5f09212777
yield for `is_genesis_trigger` 2019-06-21 22:09:09 -06:00
Hsiao-Wei Wang 47b29c8456
Loose condition of effective genesis deposit 2019-06-21 21:49:13 -06:00
Hsiao-Wei Wang 8828dad786
minor updates 2019-06-21 17:07:44 -06:00
Danny Ryan de5b9cc823
convert _root/_epoch tuples to Checkpoint obj in beacon spec 2019-06-21 16:33:43 -06:00
Hsiao-Wei Wang ac34221f55
Fix `is_genesis_trigger` and add test case 2019-06-21 16:30:31 -06:00
Hsiao-Wei Wang b36ffd5c41
default value of `deposit_index` 2019-06-21 16:10:19 -06:00
Hsiao-Wei Wang 7a16db144c
Add test_genesis 2019-06-21 15:59:18 -06:00
protolambda 0b0e9a51d7
Merge branch 'dev' into list-rework 2019-06-21 23:44:01 +02:00
Hsiao-Wei Wang f55499c0ba Fix Gwei value table (#1203) 2019-06-21 14:30:22 -06:00
protolambda 80c40f5e09
merge dev, resolve minor merge conflicts 2019-06-21 21:22:23 +02: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 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
Hsiao-Wei Wang e99c864ed1
Deltas = NewType('Deltas', TypingList[Gwei]) 2019-06-20 17:17:12 -06:00
protolambda 3d8466fd6e
make Bit check not use "is", and remove duplicate line 2019-06-20 23:04:19 +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
protolambda 2d67717079
fix linting issues + make spec builder remove comments in container re-initialization part 2019-06-20 21:42:55 +02: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
protolambda f157745248
resolve some remaining list-rework rebase details 2019-06-20 20:42:19 +02:00
protolambda 4e747fb887
fixes for class based ssz typing 2019-06-20 20:25:22 +02:00
protolambda 5048b9e87a temporary fix for phase-1 spec typing 2019-06-20 20:20:45 +02:00
protolambda 4b4bf87e47 update shard doc, use new types, avoid List 2019-06-20 20:15:56 +02:00
protolambda 8344d50ae5
update beacon chain doc, use new types, avoid List 2019-06-20 20:15:48 +02:00
protolambda 4aefc078e9
list-rework type fixes 2019-06-20 20:11:39 +02:00
vbuterin 4c2adcc5e6 Update 0_beacon-chain.md 2019-06-20 20:05:57 +02:00
protolambda b89183ae69
Update spec for new SSZ with list max length 2019-06-20 20:05:34 +02:00
protolambda 97025c51ac
start updating virtual sizes of lists 2019-06-20 20:03:11 +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
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
protolambda 060041945c
remove unnecessary cast 2019-06-18 22:00:22 +02:00
protolambda 346e61dfeb
make epoch pattern similar to exit-epoch loop 2019-06-18 21:59:16 +02:00
Carl Beekhuizen 7a71919c53
Test removing all the Bytes objects 2019-06-18 21:55:41 +02:00
Carl Beekhuizen d804cb307b
Removes defaults from Store to try get CI to pass 2019-06-18 21:50:40 +02:00
Carl Beekhuizen 3bcddf5e49
Removes defaults from Store to try get CI to pass 2019-06-18 20:59:17 +02:00
Hsiao-Wei Wang dd79a0edb5
Merge branch 'dev' into mypy 2019-06-18 08:24:23 -06:00
Carl Beekhuizen 28a3e54db0
Actually resolve some merge conflicts 2019-06-18 15:13:04 +02:00
Carl Beekhuizen 31a4700223
Merge conflicts on `dev` 2019-06-17 22:09:43 -04:00
Danny Ryan 02954e84fe
Merge branch 'dev' into JustinDrake-patch-14 2019-06-17 16:33:59 -06:00
Danny Ryan 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
Danny Ryan 7298b3e290
Merge pull request #1191 from ethereum/constats-config 
split constants vs configuration
 2019-06-17 16:18:34 -06:00
Danny Ryan 89d9d80b1c
move BASE_REWARDS_PER_EPOCH to constants 2019-06-17 16:12:47 -06:00
Hsiao-Wei Wang 01e9f18713
Merge branch 'dev' into mypy 2019-06-17 17:51:46 -04:00
Hsiao-Wei Wang 9af9bbf42b
Merge branch 'dev' into mypy 2019-06-17 17:51:00 -04:00
Hsiao-Wei Wang 18ebd2aa90
Bytes32 -> Hash 2019-06-17 17:21:45 -04:00
Danny Ryan 207eb808a0
split constants vs configuration 2019-06-17 15:19:44 -06:00
terence tsao d911236fbb
Update slots.md 2019-06-17 14:19:17 -07:00
vbuterin 2605dfba08
Updates to SSZ partials 2019-06-17 11:16:00 -04:00
Carl Beekhuizen 2ea6cede3e
Moves fork-choice objects away from SSZ 2019-06-17 10:48:33 -04:00
Carl Beekhuizen 20d8156f46
Merge branch 'dev' into executable_fork_choice 
* dev:
  Fix #1173
  attestations: check shard, and check epoch earlier
 2019-06-16 16:03:37 -04:00
Carl Beekhuizen 9f2d06b2e7
Somehow I had indented with 5 spaces everywhere. 2019-06-16 16:02:56 -04:00
Carl Beekhuizen f421850dc9
Fixes tests! Thanks @hwwhww! 2019-06-16 15:53:42 -04:00
Carl Beekhuizen 4deb311b71
Debugging 1st test 2019-06-16 12:17:31 -04:00
Carl Beekhuizen 5d10cd63c7
SSZ (partially) handles Dicts 2019-06-16 09:52:52 -04:00
Carl Beekhuizen 11edda64ed
Adds fork-choice to spec builder 2019-06-15 18:42:03 -04:00
Hsiao-Wei Wang e93ba51ef8
More clean up 2019-06-15 18:25:37 -04:00
Hsiao-Wei Wang 9b77ec11f8
Version: Bytes4 2019-06-15 17:32:52 -04:00
Hsiao-Wei Wang b772b03847
Handle `BLSPubkey` and `BLSSignature` 2019-06-15 17:23:44 -04:00
Hsiao-Wei Wang 00a68e28b5
Define Custom Types via function_puller 2019-06-15 16:57:50 -04:00
protolambda 75b469281e
fix linting issue 2019-06-15 18:05:01 +02:00
Justin Drake 7cd7659a4b Add comments to non-obvious container fields 2019-06-15 15:51:17 +01:00
Justin Drake ed748a7d76 Address Danny's comments 2019-06-15 15:09:50 +01:00
Danny Ryan a6230425b8
Merge branch 'dev' into container-cleanup 2019-06-14 10:36:41 -06:00
Justin 67d2585ec0
Fix #1173 
The bug is that it's possible to include a participating validator which has custody bit one *without* specifying that validator in `attestation.aggregation_bitfield`. In other words, we want to check that every bit in `custody_bitfield` is zero whenever the corresponding bit in `aggregation_bitfield` is zero. Well spotted @protolambda
 2019-06-13 21:01:10 +01:00
protolambda aabd2b08ad
attestations: check shard, and check epoch earlier 2019-06-13 15:51:22 +02:00
Alex Stokes f095ab43bb Update 0_beacon-chain.md (#1170) 
minor typo fix
 2019-06-13 10:40:02 +01:00
Hsiao-Wei Wang 48e8164e28
Add phase1 type hinting checks and fix many bugs 2019-06-12 20:08:19 -04:00
Hsiao-Wei Wang 7a366828ba
Make phase0 pass 2019-06-12 14:54:00 -04:00
Danny Ryan 12293a91b4
Merge pull request #1152 from ethereum/deposit-contract-justin 
Custom genesis trigger, and deposit contract cleanups
 2019-06-12 10:54:11 -06:00
Justin Drake 6a83205420 Minor copy edit 2019-06-11 15:29:34 +01:00
Hsiao-Wei Wang 6f526add79
flake8 length 2019-06-11 00:45:00 -04:00
Hsiao-Wei Wang 9f454185f8
WIP! 
1. Use custom types in SSZ declaration
2. Casting
 2019-06-11 00:44:54 -04:00
Danny Ryan b56539a47d
add missing colon to v-guide 2019-06-10 15:14:42 -06:00
Justin Drake 05f1a44a38 Fix tests 2019-06-10 21:20:45 +01:00
Justin Drake dc56d87eef Revert a couple of renamings 2019-06-10 21:16:51 +01:00
Justin Drake b60314e892 Merge branch 'deposit-contract-justin' of github.com:ethereum/eth2.0-specs into deposit-contract-justin 2019-06-10 16:03:08 +01:00
Justin Drake ef91ee5698 Address Danny's comments 2019-06-10 15:55:08 +01:00
Justin 05a35c7228
Tweak inclusion delay rewards and set BASE_REWARD_FACTOR 
Substantive changes:

1) Split the inclusion delay reward between attester and proposer to add up to at most one base reward. This is analogous to the reward logic in `slash_validator`, and makes the `BASE_REWARDS_PER_EPOCH` constant include proposer rewards.
2) Double `BASE_REWARD_FACTOR` to 2^6 (addressing item 4 in #1054). When the total effective balance is 2^17 ETH then maximum annual issuance is a bit below 2^21 ETH. Maximum annual issuance happens when a) all validators make perfect attestations (matching source, target, head, as well as consistent crosslink data), b) all attestations are included as fast as possible (in particular, no skip blocks), and c) there are no slashings.

```python
BASE_REWARD_FACTOR = 2**6
SLOTS_PER_EPOCH = 2**6
SECONDS_PER_SLOT = 6
BASE_REWARDS_PER_EPOCH = 5
GWEI_PER_ETH = 10**9
MAX_TOTAL_EFFECTIVE_BALANCE = 2**27 * GWEI_PER_ETH
TARGET_MAX_ISSUANCE = 2**21 * GWEI_PER_ETH

def integer_squareroot(n: int) -> int:
    """
    The largest integer ``x`` such that ``x**2`` is less than or equal to ``n``.
    """
    assert n >= 0
    x = n
    y = (x + 1) // 2
    while y < x:
        x = y
        y = (x + n // x) // 2
    return x

MAX_REWARDS_PER_EPOCH = MAX_TOTAL_EFFECTIVE_BALANCE * BASE_REWARD_FACTOR // integer_squareroot(MAX_TOTAL_EFFECTIVE_BALANCE) // BASE_REWARDS_PER_EPOCH
EPOCHS_PER_YEAR = 365.25*24*60*60 / (SECONDS_PER_SLOT * SLOTS_PER_EPOCH)
MAX_REWARDS_PER_YEAR = EPOCHS_PER_YEAR * MAX_REWARDS_PER_EPOCH * BASE_REWARDS_PER_EPOCH

print(MAX_REWARDS_PER_YEAR / TARGET_MAX_ISSUANCE)
```
 2019-06-10 15:14:32 +01:00
Justin 9bb0f25f18
Update specs/core/0_beacon-chain.md 
Co-Authored-By: NIC Lin <twedusuck@gmail.com>
 2019-06-10 13:41:28 +01:00
Justin 36a6c1bf1f
Set MIN_ATTESTATION_INCLUSION_DELAY to 1 
See item 7 of #1054. We should consider increasing the slot duration as well.
 2019-06-09 21:30:42 +01:00
Justin Drake 565f61dfaa Cleanup containers 2019-06-09 20:41:21 +01:00
terence tsao 8b54c90fd6
Update 0_beacon-chain-validator.md 2019-06-09 12:09:54 -07:00
Justin Drake 4ee00c9cbd Address HW's comments 2019-06-09 11:03:38 +01:00
Hsiao-Wei Wang 11f2cd189a Fix the Vyper contract link (#1154) 2019-06-08 23:48:34 +01:00
Justin Drake d1e589f11f Remove eth2 genesis in favour of genesis trigger 2019-06-08 19:00:50 +01:00
Carl Beekhuizen 68fc0bf87d
Merge branch 'dev' into dankrad-patch-7 
* dev:
  Update simple-serialize.md
 2019-06-06 23:31:36 +02:00
terence tsao 84ce28a71d
Update simple-serialize.md 2019-06-06 09:45:20 -04:00
Carl Beekhuizen 35c03c5f3e
Adds review suggestions I missed 2019-06-06 11:45:22 +02:00
Carl Beekhuizen 58a137e81c
Merge branch 'dev' into dankrad-patch-7 
* dev:
  Update 0_beacon-chain-validator.md
 2019-06-06 10:43:13 +02:00
Carl Beekhuizen 60d9dc68c4
Apply suggestions from @djrtwo's code review 2019-06-05 21:49:30 +02:00
Carl Beekhuizen 38414c2e4e
Merge branch 'dev' into dankrad-patch-7 
* dev:
  add  beaconblockheader back to toc
  Move crosslink above attestation data
  Change data structure to match beacon state order
  Reorganize data structures to mirror beacon state order
  Update 0_beacon-chain.md
 2019-06-05 20:28:14 +02:00
terence tsao eefd306253
Update 0_beacon-chain-validator.md 2019-06-05 13:07:10 -04:00
Danny Ryan 1daff359ba
Merge pull request #1139 from terencechain/patch-76 
Use get_total_balance for get_attestation_deltas
 2019-06-05 10:14:28 -06:00
Danny Ryan 853c34eb60
add beaconblockheader back to toc 2019-06-05 09:50:15 -06:00
Carl Beekhuizen d761b6f041
Implements new SSZ types 2019-06-05 15:29:26 +02:00
Ivan Martinez c250296d8a
Move crosslink above attestation data 2019-06-05 15:07:50 +09:00
Ivan Martinez 65d2a50219
Change data structure to match beacon state order 2019-06-05 14:57:54 +09:00
Ivan Martinez e83500cef8
Reorganize data structures to mirror beacon state order 2019-06-05 14:52:09 +09:00
Danny Ryan e8b4c4c57f
Merge pull request #1077 from ethereum/ssz-impl-rework 
SSZ implementation for exec. spec - Support for Python 3 typing.
 2019-06-04 14:52:28 -06:00
protolambda 9bdb18245e
remove tautological type definition 2019-06-04 18:22:42 +02:00
Diederik Loerakker fe9c708d83
Fix whitespace 
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
 2019-06-04 15:31:20 +02:00
Ivan Martinez 1b5370f8e2
Update 0beacon-chain-validator.md 2019-06-04 18:20:16 +09:00
Carl Beekhuizen d5f2f63b4a
Merge branch 'dev' into dankrad-patch-7 
* dev:
  Update link to Prysmatic Labs implementation of SSZ (#1138)
 2019-06-03 11:12:03 +02:00
Ivan Martinez e578c95837 Update link to Prysmatic Labs implementation of SSZ (#1138) 
* Update link to go SSZ implementation

We have changed our SSZ implementation to it's own repo so this updates the link on the spec.

* Update simple-serialize.md
 2019-06-03 13:33:59 +08:00
terence tsao 2246f1b934
Update 0_beacon-chain.md 2019-06-02 13:13:52 -07:00
protolambda e044305457
Merge branch 'dev' into ssz-impl-rework 2019-06-01 01:34:49 +02:00
Carl Beekhuizen 5155bc6c4f
Makes everything pass around 2019-05-30 22:57:18 +02:00
Danny Ryan f0314bec52
Merge branch 'dev' into JustinDrake-patch-13 2019-05-29 20:15:17 -06:00
Danny Ryan 2aea4b93d0
Merge pull request #1123 from ethereum/JustinDrake-patch-14 
Avoid divisions by zero
 2019-05-29 20:14:23 -06:00
Danny Ryan f4afb7c1b4
Merge pull request #1134 from terencechain/patch-75 
Fix Test Formats Broken Links
 2019-05-29 20:13:13 -06:00
Hsiao-Wei Wang 6ec59867ef
Fix linter errors 2019-05-30 09:53:46 +08:00
Justin 1c416541e1
Update 0_beacon-chain.md 2019-05-29 23:40:46 +03:00
terence tsao 12a7e26453
Update README.md 2019-05-28 20:57:18 -07:00
Danny Ryan 6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13 2019-05-28 18:15:33 -06:00
Danny Ryan c2f0f7e4d8
Merge pull request #1108 from ethereum/eth1_error 
minor fix to how eth1 data is counted in validator guide
 2019-05-28 16:09:04 -06:00
Danny Ryan 4183d8440b
Merge pull request #1069 from sigp/bn-vc-api-rfc 
Beacon Node API for Validator
 2019-05-28 16:07:51 -06:00
protolambda 6e8fb529d2
Merge branch 'ssz_static_format' into v06x-to-dev 2019-05-28 18:32:38 +02:00
protolambda 3781614f20
SSZ format update, to facilitate more efficient parsing 2019-05-28 18:28:37 +02:00
protolambda 25cc393180
Merge in fix of bls-setting doc, rm old comments 2019-05-28 18:04:16 +02:00
protolambda d036b5a87a
Remove some old comments about BLS setting. Description is shared in main readme now. 2019-05-28 18:02:09 +02:00
protolambda 8737984e19
introduce back assert, modified to allow valid but non-effective calls 2019-05-28 16:05:25 +02:00
protolambda 401dba3230
Merge branch 'bls-setting' into v06x-to-dev 2019-05-28 15:38:08 +02:00
protolambda 6ffd41650b
suggestion from hww, reduce into one bls_setting key 2019-05-28 15:35:00 +02:00
Carl Beekhuizen bfa45e06f0
merge dev -> d-p-7 2019-05-28 11:15:17 +02:00
Carl Beekhuizen fd05b6e364
Minor bugfixes 2019-05-28 09:58:51 +02:00
Luke Anderson c32328fdf2
Fixed swagger URL so that the version number isn't specified (defaults to latest). 2019-05-28 10:49:40 +10:00
Luke Anderson 56698602ab
Updated all absolute URLs to the eth2.0-specs repo so that they point to the master branch (instead of dev). 2019-05-28 10:48:41 +10:00
protolambda 0e9a047b1d
Merge branch 'dev' into ssz-impl-rework 2019-05-28 00:42:35 +02:00
protolambda f3088884b3
Minor adjustments + getting the beacon spec doc ready 2019-05-27 20:29:53 +02:00
Danny Ryan d3d8b36365
Merge branch 'dev' into v06x-to-dev 2019-05-27 11:09:52 -06:00
Danny Ryan 405b34225f
D be list instead of set in validator eth1 data counting 2019-05-27 09:37:30 -06:00
Danny Ryan 31c02ebcab
Merge pull request #1116 from ethereum/hwwhww/phase1_withdrawable 
Clean up `process_penalties_and_exits` and fix ToC
 2019-05-27 09:33:43 -06:00
Michael Sproul a82a6f9a1a
Sort attester slashing indices to avoid arbitrary ordering 
Closes #1125
 2019-05-27 17:36:20 +10:00
Luke Anderson fa177e0355
Bumped API version number to 0.2.0 2019-05-27 13:01:36 +10:00
Luke Anderson af798a3065
Minor updates. 
- Fixed spelling (and made American English)
 - Clarified the schema for the new poc_bit field, and description.
 2019-05-27 11:21:23 +10:00
Carl Beekhuizen f7f069d6b5
Bug fixes and cleanup of 2_shard-data-chains 2019-05-26 19:41:36 +02:00
Justin cdfb886c22
Avoid divisions by zero 
Possible fix to avoid four cases of divisions by zero:

* `return state.validator_registry[index].effective_balance // adjusted_quotient // BASE_REWARDS_PER_EPOCH`
* `rewards[index] += get_base_reward(state, index) * attesting_balance // total_balance`
* `validator.effective_balance * min(total_penalties * 3, total_balance) // total_balance`
* `rewards[index] += base_reward * attesting_balance // committee_balance`

See also #1107.
 2019-05-26 18:42:37 +03:00
Carl Beekhuizen a7dbbafc92
Integrates shard-data-chains 2019-05-26 14:14:48 +02:00
vbuterin 3b4d9b7a85
Class-ified the type definitions 2019-05-25 16:14:52 -04:00
Carl Beekhuizen f6ce817f24
merge dev->dankrad-patch-7 2019-05-25 15:57:28 +02:00
Carl Beekhuizen 3bfe81ed7b
Merge branch 'dev' into dankrad-patch-7 
* dev:
  Fix typo in libp2p-standardization
  update version used in test generators to get SHA-256 hash
 2019-05-25 15:13:45 +02:00
protolambda 81cb4a23b3
update some common usage of SSZ types, as a start 2019-05-25 00:10:06 +02:00
Luke Anderson edf0b9d05f
Addressed some of @djrtwo's suggestions. 
- Rewording of specification goal paragraph
 - Clarify get duties description regarding chain reorgs.
 - Add epoch parameter to get duties, and new error 406
 - Block publishing action is clarified around validation, with a new status code 202
 - The validator pubkey and PoC bit are passed to produce attestation
 - Attestation publishing action is clarified around validation, new status code 202
 - Rewording of genesis_time, 'block' -> 'slot'
 - Update Crosslink to latest spec
 - Added missing signature field to IndexedAttestation
 2019-05-25 07:59:35 +10:00
Justin d805fb5084
Simplify deposits 2019-05-25 00:35:17 +03:00
Danny Ryan 28b76bcd4c
a number of minor fixes in phsae 1 2019-05-24 11:59:22 -06:00
Diederik Loerakker b6b5787931
Update specs/test_formats/epoch_processing/README.md 
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
 2019-05-24 12:24:42 -04:00
Carl Beekhuizen ac9564c2b7
Adds Insert-into-label functionality 2019-05-24 16:51:21 +02:00
Carl Beekhuizen d41bc67ec8
merge dev -> dankrad-patch-7 2019-05-24 14:56:10 +02:00
Diederik Loerakker 4690bcf682
Update specs/test_formats/operations/README.md 
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
 2019-05-24 08:33:06 -04:00
Diederik Loerakker f52b2282b3
Update specs/test_formats/operations/README.md 
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
 2019-05-24 08:32:54 -04:00
Age Manning 2cd188358b
Fix typo in libp2p-standardization 2019-05-24 21:24:35 +10:00
protolambda 4ccd304603
docs for sanity tests 2019-05-24 01:03:21 +02:00
protolambda 902059d6d8
fix operations readme 2019-05-24 00:13:49 +02:00
protolambda f98a8d534e
update epoch processing tests to conform to processing pattern, add docs for epoch sub-transition testing 2019-05-23 23:50:58 +02:00
Hsiao-Wei Wang 0f7abfa4ce
Update specs/core/1_custody-game.md 
Co-Authored-By: Carl Beekhuizen <carl.beek@gmail.com>
 2019-05-24 02:54:41 +08:00
Hsiao-Wei Wang 650c4244bd
Things are different after rebasing #1035 2019-05-24 01:35:51 +08:00
Danny Ryan 7b30c55cd4
minor copy edits to vc api 2019-05-23 13:10:34 -04:00
Danny Ryan 72e12679ae
Merge pull request #935 from AgeManning/libp2p 
Add initial libp2p standardization
 2019-05-23 09:33:55 -06:00
protolambda 6cd681e952
update docs on operation testing 2019-05-23 11:22:10 +02:00
Age Manning ae6d30fd62
Update with discv5 2019-05-23 11:48:04 +10:00
Danny Ryan c13421a9a7
type hinting for fork version 
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
 2019-05-22 16:52:44 -04:00
Carl Beekhuizen 9058647b67
flake8v3.7->flake8v3.5 2019-05-22 10:28:03 +02:00
protolambda 6b5f4b44ea
avoid zero constant for deposits fork-version, just default to it 2019-05-22 01:39:20 +02:00
protolambda b919d08ab2
comment on the deposit signature being soft-rejected 2019-05-22 00:07:52 +02:00
Danny Ryan 4ce441c4a4
minor fix to how eth1 data is counted in validator guide 2019-05-21 12:54:38 -06:00
Danny Ryan b075a7a0ab
add bls_domain to toc 2019-05-21 11:33:52 -06:00
Danny Ryan 847fcf52cc
utilize bls_domain directly for deposits 2019-05-21 11:30:38 -06:00
Danny Ryan 7a9097ec23
Merge branch 'dev' into fix-deposit-forkv 2019-05-21 11:04:13 -06:00
Carl Beekhuizen 24c4d21d5e
Minor edits + PEP8 2019-05-21 12:41:24 +02:00
Justin 90a3f56e0f
Edit BLS spec warning 
Fix #898.
 2019-05-21 09:13:57 +01:00
Carl Beekhuizen 6b062405c9
merge dev -> carl-exec-phase1 2019-05-20 20:59:08 +02:00
Danny Ryan c0e15f14cc
Merge pull request #1099 from ethereum/vbuterin-patch-4 
Updated get_custody_chunk_count
 2019-05-20 09:53:33 -04:00
Danny Ryan 14c4d63f2a
Merge pull request #1097 from ethereum/vbuterin-patch-3 
Crosslinks store start and end epoch
 2019-05-20 09:53:24 -04:00
Hsiao-Wei Wang 83123a33da
Set genesis_state.latest_block_header with `body_root` of empty BeaconBlockBody (#1098) 2019-05-20 17:16:20 +08:00
Carl Beekhuizen cfed4bb41c
Adds missing functions 2019-05-20 10:50:07 +02:00
Justin 2018dd83f5
Update 1_custody-game.md 2019-05-20 09:29:09 +01:00
Carl Beekhuizen 725dcf27f5
Hella bug-fixes and PEP8 2019-05-20 09:47:44 +02:00
Luke Anderson 8e67dec7e4
Fixed misinterpretation of the proof array in the Deposit object, bumped version. 2019-05-20 16:43:21 +10:00
Luke Anderson 490cf9e347
Updated version number to reflect small changes. 2019-05-20 13:56:25 +10:00
Luke Anderson 73c9d126de
Updated API spec with suggestions by @hwwhww. 
- Corrected to use American English instead of Australian
 - Fixed spelling mistake with indices
 - Changed tag to 'MinimalSet' and 'OptionalSet'
 - Added a  response to the list of components
 - Renamed 'block_production' to 'block_proposal'
 2019-05-20 13:49:06 +10:00
Hsiao-Wei Wang a68aa82b89
Update validator guide 2019-05-20 11:39:13 +08:00
vbuterin c14452bcf4
Updated get_custody_chunk_count 
Co-requisite with #1097
 2019-05-19 19:44:12 -04:00
vbuterin 85c1654456
Crosslinks store start and end epoch 
Solves #1034
 2019-05-19 09:33:01 -04:00
Danny Ryan a6a61bbecb
Merge pull request #1093 from ethereum/fix-v-committee 
Missed PR feedback from #1085
 2019-05-17 14:14:39 -04:00
Danny Ryan 46d30048a6
Merge pull request #1035 from ethereum/vbuterin-patch-2 
Allow multiple bit challenges, and recover withdrawability
 2019-05-17 13:56:10 -04:00
Danny Ryan 78471e0818
Merge branch 'dev' into fix-v-committee 2019-05-17 13:53:19 -04:00
vbuterin 24edca3456
Fix to make Danny and hww happy 2019-05-17 13:52:23 -04:00
Danny Ryan e0b4dd1aeb
Merge pull request #974 from mslipper/no-ssz-wrapper 
Use SSZ union-types in RPC request/response
 2019-05-17 13:20:04 -04:00
Danny Ryan 174e1e4dbe
pr feedback 2019-05-17 11:04:05 -04:00
Danny Ryan e1d973d546
Update specs/validator/0_beacon-chain-validator.md 
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
 2019-05-17 11:01:18 -04:00
Danny Ryan acb7444184
pr feedback 2019-05-17 10:58:02 -04:00
Danny Ryan 37aca60fae
pr feedback 2019-05-17 10:55:07 -04:00
Danny Ryan d1f5f85464
Merge branch 'dev' into fix-v-committee 2019-05-17 10:31:57 -04:00
Justin 694b31b934
Update 0_beacon-chain.md 2019-05-17 06:11:39 -04:00
Justin f19188816b
Update 0_beacon-chain.md 2019-05-17 06:07:38 -04:00
Justin 05f9dc7baa
Fix #1090 
Avoid signed integer
 2019-05-17 05:59:01 -04:00
Matthew Slipper 7f6896cca3 Update to use union type 2019-05-16 16:43:10 -07:00
Carl Beekhuizen 229dfe81a6
Merge branch 'dev' into dankrad-patch-7 
* dev:
  Typo fix
 2019-05-16 12:15:30 +02:00
Bruno Škvorc bc95906e4f
Typo fix 2019-05-15 10:40:42 +02:00
Carl Beekhuizen c10fb92776
Merge dev -> dankrad-p-7 2019-05-15 10:36:01 +02:00
Danny Ryan 01efe52eb0
fix start shard 2019-05-14 17:32:44 -04:00
Danny Ryan 5e7b173b22
fix up validator guide crosslink committee instructions 2019-05-14 17:29:11 -04:00