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

shard work status enum, prefix instead of suffix + move full committee balance init line

This commit is contained in:
protolambda 2021-06-03 17:32:35 +02:00
parent 417dda8326
commit c0af420130
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
- [Constants](#constants) - [Constants](#constants)
- [Misc](#misc) - [Misc](#misc)
- [Domain types](#domain-types) - [Domain types](#domain-types)
- [Shard Header Status](#shard-header-status) - [Shard Work Status](#shard-work-status)
- [Preset](#preset) - [Preset](#preset)
- [Misc](#misc-1) - [Misc](#misc-1)
- [Shard block samples](#shard-block-samples) - [Shard block samples](#shard-block-samples)
@ -101,13 +101,13 @@ The following values are (non-configurable) constants used throughout the specif
| `DOMAIN_SHARD_PROPOSER` | `DomainType('0x80000000')` | | `DOMAIN_SHARD_PROPOSER` | `DomainType('0x80000000')` |
| `DOMAIN_SHARD_COMMITTEE` | `DomainType('0x81000000')` | | `DOMAIN_SHARD_COMMITTEE` | `DomainType('0x81000000')` |
### Shard Header Status ### Shard Work Status
| Name | Value | Notes | | Name | Value | Notes |
| - | - | - | | - | - | - |
| `UNCONFIRMED_SHARD_DATA` | `0` | Unconfirmed, nullified after confirmation time elapses | | `SHARD_WORK_UNCONFIRMED` | `0` | Unconfirmed, nullified after confirmation time elapses |
| `CONFIRMED_SHARD_DATA` | `1` | Confirmed, reduced to just the commitment | | `SHARD_WORK_CONFIRMED` | `1` | Confirmed, reduced to just the commitment |
| `PENDING_SHARD_DATA` | `2` | Pending, a list of competing headers | | `SHARD_WORK_PENDING` | `2` | Pending, a list of competing headers |
## Preset ## Preset
@ -289,10 +289,10 @@ class ShardProposerSlashing(Container):
```python ```python
class ShardWork(Container): class ShardWork(Container):
# Upon confirmation the data is reduced to just the header. # Upon confirmation the data is reduced to just the header.
status: Union[ # See Shard Header Status enum status: Union[ # See Shard Work Status enum
None, # UNCONFIRMED_SHARD_DATA None, # SHARD_WORK_UNCONFIRMED
DataCommitment, # CONFIRMED_SHARD_DATA DataCommitment, # SHARD_WORK_CONFIRMED
List[PendingShardHeader, MAX_SHARD_HEADERS_PER_SHARD] # PENDING_SHARD_DATA List[PendingShardHeader, MAX_SHARD_HEADERS_PER_SHARD] # SHARD_WORK_PENDING
] ]
``` ```
@ -541,7 +541,7 @@ def update_pending_shard_work(state: BeaconState, attestation: Attestation) -> N
committee_work = state.shard_buffer[buffer_index][attestation_shard] committee_work = state.shard_buffer[buffer_index][attestation_shard]
# Skip attestation vote accounting if the header is not pending # Skip attestation vote accounting if the header is not pending
if committee_work.status.selector != PENDING_SHARD_DATA: if committee_work.status.selector != SHARD_WORK_PENDING:
# TODO In Altair: set participation bit flag, if attestation matches winning header. # TODO In Altair: set participation bit flag, if attestation matches winning header.
return return
@ -552,7 +552,6 @@ def update_pending_shard_work(state: BeaconState, attestation: Attestation) -> N
pending_header: PendingShardHeader = current_headers[header_index] pending_header: PendingShardHeader = current_headers[header_index]
full_committee = get_beacon_committee(state, attestation.data.slot, attestation.data.index) full_committee = get_beacon_committee(state, attestation.data.slot, attestation.data.index)
full_committee_balance = Gwei(0)
# The weight may be outdated if it is not the initial weight, and from a previous epoch # The weight may be outdated if it is not the initial weight, and from a previous epoch
if pending_header.weight != 0 and compute_epoch_at_slot(pending_header.update_slot) < get_current_epoch(state): if pending_header.weight != 0 and compute_epoch_at_slot(pending_header.update_slot) < get_current_epoch(state):
@ -561,6 +560,7 @@ def update_pending_shard_work(state: BeaconState, attestation: Attestation) -> N
pending_header.update_slot = state.slot pending_header.update_slot = state.slot
full_committee_balance = Gwei(0)
# Update votes bitfield in the state, update weights # Update votes bitfield in the state, update weights
for i, bit in enumerate(attestation.aggregation_bits): for i, bit in enumerate(attestation.aggregation_bits):
weight = state.validators[full_committee[i]].effective_balance weight = state.validators[full_committee[i]].effective_balance
@ -576,12 +576,12 @@ def update_pending_shard_work(state: BeaconState, attestation: Attestation) -> N
if pending_header.commitment == DataCommitment(): if pending_header.commitment == DataCommitment():
# The committee voted to not confirm anything # The committee voted to not confirm anything
state.shard_buffer[buffer_index][attestation_shard].change( state.shard_buffer[buffer_index][attestation_shard].change(
selector=UNCONFIRMED_SHARD_DATA, selector=SHARD_WORK_UNCONFIRMED,
value=None, value=None,
) )
else: else:
state.shard_buffer[buffer_index][attestation_shard].change( state.shard_buffer[buffer_index][attestation_shard].change(
selector=CONFIRMED_SHARD_DATA, selector=SHARD_WORK_CONFIRMED,
value=pending_header.commitment, value=pending_header.commitment,
) )
``` ```
@ -604,7 +604,7 @@ def process_shard_header(state: BeaconState, signed_header: SignedShardBlobHeade
# Check that this data is still pending # Check that this data is still pending
committee_work = state.shard_buffer[header.slot % SHARD_STATE_MEMORY_SLOTS][header.shard] committee_work = state.shard_buffer[header.slot % SHARD_STATE_MEMORY_SLOTS][header.shard]
assert committee_work.status.selector == PENDING_SHARD_DATA assert committee_work.status.selector == SHARD_WORK_PENDING
# Check that this header is not yet in the pending list # Check that this header is not yet in the pending list
current_headers: Sequence[PendingShardHeader] = committee_work.status.value current_headers: Sequence[PendingShardHeader] = committee_work.status.value
@ -718,13 +718,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 == PENDING_SHARD_DATA: if committee_work.selector == SHARD_WORK_PENDING:
winning_header = max(committee_work.value, key=lambda header: header.weight) winning_header = max(committee_work.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=UNCONFIRMED_SHARD_DATA, value=None) committee_work.change(selector=SHARD_WORK_UNCONFIRMED, value=None)
else: else:
committee_work.change(selector=CONFIRMED_SHARD_DATA, value=winning_header.commitment) committee_work.change(selector=SHARD_WORK_CONFIRMED, value=winning_header.commitment)
``` ```
#### `charge_confirmed_shard_fees` #### `charge_confirmed_shard_fees`
@ -743,7 +743,7 @@ def charge_confirmed_shard_fees(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.status.selector == CONFIRMED_SHARD_DATA: if committee_work.status.selector == SHARD_WORK_CONFIRMED:
# 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 = (
@ -783,7 +783,7 @@ def reset_pending_shard_work(state: BeaconState) -> None:
# a committee is available, initialize a pending shard-header list # a committee is available, initialize a pending shard-header list
committee_length = len(get_beacon_committee(state, slot, committee_index)) committee_length = len(get_beacon_committee(state, slot, committee_index))
state.shard_buffer[buffer_index][shard].change( state.shard_buffer[buffer_index][shard].change(
selector=PENDING_SHARD_DATA, selector=SHARD_WORK_PENDING,
value=List[PendingShardHeader, MAX_SHARD_HEADERS_PER_SHARD]( value=List[PendingShardHeader, MAX_SHARD_HEADERS_PER_SHARD](
PendingShardHeader( PendingShardHeader(
commitment=DataCommitment(), commitment=DataCommitment(),
@ -794,7 +794,7 @@ def reset_pending_shard_work(state: BeaconState) -> None:
) )
) )
) )
# a shard without committee available defaults to UNCONFIRMED_SHARD_DATA. # a shard without committee available defaults to SHARD_WORK_UNCONFIRMED.
``` ```
#### `process_shard_epoch_increment` #### `process_shard_epoch_increment`