Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove SHARDING_* fields from spec config #4572

Merged
merged 1 commit into from
Sep 20, 2022
Merged

Remove SHARDING_* fields from spec config #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/config/src/chainConfig/networks/gnosis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,4 @@ export const gnosisChainConfig: IChainConfig = {
// Bellatrix
BELLATRIX_FORK_VERSION: b("0x02000064"),
BELLATRIX_FORK_EPOCH: Infinity,
// Sharding
SHARDING_FORK_VERSION: b("0x03000064"),
SHARDING_FORK_EPOCH: Infinity,
};
3 changes: 0 additions & 3 deletions packages/config/src/chainConfig/networks/goerli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,4 @@ export const goerliChainConfig: IChainConfig = {
// Bellatrix
BELLATRIX_FORK_VERSION: b("0x02001020"),
BELLATRIX_FORK_EPOCH: 112260,
// Sharding
SHARDING_FORK_VERSION: b("0x03001020"),
SHARDING_FORK_EPOCH: Infinity,
};
3 changes: 0 additions & 3 deletions packages/config/src/chainConfig/networks/ropsten.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ export const ropstenChainConfig: IChainConfig = {
BELLATRIX_FORK_VERSION: b("0x80000071"),
BELLATRIX_FORK_EPOCH: 750,
TERMINAL_TOTAL_DIFFICULTY: BigInt("50000000000000000"),
// # Sharding
SHARDING_FORK_VERSION: b("0x03001020"),
SHARDING_FORK_EPOCH: Infinity,

// Deposit contract
// ---------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions packages/config/src/chainConfig/presets/mainnet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ export const chainConfig: IChainConfig = {
// Bellatrix
BELLATRIX_FORK_VERSION: b("0x02000000"),
BELLATRIX_FORK_EPOCH: 144896, // Sept 6, 2022, 11:34:47am UTC
// Sharding
SHARDING_FORK_VERSION: b("0x03000000"),
SHARDING_FORK_EPOCH: Infinity,

// Time parameters
// ---------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions packages/config/src/chainConfig/presets/minimal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ export const chainConfig: IChainConfig = {
// Bellatrix
BELLATRIX_FORK_VERSION: b("0x02000001"),
BELLATRIX_FORK_EPOCH: Infinity,
// Sharding
SHARDING_FORK_VERSION: b("0x03000001"),
SHARDING_FORK_EPOCH: Infinity,

// Time parameters
// ---------------------------------------------------------------
Expand Down
6 changes: 0 additions & 6 deletions packages/config/src/chainConfig/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ export type IChainConfig = {
// Bellatrix
BELLATRIX_FORK_VERSION: Uint8Array;
BELLATRIX_FORK_EPOCH: number;
// Sharding
SHARDING_FORK_VERSION: Uint8Array;
SHARDING_FORK_EPOCH: number;

// Time parameters
SECONDS_PER_SLOT: number;
Expand Down Expand Up @@ -83,9 +80,6 @@ export const chainConfigTypes: SpecTypes<IChainConfig> = {
// Bellatrix
BELLATRIX_FORK_VERSION: "bytes",
BELLATRIX_FORK_EPOCH: "number",
// Sharding
SHARDING_FORK_VERSION: "bytes",
SHARDING_FORK_EPOCH: "number",

// Time parameters
SECONDS_PER_SLOT: "number",
Expand Down
4 changes: 0 additions & 4 deletions packages/validator/src/util/params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ export function assertEqualParams(localConfig: IChainConfig, externalSpecJson: R
function getSpecCriticalParams(localConfig: IChainConfig): Record<keyof ConfigWithPreset, boolean> {
const altairForkRelevant = localConfig.ALTAIR_FORK_EPOCH < Infinity;
const bellatrixForkRelevant = localConfig.BELLATRIX_FORK_EPOCH < Infinity;
const shardingForkRelevant = localConfig.SHARDING_FORK_EPOCH < Infinity;

return {
// # Config
Expand All @@ -98,9 +97,6 @@ function getSpecCriticalParams(localConfig: IChainConfig): Record<keyof ConfigWi
// Bellatrix
BELLATRIX_FORK_VERSION: bellatrixForkRelevant,
BELLATRIX_FORK_EPOCH: bellatrixForkRelevant,
// Sharding
SHARDING_FORK_VERSION: shardingForkRelevant,
SHARDING_FORK_EPOCH: shardingForkRelevant,

// Time parameters
SECONDS_PER_SLOT: true,
Expand Down
4 changes: 0 additions & 4 deletions packages/validator/test/unit/utils/interopConfigs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ export const prysmRopstenConfig = {
SAFE_SLOTS_TO_UPDATE_JUSTIFIED: "8",
SECONDS_PER_ETH1_BLOCK: "14",
SECONDS_PER_SLOT: "12",
SHARDING_FORK_EPOCH: "18446744073709551615",
SHARDING_FORK_VERSION: "0x04000000",
SHARD_COMMITTEE_PERIOD: "256",
SHUFFLE_ROUND_COUNT: "90",
SLOTS_PER_EPOCH: "32",
Expand Down Expand Up @@ -344,8 +342,6 @@ export const nimbusRopstenConfig = {
BELLATRIX_FORK_EPOCH: "750",
CAPELLA_FORK_VERSION: "0x03001020",
CAPELLA_FORK_EPOCH: "18446744073709551615",
SHARDING_FORK_VERSION: "0x04001020",
SHARDING_FORK_EPOCH: "18446744073709551615",
SECONDS_PER_SLOT: "12",
SECONDS_PER_ETH1_BLOCK: "14",
MIN_VALIDATOR_WITHDRAWABILITY_DELAY: "256",
Expand Down