From 8b10a9ecec3955acfa4eee98e6416ff8103f9d8f Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Mon, 7 Apr 2025 15:17:04 +0100 Subject: [PATCH 1/7] Schedule electra fork --- metadata/config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata/config.yaml b/metadata/config.yaml index 6b769d8..788b0ba 100644 --- a/metadata/config.yaml +++ b/metadata/config.yaml @@ -50,6 +50,9 @@ CAPELLA_FORK_EPOCH: 194048 # April 12, 2023, 10:27:35pm UTC # Deneb DENEB_FORK_VERSION: 0x04000000 DENEB_FORK_EPOCH: 269568 # March 13, 2024, 01:55:35pm UTC +# Electra +ELECTRA_FORK_VERSION: 0x05000000 +ELECTRA_FORK_EPOCH: 364032 # May 7, 2025, 10:05:11am UTC # Time parameters From 56d464acd2c89dba8ca9424c08a2e5ad604c463b Mon Sep 17 00:00:00 2001 From: pk910 Date: Mon, 7 Apr 2025 16:57:09 +0200 Subject: [PATCH 2/7] add prague activation settings to EL genesis files --- metadata/besu.json | 15 ++++++++++++++- metadata/chainspec.json | 22 +++++++++++++++++++++- metadata/genesis.json | 15 ++++++++++++++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/metadata/besu.json b/metadata/besu.json index ab35a5a..629968f 100644 --- a/metadata/besu.json +++ b/metadata/besu.json @@ -16,7 +16,20 @@ "terminalTotalDifficulty": 58750000000000000000000, "shanghaiTime": 1681338455, "cancunTime": 1710338135, - "ethash": { + "pragueTime": 1746612311, + "ethash": {}, + "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa", + "blobSchedule": { + "cancun": { + "target": 3, + "max": 6, + "baseFeeUpdateFraction": 3338477 + }, + "prague": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + } }, "discovery": { "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net", diff --git a/metadata/chainspec.json b/metadata/chainspec.json index 0f11309..65fb681 100644 --- a/metadata/chainspec.json +++ b/metadata/chainspec.json @@ -190,7 +190,27 @@ "eip4844TransitionTimestamp": "0x65F1B057", "eip5656TransitionTimestamp": "0x65F1B057", "eip6780TransitionTimestamp": "0x65F1B057", - "terminalTotalDifficulty": "C70D808A128D7380000" + "eip2537TransitionTimestamp": "0x681B3057", + "eip2935TransitionTimestamp": "0x681B3057", + "eip6110TransitionTimestamp": "0x681B3057", + "eip7002TransitionTimestamp": "0x681B3057", + "eip7251TransitionTimestamp": "0x681B3057", + "eip7702TransitionTimestamp": "0x681B3057", + "eip7623TransitionTimestamp": "0x681B3057", + "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa", + "terminalTotalDifficulty": "C70D808A128D7380000", + "blobSchedule": { + "cancun": { + "target": 3, + "max": 6, + "baseFeeUpdateFraction": 3338477 + }, + "prague": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + } + } }, "genesis": { "seal": { diff --git a/metadata/genesis.json b/metadata/genesis.json index e53f978..2c2d06e 100644 --- a/metadata/genesis.json +++ b/metadata/genesis.json @@ -21,8 +21,21 @@ "terminalTotalDifficultyPassed": true, "shanghaiTime": 1681338455, "cancunTime": 1710338135, + "pragueTime": 1746612311, "ethash": {}, - "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa" + "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa", + "blobSchedule": { + "cancun": { + "target": 3, + "max": 6, + "baseFeeUpdateFraction": 3338477 + }, + "prague": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + } + } }, "nonce": "0x42", "timestamp": "0x0", From 2bf74cbd437c7c79a1afc4d311ab32ffe74e47a7 Mon Sep 17 00:00:00 2001 From: pk910 Date: Mon, 7 Apr 2025 17:59:36 +0200 Subject: [PATCH 3/7] fix eip order in `chainspec.json` --- metadata/chainspec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/chainspec.json b/metadata/chainspec.json index 65fb681..76070b4 100644 --- a/metadata/chainspec.json +++ b/metadata/chainspec.json @@ -195,8 +195,8 @@ "eip6110TransitionTimestamp": "0x681B3057", "eip7002TransitionTimestamp": "0x681B3057", "eip7251TransitionTimestamp": "0x681B3057", - "eip7702TransitionTimestamp": "0x681B3057", "eip7623TransitionTimestamp": "0x681B3057", + "eip7702TransitionTimestamp": "0x681B3057", "depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa", "terminalTotalDifficulty": "C70D808A128D7380000", "blobSchedule": { From e6da65b78fa71f192af70c6c554ea180f2ca547d Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 7 Apr 2025 20:51:24 -0500 Subject: [PATCH 4/7] Update network list --- metadata/config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/metadata/config.yaml b/metadata/config.yaml index 788b0ba..dfe68fd 100644 --- a/metadata/config.yaml +++ b/metadata/config.yaml @@ -6,7 +6,9 @@ PRESET_BASE: 'mainnet' # Free-form short name of the network that this configuration applies to - known # canonical network names include: # * 'mainnet' - there can be only one -# * 'prater' - testnet +# * 'sepolia' - testnet +# * 'holesky' - testnet +# * 'hoodi' - testnet # Must match the regex: [a-z0-9\-] CONFIG_NAME: 'mainnet' From ef277a3a1f2fc66204d19cb24a4719e14d4b7427 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 7 Apr 2025 20:52:11 -0500 Subject: [PATCH 5/7] Do s/GOSSIP_MAX_SIZE/MAX_PAYLOAD_SIZE and remove MAX_CHUNK_SIZE --- metadata/config.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/metadata/config.yaml b/metadata/config.yaml index dfe68fd..c340118 100644 --- a/metadata/config.yaml +++ b/metadata/config.yaml @@ -109,15 +109,13 @@ DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa # Networking # --------------------------------------------------------------- # `10 * 2**20` (= 10485760, 10 MiB) -GOSSIP_MAX_SIZE: 10485760 +MAX_PAYLOAD_SIZE: 10485760 # `2**10` (= 1024) MAX_REQUEST_BLOCKS: 1024 # `2**8` (= 256) EPOCHS_PER_SUBNET_SUBSCRIPTION: 256 # `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 33024, ~5 months) MIN_EPOCHS_FOR_BLOCK_REQUESTS: 33024 -# `10 * 2**20` (=10485760, 10 MiB) -MAX_CHUNK_SIZE: 10485760 # 5s TTFB_TIMEOUT: 5 # 10s From 56045d867dee1aff6f769b10f9d034c6e269e7ed Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 7 Apr 2025 20:53:03 -0500 Subject: [PATCH 6/7] Remove extra blank line --- metadata/config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata/config.yaml b/metadata/config.yaml index c340118..e5b0e94 100644 --- a/metadata/config.yaml +++ b/metadata/config.yaml @@ -21,7 +21,6 @@ TERMINAL_BLOCK_HASH: 0x000000000000000000000000000000000000000000000000000000000 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 - # Genesis # --------------------------------------------------------------- # `2**14` (= 16,384) From e1b96c92ad3ce93f4558c255cbe57e26553bb20a Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 7 Apr 2025 20:53:39 -0500 Subject: [PATCH 7/7] Add Electra networking configs --- metadata/config.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/metadata/config.yaml b/metadata/config.yaml index e5b0e94..e4189bd 100644 --- a/metadata/config.yaml +++ b/metadata/config.yaml @@ -141,3 +141,15 @@ MAX_REQUEST_BLOB_SIDECARS: 768 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096 # `6` BLOB_SIDECAR_SUBNET_COUNT: 6 + +# Electra +# 2**7 * 10**9 (= 128,000,000,000) +MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 +# 2**8 * 10**9 (= 256,000,000,000) +MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 +# `9` +BLOB_SIDECAR_SUBNET_COUNT_ELECTRA: 9 +# `uint64(9)` +MAX_BLOBS_PER_BLOCK_ELECTRA: 9 +# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_ELECTRA +MAX_REQUEST_BLOB_SIDECARS_ELECTRA: 1152