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

renaming consolidations to consolidation_requests

This commit is contained in:
fradamt 2024-05-21 17:47:57 +02:00
parent 17c51488eb
commit 7c4b32a717
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
presets/mainnet/electra.yaml
View File

@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
# `uint64(2**3)` (= 8) # `uint64(2**3)` (= 8)
MAX_ATTESTATIONS_ELECTRA: 8 MAX_ATTESTATIONS_ELECTRA: 8
# `uint64(2**0)` (= 1) # `uint64(2**0)` (= 1)
MAX_CONSOLIDATIONS_PER_PAYLOAD: 1 MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
# Execution # Execution
# --------------------------------------------------------------- # ---------------------------------------------------------------

2
presets/minimal/electra.yaml
View File

@ -30,7 +30,7 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
# `uint64(2**3)` (= 8) # `uint64(2**3)` (= 8)
MAX_ATTESTATIONS_ELECTRA: 8 MAX_ATTESTATIONS_ELECTRA: 8
# `uint64(2**0)` (= 1) # `uint64(2**0)` (= 1)
MAX_CONSOLIDATIONS_PER_PAYLOAD: 1 MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
# Execution # Execution
# --------------------------------------------------------------- # ---------------------------------------------------------------

34
specs/electra/beacon-chain.md
View File

