Skip to content

More tuning to getPayloadBodiesByRange #3442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions execution_chain/beacon/api_handler/api_getbodies.nim
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,21 @@ proc getPayloadBodiesByRange*(ben: BeaconEngineRef,
if last > ben.chain.latestNumber:
last = ben.chain.latestNumber

let base = ben.chain.baseNumber
var list = newSeqOfCap[Opt[ExecutionPayloadBodyV1]](last-start)

# get bodies from database.
for bn in start..min(last, ben.chain.baseNumber):
var body = ben.chain.payloadBodyV1ByNumber(bn).valueOr:
list.add Opt.none(ExecutionPayloadBodyV1)
continue
list.add Opt.some(move(body))

# get bodies from cache in FC module.
if last > ben.chain.baseNumber:
ben.chain.payloadBodyV1FromBaseTo(last, list)
if start < base:
# get bodies from database.
for bn in start..min(last, base):
var body = ben.chain.payloadBodyV1ByNumber(bn).valueOr:
list.add Opt.none(ExecutionPayloadBodyV1)
continue
list.add Opt.some(move(body))

# get bodies from cache in FC module.
if last > base:
ben.chain.payloadBodyV1InMemory(base, last, list)
else:
ben.chain.payloadBodyV1InMemory(start, last, list)

move(list)
11 changes: 6 additions & 5 deletions execution_chain/core/chain/forked_chain.nim
Original file line number Diff line number Diff line change
Expand Up @@ -893,14 +893,15 @@ proc receiptsByBlockHash*(c: ForkedChainRef, blockHash: Hash32): Result[seq[Stor

c.baseTxFrame.getReceipts(header.receiptsRoot)

func payloadBodyV1FromBaseTo*(c: ForkedChainRef,
last: BlockNumber,
list: var seq[Opt[ExecutionPayloadBodyV1]]) =
func payloadBodyV1InMemory*(c: ForkedChainRef,
first: BlockNumber,
last: BlockNumber,
list: var seq[Opt[ExecutionPayloadBodyV1]]) =
var
blocks = newSeqOfCap[BlockRef](last-c.base.number+1)
blocks = newSeqOfCap[BlockRef](last-first+1)

loopIt(c.latest):
if it.number <= last:
if it.number >= first and it.number <= last:
blocks.add(it)

for i in countdown(blocks.len-1, 0):
Expand Down
Loading