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

fix committee work status and commitment references

This commit is contained in:
protolambda 2021-06-03 19:11:47 +02:00
parent d4f6459108
commit 9050897cb2
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,13 +719,13 @@ def process_pending_shard_confirmations(state: BeaconState) -> None:
buffer_index = slot % SHARD_STATE_MEMORY_SLOTS buffer_index = slot % SHARD_STATE_MEMORY_SLOTS
for shard_index in range(len(state.shard_buffer[buffer_index])): for shard_index in range(len(state.shard_buffer[buffer_index])):
committee_work = state.shard_buffer[buffer_index][shard_index] committee_work = state.shard_buffer[buffer_index][shard_index]
if committee_work.selector == SHARD_WORK_PENDING: if committee_work.status.selector == SHARD_WORK_PENDING:
winning_header = max(committee_work.value, key=lambda header: header.weight) winning_header = max(committee_work.status.value, key=lambda header: header.weight)
# TODO In Altair: set participation bit flag of voters for winning header # TODO In Altair: set participation bit flag of voters for winning header
if winning_header.commitment == DataCommitment(): if winning_header.commitment == DataCommitment():
committee_work.change(selector=SHARD_WORK_UNCONFIRMED, value=None) committee_work.status.change(selector=SHARD_WORK_UNCONFIRMED, value=None)
else: else:
committee_work.change(selector=SHARD_WORK_CONFIRMED, value=winning_header.commitment) committee_work.status.change(selector=SHARD_WORK_CONFIRMED, value=winning_header.commitment)
``` ```
#### `charge_confirmed_shard_fees` #### `charge_confirmed_shard_fees`
@ -745,10 +745,11 @@ def charge_confirmed_shard_fees(state: BeaconState) -> None:
for shard_index in range(len(state.shard_buffer[buffer_index])): for shard_index in range(len(state.shard_buffer[buffer_index])):
committee_work = state.shard_buffer[buffer_index][shard_index] committee_work = state.shard_buffer[buffer_index][shard_index]
if committee_work.status.selector == SHARD_WORK_CONFIRMED: if committee_work.status.selector == SHARD_WORK_CONFIRMED:
commitment: DataCommitment = committee_work.status.value
# Charge EIP 1559 fee # Charge EIP 1559 fee
proposer = get_shard_proposer_index(state, slot, Shard(shard_index)) proposer = get_shard_proposer_index(state, slot, Shard(shard_index))
fee = ( fee = (
(state.shard_gasprice * candidate.commitment.length) (state.shard_gasprice * commitment.length)
// TARGET_SAMPLES_PER_BLOCK // TARGET_SAMPLES_PER_BLOCK
) )
decrease_balance(state, proposer, fee) decrease_balance(state, proposer, fee)
@ -756,7 +757,7 @@ def charge_confirmed_shard_fees(state: BeaconState) -> None:
# Track updated gas price # Track updated gas price
new_gasprice = compute_updated_gasprice( new_gasprice = compute_updated_gasprice(
new_gasprice, new_gasprice,
candidate.commitment.length, commitment.length,
adjustment_quotient, adjustment_quotient,
) )
state.shard_gasprice = new_gasprice state.shard_gasprice = new_gasprice