From f90b8c440301466517835b8ed312695514524daa Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Fri, 19 Jan 2024 17:48:18 +0100 Subject: [PATCH] chore: extend chiado config from gnosis config --- .../config/src/chainConfig/networks/chiado.ts | 19 ++++++------------- .../config/src/chainConfig/networks/gnosis.ts | 8 +++++--- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/config/src/chainConfig/networks/chiado.ts b/packages/config/src/chainConfig/networks/chiado.ts index 284071f25bf8..0b7af5eaefec 100644 --- a/packages/config/src/chainConfig/networks/chiado.ts +++ b/packages/config/src/chainConfig/networks/chiado.ts @@ -1,32 +1,23 @@ /* eslint-disable @typescript-eslint/naming-convention */ import {fromHexString as b} from "@chainsafe/ssz"; -import {PresetName} from "@lodestar/params"; import {ChainConfig} from "../types.js"; -import {chainConfig as mainnet} from "../presets/mainnet.js"; +import {gnosisChainConfig as gnosis} from "./gnosis.js"; export const chiadoChainConfig: ChainConfig = { - ...mainnet, + ...gnosis, // NOTE: Only add diff values - PRESET_BASE: PresetName.gnosis, CONFIG_NAME: "chiado", // Transition TERMINAL_TOTAL_DIFFICULTY: BigInt("231707791542740786049188744689299064356246512"), - TERMINAL_BLOCK_HASH: b("0x0000000000000000000000000000000000000000000000000000000000000000"), - TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: Infinity, - SECONDS_PER_SLOT: 5, - SECONDS_PER_ETH1_BLOCK: 6, - ETH1_FOLLOW_DISTANCE: 1024, - CHURN_LIMIT_QUOTIENT: 4096, - - // Ethereum Goerli testnet + // Deposit contract DEPOSIT_CHAIN_ID: 10200, DEPOSIT_NETWORK_ID: 10200, DEPOSIT_CONTRACT_ADDRESS: b("0xb97036A26259B7147018913bD58a774cf91acf25"), - // Dec 8, 2021, 13:00 UTC + // 10 October 2022 10:00:00 GMT+0000 MIN_GENESIS_TIME: 1665396000, MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 6000, GENESIS_FORK_VERSION: b("0x0000006f"), @@ -41,4 +32,6 @@ export const chiadoChainConfig: ChainConfig = { // Capella CAPELLA_FORK_VERSION: b("0x0300006f"), CAPELLA_FORK_EPOCH: 244224, // Wed May 24 2023 13:12:00 GMT+0000 + // Deneb + DENEB_FORK_VERSION: b("0x0400006f"), }; diff --git a/packages/config/src/chainConfig/networks/gnosis.ts b/packages/config/src/chainConfig/networks/gnosis.ts index c952352f8438..22c038ba747a 100644 --- a/packages/config/src/chainConfig/networks/gnosis.ts +++ b/packages/config/src/chainConfig/networks/gnosis.ts @@ -13,15 +13,14 @@ export const gnosisChainConfig: ChainConfig = { // Transition TERMINAL_TOTAL_DIFFICULTY: BigInt("8626000000000000000000058750000000000000000000"), - TERMINAL_BLOCK_HASH: b("0x0000000000000000000000000000000000000000000000000000000000000000"), - TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: Infinity, + // Time parameters SECONDS_PER_SLOT: 5, SECONDS_PER_ETH1_BLOCK: 6, ETH1_FOLLOW_DISTANCE: 1024, CHURN_LIMIT_QUOTIENT: 4096, - // Ethereum Goerli testnet + // Deposit contract DEPOSIT_CHAIN_ID: 100, DEPOSIT_NETWORK_ID: 100, DEPOSIT_CONTRACT_ADDRESS: b("0x0b98057ea310f4d31f2a452b414647007d1645d9"), @@ -41,4 +40,7 @@ export const gnosisChainConfig: ChainConfig = { // Capella CAPELLA_FORK_VERSION: b("0x03000064"), CAPELLA_FORK_EPOCH: 648704, // 2023-08-01T11:34:20.000Z + // Deneb + DENEB_FORK_VERSION: b("0x04000064"), + DENEB_FORK_EPOCH: Infinity, };