From 554a31d20d689e0994b8c65725cb72160ddd2274 Mon Sep 17 00:00:00 2001 From: zah Date: Wed, 29 Sep 2021 19:44:43 +0300 Subject: [PATCH] Implement the merge networking req/resp changes (#2922) The other part of this change was already implemented in the `sendResponseChunk` function. --- beacon_chain/sync/sync_protocol.nim | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/beacon_chain/sync/sync_protocol.nim b/beacon_chain/sync/sync_protocol.nim index 2a9e40ab1..92730fbbe 100644 --- a/beacon_chain/sync/sync_protocol.nim +++ b/beacon_chain/sync/sync_protocol.nim @@ -10,7 +10,7 @@ import options, tables, sets, macros, chronicles, chronos, stew/ranges/bitranges, libp2p/switch, - ../spec/datatypes/[phase0, altair], + ../spec/datatypes/[phase0, altair, merge], ../spec/[helpers, forks, network], ".."/[beacon_node_types, beacon_clock], ../networking/eth2_network, @@ -79,6 +79,12 @@ proc readChunkPayload*(conn: Connection, peer: Peer, return ok ForkedSignedBeaconBlock.init(res.get) else: return err(res.error) + elif contextBytes == peer.network.forkDigests.merge: + let res = await readChunkPayload(conn, peer, merge.SignedBeaconBlock) + if res.isOk: + return ok ForkedSignedBeaconBlock.init(res.get) + else: + return err(res.error) else: return neterr InvalidContextBytes