Skip to content

Commit bcf1051

Browse files
pawanjay176paulhauner
authored andcommitted
Add merge fork_epoch and fork_version to Config (#2663)
1 parent 007f702 commit bcf1051

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

consensus/types/src/chain_spec.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,12 @@ pub struct Config {
569569
#[serde(deserialize_with = "deserialize_fork_epoch")]
570570
pub altair_fork_epoch: Option<MaybeQuoted<Epoch>>,
571571

572+
#[serde(with = "eth2_serde_utils::bytes_4_hex")]
573+
merge_fork_version: [u8; 4],
574+
#[serde(serialize_with = "serialize_fork_epoch")]
575+
#[serde(deserialize_with = "deserialize_fork_epoch")]
576+
pub merge_fork_epoch: Option<MaybeQuoted<Epoch>>,
577+
572578
#[serde(with = "eth2_serde_utils::quoted_u64")]
573579
seconds_per_slot: u64,
574580
#[serde(with = "eth2_serde_utils::quoted_u64")]
@@ -659,6 +665,10 @@ impl Config {
659665
altair_fork_epoch: spec
660666
.altair_fork_epoch
661667
.map(|epoch| MaybeQuoted { value: epoch }),
668+
merge_fork_version: spec.merge_fork_version,
669+
merge_fork_epoch: spec
670+
.merge_fork_epoch
671+
.map(|epoch| MaybeQuoted { value: epoch }),
662672

663673
seconds_per_slot: spec.seconds_per_slot,
664674
seconds_per_eth1_block: spec.seconds_per_eth1_block,
@@ -695,6 +705,8 @@ impl Config {
695705
genesis_delay,
696706
altair_fork_version,
697707
altair_fork_epoch,
708+
merge_fork_epoch,
709+
merge_fork_version,
698710
seconds_per_slot,
699711
seconds_per_eth1_block,
700712
min_validator_withdrawability_delay,
@@ -721,6 +733,8 @@ impl Config {
721733
genesis_delay,
722734
altair_fork_version,
723735
altair_fork_epoch: altair_fork_epoch.map(|q| q.value),
736+
merge_fork_epoch: merge_fork_epoch.map(|q| q.value),
737+
merge_fork_version,
724738
seconds_per_slot,
725739
seconds_per_eth1_block,
726740
min_validator_withdrawability_delay,

0 commit comments

Comments
 (0)