Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# To specify a specific network (defaults to mainnet) set this value.
# Allowed values are: mainnet, gnosis, holesky, sepolia, hoodi and chiado. Source for currently supported networks: https://github.com/ChainSafe/lodestar/blob/unstable/packages/cli/src/networks/index.ts#L21
# Allowed values are: mainnet, gnosis, sepolia, hoodi, chiado, ephemery, and dev. Source for currently supported networks: https://github.com/ChainSafe/lodestar/blob/unstable/packages/cli/src/networks/index.ts#L26
LODESTAR_NETWORK=mainnet

# Set a custom admin password to prevent having to signup.
Expand Down
17 changes: 0 additions & 17 deletions packages/cli/src/networks/holesky.ts

This file was deleted.

6 changes: 1 addition & 5 deletions packages/cli/src/networks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ import * as chiado from "./chiado.js";
import * as dev from "./dev.js";
import * as ephemery from "./ephemery.js";
import * as gnosis from "./gnosis.js";
import * as holesky from "./holesky.js";
import * as hoodi from "./hoodi.js";
import * as mainnet from "./mainnet.js";
import * as sepolia from "./sepolia.js";

export type NetworkName = "mainnet" | "dev" | "gnosis" | "sepolia" | "holesky" | "hoodi" | "chiado" | "ephemery";
export type NetworkName = "mainnet" | "dev" | "gnosis" | "sepolia" | "hoodi" | "chiado" | "ephemery";
export const networkNames: NetworkName[] = [
"mainnet",
"gnosis",
"sepolia",
"holesky",
"hoodi",
"chiado",
"ephemery",
Expand Down Expand Up @@ -66,8 +64,6 @@ export function getNetworkData(network: NetworkName): {
return gnosis;
case "sepolia":
return sepolia;
case "holesky":
return holesky;
case "hoodi":
return hoodi;
case "chiado":
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/test/unit/config/beaconParams.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import {getTestdirPath} from "../../utils.js";

describe("config / beaconParams", () => {
const GENESIS_FORK_VERSION_MAINNET = "0x00000000";
const GENESIS_FORK_VERSION_HOLESKY = "0x01017000";
const GENESIS_FORK_VERSION_HOODI = "0x10000910";
const GENESIS_FORK_VERSION_FILE = "0x00009902";
const GENESIS_FORK_VERSION_CLI = "0x00009903";
const networkName = "holesky";
const networkName = "hoodi";
const paramsFilepath = getTestdirPath("./test-config.yaml");

const testCases: {
Expand All @@ -31,7 +31,7 @@ describe("config / beaconParams", () => {
network: networkName,
additionalParamsCli: {},
},
GENESIS_FORK_VERSION: GENESIS_FORK_VERSION_HOLESKY,
GENESIS_FORK_VERSION: GENESIS_FORK_VERSION_HOODI,
},
{
id: "Params from network & file > returns file",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/unit/paths/globalPaths.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ describe("paths / global", () => {
},
{
id: "Network paths",
args: {network: "holesky"},
args: {network: "hoodi"},
globalPaths: {
dataDir: "/my-root-dir/lodestar/holesky",
dataDir: "/my-root-dir/lodestar/hoodi",
},
},
{
Expand Down
67 changes: 0 additions & 67 deletions packages/config/src/chainConfig/networks/holesky.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/config/src/chainConfig/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type ChainConfig = {
* Free-form short name of the network that this configuration applies to - known
* canonical network names include:
* * 'mainnet' - there can be only one
* * 'holesky' - testnet
* * 'hoodi' - testnet
* Must match the regex: [a-z0-9\-]
*/
CONFIG_NAME: string;
Expand Down
9 changes: 1 addition & 8 deletions packages/config/src/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {ChainConfig} from "./chainConfig/index.js";
import {chiadoChainConfig} from "./chainConfig/networks/chiado.js";
import {ephemeryChainConfig} from "./chainConfig/networks/ephemery.js";
import {gnosisChainConfig} from "./chainConfig/networks/gnosis.js";
import {holeskyChainConfig} from "./chainConfig/networks/holesky.js";
import {hoodiChainConfig} from "./chainConfig/networks/hoodi.js";
import {mainnetChainConfig} from "./chainConfig/networks/mainnet.js";
import {sepoliaChainConfig} from "./chainConfig/networks/sepolia.js";
Expand All @@ -11,18 +10,16 @@ export {
mainnetChainConfig,
gnosisChainConfig,
sepoliaChainConfig,
holeskyChainConfig,
hoodiChainConfig,
chiadoChainConfig,
ephemeryChainConfig,
};

export type NetworkName = "mainnet" | "gnosis" | "sepolia" | "holesky" | "hoodi" | "chiado" | "ephemery";
export type NetworkName = "mainnet" | "gnosis" | "sepolia" | "hoodi" | "chiado" | "ephemery";
export const networksChainConfig: Record<NetworkName, ChainConfig> = {
mainnet: mainnetChainConfig,
gnosis: gnosisChainConfig,
sepolia: sepoliaChainConfig,
holesky: holeskyChainConfig,
hoodi: hoodiChainConfig,
chiado: chiadoChainConfig,
ephemery: ephemeryChainConfig,
Expand All @@ -46,10 +43,6 @@ export const genesisData: Record<NetworkName, GenesisData> = {
genesisTime: 1655733600,
genesisValidatorsRoot: "0xd8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078",
},
holesky: {
genesisTime: 1695902400,
genesisValidatorsRoot: "0x9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1",
},
hoodi: {
genesisTime: 1742213400,
genesisValidatorsRoot: "0x212f13fc4df078b6cb7db228f1c8307566dcecf900867401a92023d7ba99cb5f",
Expand Down
2 changes: 1 addition & 1 deletion packages/flare/src/cmds/selfSlashProposer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const selfSlashProposer: CliCommand<SelfSlashArgs, Record<never, never>,
describe: "Self slash validators of a provided mnemonic with ProposerSlashing",
examples: [
{
command: "self-slash-proposer --network holesky",
command: "self-slash-proposer --network hoodi",
description: "Self slash validators of a provided mnemonic",
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/prover/src/utils/execution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function getChainCommon(network: string): Common {
switch (network) {
case "mainnet":
case "sepolia":
case "holesky":
case "hoodi":
case "ephemery":
// TODO: Not sure how to detect the fork during runtime
return new Common({chain: network, hardfork: Hardfork.Shanghai});
Expand Down
2 changes: 1 addition & 1 deletion packages/validator/src/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type LodestarGitData = {
version: string;
/** "4f816b16dfde718e2d74f95f2c8292596138c248" */
commit: string;
/** "holesky" */
/** "hoodi" */
network: string;
};

Expand Down
5 changes: 4 additions & 1 deletion packages/validator/src/util/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ export function assertEqualParams(localConfig: ChainConfig, externalSpecJson: Sp
}

if (key === "BLOB_SCHEDULE") {
// Parse JSON string if needed (interopConfigs stores BLOB_SCHEDULE as JSON string)
const remoteBlobScheduleValue =
typeof externalSpecJson[key] === "string" ? JSON.parse(externalSpecJson[key]) : externalSpecJson[key];
const localBlobSchedule = deserializeBlobSchedule(localSpecJson[key]).sort((a, b) => a.EPOCH - b.EPOCH);
const remoteBlobSchedule = deserializeBlobSchedule(externalSpecJson[key]).sort((a, b) => a.EPOCH - b.EPOCH);
const remoteBlobSchedule = deserializeBlobSchedule(remoteBlobScheduleValue).sort((a, b) => a.EPOCH - b.EPOCH);
Comment on lines +56 to +60
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes shouldn't be required, the BLOB_SCHEDULE should be an array, not a string


if (localBlobSchedule.length !== remoteBlobSchedule.length) {
errors.push(`BLOB_SCHEDULE different length: ${localBlobSchedule.length} != ${remoteBlobSchedule.length}`);
Expand Down
Loading
Loading