Commit Graph

760 Commits

Author SHA1 Message Date
Hsiao-Wei Wang e772c4da6f
Merge branch 'master' into rename_pow_to_deposit 2019-01-07 14:02:11 +08:00
Cayman 140ee1ade9
Fix hash function link 2019-01-06 23:10:33 -06:00
Alex Stokes c69fa9a793
Fixes typo in `sorted` function.
In keeping with the rest of the code in this document we adhere to valid Python
where possible.

The custom comparator keyword argument for `sorted` is `key` so this commit
updates its usage when sorting validators by exit order.
2019-01-06 17:41:11 -06:00
Cayman cebbe7b7c5
Fix minor variable name mismatch 2019-01-06 13:05:27 -06:00
Danny Ryan fd2cc6956f
Merge branch 'master' into vbuterin-patch-19 2019-01-05 08:53:04 -07:00
Cayman fb17be0e9b
Fix deserialize uint bounds logic
Array accesses should be relative to uint byte length, not bit length.
2019-01-04 11:14:27 -06:00
Alex Stokes a0e454d86c
Fixes bug with Merkle proof branch selection
This code determines the order in which the next branch element and the
current value should be hashed to produce the parent node in the Merkle tree.

The existing code fails to verify branches constructed in the standard way.

This patch fixes the spec code so that it works properly by using an appropriate
parity calculation.

Example code here to illustrate it working:
https://gist.github.com/ralexstokes/9d82e188bd3286ff74a1fa1dcb5068e0
2019-01-04 09:48:50 -06:00
vbuterin c24f907088
Put back spaces 2019-01-04 09:22:59 -06:00
Hsiao-Wei Wang 88de4e35f2
Merge pull request #395 from terenc3t/patch-28
Get shard_block_root from crosslink
2019-01-04 16:04:43 +08:00
Hsiao-Wei Wang fa08e240c8
Merge branch 'master' into HEAD 2019-01-04 15:55:03 +08:00
Hsiao-Wei Wang 61b2b6392c
bugfix and rename
Use `deposit_root_vote` for `DepositRootVote` object and `deposit_root` for the
deposit root hash.
2019-01-04 15:54:48 +08:00
Danny Ryan 36231e698a
Apply suggestions from code review
Co-Authored-By: hwwhww <hwwang156@gmail.com>
2019-01-04 15:54:35 +08:00
Danny Ryan e3c4155ba5
Merge pull request #393 from terenc3t/patch-27
Align Field Names with Phase 0 Spec
2019-01-03 21:48:14 -07:00
Danny Ryan d360330f83
Merge pull request #394 from ralexstokes/fix-update-validator-registry-fn
Remove dangling `return` statement from spec function
2019-01-03 21:46:34 -07:00
Danny Ryan a84dd398e4
Merge pull request #392 from ralexstokes/fix-units-ejection-balance
Fix a type error with units of wei when determining ejection balance.
2019-01-03 21:44:08 -07:00
Danny Ryan d5e6d84269
Merge pull request #391 from ralexstokes/typo/hash-slot
Change "justified hash" to "justified slot"
2019-01-03 21:43:12 -07:00
terence tsao 97bd04607c
Update 0_beacon-chain.md 2019-01-03 19:40:03 -08:00
terence tsao c0140d72ee
Update 0_beacon-chain.md 2019-01-03 18:23:23 -08:00
vbuterin a5b1f2cc0a
Moved comment and changed conditional 2019-01-03 19:44:39 -06:00
vbuterin 3f4be7abb7
Fixed activation slot conditional. 2019-01-03 19:42:59 -06:00
Alex Stokes 19a9582a48
Remove dangling `return` statement from spec function
This function declares that it returns `None` and instead directly mutates the
state.

There is a dangling return statement that this commit deletes.
2019-01-03 19:42:07 -06:00
terence tsao 19b1a31903
Update 1_shard-data-chains.md 2019-01-03 13:57:04 -08:00
Alex Stokes 9a83ad7b9b
Fix a type error with units of wei when determining ejection balance.
`EJECTION_BALANCE` is in units of ETH.

