From dae5b87c2ba61cab8608fc906c641c6ef92f33d6 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Thu, 21 Oct 2021 15:56:58 -0600 Subject: [PATCH] increase TX sizes to account for very high gas limits --- presets/mainnet/merge.yaml | 8 ++++---- presets/minimal/merge.yaml | 8 ++++---- specs/merge/beacon-chain.md | 4 ++-- specs/merge/p2p-interface.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/presets/mainnet/merge.yaml b/presets/mainnet/merge.yaml index 10834dcc3..3deac4574 100644 --- a/presets/mainnet/merge.yaml +++ b/presets/mainnet/merge.yaml @@ -2,10 +2,10 @@ # Execution # --------------------------------------------------------------- -# 2**24 (= 16,777,216) -MAX_BYTES_PER_TRANSACTION: 16777216 -# 2**14 (= 16,384) -MAX_TRANSACTIONS_PER_PAYLOAD: 16384 +# 2**30 (= 1,073,741,824) +MAX_BYTES_PER_TRANSACTION: 1073741824 +# 2**20 (= 1,048,576) +MAX_TRANSACTIONS_PER_PAYLOAD: 1048576 # 2**8 (= 256) BYTES_PER_LOGS_BLOOM: 256 # 2**10 (= 1,024) diff --git a/presets/minimal/merge.yaml b/presets/minimal/merge.yaml index ec2dd384d..5df32ff57 100644 --- a/presets/minimal/merge.yaml +++ b/presets/minimal/merge.yaml @@ -2,10 +2,10 @@ # Execution # --------------------------------------------------------------- -# 2**24 (= 16,777,216) -MAX_BYTES_PER_TRANSACTION: 16777216 -# 2**14 (= 16,384) -MAX_TRANSACTIONS_PER_PAYLOAD: 16384 +# 2**30 (= 1,073,741,824) +MAX_BYTES_PER_TRANSACTION: 1073741824 +# 2**20 (= 1,048,576) +MAX_TRANSACTIONS_PER_PAYLOAD: 1048576 # 2**8 (= 256) BYTES_PER_LOGS_BLOOM: 256 # 2**10 (= 1,024) diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 9bb7db6c9..aa2a771c5 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -59,8 +59,8 @@ This patch adds transaction execution to the beacon chain as part of the Merge f | Name | Value | | - | - | -| `MAX_BYTES_PER_TRANSACTION` | `uint64(2**24)` (= 16,777,216) | -| `MAX_TRANSACTIONS_PER_PAYLOAD` | `uint64(2**14)` (= 16,384) | +| `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) | diff --git a/specs/merge/p2p-interface.md b/specs/merge/p2p-interface.md index e3eb3b152..4283a0517 100644 --- a/specs/merge/p2p-interface.md +++ b/specs/merge/p2p-interface.md @@ -44,7 +44,7 @@ This section outlines modifications constants that are used in this spec. | Name | Value | Description | |---|---|---| -| `GOSSIP_MAX_SIZE_MERGE` | `10 * 2**20` (= 10485760, 10 MiB) | The maximum allowed size of uncompressed gossip messages starting at the Merge upgrade | +| `GOSSIP_MAX_SIZE_MERGE` | `10 * 2**20` (= 10,485,760, 10 MiB) | The maximum allowed size of uncompressed gossip messages starting at the Merge upgrade | ## The gossip domain: gossipsub