status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-27 14:58:46 +00:00
Code Issues Projects Releases Wiki Activity

Avoid IndexDefect when Prague EL sends malformed requests (#6822)

Browse Source 
* Avoid `IndexDefect` when Prague EL sends malformed requests

When using an outdated EL that does not prefix requests with types,
the `.len < 2` check was performed after already doing `mapIt(it[0])`.
Reorder the checks and also avoid the O(n) `request_types` allocation.

* Somehow this `mapIt` is used by `message_router_mev.nim`
This commit is contained in:
Etan Kissling 2025-01-07 10:04:50 +01:00 committed by GitHub
parent d1bdc1378b
commit a0f5e992f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
beacon_chain/validators/beacon_validators.nim
View File

@ -1,5 +1,5 @@
# beacon_chain
# Copyright (c) 2018-2024 Status Research & Development GmbH
# Copyright (c) 2018-2025 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@ -43,7 +43,7 @@ import
keystore_management, slashing_protection, validator_duties, validator_pool],
".."/spec/mev/[rest_deneb_mev_calls, rest_electra_mev_calls, rest_fulu_mev_calls]
from std/sequtils import countIt, deduplicate, foldl, mapIt
from std/sequtils import mapIt
from eth/async_utils import awaitWithTimeout
# Metrics for tracking attestation and beacon block loss
@ -443,8 +443,6 @@ proc getExecutionPayload(
PayloadType, beaconHead.blck.bid.root, executionHead, latestSafe,
latestFinalized, timestamp, random, feeRecipient, withdrawals)
from std/algorithm import isSorted
# BlockRewards has issues resolving somehow otherwise
import ".."/spec/state_transition_block
@ -543,18 +541,22 @@ proc makeBeaconBlockForHeadAndSlot*(
let execution_requests_actual =
when PayloadType.kind >= ConsensusFork.Electra:
# Don't want un-decoded SSZ going any further/deeper
var execution_requests_buffer: ExecutionRequests
block:
let request_types = mapIt(payload.executionRequests, it[0])
if not isSorted(request_types):
return err("Execution layer request types not sorted")
if payload.executionRequests.len !=
deduplicate(request_types, isSorted = true).len:
return err("Execution layer request types duplicated")
var
execution_requests_buffer: ExecutionRequests
prev_type: Opt[byte]
try:
for request_type_and_payload in payload.executionRequests:
if request_type_and_payload.len < 2:
return err("Execution layer request too short")
let request_type = request_type_and_payload[0]
if prev_type.isSome:
if request_type < prev_type.get:
return err("Execution layer request types not sorted")
if request_type == prev_type.get:
return err("Execution layer request types duplicated")
prev_type.ok request_type
template request_payload: untyped =
request_type_and_payload.toOpenArray(
1, request_type_and_payload.len - 1)