1722 Commits

Author SHA1 Message Date
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
89d9d80b1c
move BASE_REWARDS_PER_EPOCH to constants 2019-06-17 16:12:47 -06: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
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
7a366828ba
Make phase0 pass 2019-06-12 14:54:00 -04: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
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
Justin Drake
4ee00c9cbd Address HW's comments 2019-06-09 11:03:38 +01:00
Justin Drake
d1e589f11f Remove eth2 genesis in favour of genesis trigger 2019-06-08 19:00:50 +01: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
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
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
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
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
Danny Ryan
6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13 2019-05-28 18:15:33 -06:00
protolambda
8737984e19
introduce back assert, modified to allow valid but non-effective calls 2019-05-28 16:05:25 +02:00
Carl Beekhuizen
bfa45e06f0
merge dev -> d-p-7 2019-05-28 11:15:17 +02: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