remove gas validations from CL

presets/mainnet/merge.yaml

@@ -17,9 +17,5 @@ MAX_BYTES_PER_TRANSACTION: 1073741824
 MAX_TRANSACTIONS_PER_PAYLOAD: 1048576
 # 2**8 (= 256)
 BYTES_PER_LOGS_BLOOM: 256
-# 2**10 (= 1,024)
-GAS_LIMIT_DENOMINATOR: 1024
-# 5,000
-MIN_GAS_LIMIT: 5000
 # 2**5 (= 32)
 MAX_EXTRA_DATA_BYTES: 32

presets/minimal/merge.yaml

@@ -17,9 +17,5 @@ MAX_BYTES_PER_TRANSACTION: 1073741824
 MAX_TRANSACTIONS_PER_PAYLOAD: 1048576
 # 2**8 (= 256)
 BYTES_PER_LOGS_BLOOM: 256
-# 2**10 (= 1,024)
-GAS_LIMIT_DENOMINATOR: 1024
-# 5,000
-MIN_GAS_LIMIT: 5000
 # 2**5 (= 32)
 MAX_EXTRA_DATA_BYTES: 32

specs/merge/beacon-chain.md

@@ -39,7 +39,6 @@
     - [`execute_payload`](#execute_payload)
   - [Block processing](#block-processing)
     - [Execution payload](#execution-payload)
-      - [`is_valid_gas_limit`](#is_valid_gas_limit)
       - [`process_execution_payload`](#process_execution_payload)
   - [Epoch processing](#epoch-processing)
     - [Slashings](#slashings)
@@ -73,8 +72,6 @@ Additionally, this upgrade introduces the following minor changes:
 | `MAX_BYTES_PER_TRANSACTION` | `uint64(2**30)` (= 1,073,741,824) |
 | `MAX_TRANSACTIONS_PER_PAYLOAD` | `uint64(2**20)` (= 1,048,576) |
 | `BYTES_PER_LOGS_BLOOM` | `uint64(2**8)` (= 256) |
-| `GAS_LIMIT_DENOMINATOR` | `uint64(2**10)` (= 1,024) |
-| `MIN_GAS_LIMIT` | `uint64(5000)` (= 5,000) |
 | `MAX_EXTRA_DATA_BYTES` | `2**5` (= 32) |
 
 ## Preset
@@ -347,39 +344,13 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None:
 
 #### Execution payload
 
-##### `is_valid_gas_limit`
-
-```python
-def is_valid_gas_limit(payload: ExecutionPayload, parent: ExecutionPayloadHeader) -> bool:
-    parent_gas_limit = parent.gas_limit
-
-    # Check if the payload used too much gas
-    if payload.gas_used > payload.gas_limit:
-        return False
-
-    # Check if the payload changed the gas limit too much
-    if payload.gas_limit >= parent_gas_limit + parent_gas_limit // GAS_LIMIT_DENOMINATOR:
-        return False
-    if payload.gas_limit <= parent_gas_limit - parent_gas_limit // GAS_LIMIT_DENOMINATOR:
-        return False
-
-    # Check if the gas limit is at least the minimum gas limit
-    if payload.gas_limit < MIN_GAS_LIMIT:
-        return False
-
-    return True
-```
-
 ##### `process_execution_payload`
 
 ```python
 def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None:
-    # Verify consistency of the parent hash, block number, base fee per gas and gas limit
-    # with respect to the previous execution payload header
+    # Verify consistency of the parent hash with respect to the previous execution payload header
     if is_merge_complete(state):
         assert payload.parent_hash == state.latest_execution_payload_header.block_hash
-        assert payload.block_number == state.latest_execution_payload_header.block_number + uint64(1)
-        assert is_valid_gas_limit(payload, state.latest_execution_payload_header)
     # Verify random
     assert payload.random == get_randao_mix(state, get_current_epoch(state))
     # Verify timestamp

specs/merge/p2p-interface.md

@@ -92,11 +92,6 @@ Alias `block = signed_beacon_block.message`, `execution_payload = block.body.exe
   then validate the following:
   - _[REJECT]_ The block's execution payload timestamp is correct with respect to the slot
     -- i.e. `execution_payload.timestamp == compute_timestamp_at_slot(state, block.slot)`.
-  - _[REJECT]_ Gas used is less than the gas limit --
-    i.e. `execution_payload.gas_used <= execution_payload.gas_limit`.
-
-*Note*: Additional [gossip validations](https://github.com/ethereum/devp2p/blob/master/caps/eth.md#block-encoding-and-validity)
-(see block "data validity" conditions) that rely more heavily on execution-layer state and logic are currently under consideration.
 
 ### Transitioning the gossip
 

tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py

@@ -1,4 +1,3 @@
-from eth2spec.utils.ssz.ssz_typing import uint64
 from eth2spec.test.helpers.execution_payload import (
     build_empty_execution_payload,
     get_execution_payload_header,
@@ -173,20 +172,6 @@ def test_bad_random_regular_payload(spec, state):
     yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
 
 
-@with_merge_and_later
-@spec_state_test
-def test_bad_number_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.block_number = execution_payload.block_number + 1
-
-    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
-
-
 @with_merge_and_later
 @spec_state_test
 def test_bad_everything_regular_payload(spec, state):
@@ -197,7 +182,8 @@ def test_bad_everything_regular_payload(spec, state):
     # execution payload
     execution_payload = build_empty_execution_payload(spec, state)
     execution_payload.parent_hash = spec.Hash32()
-    execution_payload.block_number = execution_payload.block_number + 1
+    execution_payload.random = spec.Bytes32()
+    execution_payload.timestamp = 0
 
     yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
 
@@ -228,157 +214,3 @@ def test_bad_timestamp_regular_payload(spec, state):
     execution_payload.timestamp = execution_payload.timestamp + 1
 
     yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_zero_first_payload(spec, state):
-    # pre-state
-    state = build_state_with_incomplete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = uint64(0)
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_max_first_payload(spec, state):
-    # pre-state
-    state = build_state_with_incomplete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = uint64(2**64 - 1)
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_upper_plus_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = (
-        execution_payload.gas_limit +
-        execution_payload.gas_limit // spec.GAS_LIMIT_DENOMINATOR
-    )
-
-    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_upper_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = (
-        execution_payload.gas_limit +
-        execution_payload.gas_limit // spec.GAS_LIMIT_DENOMINATOR - uint64(1)
-    )
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_lower_minus_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = (
-        execution_payload.gas_limit -
-        execution_payload.gas_limit // spec.GAS_LIMIT_DENOMINATOR
-    )
-
-    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_lower_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = (
-        execution_payload.gas_limit -
-        execution_payload.gas_limit // spec.GAS_LIMIT_DENOMINATOR + uint64(1)
-    )
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_minimum_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-    state.latest_execution_payload_header.gas_limit = spec.MIN_GAS_LIMIT
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = execution_payload.gas_limit
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gaslimit_minimum_minus_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-    state.latest_execution_payload_header.gas_limit = spec.MIN_GAS_LIMIT
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_limit = execution_payload.gas_limit - uint64(1)
-
-    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gasused_gaslimit_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_used = execution_payload.gas_limit
-
-    yield from run_execution_payload_processing(spec, state, execution_payload)
-
-
-@with_merge_and_later
-@spec_state_test
-def test_gasused_gaslimit_plus_regular_payload(spec, state):
-    # pre-state
-    state = build_state_with_complete_transition(spec, state)
-    next_slot(spec, state)
-
-    # execution payload
-    execution_payload = build_empty_execution_payload(spec, state)
-    execution_payload.gas_used = execution_payload.gas_limit + uint64(1)
-
-    yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)