Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mandatory deposit index ordering #594

Merged
merged 3 commits into from
Feb 9, 2019
Merged

Add mandatory deposit index ordering #594

merged 3 commits into from
Feb 9, 2019

Conversation

vbuterin
Copy link
Contributor

@vbuterin vbuterin commented Feb 9, 2019

Co-requisite with #589

specs/core/0_beacon-chain.md Outdated Show resolved Hide resolved
@@ -1478,6 +1479,7 @@ def get_initial_beacon_state(initial_validator_deposits: List[Deposit],
# Ethereum 1.0 chain data
latest_eth1_data=latest_eth1_data,
eth1_data_votes=[],
deposit_index=0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should default to len(initial_validator_deposits)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Though note that all this introduces one issue: if there are bad deposits before launch, then there will be a bunch of deposits that have to be reprocessed before any new deposits can be processed. I guess it's fine because they'll all fail due to the pubkey uniqueness check?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. This will ensure that we don't have to attempt to process any failed deposits -- thus starting from the next deposit after the initial.

I'm assuming that initial_validator_deposits includes invalid ones that will just get skipped over in process_deposit below

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or am I missing something

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aah I see, if initial_validator_deposits includes invalid ones then there's no issue.

@djrtwo djrtwo merged commit 311cf00 into dev Feb 9, 2019
@djrtwo djrtwo deleted the vbuterin-patch-3 branch February 9, 2019 15:22
hwwhww added a commit to hwwhww/trinity that referenced this pull request Feb 17, 2019
hwwhww added a commit to ethereum/trinity that referenced this pull request Feb 18, 2019
* Rename

1. `get_initial_beacon_state` -> `get_genesis_beacon_state`
2. `initial_validator_deposits` -> `genesis_validator_deposits`

* Add BeaconState.deposit_index (ethereum/consensus-specs#594)

* Use BLS-based RANDAO types and modify `process_deposit`

* Remove outdated per-slot `proposer.randao_layers` and `state.latest_randao_mixes` update

* Update eth2/beacon/types/blocks.py

Co-Authored-By: hwwhww <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants