From 41f97162d6a0562c0ef13e036b19fe2bea44660f Mon Sep 17 00:00:00 2001 From: Dankrad Feist Date: Mon, 28 Dec 2020 16:53:50 +0000 Subject: [PATCH] most_recent_confirmed_commitments -> grantparent_epoch_confirmed_commitments --- specs/phase1/beacon-chain.md | 6 +++--- specs/phase1/fork-choice.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/phase1/beacon-chain.md b/specs/phase1/beacon-chain.md index e909769e6..44df6d16a 100644 --- a/specs/phase1/beacon-chain.md +++ b/specs/phase1/beacon-chain.md @@ -150,7 +150,7 @@ class BeaconState(phase0.BeaconState): # New fields current_epoch_pending_shard_headers: List[PendingShardHeader, MAX_SHARD_HEADERS * SLOTS_PER_EPOCH] previous_epoch_pending_shard_headers: List[PendingShardHeader, MAX_SHARD_HEADERS * SLOTS_PER_EPOCH] - most_recent_confirmed_commitments: Vector[Vector[DataCommitment, SLOTS_PER_EPOCH], MAX_SHARDS] + grandparent_epoch_confirmed_commitments: Vector[Vector[DataCommitment, SLOTS_PER_EPOCH], MAX_SHARDS] shard_gasprice: uint64 current_epoch_start_shard: Shard ``` @@ -591,10 +591,10 @@ def process_pending_headers(state: BeaconState): candidates[winning_index].confirmed = True for slot in range(SLOTS_PER_EPOCH): for shard in range(SHARD_COUNT): - state.most_recent_confirmed_commitments[shard][slot] = DataCommitment() + state.grandparent_epoch_confirmed_commitments[shard][slot] = DataCommitment() for c in state.previous_epoch_pending_shard_headers: if c.confirmed: - state.most_recent_confirmed_commitments[c.shard][c.slot % SLOTS_PER_EPOCH] = c.commitment + state.grandparent_epoch_confirmed_commitments[c.shard][c.slot % SLOTS_PER_EPOCH] = c.commitment ``` ```python diff --git a/specs/phase1/fork-choice.md b/specs/phase1/fork-choice.md index 858a0c872..e9c9f4f02 100644 --- a/specs/phase1/fork-choice.md +++ b/specs/phase1/fork-choice.md @@ -27,7 +27,7 @@ def get_new_dependencies(state: BeaconState) -> Set[DataCommitment]: # Already confirmed during previous epoch [c.commitment for c in state.previous_epoch_pending_headers if c.confirmed] + # Confirmed in the epoch before the previous - [c for c in shard for shard in state.most_recent_confirmed_commitments if c != DataCommitment()] + [c for c in shard for shard in state.grandparent_epoch_confirmed_commitments if c != DataCommitment()] ) ```