From 0ce90de4b381a29be983dd90b51bf878043c01f1 Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Sun, 26 Jan 2025 15:27:49 +0000 Subject: [PATCH 1/3] feat: schedule electra on holesky and sepolia --- packages/config/src/chainConfig/networks/holesky.ts | 3 +++ packages/config/src/chainConfig/networks/sepolia.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/config/src/chainConfig/networks/holesky.ts b/packages/config/src/chainConfig/networks/holesky.ts index 18f356d6bc03..3992ac5635db 100644 --- a/packages/config/src/chainConfig/networks/holesky.ts +++ b/packages/config/src/chainConfig/networks/holesky.ts @@ -33,6 +33,9 @@ export const holeskyChainConfig: ChainConfig = { // Deneb DENEB_FORK_VERSION: b("0x05017000"), DENEB_FORK_EPOCH: 29696, + // Electra + ELECTRA_FORK_VERSION: b("0x06017000"), + ELECTRA_FORK_EPOCH: 113152, // # 28,000,000,000 Gwei to ensure quicker ejection EJECTION_BALANCE: 28000000000, diff --git a/packages/config/src/chainConfig/networks/sepolia.ts b/packages/config/src/chainConfig/networks/sepolia.ts index f47d73436702..ebd450e984b4 100644 --- a/packages/config/src/chainConfig/networks/sepolia.ts +++ b/packages/config/src/chainConfig/networks/sepolia.ts @@ -33,6 +33,9 @@ export const sepoliaChainConfig: ChainConfig = { // Deneb DENEB_FORK_VERSION: b("0x90000073"), DENEB_FORK_EPOCH: 132608, + // Electra + ELECTRA_FORK_VERSION: b("0x90000074"), + ELECTRA_FORK_EPOCH: 219392, // Deposit contract // --------------------------------------------------------------- From f4e500d93997184cc2e5ac3ebc754e453c669a5e Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Sun, 26 Jan 2025 16:46:27 +0000 Subject: [PATCH 2/3] Fix interop config tests --- packages/validator/test/unit/utils/interopConfigs.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/validator/test/unit/utils/interopConfigs.ts b/packages/validator/test/unit/utils/interopConfigs.ts index a575b796e095..842a97e38d73 100644 --- a/packages/validator/test/unit/utils/interopConfigs.ts +++ b/packages/validator/test/unit/utils/interopConfigs.ts @@ -121,7 +121,7 @@ export const lighthouseHoleskyConfig = { DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF: "0x08000000", DOMAIN_BLS_TO_EXECUTION_CHANGE: "0x0A000000", MAX_EFFECTIVE_BALANCE_ELECTRA: "2048000000000", - MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "65536", + MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "4096", MIN_ACTIVATION_BALANCE: "32000000000", PENDING_DEPOSITS_LIMIT: "134217728", PENDING_PARTIAL_WITHDRAWALS_LIMIT: "134217728", @@ -219,7 +219,7 @@ export const prysmHoleskyConfig = { MIN_SLASHING_PENALTY_QUOTIENT: "128", MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR: "64", MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX: "32", - MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "65536", + MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "4096", MIN_SYNC_COMMITTEE_PARTICIPANTS: "1", MIN_VALIDATOR_WITHDRAWABILITY_DELAY: "256", NODE_ID_BITS: "256", @@ -357,7 +357,7 @@ export const tekuHoleskyConfig = { DOMAIN_DEPOSIT: "0x03000000", DOMAIN_CONTRIBUTION_AND_PROOF: "0x09000000", UPDATE_TIMEOUT: "8192", - ELECTRA_FORK_EPOCH: "18446744073709551615", + ELECTRA_FORK_EPOCH: "113152", SYNC_COMMITTEE_BRANCH_LENGTH: "5", DEPOSIT_CHAIN_ID: "17000", MAX_BLOB_COMMITMENTS_PER_BLOCK: "4096", @@ -401,7 +401,7 @@ export const tekuHoleskyConfig = { CHURN_LIMIT_QUOTIENT: "65536", BLS_WITHDRAWAL_PREFIX: "0x00", MAX_EFFECTIVE_BALANCE_ELECTRA: "2048000000000", - MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "65536", + MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "4096", MIN_ACTIVATION_BALANCE: "32000000000", PENDING_DEPOSITS_LIMIT: "134217728", PENDING_PARTIAL_WITHDRAWALS_LIMIT: "134217728", @@ -544,7 +544,7 @@ export const nimbusHoleskyConfig = { TARGET_AGGREGATORS_PER_SYNC_SUBCOMMITTEE: "16", SYNC_COMMITTEE_SUBNET_COUNT: "4", MAX_EFFECTIVE_BALANCE_ELECTRA: "2048000000000", - MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "65536", + MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "4096", MIN_ACTIVATION_BALANCE: "32000000000", PENDING_DEPOSITS_LIMIT: "134217728", PENDING_PARTIAL_WITHDRAWALS_LIMIT: "134217728", From bf04e417724c67ebfbb8e25d9259e7a39c2661c1 Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Thu, 6 Feb 2025 23:12:12 +0000 Subject: [PATCH 3/3] Update fork epochs as per latest ACDC decision --- packages/config/src/chainConfig/networks/holesky.ts | 2 +- packages/config/src/chainConfig/networks/sepolia.ts | 2 +- packages/validator/test/unit/utils/interopConfigs.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/config/src/chainConfig/networks/holesky.ts b/packages/config/src/chainConfig/networks/holesky.ts index 3992ac5635db..632b7fea8ec2 100644 --- a/packages/config/src/chainConfig/networks/holesky.ts +++ b/packages/config/src/chainConfig/networks/holesky.ts @@ -35,7 +35,7 @@ export const holeskyChainConfig: ChainConfig = { DENEB_FORK_EPOCH: 29696, // Electra ELECTRA_FORK_VERSION: b("0x06017000"), - ELECTRA_FORK_EPOCH: 113152, + ELECTRA_FORK_EPOCH: 115968, // # 28,000,000,000 Gwei to ensure quicker ejection EJECTION_BALANCE: 28000000000, diff --git a/packages/config/src/chainConfig/networks/sepolia.ts b/packages/config/src/chainConfig/networks/sepolia.ts index ebd450e984b4..f6629ac70755 100644 --- a/packages/config/src/chainConfig/networks/sepolia.ts +++ b/packages/config/src/chainConfig/networks/sepolia.ts @@ -35,7 +35,7 @@ export const sepoliaChainConfig: ChainConfig = { DENEB_FORK_EPOCH: 132608, // Electra ELECTRA_FORK_VERSION: b("0x90000074"), - ELECTRA_FORK_EPOCH: 219392, + ELECTRA_FORK_EPOCH: 222464, // Deposit contract // --------------------------------------------------------------- diff --git a/packages/validator/test/unit/utils/interopConfigs.ts b/packages/validator/test/unit/utils/interopConfigs.ts index 842a97e38d73..79c10594b007 100644 --- a/packages/validator/test/unit/utils/interopConfigs.ts +++ b/packages/validator/test/unit/utils/interopConfigs.ts @@ -357,7 +357,7 @@ export const tekuHoleskyConfig = { DOMAIN_DEPOSIT: "0x03000000", DOMAIN_CONTRIBUTION_AND_PROOF: "0x09000000", UPDATE_TIMEOUT: "8192", - ELECTRA_FORK_EPOCH: "113152", + ELECTRA_FORK_EPOCH: "115968", SYNC_COMMITTEE_BRANCH_LENGTH: "5", DEPOSIT_CHAIN_ID: "17000", MAX_BLOB_COMMITMENTS_PER_BLOCK: "4096",