Skip to content

Commit

Permalink
remove etra gas constants and p2p validations
Browse files Browse the repository at this point in the history
  • Loading branch information
djrtwo committed Nov 1, 2021
1 parent 52a97ab commit 879bd2f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 15 deletions.
4 changes: 0 additions & 4 deletions presets/mainnet/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions presets/minimal/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions specs/merge/beacon-chain.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions specs/merge/p2p-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 879bd2f

Please sign in to comment.