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
11f2cd189a
Fix the Vyper contract link ( #1154 )
2019-06-08 23:48:34 +01:00
d1e589f11f
Remove eth2 genesis in favour of genesis trigger
2019-06-08 19:00:50 +01:00
35c03c5f3e
Adds review suggestions I missed
2019-06-06 11:45:22 +02: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
fd05b6e364
Minor bugfixes
2019-05-28 09:58:51 +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
31c02ebcab
Merge pull request #1116 from ethereum/hwwhww/phase1_withdrawable
...
Clean up `process_penalties_and_exits` and fix ToC
2019-05-27 09:33:43 -06:00
a82a6f9a1a
Sort attester slashing indices to avoid arbitrary ordering
...
Closes #1125
2019-05-27 17:36:20 +10:00
f7f069d6b5
Bug fixes and cleanup of 2_shard-data-chains
2019-05-26 19:41:36 +02: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
a7dbbafc92
Integrates shard-data-chains
2019-05-26 14:14:48 +02:00
3b4d9b7a85
Class-ified the type definitions
2019-05-25 16:14:52 -04:00
f6ce817f24
merge dev->dankrad-patch-7
2019-05-25 15:57:28 +02: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
28b76bcd4c
a number of minor fixes in phsae 1
2019-05-24 11:59:22 -06:00
ac9564c2b7
Adds Insert-into-label functionality
2019-05-24 16:51:21 +02:00
d41bc67ec8
merge dev -> dankrad-patch-7
2019-05-24 14:56:10 +02:00
0f7abfa4ce
Update specs/core/1_custody-game.md
...
Co-Authored-By: Carl Beekhuizen <carl.beek@gmail.com>
2019-05-24 02:54:41 +08:00
650c4244bd
Things are different after rebasing #1035
2019-05-24 01:35:51 +08:00
c13421a9a7
type hinting for fork version
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-05-22 16:52:44 -04:00
9058647b67
flake8v3.7->flake8v3.5
2019-05-22 10:28:03 +02: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
24c4d21d5e
Minor edits + PEP8
2019-05-21 12:41:24 +02:00
6b062405c9
merge dev -> carl-exec-phase1
2019-05-20 20:59:08 +02:00
c0e15f14cc
Merge pull request #1099 from ethereum/vbuterin-patch-4
...
Updated get_custody_chunk_count
2019-05-20 09:53:33 -04: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
cfed4bb41c
Adds missing functions
2019-05-20 10:50:07 +02:00
2018dd83f5
Update 1_custody-game.md
2019-05-20 09:29:09 +01:00
725dcf27f5
Hella bug-fixes and PEP8
2019-05-20 09:47:44 +02:00
c14452bcf4
Updated get_custody_chunk_count
...
Co-requisite with #1097
2019-05-19 19:44:12 -04:00
85c1654456
Crosslinks store start and end epoch
...
Solves #1034
2019-05-19 09:33:01 -04:00
46d30048a6
Merge pull request #1035 from ethereum/vbuterin-patch-2
...
Allow multiple bit challenges, and recover withdrawability
2019-05-17 13:56:10 -04:00
24edca3456
Fix to make Danny and hww happy
2019-05-17 13:52:23 -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
c10fb92776
Merge dev -> dankrad-p-7
2019-05-15 10:36:01 +02: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
ba1949b2bc
Update 1_custody-game.md
2019-05-12 13:46:17 -07:00
9bd771f787
Merge pull request #1075 from jrhea/patch-1
...
get_genesis_beacon_state is not defined in the deposit contract
2019-05-12 08:56:37 -06:00
e85847719f
use relative path for beacon chain link
2019-05-12 08:50:46 -06:00
36514d1c38
Update 0_deposit-contract.md
...
get_genesis_beacon_state is not defined here. i modified the spec to link to the function.
2019-05-11 16:49:46 -05: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
4db4d87930
Refactor `process_final_updates`
2019-05-09 14:57:36 +08:00
3203e4f7d7
Merge branch 'dev' into vbuterin-patch-2
2019-05-09 14:52:56 +08:00
a4ba283d67
Limit to 120 characters per line
...
Limit to 120 characters per line
2019-05-09 14:34:23 +08:00
ec230f443a
Merge branch 'dev' into dankrad-patch-7
...
# Conflicts:
# specs/core/1_custody-game.md
# specs/core/1_shard-data-chains.md
2019-05-09 01:00:25 +01:00
6ab55efd3d
Phase 0 tests work on phase 1, yay :)
2019-05-08 23:30:08 +01: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
4ad92a0989
Fix typing
2019-05-07 13:23:28 +01:00
1db49f4c98
Merge branch 'dev' into dankrad-patch-7
...
# Conflicts:
# specs/core/1_custody-game.md
2019-05-07 12:27:24 +01:00
a604d03dff
Basic phase 1 pulling + correcting syntax errors in phase 1
2019-05-07 12:13:22 +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
148f18c5fd
Merge pull request #1023 from ethereum/ralexstokes-patch-1
...
Add notes to compute fork choice at genesis
2019-05-06 09:11:25 -06:00
7d0a6191ed
simplify justificatio/finality notes at genesis
2019-05-06 09:09:37 -06: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
2ccd357f0e
Update specs/core/1_custody-game.md
...
Co-Authored-By: vbuterin <v@buterin.com>
2019-05-03 21:05:54 +08:00
66b152f79e
Allow multiple bit challenges, and recover withdrawability
...
Resolves #864 items 4, 7, 14
2019-05-03 05:07:11 -05:00
c0f3453093
RANDAO reveal slashing, custody period staggering and integration of custody and RANDAO reveals ( #880 )
...
* Add RandaoRevealSlashing for early Randao reveals
* add some randao reveal slashing tests
* Unifying RANDAO reveal slashing and Custody reveal slashing; implemented more lenient penalty for not-to-early reveals
* Fix custody reveal domain
* Also test exposed_randao_reveals
* Re-add exposed_randao_reveals to validator initialization
* Fix tests
* Unified Randao Reveal slashing mechanism and Custody Reveal,
CUSTODY_PERIOD_TO_RANDAO_PADDING = EPOCHS_PER_CUSTODY_PERIOD
* Move exposed_randao_reveals into separate data structure to keep validator record clean
* new shiny staggered custody periods
* Fixes style and type hinting
* removes whitespace
* Cleans up multi-line conditionals
* Make RANDAO key reveal penalties proportional to block rewards
* Minor typos
* Minor typos
* Fixes off-by one error
* Removes unnecicary whitepsace
* Clean up comments; add test for key reveal too far in the future
* Reduce the CUSTODY_PERIOD_TO_RANDAO_PADDING again
* Fix max_proposer_slot_reward
* Fix types
* Move test
* Fix RandaoKeyReveal tests
* Move all RANDAO key reveal to phase 1
* Factor out signature checking
* Some fixes
* Update specs/core/1_custody-game.md
Co-Authored-By: dankrad <dankrad@ethereum.org>
* Addressing Vitalik's suggestions: Separate RANDAO and Custody key reveals; append the cleanup of RANDAO reveals instead of adding a new function
* Remove remnants of verify_custody_key
* RandaoKeyReveal -> EarlyDerivedSecretReveal
* Make penalty proportional to number of secrets already exposed
* Update specs/core/1_custody-game.md
Co-Authored-By: dankrad <dankrad@ethereum.org>
* Update specs/core/1_custody-game.md
Co-Authored-By: dankrad <dankrad@ethereum.org>
* Update specs/core/1_custody-game.md
Co-Authored-By: dankrad <dankrad@ethereum.org>
2019-05-03 17:30:55 +08:00
4ca2f11827
Custody game changes ( #866 )
...
* Custody game changes
1. Don't store the full chunk bits, instead only store a Merkle root. Increased history size complexity from `N` to `N + log(N)` but with the benefit of decreasing storage requirements from `N` to a single 32 byte hash.
2. `custody_bit` is computed as the first bit of the hash of the custody bits, not the xor. This allows us to more safely use functions with more risky security assumptions for computing the chunk mix.
* Update specs/core/1_custody-game.md
* Update specs/core/1_custody-game.md
* Update specs/core/1_custody-game.md
* Update specs/core/1_custody-game.md
* XOR aggregation before SHA256 to reduce number of hashes
* Simplifed get_chunk_bits_root
* standalone -> indexed
* Fix missing "data" and ToC
2019-05-03 17:20:54 +08: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
c761fbc318
Clean up verify_indexed_attestation
...
Cosmetic changes:
* Add 4 lines of comments (now every statement has a comment)
* Avoid unnecessary `assert` (the end goal for me is for `assert`s to be exclusive to the operation processing helpers).
* Merge `return`s into one (increase readability, reduce verbosity)
* Use shorter-named `bit_0_indices` and `bit_1_indices` helper variables
Substantive change:
* Remove the condition that `len(0_indices) + len(1_indices) > 0`. This condition is redundant in the context of `process_attester_slashing` because of `slashed_any`. It is largely artificial in `process_attestation` where validators are incentivised to maximise new attestations.
2019-05-02 09:24:24 +01:00
b169c42339
fix underflows in generate_seed, get_randao_mix, and get_active_index_roots
2019-05-01 17:44:34 -06:00
d28e5e4843
Update 0_beacon-chain.md
2019-05-01 16:26:18 -07:00
faf36e056f
Add notes to compute fork choice at genesis
2019-05-01 16:10:01 -07:00
6242e54c0a
Merge branch 'JustinDrake-patch-11' of github.com:ethereum/eth2.0-specs into JustinDrake-patch-11
2019-05-01 17:06:23 -06:00
1bb9397b65
Merge pull request #1014 from ethereum/JustinDrake-patch-10
...
Add 32-byte graffiti
2019-05-01 16:30:02 -06:00
ef72b7ec20
Merge branch 'master' into vbuterin-patch-2
2019-05-01 16:19:21 -06:00
002e27973c
alter get_winning_crosslink.. to have same function signature as get_crosslink_committee
2019-05-01 15:51:43 -06:00
e85678ac15
restore compute_committee
2019-05-01 15:21:38 +01:00
7980cf3ef7
Fix
2019-05-01 15:07:55 +01:00
a25103cefd
Merge pull request #1013 from terencechain/patch-69
...
Generate seed once for get_beacon_proposer_index
2019-05-01 07:56:57 -06:00
9b24d06b2c
Cleanup
2019-05-01 14:16:55 +01:00
2e63a9b5a0
clean up
2019-05-01 13:29:03 +01:00
5df79d7565
Get rid of state_transition.py
2019-05-01 13:14:10 +01:00
591a2b47c8
Simplify state_transition.py
2019-05-01 12:08:15 +01:00
8b316c6db4
Start moving state_transition.py to state transitition spec
...
The state transition spec should be reasonably self-contained, limiting the amount of "magic" outside of it. This PR is a first step in this direction, specifically for operation processing.
2019-05-01 12:04:27 +01:00
f62126d5ee
Update 0_beacon-chain.md
2019-05-01 09:34:09 +01:00
407902763c
Update 0_beacon-chain.md
2019-05-01 09:33:22 +01:00
427a53cdae
Remove get_state_root from state transition doc
...
Remove `get_state_root` from the state transition function spec because it is not used by the state transition function.
2019-05-01 09:24:51 +01:00
Justin Drake
Hsiao-Wei Wang
Carl Beekhuizen
Danny Ryan
Ivan Martinez
protolambda
terence tsao
Michael Sproul
vbuterin
Jonny Rhea
Ryuya Nakamura
Dankrad Feist
JSON
dankrad
Alex Stokes