From 002ca2cdeb39e8710ac209540db6bb59961bdf9d Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Mon, 2 Sep 2024 09:32:06 +1000 Subject: [PATCH] Fix context bytes logic for DataColumn RPC responses (#6325) * Fix context byte logic for data columns. --- .../lighthouse_network/src/rpc/codec/ssz_snappy.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs b/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs index eb97152acd..2d6d1d2a8f 100644 --- a/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs +++ b/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs @@ -426,11 +426,12 @@ fn context_bytes( RPCResponse::BlobsByRange(_) | RPCResponse::BlobsByRoot(_) => { return fork_context.to_context_bytes(ForkName::Deneb); } - RPCResponse::DataColumnsByRoot(_) | RPCResponse::DataColumnsByRange(_) => { + RPCResponse::DataColumnsByRoot(d) | RPCResponse::DataColumnsByRange(d) => { // TODO(das): Remove deneb fork after `peerdas-devnet-2`. - return if fork_context.spec.eip7594_fork_epoch - == fork_context.spec.deneb_fork_epoch - { + return if matches!( + fork_context.spec.fork_name_at_slot::(d.slot()), + ForkName::Deneb + ) { fork_context.to_context_bytes(ForkName::Deneb) } else { fork_context.to_context_bytes(ForkName::Electra)