`state.validator_balances[index]` is in units of Gwei.

For the ejection computation to work as desired, we need to convert the
`EJECTION_BALANCE` constant from ETH to Gwei.
2019-01-03 14:28:36 -06:00
Alex Stokes 457f84fa64
Change "justified hash" to "justified slot"
There should be a correspondence here but referring to the slot is more
explicit, especially for those who are not as familiar with the
details of FFG finalization.
2019-01-03 12:06:44 -06:00
Hsiao-Wei Wang f92735454e
Fix `verify_slashable_vote_data`
The first field of `AttestationDataAndCustodyBit` should be an `AttestationData` object, not an `SlashableVoteData` object.
2019-01-03 16:19:54 +08:00
Hsiao-Wei Wang b614595fbe
Merge branch 'master' into vbuterin-patch-19 2019-01-03 00:26:31 +08:00
Hsiao-Wei Wang af8ed89170
Merge branch 'master' into rename_pow_to_deposit 2019-01-03 00:10:18 +08:00
Hsiao-Wei Wang 78e73633bc
Merge pull request #382 from ethereum/remove_shard_reassignment_record
Remove `ShardReassignmentRecord`
2019-01-02 23:48:04 +08:00
Hsiao-Wei Wang dcaf510213
Merge branch 'master' into rename_pow_to_deposit 2019-01-02 23:44:12 +08:00
Justin 3efe1b3b6c
Update 0_beacon-chain.md 2019-01-02 15:21:22 +00:00
Justin 429e5721f2
RANDAO hash chain and no stale shuffles
* Make RANDAO into a hash chain (this makes it easy for applications to prove the intermediate RANDAO reveals).
* Include `state.slot` when shuffle to avoid stale shuffles with skip slots
2019-01-02 14:20:01 +00:00
Justin 93b18d5160
Fix typo 2019-01-02 13:51:57 +00:00
Justin 696bf23b5e
Remove returned value for process_deposit
Also trim trailing whitespace
2019-01-02 13:41:32 +00:00
Justin 7d240946a9
Update 0_beacon-chain.md
* Cleanup comments related to custody
* Rename "Miscellaneous" to "Custody" in the table of contents
* Use `INITIAL_SLOT_NUMBER` instead of `0` for initial custody slots
* (typo) Fix `second_latest_custody_reseed_slot` => `penultimate_custody_reseed_slot`
2019-01-02 13:35:57 +00:00
Justin 9a90803f5c
Update 0_beacon-chain.md
* `processed_deposit_root` => `latest_deposit_root`
* `receipt_root` => `deposit_root`
* `receipt_tree` => `deposit_tree`
* Emphasize that deposits are Ethereum 1.0 deposits in text in various places
* `Eth1Deposit` => `Deposit` for consistency (Also happy sticking with `Eth1Deposit` and replacing `deposit_` with `eth1_deposit_` everywhere. This may be unnecessary since Ethereum 2.0 deposits can be distinguished with the `shard_` prefix, e.g. `ShardDeposit` and `shard_deposit`.)
* Clarify `withdrawal_credentials`.
* Clarify that multiple Ethereum 1.0 blocks can have the same deposit root.
2019-01-02 13:18:35 +00:00
Hsiao-Wei Wang 3dbee05aa6
Rename `pow_receipt_` to `deposit_` 2019-01-02 18:27:09 +08:00
Hsiao-Wei Wang 35adc9c61a
Remove `ShardReassignmentRecord` 2019-01-02 15:31:57 +08:00
Hsiao-Wei Wang 0d9ecce344
Rename `poc_` to `custody` 2019-01-02 15:16:55 +08:00
vbuterin 2105614059
Bunch of fixes 2019-01-01 22:37:43 -06:00
Alex Stokes d49b6e5087 Fix typo with missing bracket (#379) 2018-12-31 23:35:09 +00:00
vbuterin fdb1b6775d
Removed extraneous variable setting 2018-12-31 14:08:59 -06:00
Justin fd295eb539
Merge branch 'master' into vbuterin-patch-19 2018-12-31 15:17:00 +00:00
Justin d36b403c2e
Cleanups and fixes
Cleanups

* (typo) Remove `get_new_validator_registry_delta_chain_tip` from table of contents
* (typo) Update "Routines for updating validator status" in table of contents
* Update `FAR_FUTURE_SLOT` from `2**63` to `2**64 - 1`
* Put more constants in "Initial values", homogenise
* Cleanup note formatting
* Remove `ZERO_BALANCE_VALIDATOR_TTL` logic (to be possibly reintroduced in phase 2).
* Cleanup `min_empty_validator_index`
* Rename `deposit` to `amount` in `process_deposit` and `DepositData`.
* (typo) Remove new line under `process_penalties_and_exits`
* (typo) "Status codes" => "Status flags" in the table of contents
* (typo) `(state.slot - EPOCH_LENGTH) % LATEST_RANDAO_MIXES_LENGTH` => Use `SEED_LOOKAHEAD` instead.
* Put `state.validator_registry_latest_change_slot = state.slot` in `update_validator_registry`.
* Use `GENESIS_SLOT` for `last_poc_change_slot=0` and `second_last_poc_change_slot=0`.

Bugfixes

* (typo) `validator_exit` => `exit.validator_index`
* Separate initial deposits and initial activations to avoid double activations
* Replace `proposer.status != EXITED_WITH_PENALTY` with `validator.penalized_slot > state.slot` in two different places.
* Replace `status == EXITED_WITH_PENALTY` with `validator.penalized_slot <= state.slot` (and validator active) in two different places.
2018-12-31 15:14:14 +00:00
Danny Ryan 8f29bcdf08
Merge pull request #373 from ethereum/fix-slashing
fix slashing conditons
2018-12-31 07:57:51 -06:00
vbuterin 011970169c
Edited as per Justin's comments 2018-12-30 20:42:05 -06:00
terence tsao c8ff723514
Update 0_beacon-chain.md 2018-12-30 16:06:33 -08:00
vbuterin 1a4973171f Remove references to the persistent committees (#376)
* Remove references to the persistent committees
2018-12-30 23:46:32 +00:00
vbuterin 4a93374025
Fixed as per hww's comments 2018-12-30 09:15:23 -06:00
Hsiao-Wei Wang 14f49aaacb
Update specs/core/0_beacon-chain.md
Co-Authored-By: vbuterin <v@buterin.com>
2018-12-29 13:47:10 -06:00
vbuterin bd5b32ec5a
Initialize status_flags 2018-12-29 13:44:51 -06:00
vbuterin 85d001001c
Fixed seed lookahead 2018-12-28 12:08:19 -06:00
vbuterin d9e897bbcb
Status code / slot reorganization
* Added `activation_slot`, `exit_slot`, `penalized_slot`, `withdrawal_slot`, use these to determine if a validator is active
* Universal min activation/exit delay of 256 slots
* Min exit time of ~1 day, but penalization delays this to ~18 days
* Penalty calculation period of `[time penalized - 18 days, time penalized + 18 days]`; made the total penalties array fixed size and wraparound to make calculation more fine-grained
* Processes withdrawals in all epochs, not just dynasty-changing epochs
* Change `get_shuffling` function to take slot as argument

Not yet done:

* Removed `shard_committees` from the state
* Removed persistent committees from the state
2018-12-28 12:04:03 -06:00
Danny Ryan aa9bda271f
fix slashing conditons to be based upon epochs rather than slots 2018-12-28 11:10:12 -06:00
terence tsao 10a8ba2d9e
rewording for validator registry precondition 2018-12-28 09:04:00 -08:00
Hsiao-Wei Wang 6b84dae09e Fix #361: pass `poc_commitment` to `validate_proof_of_possession` (#364)
* Fix #361
2018-12-27 18:11:38 +00:00
terence tsao 44c389bfe3 crosslink rewards typo (#367) 2018-12-27 18:01:20 +00:00
Nishant Das 8c12896fa0 Cleanup merkle_root
Add docstring and fix spacing.
2018-12-27 17:58:24 +00:00
Hsiao-Wei Wang 2c9cefa6a7
`Use `current_` instead of `this_` 2018-12-26 15:48:20 +08:00
terence tsao a2422de686
Potential bug for crosslinks? 2018-12-23 09:34:46 -08:00
vbuterin 4938481428 Added hash-and-bit data structure as per #286 (#355)
* Added hash-and-bit data structure as per #286
2018-12-23 10:48:11 +00:00
Hsiao-Wei Wang 0ee724a4ab
Merge pull request #356 from terenc3t/patch-22
updated SSZ implementation list
2018-12-23 12:04:31 +08:00
Hsiao-Wei Wang 985a3fe958
Merge pull request #351 from dangerousfood/vrc-con-update
Update VRC contract for Vyper v0.1.0-beta.6
2018-12-23 12:03:34 +08:00
terence tsao f21da324ef
updated SSZ implementation list 2018-12-22 15:13:54 -08:00
Danny Ryan f8652fa25b
Merge pull request #347 from ethereum/vbuterin-patch-15
Changes to inactivity leak
2018-12-22 07:13:41 -06:00
Danny Ryan f84b7b5f31
Merge pull request #341 from ethereum/target-committee-size
change TARGET_COMMITTEE_SIZE to 128
2018-12-22 07:12:21 -06:00
Danny Ryan a60ab53647
PR feedback 2018-12-22 07:11:58 -06:00
Danny Ryan d0b5133912
Merge pull request #349 from ethereum/vbuterin-patch-17
Proof of custody placeholders
2018-12-22 07:08:18 -06:00
vbuterin 99817aeb0e
Typo fix: lastest -> last 2018-12-21 17:23:42 -05:00
Danny Ryan 6a73a056f0
Update specs/core/0_beacon-chain.md
Co-Authored-By: vbuterin <v@buterin.com>
2018-12-21 17:22:42 -05:00
Joseph Delong 1068076822 update vrc cotnract for vyper v0.1.0-beta.6 2018-12-21 16:18:41 -06:00
Danny Ryan fa8be783ad
Update specs/core/0_beacon-chain.md
Co-Authored-By: vbuterin <v@buterin.com>
2018-12-21 17:12:38 -05:00
vbuterin 4f94f7579c
Moved notes to the end of the section to make Danny happy 2018-12-21 11:29:15 -05:00
vbuterin 5fc8f6cfca
Fixed deposit inclusion and positioning of state variables 2018-12-21 11:26:40 -05:00
Justin c8efdc7431
Add placeholder array in state for VDFs
Added `latest_vdf_outputs` in `state` initialised to an array of `ZERO_HASH` of length `LATEST_RANDAO_MIXES_LENGTH // EPOCH_LENGTH`. (There's one VDF output per epoch. The VDF input is the RANDAO mix at the epoch boundary.)

 Further changes to activate VDFs (in a future phase):

* Add a new beacon "VDF output and proof" transaction, e.g. with `MAX_VDF_OUTPUT_AND_PROOF := 1`.
* Adjust the `MAX_SEED_LOOKAHEAD` constant, e.g. to `2**4 * EPOCH_LENGTH`. (The `2**4` parameter is essentially `A_max`.)
* Add a `process_vdf_output_and_proof` helper function in the per-block processing:
    * Verify the VDF input hasn't already been processed (check the corresponding `state.latest_vdf_outputs` entry is not `ZERO_HASH`.)
    * Verify the proof is correct, i.e. matches the VDF input and output
    * Save the VDF output to `state.latest_vdf_outputs`
* In the per-epoch processing set the corresponding entry in `state.latest_vdf_outputs` to `ZERO_HASH`.
* Use a VDF output for the shuffling seed.
2018-12-21 15:26:13 +00:00
Hsiao-Wei Wang 6667edb015
Update specs/core/0_beacon-chain.md
Co-Authored-By: vbuterin <v@buterin.com>
2018-12-21 09:08:01 -05:00
vbuterin 6eb4e59b8c
slots -> epochs 2018-12-21 09:07:04 -05:00
vbuterin 8e30f1b63e
Set zero balance TTL back to 2**22 2018-12-21 09:06:30 -05:00
Hsiao-Wei Wang 1d1db908e2
Fix grammar 2018-12-21 16:43:59 +08:00
Hsiao-Wei Wang ac0b8aac07
Add initial setting of proof of custody placeholders 2018-12-21 16:41:48 +08:00
Hsiao-Wei Wang e639f365a6
Merge pull request #344 from ethereum/hwwhww/chunk_size
phase1: Adjust `CHUNK_SIZE`
2018-12-21 11:04:36 +08:00
vbuterin 985c8a2c30
Proof of custody placeholders
Replacing #145
2018-12-20 16:01:00 -05:00
vbuterin ac5db1da8d
Doubled sqrt e drop time. 2018-12-20 12:51:34 -05:00
vbuterin 53dd49167b
Changes to inactivity leak
* Fixes parameters and makes clear that the inactivity leak is on a per-epoch basis (before the leak was technically 64 times too weak as it was calculated per-slot but applied per-epoch)
* Adds a `// 2` to the inactivity leak to compensate for it being applied twice
* Changes how it is calculated (no inactivity leak for not being part of the head, only basic leak)
* Separates out early inclusion incentives into a separate incentive component rather than being multiplicative with everything else
2018-12-20 12:41:17 -05:00
Danny Ryan eaab06f2dd
Merge pull request #298 from ethereum/update_vyper_contract
deposit contract: reduce on-chain computation
2018-12-20 09:24:32 -06:00
terence tsao 96633781fb
simplify total_attesting_balance 2018-12-20 06:37:03 -08:00
Danny Ryan e780be349e
Merge pull request #345 from ChihChengLiang/patch-2
Fix typo in get_new_shuffling
2018-12-20 07:52:30 -06:00
Danny Ryan c90ab16701
Merge pull request #340 from ethereum/vbuterin-patch-15
Remove MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL
2018-12-20 07:51:58 -06:00
Chih Cheng Liang d3cdd3fcc0
Fix typo in get_new_shuffling 2018-12-20 19:36:35 +08:00
Hsiao-Wei Wang e4e923fbba
Adjust `CHUNK_SIZE` 2018-12-20 14:36:33 +08:00
terence tsao c177ce23b3
typo on attesting_validator? 2018-12-19 21:56:43 -08:00
Akhila Raju bf753a6120
Remove line repeat in initiate_validator_exit 2018-12-19 19:56:26 -06:00
Akhila Raju 09e31acda5
Remove line repeat in activate_validator 2018-12-19 19:53:28 -06:00
Danny Ryan 0809ca0d62
fix 'CYCLE_LENGTH' -> 'EPOCH_LENGTH' 2018-12-19 19:35:55 -06:00
Danny Ryan 55ac9ac313
change TARGET_COMMITTEE_SIZE to 128 2018-12-19 15:09:17 -06:00
vbuterin 56bc4412bc
Remove MIN_VALIDATOR_REGISTRY_CHANGE_INTERVAL
Slight simplification. Only substantive change is that if the validator registry stays constant, we don't reshuffle 3 epochs after the last reshuffling (ie. before the reshufflings happened after 1, 2, 3, 4, 8, 16... epochs, now it's just 1, 2, 4, 8, 16...)
2018-12-19 14:09:50 -05:00
Vitalik Buterin a9328157a8
Don't lexicographically sort 2018-12-19 13:48:04 -05:00
Hsiao-Wei Wang 9b9114fac2
Merge branch 'master' into update_vyper_contract 2018-12-19 23:39:59 +08:00
Danny Ryan 105e669391
Merge pull request #327 from ethereum/vbuterin-patch-18
Keep randao mixes in the state
2018-12-19 09:03:25 -06:00
Anirudha Bose 257c83cc23
Fix typos in the beacon chain spec 2018-12-19 12:47:37 +01:00
Danny Ryan 36e26c86a3
fix assert conditions in get_block_hash 2018-12-18 12:53:48 -06:00