From 171504024694e79da4ee82b02e40c7be0316d5df Mon Sep 17 00:00:00 2001 From: Wolmin Date: Thu, 19 Sep 2024 12:10:27 +0200 Subject: [PATCH 1/3] Add values for mainnet dencun fork --- mainnet/nethermind/chainspec.json | 11 ++++++----- mainnet/shared/config.yaml | 5 ++--- mainnet/shared/genesis.json | 2 +- mainnet/teku/config.yaml | 17 ++++++++++++++--- testnet/teku/config.yaml | 2 +- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/mainnet/nethermind/chainspec.json b/mainnet/nethermind/chainspec.json index ebbef61..012832f 100644 --- a/mainnet/nethermind/chainspec.json +++ b/mainnet/nethermind/chainspec.json @@ -52,11 +52,12 @@ "eip3855TransitionTimestamp": "0x649C5DAE", "eip3651TransitionTimestamp": "0x649C5DAE", "eip3860TransitionTimestamp": "0x649C5DAE", - "eip1153TransitionTimestamp": "0x69551040", - "eip4788TransitionTimestamp": "0x69551040", - "eip4844TransitionTimestamp": "0x69551040", - "eip5656TransitionTimestamp": "0x69551040", - "eip6780TransitionTimestamp": "0x69551040" + "eip1153TransitionTimestamp": "0x673E0C30", + "eip4788TransitionTimestamp": "0x673E0C30", + "eip4844TransitionTimestamp": "0x673E0C30", + "eip5656TransitionTimestamp": "0x673E0C30", + "eip6780TransitionTimestamp": "0x673E0C30", + "eip7516TransitionTimestamp": "0x673E0C30" }, "genesis": { "number": "0x0", diff --git a/mainnet/shared/config.yaml b/mainnet/shared/config.yaml index 49875bf..2589cae 100644 --- a/mainnet/shared/config.yaml +++ b/mainnet/shared/config.yaml @@ -60,10 +60,9 @@ CAPELLA_FORK_VERSION: 0x42000004 CAPELLA_FORK_EPOCH: 8100 # Deneb -# 18446744073709551615 is max uint64 -# It is set to far future epoch for now +# Date and time (GMT): Wednesday, 20 November 2024 16:20:00 DENEB_FORK_VERSION: 0x42000005 -DENEB_FORK_EPOCH: 18446744073709551615 +DENEB_FORK_EPOCH: 123075 # Fork choice # --------------------------------------------------------------- diff --git a/mainnet/shared/genesis.json b/mainnet/shared/genesis.json index 73c7cfc..7f69e9e 100644 --- a/mainnet/shared/genesis.json +++ b/mainnet/shared/genesis.json @@ -17,7 +17,7 @@ "terminalTotalDifficulty": 0, "terminalTotalDifficultyPassed": true, "shanghaiTime": 1687969198, - "cancunTime": 1767182400 + "cancunTime": 1732119600 }, "number": "0x0", "nonce": "0x1", diff --git a/mainnet/teku/config.yaml b/mainnet/teku/config.yaml index 8cd4528..8aa9eb7 100644 --- a/mainnet/teku/config.yaml +++ b/mainnet/teku/config.yaml @@ -60,10 +60,9 @@ CAPELLA_FORK_VERSION: 0x42000004 CAPELLA_FORK_EPOCH: 8100 # Deneb -# 18446744073709551615 is max uint64 -# It is set to far future epoch for now +# Date and time (GMT): Wednesday, 20 November 2024 16:20:00 DENEB_FORK_VERSION: 0x42000005 -DENEB_FORK_EPOCH: 18446744073709551615 +DENEB_FORK_EPOCH: 123075 # Fork choice # --------------------------------------------------------------- @@ -102,6 +101,8 @@ INACTIVITY_SCORE_RECOVERY_RATE: 16 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 # Validator Stakes # --------------------------------------------------------------- @@ -137,3 +138,13 @@ ATTESTATION_SUBNET_EXTRA_BITS: 0 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS ATTESTATION_SUBNET_PREFIX_BITS: 6 MIN_EPOCHS_FOR_BLOCK_REQUESTS: 33024 + +# 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 diff --git a/testnet/teku/config.yaml b/testnet/teku/config.yaml index 5025e44..52c9e7d 100644 --- a/testnet/teku/config.yaml +++ b/testnet/teku/config.yaml @@ -144,4 +144,4 @@ 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 +BLOB_SIDECAR_SUBNET_COUNT: 6 From b3f941cbd668e8754d61a5e2b773242340ac1721 Mon Sep 17 00:00:00 2001 From: Wolmin Date: Thu, 19 Sep 2024 12:24:56 +0200 Subject: [PATCH 2/3] Shift execution timestamps --- mainnet/nethermind/chainspec.json | 12 ++++++------ mainnet/shared/genesis.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mainnet/nethermind/chainspec.json b/mainnet/nethermind/chainspec.json index 012832f..7ee718d 100644 --- a/mainnet/nethermind/chainspec.json +++ b/mainnet/nethermind/chainspec.json @@ -52,12 +52,12 @@ "eip3855TransitionTimestamp": "0x649C5DAE", "eip3651TransitionTimestamp": "0x649C5DAE", "eip3860TransitionTimestamp": "0x649C5DAE", - "eip1153TransitionTimestamp": "0x673E0C30", - "eip4788TransitionTimestamp": "0x673E0C30", - "eip4844TransitionTimestamp": "0x673E0C30", - "eip5656TransitionTimestamp": "0x673E0C30", - "eip6780TransitionTimestamp": "0x673E0C30", - "eip7516TransitionTimestamp": "0x673E0C30" + "eip1153TransitionTimestamp": "0x673E0C2B", + "eip4788TransitionTimestamp": "0x673E0C2B", + "eip4844TransitionTimestamp": "0x673E0C2B", + "eip5656TransitionTimestamp": "0x673E0C2B", + "eip6780TransitionTimestamp": "0x673E0C2B", + "eip7516TransitionTimestamp": "0x673E0C2B" }, "genesis": { "number": "0x0", diff --git a/mainnet/shared/genesis.json b/mainnet/shared/genesis.json index 7f69e9e..4d246f0 100644 --- a/mainnet/shared/genesis.json +++ b/mainnet/shared/genesis.json @@ -17,7 +17,7 @@ "terminalTotalDifficulty": 0, "terminalTotalDifficultyPassed": true, "shanghaiTime": 1687969198, - "cancunTime": 1732119600 + "cancunTime": 1732119595 }, "number": "0x0", "nonce": "0x1", From f04fca8f111c100666555f0f5cb524f41b2400c9 Mon Sep 17 00:00:00 2001 From: Wolmin Date: Thu, 19 Sep 2024 12:31:32 +0200 Subject: [PATCH 3/3] Add missing eip for testnet nethermind --- testnet/nethermind/chainspec.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testnet/nethermind/chainspec.json b/testnet/nethermind/chainspec.json index eb10b2b..dbaeca4 100644 --- a/testnet/nethermind/chainspec.json +++ b/testnet/nethermind/chainspec.json @@ -56,7 +56,8 @@ "eip4788TransitionTimestamp": "0x66EAFDAB", "eip4844TransitionTimestamp": "0x66EAFDAB", "eip5656TransitionTimestamp": "0x66EAFDAB", - "eip6780TransitionTimestamp": "0x66EAFDAB" + "eip6780TransitionTimestamp": "0x66EAFDAB", + "eip7516TransitionTimestamp": "0x66EAFDAB" }, "genesis": { "number": "0x0",