2344 Commits

Author SHA1 Message Date
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