diff --git a/packages/beacon-node/test/unit-mainnet/network/gossip/scoringParameters.test.ts b/packages/beacon-node/test/unit-mainnet/network/gossip/scoringParameters.test.ts index 3b84bba01f92..ac0b5a1d8be6 100644 --- a/packages/beacon-node/test/unit-mainnet/network/gossip/scoringParameters.test.ts +++ b/packages/beacon-node/test/unit-mainnet/network/gossip/scoringParameters.test.ts @@ -2,7 +2,7 @@ import {expect} from "chai"; import {TopicScoreParams} from "@chainsafe/libp2p-gossipsub/score"; import {ATTESTATION_SUBNET_COUNT, ForkName, SLOTS_PER_EPOCH} from "@lodestar/params"; import {createBeaconConfig} from "@lodestar/config"; -import {mainnetChainConfig} from "@lodestar/config/presets"; +import {mainnetChainConfig} from "@lodestar/config/configs"; import {computeGossipPeerScoreParams, gossipScoreThresholds} from "../../../../src/network/gossip/scoringParameters.js"; import {stringifyGossipTopic} from "../../../../src/network/gossip/topic.js"; import {GossipType} from "../../../../src/network/index.js"; diff --git a/packages/cli/src/networks/dev.ts b/packages/cli/src/networks/dev.ts index 77d55bc6a32d..ff8afc127dcc 100644 --- a/packages/cli/src/networks/dev.ts +++ b/packages/cli/src/networks/dev.ts @@ -1,5 +1,5 @@ import {gnosisChainConfig} from "@lodestar/config/networks"; -import {minimalChainConfig, mainnetChainConfig} from "@lodestar/config/presets"; +import {minimalChainConfig, mainnetChainConfig} from "@lodestar/config/configs"; import {ACTIVE_PRESET, PresetName} from "@lodestar/params"; let chainConfig; diff --git a/packages/config/package.json b/packages/config/package.json index ed79bd700cfb..52de3f00f5a7 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -19,8 +19,8 @@ "./networks": { "import": "./lib/networks.js" }, - "./presets": { - "import": "./lib/presets.js" + "./configs": { + "import": "./lib/configs.js" } }, "typesVersions": { diff --git a/packages/config/src/chainConfig/presets/mainnet.ts b/packages/config/src/chainConfig/configs/mainnet.ts similarity index 100% rename from packages/config/src/chainConfig/presets/mainnet.ts rename to packages/config/src/chainConfig/configs/mainnet.ts diff --git a/packages/config/src/chainConfig/presets/minimal.ts b/packages/config/src/chainConfig/configs/minimal.ts similarity index 100% rename from packages/config/src/chainConfig/presets/minimal.ts rename to packages/config/src/chainConfig/configs/minimal.ts diff --git a/packages/config/src/chainConfig/default.ts b/packages/config/src/chainConfig/default.ts index 368f2afd067d..d778c9b82447 100644 --- a/packages/config/src/chainConfig/default.ts +++ b/packages/config/src/chainConfig/default.ts @@ -1,7 +1,7 @@ import {ACTIVE_PRESET, PresetName} from "@lodestar/params"; import {ChainConfig} from "./types.js"; -import {chainConfig as mainnet} from "./presets/mainnet.js"; -import {chainConfig as minimal} from "./presets/minimal.js"; +import {chainConfig as mainnet} from "./configs/mainnet.js"; +import {chainConfig as minimal} from "./configs/minimal.js"; let defaultChainConfig: ChainConfig; diff --git a/packages/config/src/chainConfig/networks/chiado.ts b/packages/config/src/chainConfig/networks/chiado.ts index 2ae4f84cda4a..6a51cac1ff69 100644 --- a/packages/config/src/chainConfig/networks/chiado.ts +++ b/packages/config/src/chainConfig/networks/chiado.ts @@ -2,7 +2,7 @@ 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 {chainConfig as mainnet} from "../configs/mainnet.js"; // Chiado beacon chain config: // https://github.com/gnosischain/configs/blob/main/chiado/config.yaml diff --git a/packages/config/src/chainConfig/networks/ephemery.ts b/packages/config/src/chainConfig/networks/ephemery.ts index 5557767550bb..29e3f7b92d01 100644 --- a/packages/config/src/chainConfig/networks/ephemery.ts +++ b/packages/config/src/chainConfig/networks/ephemery.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; // Ephemery dynamic beacon chain config: // https://github.com/ephemery-testnet/ephemery-genesis/blob/master/cl-config.yaml diff --git a/packages/config/src/chainConfig/networks/gnosis.ts b/packages/config/src/chainConfig/networks/gnosis.ts index dbdf8b8fb1bb..97acee832164 100644 --- a/packages/config/src/chainConfig/networks/gnosis.ts +++ b/packages/config/src/chainConfig/networks/gnosis.ts @@ -2,7 +2,7 @@ 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 {chainConfig as mainnet} from "../configs/mainnet.js"; // Gnosis beacon chain config: // https://github.com/gnosischain/configs/blob/main/mainnet/config.yaml diff --git a/packages/config/src/chainConfig/networks/goerli.ts b/packages/config/src/chainConfig/networks/goerli.ts index a3a01e937178..b90f79f4e272 100644 --- a/packages/config/src/chainConfig/networks/goerli.ts +++ b/packages/config/src/chainConfig/networks/goerli.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; // Goerli beacon chain config: // https://github.com/eth-clients/goerli/blob/main/prater/config.yaml diff --git a/packages/config/src/chainConfig/networks/holesky.ts b/packages/config/src/chainConfig/networks/holesky.ts index e255369ccbaa..3115caf1ab76 100644 --- a/packages/config/src/chainConfig/networks/holesky.ts +++ b/packages/config/src/chainConfig/networks/holesky.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; // Holesky beacon chain config: // https://github.com/eth-clients/holesky/blob/main/custom_config_data/config.yaml diff --git a/packages/config/src/chainConfig/networks/mainnet.ts b/packages/config/src/chainConfig/networks/mainnet.ts index 1ae9858523e2..24584ad8442b 100644 --- a/packages/config/src/chainConfig/networks/mainnet.ts +++ b/packages/config/src/chainConfig/networks/mainnet.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; export const mainnetChainConfig: ChainConfig = { ...mainnet, diff --git a/packages/config/src/chainConfig/networks/ropsten.ts b/packages/config/src/chainConfig/networks/ropsten.ts index a94419c9140b..6bb7811ccba3 100644 --- a/packages/config/src/chainConfig/networks/ropsten.ts +++ b/packages/config/src/chainConfig/networks/ropsten.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; // Ropsten beacon chain config: // https://github.com/eth-clients/merge-testnets/blob/main/ropsten-beacon-chain/config.yaml diff --git a/packages/config/src/chainConfig/networks/sepolia.ts b/packages/config/src/chainConfig/networks/sepolia.ts index 0599d020ae4f..a3598299e294 100644 --- a/packages/config/src/chainConfig/networks/sepolia.ts +++ b/packages/config/src/chainConfig/networks/sepolia.ts @@ -1,7 +1,7 @@ /* 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"; +import {chainConfig as mainnet} from "../configs/mainnet.js"; // Sepolia beacon chain config: // https://github.com/eth-clients/sepolia/blob/main/bepolia/config.yaml diff --git a/packages/config/src/configs.ts b/packages/config/src/configs.ts new file mode 100644 index 000000000000..9aded2b5190b --- /dev/null +++ b/packages/config/src/configs.ts @@ -0,0 +1,4 @@ +import {chainConfig as mainnetChainConfig} from "./chainConfig/configs/mainnet.js"; +import {chainConfig as minimalChainConfig} from "./chainConfig/configs/minimal.js"; + +export {mainnetChainConfig, minimalChainConfig}; diff --git a/packages/config/src/presets.ts b/packages/config/src/presets.ts deleted file mode 100644 index 542c01ece33d..000000000000 --- a/packages/config/src/presets.ts +++ /dev/null @@ -1,4 +0,0 @@ -import {chainConfig as mainnetChainConfig} from "./chainConfig/presets/mainnet.js"; -import {chainConfig as minimalChainConfig} from "./chainConfig/presets/minimal.js"; - -export {mainnetChainConfig, minimalChainConfig};