@ -164,16 +164,16 @@ The following values are (non-configurable) constants used throughout the specif
| Name | Value | | Name | Value |
| - | - | | - | - |
| `MAX_CONSOLIDATIONS_PER_PAYLOAD` | `uint64(1)` | | `MAX_ATTESTER_SLASHINGS_ELECTRA` | `2**0` (= 1) | *[New in Electra:EIP7549]* |
| `MAX_ATTESTATIONS_ELECTRA` | `2**3` (= 8) | *[New in Electra:EIP7549]* |
### Execution ### Execution
| Name | Value | Description | | Name | Value | Description |
| - | - | - | | - | - | - |
| `MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD` | `uint64(2**13)` (= 8,192) | *[New in Electra:EIP6110]* Maximum number of deposit receipts allowed in each payload | | `MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD` | `uint64(2**13)` (= 8,192) | *[New in Electra:EIP6110]* Maximum number of deposit receipts allowed in each payload |
| `MAX_ATTESTER_SLASHINGS_ELECTRA` | `2**0` (= 1) | *[New in Electra:EIP7549]* |
| `MAX_ATTESTATIONS_ELECTRA` | `2**3` (= 8) | *[New in Electra:EIP7549]* |
| `MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD` | `uint64(2**4)` (= 16)| *[New in Electra:EIP7002]* Maximum number of execution layer withdrawal requests in each payload | | `MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD` | `uint64(2**4)` (= 16)| *[New in Electra:EIP7002]* Maximum number of execution layer withdrawal requests in each payload |
| `MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD` | `uint64(1)` (= 1) | *[New in Electra:EIP7002]* Maximum number of execution layer consolidation requests in each payload |
### Withdrawals processing ### Withdrawals processing
@ -238,12 +238,12 @@ class ExecutionLayerWithdrawalRequest(Container):
amount: Gwei amount: Gwei
``` ```
#### `ExecutionLayerConsolidation` #### `ExecutionLayerConsolidationRequest`
*Note*: The container is new in EIP7251. *Note*: The container is new in EIP7251.
```python ```python
class ExecutionLayerConsolidation(Container): class ExecutionLayerConsolidationRequest(Container):
source_address: ExecutionAddress source_address: ExecutionAddress
source_pubkey: BLSPubkey source_pubkey: BLSPubkey
target_pubkey: BLSPubkey target_pubkey: BLSPubkey
@ -337,7 +337,7 @@ class ExecutionPayload(Container):
deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD] # [New in Electra:EIP6110] deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD] # [New in Electra:EIP6110]
# [New in Electra:EIP7002:EIP7251] # [New in Electra:EIP7002:EIP7251]
withdrawal_requests: List[ExecutionLayerWithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD] withdrawal_requests: List[ExecutionLayerWithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]
consolidations: List[ExecutionLayerConsolidation, MAX_CONSOLIDATIONS_PER_PAYLOAD] # [New in Electra:EIP7251] consolidations_requests: List[ExecutionLayerConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD] # [New in Electra:EIP7251]
``` ```
#### `ExecutionPayloadHeader` #### `ExecutionPayloadHeader`
@ -365,7 +365,7 @@ class ExecutionPayloadHeader(Container):
excess_blob_gas: uint64 excess_blob_gas: uint64
deposit_receipts_root: Root # [New in Electra:EIP6110] deposit_receipts_root: Root # [New in Electra:EIP6110]
withdrawal_requests_root: Root # [New in Electra:EIP7002:EIP7251] withdrawal_requests_root: Root # [New in Electra:EIP7002:EIP7251]
consolidations_root: Root # [New in Electra:EIP7251] consolidations_requests_root: Root # [New in Electra:EIP7251]
``` ```
#### `BeaconState` #### `BeaconState`
@ -1037,7 +1037,7 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
# [New in Electra:EIP7002:EIP7251] # [New in Electra:EIP7002:EIP7251]
for_ops(body.execution_payload.withdrawal_requests, process_execution_layer_withdrawal_request) for_ops(body.execution_payload.withdrawal_requests, process_execution_layer_withdrawal_request)
for_ops(body.execution_payload.deposit_receipts, process_deposit_receipt) # [New in Electra:EIP6110] for_ops(body.execution_payload.deposit_receipts, process_deposit_receipt) # [New in Electra:EIP6110]
for_ops(body.execution_payload.consolidations, process_execution_layer_consolidation) # [New in Electra:EIP7251] for_ops(body.execution_payload.consolidations_requests, process_execution_layer_consolidation_request) # [New in Electra:EIP7251]
``` ```
##### Attestations ##### Attestations
@ -1284,12 +1284,14 @@ def process_deposit_receipt(state: BeaconState, deposit_receipt: DepositReceipt)
) )
``` ```
##### Consolidations ##### Execution layer consolidation requests
###### New `process_consolidation` ###### New `process_execution_layer_consolidation_requests`
```python ```python
def process_execution_layer_consolidation(state: BeaconState, consolidation: ExecutionLayerConsolidation) -> None: def process_execution_layer_consolidation_requests(
state: BeaconState,
execution_layer_consolidation_request: ExecutionLayerConsolidationRequest) -> None:
# If the pending consolidations queue is full, consolidation requests are ignored # If the pending consolidations queue is full, consolidation requests are ignored
if len(state.pending_consolidations) == PENDING_CONSOLIDATIONS_LIMIT: if len(state.pending_consolidations) == PENDING_CONSOLIDATIONS_LIMIT:
return return
@ -1299,12 +1301,14 @@ def process_execution_layer_consolidation(state: BeaconState, consolidation: Exe
validator_pubkeys = [v.pubkey for v in state.validators] validator_pubkeys = [v.pubkey for v in state.validators]
# Verify pubkeys exists # Verify pubkeys exists
if consolidation.source_pubkey not in validator_pubkeys: request_source_pubkey = execution_layer_consolidation_request.source_pubkey
request_target_pubkey = execution_layer_consolidation_request.target_pubkey
if request_source_pubkey not in validator_pubkeys:
return return
if consolidation.target_pubkey not in validator_pubkeys: if request_target_pubkey not in validator_pubkeys:
return return
source_index = ValidatorIndex(validator_pubkeys.index(consolidation.source_pubkey)) source_index = ValidatorIndex(validator_pubkeys.index(request_source_pubkey))
target_index = ValidatorIndex(validator_pubkeys.index(consolidation.target_pubkey)) target_index = ValidatorIndex(validator_pubkeys.index(request_target_pubkey))
source_validator = state.validators[source_index] source_validator = state.validators[source_index]
target_validator = state.validators[target_index] target_validator = state.validators[target_index]

2
specs/electra/fork.md
View File

@ -92,7 +92,7 @@ def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
excess_blob_gas=pre.latest_execution_payload_header.excess_blob_gas, excess_blob_gas=pre.latest_execution_payload_header.excess_blob_gas,
deposit_receipts_root=Root(), # [New in Electra:EIP6110] deposit_receipts_root=Root(), # [New in Electra:EIP6110]
withdrawal_requests_root=Root(), # [New in Electra:EIP7002] withdrawal_requests_root=Root(), # [New in Electra:EIP7002]
consolidations_root=Root(), # [New in Electra:EIP7251] consolidations_requests_root=Root(), # [New in Electra:EIP7251]
) )
exit_epochs = [v.exit_epoch for v in pre.validators if v.exit_epoch != FAR_FUTURE_EPOCH] exit_epochs = [v.exit_epoch for v in pre.validators if v.exit_epoch != FAR_FUTURE_EPOCH]

2
tests/generators/operations/main.py
View File

@ -45,7 +45,7 @@ if __name__ == "__main__":
_new_electra_mods = {key: 'eth2spec.test.electra.block_processing.test_process_' + key for key in [ _new_electra_mods = {key: 'eth2spec.test.electra.block_processing.test_process_' + key for key in [
'attestation', 'attestation',
'execution_layer_consolidation', 'execution_layer_consolidation_requests',
'deposit_receipt', 'deposit_receipt',
'execution_layer_withdrawal_request', 'execution_layer_withdrawal_request',
'voluntary_exit' 'voluntary_exit'