From 74d7c8ac0369327eef3eb098a1b95a6b4fa2e70e Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Tue, 16 Jan 2024 12:03:48 +1000 Subject: [PATCH] Added Deneb config for Sepolia testnet (#7885) fixes #7882 Signed-off-by: Paul Harris --- CHANGELOG.md | 1 + .../networks/Eth2NetworkConfiguration.java | 1 + .../teku/spec/config/configs/sepolia.yaml | 29 +++++++++++-------- .../pegasys/teku/spec/SpecFactoryTest.java | 4 +-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8103a9ffd4e..4ad877c33c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ the [releases page](https://github.com/Consensys/teku/releases). - Added a hidden flag `--Xfork-choice-updated-always-send-payload-attributes` which would cause payload attributes to be calculated and sent with every fcU. This could be useful for builders consuming the `payload_attributes` SSE events. +- Added Deneb (aka Dencun) configuration for Sepolia network for epoch 132608 (2024-01-30 22:51:12 UTC). - Added Deneb (aka Dencun) configuration for Holesky network for epoch 29696 (2024-02-07 11:34:24 UTC). ### Bug Fixes diff --git a/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java b/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java index 2859cd42213..ca1be5748da 100644 --- a/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java +++ b/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java @@ -730,6 +730,7 @@ private Builder applySepoliaNetworkDefaults() { return applyTestnetDefaults() .constants(SEPOLIA.configName()) .startupTimeoutSeconds(120) + .trustedSetupFromClasspath(MAINNET_TRUSTED_SETUP_FILENAME) .eth1DepositContractDeployBlock(1273020) .defaultInitialState( "https://github.com/eth-clients/merge-testnets/raw/9c873ab67b902aa676370a549129e5e91013afa3/sepolia/genesis.ssz") diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml index a94b0d7587c..65d8ba67ea6 100644 --- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml +++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml @@ -32,9 +32,9 @@ TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 CAPELLA_FORK_VERSION: 0x90000072 CAPELLA_FORK_EPOCH: 56832 -# Sharding -SHARDING_FORK_VERSION: 0x04001020 -SHARDING_FORK_EPOCH: 18446744073709551615 +# Deneb +DENEB_FORK_VERSION: 0x90000073 +DENEB_FORK_EPOCH: 132608 # Time parameters # --------------------------------------------------------------- @@ -62,18 +62,13 @@ EJECTION_BALANCE: 16000000000 MIN_PER_EPOCH_CHURN_LIMIT: 4 # 2**16 (= 65,536) CHURN_LIMIT_QUOTIENT: 65536 - +# [New in Deneb:EIP7514] 2**3 (= 8) +MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 8 # Fork choice # --------------------------------------------------------------- # 40% PROPOSER_SCORE_BOOST: 40 -# 20% -REORG_HEAD_WEIGHT_THRESHOLD: 20 -# 160% -REORG_PARENT_WEIGHT_THRESHOLD: 160 -# `2` epochs -REORG_MAX_EPOCHS_SINCE_FINALIZATION: 2 # Deposit contract # --------------------------------------------------------------- @@ -89,7 +84,7 @@ GOSSIP_MAX_SIZE: 10485760 MAX_REQUEST_BLOCKS: 1024 # `2**8` (= 256) EPOCHS_PER_SUBNET_SUBSCRIPTION: 256 -## `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 33024, ~5 months) +# `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 @@ -108,4 +103,14 @@ SUBNETS_PER_NODE: 2 ATTESTATION_SUBNET_COUNT: 64 ATTESTATION_SUBNET_EXTRA_BITS: 0 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS -ATTESTATION_SUBNET_PREFIX_BITS: 6 \ No newline at end of file +ATTESTATION_SUBNET_PREFIX_BITS: 6 + +# Deneb +# `2**7` (=128) +MAX_REQUEST_BLOCKS_DENEB: 128 +# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK +MAX_REQUEST_BLOB_SIDECARS: 768 +# `2**12` (= 4096 epochs, ~18 days) +MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096 +# `6` +BLOB_SIDECAR_SUBNET_COUNT: 6 \ No newline at end of file diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java index 2710b7f35fa..e21a7eae273 100644 --- a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java +++ b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java @@ -40,9 +40,9 @@ public class SpecFactoryTest { private static final Set NON_BELLATRIX_NETWORKS = Set.of("swift", "less-swift"); private static final Set CAPELLA_NETWORKS = - Set.of("sepolia", "mainnet", "gnosis", "chiado", "lukso"); + Set.of("mainnet", "gnosis", "chiado", "lukso"); - private static final Set DENEB_NETWORKS = Set.of("prater", "holesky"); + private static final Set DENEB_NETWORKS = Set.of("prater", "sepolia", "holesky"); @Test public void defaultFactoryShouldScheduleBellatrixAndCapellaForMainNet() {