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
Danny Ryan
4902a7746a
Merge pull request #1162 from ethereum/master-port
...
handle master-dev merge conflict
2019-06-10 12:39:47 -06:00
Danny Ryan
e68b495ada
Merge branch 'dev' into master-port
2019-06-10 10:53:13 -06:00
Hsiao-Wei Wang
9fc197af67
class Bytes32
2019-06-10 11:10:13 -04: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
Danny Ryan
9df4c80b47
Merge pull request #1155 from terencechain/patch-79
...
Fixed Target Root Construction
2019-06-10 08:37:22 -06: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
4d6a25f161
Update conftest.py
2019-06-10 13:43:00 +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
29129d06cf
Fix tests
2019-06-09 17:03:35 +01:00
Justin
9f953ad3b1
Merge branch 'dev' into deposit-contract-justin
2019-06-09 16:25:07 +01:00
Justin Drake
c293b9dcef
Cleanups
2019-06-09 11:29:22 +01: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
Diederik Loerakker
6f82480df2
Merge pull request #1127 from ethereum/deposit_contract
...
Move deposit contract back
2019-06-08 13:35:40 +02:00
protolambda
bce6c899f6
improve makefile: declare new targets as non-file
2019-06-08 13:30:47 +02:00
Hsiao-Wei Wang
e52c4a5526
fix
2019-06-07 23:01:10 -04:00
Hsiao-Wei Wang
5b8cca8314
deposit_contract/venv
...
PR feedback + bump eth-tester
2019-06-07 22:41:50 -04:00
Hsiao-Wei Wang
96237c74e1
two venv caches
2019-06-07 15:46:38 -04:00
Hsiao-Wei Wang
cf23a252b4
fix path
2019-06-07 15:46:38 -04:00
Hsiao-Wei Wang
b78f5b2cc9
Merge branch 'dev' into deposit_contract_venvs
2019-06-07 15:22:43 -04:00
Danny Ryan
eec7e115d1
Merge pull request #1061 from ethereum/dankrad-patch-7
...
Make phase 1 spec executable
2019-06-07 07:38:14 -06:00
Carl Beekhuizen
68fc0bf87d
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update simple-serialize.md
2019-06-06 23:31:36 +02:00
Carl Beekhuizen
67471a8d6e
Rework of phases decorator
2019-06-06 23:30:40 +02:00
Danny Ryan
b30c69d93a
Merge pull request #1144 from terencechain/patch-78
...
Updated SSZ ToC
2019-06-06 10:40:55 -06:00
Carl Beekhuizen
956c476d81
Move over to parameterised decorators for phases
2019-06-06 16:23:30 +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
4c1b9ef6d6
Fixes custody key reveal test bug
2019-06-06 11:04:55 +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
e498ff7e94
Separates tests into phases
2019-06-05 21:28:30 +02:00
Danny Ryan
71ab58a530
Merge pull request #1142 from terencechain/patch-77
...
Inline Attestations Variables
2019-06-05 12:54:08 -06: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
protolambda
b9abc5f2cf
List[uint64] is not like a type but just for annotation, same for other Generics with __args__, Vector/BytesN work, because their metaclasses produce non-parametrized types, so don't check vector values when type contains args
2019-06-05 18:53:34 +02:00
protolambda
1cc7c7309d
change to issubclass, hope parametrized external type is ok
2019-06-05 18:28:09 +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
protolambda
a7554d503c
fix for typing check of vector elements with non-type element type (annotation)
2019-06-05 18:02:39 +02:00
Danny Ryan
6feede7f6b
Merge pull request #1141 from 0xKiwi/patch-2
...
Change data structure order to mirror beacon state property order
2019-06-05 09:54:09 -06:00
Danny Ryan
853c34eb60
add beaconblockheader back to toc
2019-06-05 09:50:15 -06:00
Carl Beekhuizen
e5fb91c4a2
Make test generators work with phase 1 execution
2019-06-05 16:23:44 +02: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
