status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-17 08:56:45 +00:00
Code Issues Projects Releases Wiki Activity

fix forkDigest

Browse Source
This commit is contained in:
Jacek Sieka 2021-10-06 18:47:11 +03:00
parent 0fffdaf96d
commit a017e4a817
No known key found for this signature in database
GPG Key ID: A1B09461ABB656B8
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_chain/networking/eth2_network.nim
View File

@ -1857,9 +1857,9 @@ proc createEth2Node*(rng: ref BrHmacDrbgContext,
# that are different from the host address (this is relevant when we # that are different from the host address (this is relevant when we
# are running behind a NAT). # are running behind a NAT).
var switch = newBeaconSwitch(config, netKeys.seckey, hostAddress, rng) var switch = newBeaconSwitch(config, netKeys.seckey, hostAddress, rng)
let altairPrefix = $forkDigests.altair
func msgIdProvider(m: messages.Message): seq[byte] = func msgIdProvider(m: messages.Message): seq[byte] =
let topic = getAltairTopic(m, forkDigests.altairTopicPrefix) let topic = getAltairTopic(m, altairPrefix)
try: try:
let decoded = snappy.decode(m.data, GOSSIP_MAX_SIZE) let decoded = snappy.decode(m.data, GOSSIP_MAX_SIZE)
gossipId(decoded, topic, true) gossipId(decoded, topic, true)

22
beacon_chain/spec/forks.nim
View File

@ -68,11 +68,10 @@ type
of BeaconBlockFork.Merge: of BeaconBlockFork.Merge:
mergeBlock*: merge.TrustedSignedBeaconBlock mergeBlock*: merge.TrustedSignedBeaconBlock
ForkDigests* = object ForkDigests* {.requiresInit.} = object
phase0*: ForkDigest phase0*: ForkDigest
altair*: ForkDigest altair*: ForkDigest
merge*: ForkDigest # TODO where does this get filled merge*: ForkDigest
altairTopicPrefix*: string # Used by isAltairTopic
ForkDigestsRef* = ref ForkDigests ForkDigestsRef* = ref ForkDigests
@ -306,15 +305,14 @@ func get_previous_epoch*(stateData: ForkedHashedBeaconState): Epoch =
func init*(T: type ForkDigests, func init*(T: type ForkDigests,
cfg: RuntimeConfig, cfg: RuntimeConfig,
genesisValidatorsRoot: Eth2Digest): T = genesisValidatorsRoot: Eth2Digest): T =
let altairForkDigest = compute_fork_digest( T(
cfg.ALTAIR_FORK_VERSION, phase0:
genesisValidatorsRoot) compute_fork_digest(cfg.GENESIS_FORK_VERSION, genesisValidatorsRoot),
altair:
T(phase0: compute_fork_digest( compute_fork_digest(cfg.ALTAIR_FORK_VERSION, genesisValidatorsRoot),
cfg.GENESIS_FORK_VERSION, merge:
genesisValidatorsRoot), compute_fork_digest(cfg.MERGE_FORK_VERSION, genesisValidatorsRoot),
altair: altairForkDigest, )
altairTopicPrefix: $altairForkDigest)
template asSigned*(x: phase0.TrustedSignedBeaconBlock or phase0.SigVerifiedBeaconBlock): template asSigned*(x: phase0.TrustedSignedBeaconBlock or phase0.SigVerifiedBeaconBlock):
phase0.SignedBeaconBlock = phase0.SignedBeaconBlock =