status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace unspecified SHARD_COUNT const with get_active_shard_count(previous_epoch)

This commit is contained in:
Anton Nashatyrev 2021-04-30 14:09:09 +03:00
parent 2af585b333
commit 86d8a10495
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
specs/sharding/beacon-chain.md
View File

@ -670,8 +670,9 @@ def process_pending_headers(state: BeaconState) -> None:
previous_epoch = get_previous_epoch(state) previous_epoch = get_previous_epoch(state)
previous_epoch_start_slot = compute_start_slot_at_epoch(previous_epoch) previous_epoch_start_slot = compute_start_slot_at_epoch(previous_epoch)
active_shard_count = get_active_shard_count(state, previous_epoch)
for slot in range(previous_epoch_start_slot, previous_epoch_start_slot + SLOTS_PER_EPOCH): for slot in range(previous_epoch_start_slot, previous_epoch_start_slot + SLOTS_PER_EPOCH):
for shard_index in range(get_active_shard_count(state, previous_epoch)): for shard_index in range(active_shard_count):
shard = Shard(shard_index) shard = Shard(shard_index)
# Pending headers for this (slot, shard) combo # Pending headers for this (slot, shard) combo
candidates = [ candidates = [
@ -704,7 +705,7 @@ def process_pending_headers(state: BeaconState) -> None:
winning_index = [c.root for c in candidates].index(Root()) winning_index = [c.root for c in candidates].index(Root())
candidates[winning_index].confirmed = True candidates[winning_index].confirmed = True
for slot_index in range(SLOTS_PER_EPOCH): for slot_index in range(SLOTS_PER_EPOCH):
for shard in range(SHARD_COUNT): for shard in range(active_shard_count):
state.grandparent_epoch_confirmed_commitments[shard][slot_index] = DataCommitment() state.grandparent_epoch_confirmed_commitments[shard][slot_index] = DataCommitment()
confirmed_headers = [candidate for candidate in state.previous_epoch_pending_shard_headers if candidate.confirmed] confirmed_headers = [candidate for candidate in state.previous_epoch_pending_shard_headers if candidate.confirmed]
for header in confirmed_headers: for header in confirmed_headers:
@ -718,9 +719,10 @@ def charge_confirmed_header_fees(state: BeaconState) -> None:
get_active_shard_count(state, get_current_epoch(state)) get_active_shard_count(state, get_current_epoch(state))
* SLOTS_PER_EPOCH * GASPRICE_ADJUSTMENT_COEFFICIENT * SLOTS_PER_EPOCH * GASPRICE_ADJUSTMENT_COEFFICIENT
) )
previous_epoch_start_slot = compute_start_slot_at_epoch(get_previous_epoch(state)) previous_epoch = get_previous_epoch(state)
previous_epoch_start_slot = compute_start_slot_at_epoch(previous_epoch)
for slot in range(previous_epoch_start_slot, previous_epoch_start_slot + SLOTS_PER_EPOCH): for slot in range(previous_epoch_start_slot, previous_epoch_start_slot + SLOTS_PER_EPOCH):
for shard_index in range(SHARD_COUNT): for shard_index in range(get_active_shard_count(state, previous_epoch)):
shard = Shard(shard_index) shard = Shard(shard_index)
confirmed_candidates = [ confirmed_candidates = [
c for c in state.previous_epoch_pending_shard_headers c for c in state.previous_epoch_pending_shard_headers