Commit Graph

1613 Commits

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