From 68ef5cdd0f9a54dcbcd1ddd171ba7d6e2a374478 Mon Sep 17 00:00:00 2001 From: harkamal Date: Fri, 30 Jun 2023 14:38:15 +0530 Subject: [PATCH] refac: remove now defunct network zhejiang --- packages/cli/src/networks/index.ts | 6 +-- packages/cli/src/networks/zhejiang.ts | 10 ----- .../src/chainConfig/networks/zhejiang.ts | 41 ------------------- packages/config/src/networks.ts | 9 +--- 4 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 packages/cli/src/networks/zhejiang.ts delete mode 100644 packages/config/src/chainConfig/networks/zhejiang.ts diff --git a/packages/cli/src/networks/index.ts b/packages/cli/src/networks/index.ts index fb4b8dbe72ee..049cca9b002d 100644 --- a/packages/cli/src/networks/index.ts +++ b/packages/cli/src/networks/index.ts @@ -16,9 +16,8 @@ import * as goerli from "./goerli.js"; import * as ropsten from "./ropsten.js"; import * as sepolia from "./sepolia.js"; import * as chiado from "./chiado.js"; -import * as zhejiang from "./zhejiang.js"; -export type NetworkName = "mainnet" | "dev" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado" | "zhejiang"; +export type NetworkName = "mainnet" | "dev" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado"; export const networkNames: NetworkName[] = [ "mainnet", "gnosis", @@ -26,7 +25,6 @@ export const networkNames: NetworkName[] = [ "ropsten", "sepolia", "chiado", - "zhejiang", // Leave always as last network. The order matters for the --help printout "dev", @@ -66,8 +64,6 @@ export function getNetworkData(network: NetworkName): { return sepolia; case "chiado": return chiado; - case "zhejiang": - return zhejiang; default: throw Error(`Network not supported: ${network}`); } diff --git a/packages/cli/src/networks/zhejiang.ts b/packages/cli/src/networks/zhejiang.ts deleted file mode 100644 index 4b4d42516a92..000000000000 --- a/packages/cli/src/networks/zhejiang.ts +++ /dev/null @@ -1,10 +0,0 @@ -export {zhejiangChainConfig as chainConfig} from "@lodestar/config/networks"; - -export const depositContractDeployBlock = 0; -export const genesisFileUrl = - "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/genesis.ssz"; -export const bootnodesFileUrl = - "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/bootstrap_nodes.txt"; - -// Pick from above file -export const bootEnrs = []; diff --git a/packages/config/src/chainConfig/networks/zhejiang.ts b/packages/config/src/chainConfig/networks/zhejiang.ts deleted file mode 100644 index 42bab23110ab..000000000000 --- a/packages/config/src/chainConfig/networks/zhejiang.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -import {fromHexString as b} from "@chainsafe/ssz"; -import {ChainConfig} from "../types.js"; -import {chainConfig as mainnet} from "../presets/mainnet.js"; - -// Zhejiang beacon chain config: -// https://github.com/eth-clients/merge-testnets/blob/main/sepolia-beacon-chain/config.yaml - -export const zhejiangChainConfig: ChainConfig = { - ...mainnet, - - CONFIG_NAME: "zhejiang", - - // Genesis - // --------------------------------------------------------------- - MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 58000, - MIN_GENESIS_TIME: 1675263480, - GENESIS_FORK_VERSION: b("0x00000069"), - GENESIS_DELAY: 120, - - // Forking - // --------------------------------------------------------------- - // # Altair - ALTAIR_FORK_VERSION: b("0x00000070"), - ALTAIR_FORK_EPOCH: 0, - // # Merge - BELLATRIX_FORK_VERSION: b("0x00000071"), - BELLATRIX_FORK_EPOCH: 0, - TERMINAL_TOTAL_DIFFICULTY: BigInt("0"), - // Capella - CAPELLA_FORK_VERSION: b("0x00000072"), - CAPELLA_FORK_EPOCH: 1350, - // Deneb - DENEB_FORK_VERSION: b("0x00000073"), - - // Deposit contract - // --------------------------------------------------------------- - DEPOSIT_CHAIN_ID: 1337803, - DEPOSIT_NETWORK_ID: 1337803, - DEPOSIT_CONTRACT_ADDRESS: b("0x4242424242424242424242424242424242424242"), -}; diff --git a/packages/config/src/networks.ts b/packages/config/src/networks.ts index 956f26b4f7ef..3f3c8da3cabe 100644 --- a/packages/config/src/networks.ts +++ b/packages/config/src/networks.ts @@ -5,7 +5,6 @@ import {goerliChainConfig} from "./chainConfig/networks/goerli.js"; import {ropstenChainConfig} from "./chainConfig/networks/ropsten.js"; import {sepoliaChainConfig} from "./chainConfig/networks/sepolia.js"; import {chiadoChainConfig} from "./chainConfig/networks/chiado.js"; -import {zhejiangChainConfig} from "./chainConfig/networks/zhejiang.js"; export { mainnetChainConfig, @@ -14,10 +13,9 @@ export { ropstenChainConfig, sepoliaChainConfig, chiadoChainConfig, - zhejiangChainConfig, }; -export type NetworkName = "mainnet" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado" | "zhejiang"; +export type NetworkName = "mainnet" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado"; export const networksChainConfig: Record = { mainnet: mainnetChainConfig, gnosis: gnosisChainConfig, @@ -25,7 +23,6 @@ export const networksChainConfig: Record = { ropsten: ropstenChainConfig, sepolia: sepoliaChainConfig, chiado: chiadoChainConfig, - zhejiang: zhejiangChainConfig, }; export type GenesisData = { @@ -58,8 +55,4 @@ export const genesisData: Record = { genesisTime: 1665396300, genesisValidatorsRoot: "0x9d642dac73058fbf39c0ae41ab1e34e4d889043cb199851ded7095bc99eb4c1e", }, - zhejiang: { - genesisTime: 1675263600, - genesisValidatorsRoot: "0x53a92d8f2bb1d85f62d16a156e6ebcd1bcaba652d0900b2c2f387826f3481f6f", - }, };