Skip to content

Commit a326641

Browse files
authored
ensure gloas pre-BPO forkdigest is distinct from fulu (#7794)
1 parent a2ebb7a commit a326641

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

beacon_chain/spec/forks.nim

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ type
378378
deneb: ForkDigest
379379
electra: ForkDigest
380380
fuluInt: ForkDigest
381+
gloasInt: ForkDigest
381382
bpos: seq[(Epoch, ConsensusFork, ForkDigest)]
382383

383384
template kind*(
@@ -1155,9 +1156,9 @@ func consensusForkAtEpoch*(cfg: RuntimeConfig, epoch: Epoch): ConsensusFork =
11551156
func consensusForkForDigest*(
11561157
forkDigests: ForkDigests, forkDigest: ForkDigest): Opt[ConsensusFork] =
11571158
static: doAssert high(ConsensusFork) == ConsensusFork.Gloas
1158-
# Past Fulu, this reverse lookup doesn't work anyway in a good way, needs to
1159-
# be refactored
1160-
if forkDigest == forkDigests.fuluInt:
1159+
if forkDigest == forkDigests.gloasInt:
1160+
ok ConsensusFork.Gloas
1161+
elif forkDigest == forkDigests.fuluInt:
11611162
ok ConsensusFork.Fulu
11621163
elif forkDigest == forkDigests.electra:
11631164
ok ConsensusFork.Electra
@@ -1182,7 +1183,7 @@ func atConsensusFork*(
11821183
debugGloasComment "atConsensusFork is deprecated anyway, should be gone before we need it for gloas, otherwise look at again"
11831184
case consensusFork
11841185
of ConsensusFork.Gloas:
1185-
forkDigests.fuluInt
1186+
forkDigests.gloasInt
11861187
of ConsensusFork.Fulu:
11871188
forkDigests.fuluInt
11881189
of ConsensusFork.Electra:
@@ -1805,6 +1806,9 @@ func init*(T: type ForkDigests,
18051806
fuluInt:
18061807
compute_fork_digest_fulu(
18071808
cfg, genesis_validators_root, cfg.FULU_FORK_EPOCH),
1809+
gloasInt:
1810+
compute_fork_digest_fulu(
1811+
cfg, genesis_validators_root, cfg.GLOAS_FORK_EPOCH),
18081812
bpos: mapIt(
18091813
cfg.BLOB_SCHEDULE,
18101814
(

0 commit comments

Comments
 (0)