From 879bd2f3e91fe6e25cd98b50caa14b9d998d9974 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Sun, 31 Oct 2021 08:38:54 -0600 Subject: [PATCH] remove etra gas constants and p2p validations --- presets/mainnet/merge.yaml | 4 ---- presets/minimal/merge.yaml | 4 ---- specs/merge/beacon-chain.md | 2 -- specs/merge/p2p-interface.md | 5 ----- 4 files changed, 15 deletions(-) diff --git a/presets/mainnet/merge.yaml b/presets/mainnet/merge.yaml index 4ee3cf837..5f2e27bfc 100644 --- a/presets/mainnet/merge.yaml +++ b/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 diff --git a/presets/minimal/merge.yaml b/presets/minimal/merge.yaml index f92674a18..21f2f5929 100644 --- a/presets/minimal/merge.yaml +++ b/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 diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 9cdbda336..fefe0eefa 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -72,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 diff --git a/specs/merge/p2p-interface.md b/specs/merge/p2p-interface.md index ea945a1b3..0ab3d0825 100644 --- a/specs/merge/p2p-interface.md +++ b/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