status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow syncing capella blocks (#4423)

This commit is contained in:
Jacek Sieka 2022-12-14 02:30:34 +01:00 committed by GitHub
parent cd993ca418
commit 2440954555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_chain/networking/eth2_network.nim
View File

@ -804,7 +804,7 @@ func chunkMaxSize[T](): uint32 =
when T is ForkySignedBeaconBlock: when T is ForkySignedBeaconBlock:
when T is phase0.SignedBeaconBlock or T is altair.SignedBeaconBlock: when T is phase0.SignedBeaconBlock or T is altair.SignedBeaconBlock:
MAX_CHUNK_SIZE MAX_CHUNK_SIZE
elif T is bellatrix.SignedBeaconBlock: elif T is bellatrix.SignedBeaconBlock or T is capella.SignedBeaconBlock:
MAX_CHUNK_SIZE_BELLATRIX MAX_CHUNK_SIZE_BELLATRIX
else: else:
{.fatal: "what's the chunk size here?".} {.fatal: "what's the chunk size here?".}

8
beacon_chain/sync/sync_protocol.nim
View File

@ -14,7 +14,7 @@ import
std/[options, tables, sets, macros], std/[options, tables, sets, macros],
chronicles, chronos, snappy/codec, chronicles, chronos, snappy/codec,
libp2p/switch, libp2p/switch,
../spec/datatypes/[phase0, altair, bellatrix], ../spec/datatypes/[phase0, altair, bellatrix, capella],
../spec/[helpers, forks, network], ../spec/[helpers, forks, network],
".."/[beacon_clock], ".."/[beacon_clock],
../networking/eth2_network, ../networking/eth2_network,
@ -106,6 +106,12 @@ proc readChunkPayload*(
return ok newClone(ForkedSignedBeaconBlock.init(res.get)) return ok newClone(ForkedSignedBeaconBlock.init(res.get))
else: else:
return err(res.error) return err(res.error)
elif contextBytes == peer.network.forkDigests.capella:
let res = await readChunkPayload(conn, peer, capella.SignedBeaconBlock)
if res.isOk:
return ok newClone(ForkedSignedBeaconBlock.init(res.get))
else:
return err(res.error)
else: else:
return neterr InvalidContextBytes return neterr InvalidContextBytes