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.

Sign up for GitHub

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

Jump to bottom

Use hash_tree_root everywhere #739

Merged
merged 6 commits into from
Mar 8, 2019
Merged

Use hash_tree_root everywhere #739

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1269542
Use hash_tree_root everywhere
JustinDrake Mar 8, 2019
9b598c9
Merge branch 'dev' into JustinDrake-patch-7
djrtwo Mar 8, 2019
1141467
Update 0_beacon-chain.md
JustinDrake Mar 8, 2019
de60533
Update 0_beacon-chain.md
JustinDrake Mar 8, 2019
f180eb5
Update 0_beacon-chain.md
JustinDrake Mar 8, 2019
f72e856
Merge branch 'dev' into JustinDrake-patch-7
djrtwo Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions specs/core/0_beacon-chain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
- [`get_active_index_root`](#get_active_index_root)
- [`generate_seed`](#generate_seed)
- [`get_beacon_proposer_index`](#get_beacon_proposer_index)
- [`merkle_root`](#merkle_root)
- [`verify_merkle_branch`](#verify_merkle_branch)
- [`get_attestation_participants`](#get_attestation_participants)
- [`is_power_of_two`](#is_power_of_two)
Expand Down Expand Up @@ -1005,20 +1004,6 @@ def get_beacon_proposer_index(state: BeaconState,
return first_committee[slot % len(first_committee)]
```

### `merkle_root`

```python
def merkle_root(values: List[Bytes32]) -> Bytes32:
"""
Merkleize ``values`` (where ``len(values)`` is a power of two) and return the Merkle root.
Note that the leaves are not hashed.
"""
o = [0] * len(values) + values
for i in range(len(values) - 1, 0, -1):
o[i] = hash(o[i * 2] + o[i * 2 + 1])
return o[1]
```

### `verify_merkle_branch`

```python
Expand Down Expand Up @@ -2494,7 +2479,7 @@ def finish_epoch_update(state: BeaconState) -> None:
state.latest_randao_mixes[next_epoch % LATEST_RANDAO_MIXES_LENGTH] = get_randao_mix(state, current_epoch)
# Set historical root accumulator
if next_epoch % (SLOTS_PER_HISTORICAL_ROOT // SLOTS_PER_EPOCH) == 0:
state.historical_roots.append(merkle_root(state.latest_block_roots + state.latest_state_roots))
state.historical_roots.append(hash_tree_root(state.latest_block_roots + state.latest_state_roots))
# Rotate current/previous epoch attestations
state.previous_epoch_attestations = state.current_epoch_attestations
state.current_epoch_attestations = []
Expand Down