a6230425b8
Merge branch 'dev' into container-cleanup
2019-06-14 10:36:41 -06:00
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
aabd2b08ad
attestations: check shard, and check epoch earlier
2019-06-13 15:51:22 +02:00
f095ab43bb
Update 0_beacon-chain.md ( #1170 )
...
minor typo fix
2019-06-13 10:40:02 +01:00
7a366828ba
Make phase0 pass
2019-06-12 14:54:00 -04:00
6a83205420
Minor copy edit
2019-06-11 15:29:34 +01:00
6f526add79
flake8 length
2019-06-11 00:45:00 -04:00
9f454185f8
WIP!
...
1. Use custom types in SSZ declaration
2. Casting
2019-06-11 00:44:54 -04:00
dc56d87eef
Revert a couple of renamings
2019-06-10 21:16:51 +01:00
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
ef91ee5698
Address Danny's comments
2019-06-10 15:55:08 +01:00
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
9bb0f25f18
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: NIC Lin <twedusuck@gmail.com>
2019-06-10 13:41:28 +01:00
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
565f61dfaa
Cleanup containers
2019-06-09 20:41:21 +01:00
4ee00c9cbd
Address HW's comments
2019-06-09 11:03:38 +01:00
d1e589f11f
Remove eth2 genesis in favour of genesis trigger
2019-06-08 19:00:50 +01:00
60d9dc68c4
Apply suggestions from @djrtwo's code review
2019-06-05 21:49:30 +02:00
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
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
853c34eb60
add beaconblockheader back to toc
2019-06-05 09:50:15 -06:00
d761b6f041
Implements new SSZ types
2019-06-05 15:29:26 +02:00
c250296d8a
Move crosslink above attestation data
2019-06-05 15:07:50 +09:00
65d2a50219
Change data structure to match beacon state order
2019-06-05 14:57:54 +09:00
e83500cef8
Reorganize data structures to mirror beacon state order
2019-06-05 14:52:09 +09:00
9bdb18245e
remove tautological type definition
2019-06-04 18:22:42 +02:00
fe9c708d83
Fix whitespace
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-04 15:31:20 +02:00
2246f1b934
Update 0_beacon-chain.md
2019-06-02 13:13:52 -07:00
e044305457
Merge branch 'dev' into ssz-impl-rework
2019-06-01 01:34:49 +02:00
5155bc6c4f
Makes everything pass around
2019-05-30 22:57:18 +02:00
f0314bec52
Merge branch 'dev' into JustinDrake-patch-13
2019-05-29 20:15:17 -06:00
2aea4b93d0
Merge pull request #1123 from ethereum/JustinDrake-patch-14
...
Avoid divisions by zero
2019-05-29 20:14:23 -06:00
6ec59867ef
Fix linter errors
2019-05-30 09:53:46 +08:00
1c416541e1
Update 0_beacon-chain.md
2019-05-29 23:40:46 +03:00
6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13
2019-05-28 18:15:33 -06:00
8737984e19
introduce back assert, modified to allow valid but non-effective calls
2019-05-28 16:05:25 +02:00
bfa45e06f0
merge dev -> d-p-7
2019-05-28 11:15:17 +02:00
0e9a047b1d
Merge branch 'dev' into ssz-impl-rework
2019-05-28 00:42:35 +02:00
f3088884b3
Minor adjustments + getting the beacon spec doc ready
2019-05-27 20:29:53 +02:00
d3d8b36365
Merge branch 'dev' into v06x-to-dev
2019-05-27 11:09:52 -06:00
a82a6f9a1a
Sort attester slashing indices to avoid arbitrary ordering
...
Closes #1125
2019-05-27 17:36:20 +10:00
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
3b4d9b7a85
Class-ified the type definitions
2019-05-25 16:14:52 -04:00
81cb4a23b3
update some common usage of SSZ types, as a start
2019-05-25 00:10:06 +02:00
d805fb5084
Simplify deposits
2019-05-25 00:35:17 +03:00
ac9564c2b7
Adds Insert-into-label functionality
2019-05-24 16:51:21 +02:00
c13421a9a7
type hinting for fork version
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-05-22 16:52:44 -04:00
6b5f4b44ea
avoid zero constant for deposits fork-version, just default to it
2019-05-22 01:39:20 +02:00
b919d08ab2
comment on the deposit signature being soft-rejected
2019-05-22 00:07:52 +02:00
b075a7a0ab
add bls_domain to toc
2019-05-21 11:33:52 -06:00
847fcf52cc
utilize bls_domain directly for deposits
2019-05-21 11:30:38 -06:00
7a9097ec23
Merge branch 'dev' into fix-deposit-forkv
2019-05-21 11:04:13 -06:00
14c4d63f2a
Merge pull request #1097 from ethereum/vbuterin-patch-3
...
Crosslinks store start and end epoch
2019-05-20 09:53:24 -04:00
83123a33da
Set genesis_state.latest_block_header with `body_root` of empty BeaconBlockBody ( #1098 )
2019-05-20 17:16:20 +08:00
85c1654456
Crosslinks store start and end epoch
...
Solves #1034
2019-05-19 09:33:01 -04:00
694b31b934
Update 0_beacon-chain.md
2019-05-17 06:11:39 -04:00
f19188816b
Update 0_beacon-chain.md
2019-05-17 06:07:38 -04:00
05f9dc7baa
Fix #1090
...
Avoid signed integer
2019-05-17 05:59:01 -04:00
c60635d2c9
Update 0_beacon-chain.md
2019-05-14 06:15:03 +01:00
5ba90d68e1
add flag for validate state root
2019-05-13 16:53:28 -04:00
a0a2aa90de
lint
2019-05-13 16:40:45 -04:00
27c8e41b32
Merge branch 'dev' into JustinDrake-patch-14
2019-05-13 16:29:29 -04:00
08faa86d70
POC ssz types spec build + update spec defs, typing still needs work
2019-05-12 23:56:53 +02:00
acf07892bb
Merge pull request #1065 from ethereum/linter
...
Add linter
2019-05-11 16:31:45 +02:00
ae19521ea8
Update the docstring of initiate_validator_exit ( #1072 )
2019-05-11 19:41:05 +08:00
a4ba283d67
Limit to 120 characters per line
...
Limit to 120 characters per line
2019-05-09 14:34:23 +08:00
c37157ead1
Revert exception handling
2019-05-08 19:15:23 +01:00
33e5b98f17
Merge branch 'dev' into JustinDrake-patch-10
2019-05-08 08:42:47 -06:00
af2bb7d6f6
Merge pull request #1044 from ethereum/JustinDrake-patch-21
...
Crosslink in AttestationData
2019-05-08 08:35:06 -06:00
62c44ffce3
Refactor to validate_indexed_attestation
2019-05-07 17:34:19 +01:00
ecc6429b9e
Address Danny's comment
2019-05-07 15:01:23 +01:00
22b06d581d
Update instances of int_to_bytes
2019-05-07 10:57:41 +01:00
b1520ea967
Update 0_beacon-chain.md
2019-05-07 10:33:51 +01:00
9eeca0cdbd
Merge branch 'dev' into JustinDrake-patch-14
2019-05-07 10:16:38 +01:00
50009ea85b
Implement HW's exception-handling suggestion
2019-05-07 10:12:33 +01:00
f371daeb20
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-05-07 09:01:07 +01:00
964e55cd4a
block_body_root => body_root
2019-05-07 08:52:56 +01:00
3a309155aa
fix deposit domain: forks are ignored for deposit validity, deposits are always accepted, if coming from the correct contract(s).
2019-05-06 22:06:00 +02:00
ea60fb632c
More renaming
2019-05-06 20:49:46 +01:00
f4db9ebae0
Renamings triggered by HW comment
2019-05-06 18:26:14 +01:00
8b1a2edb7c
Fix genesis bug
2019-05-06 17:53:49 +01:00
7ba13aa4c5
Merge branch 'dev' into JustinDrake-patch-21
2019-05-06 17:48:09 +01:00
b15105e1cb
Address Danny's comment
2019-05-06 17:34:03 +01:00
5c2bca4a0d
Merge pull request #1051 from ethereum/JustinDrake-patch-22
...
Fix #1050
2019-05-06 10:12:13 -06:00
4367a9bb0d
Merge pull request #1049 from ethereum/JustinDrake-patch-20
...
Cosmetic genesis cleanups
2019-05-06 10:06:15 -06:00
d1c96c1e0d
Doc standardization ( #1039 )
2019-05-06 16:30:32 +01:00
2c3bbac803
Fix #1050
2019-05-05 19:30:55 +01:00
6aff277b1a
Update 0_beacon-chain.md
2019-05-05 17:20:25 +01:00
a3bbf20bf7
Update 0_beacon-chain.md
2019-05-05 17:17:18 +01:00
bf20031755
Cosmetic genesis cleanups
2019-05-05 17:15:05 +01:00
5fb32fd19b
Fix tests
2019-05-05 12:10:39 +01:00
a6e825d460
Update 0_beacon-chain.md
2019-05-05 12:04:34 +01:00
d5d2f7835a
Rearranging one >= statement to make it more non-underflow-friendly
2019-05-03 22:51:59 -05:00
f57d6fa28e
Merge pull request #1038 from ethereum/master
...
backport v0.6.1 into dev
2019-05-03 16:28:24 -06:00
4c1073fa2f
Update 0_beacon-chain.md
2019-05-03 22:22:19 +01:00
197a7200ef
Add HW and Danny comments
2019-05-03 21:21:42 +01:00
6318a21ca6
fix minor typo in attestation rewards
2019-05-03 10:37:39 -06:00
c24002bb1e
Merge pull request #1025 from terencechain/patch-70
...
Add comment for `get_churn_limit`
2019-05-03 09:16:39 -06:00
d15ca4c50c
replace asserts in get_active_index_root and get_randao_mix with comment
2019-05-02 18:11:11 -06:00
9f2cdd9c78
Update 0_beacon-chain.md
2019-05-02 11:07:25 +01:00
Danny Ryan
Justin
protolambda
Alex Stokes
Hsiao-Wei Wang
Carl Beekhuizen
Ivan Martinez
terence tsao
Michael Sproul
vbuterin
Ryuya Nakamura
JSON