status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-23 09:18:29 +00:00
Code Issues Projects Releases Wiki Activity

Replace invalidParams error with invalidForkchoiceState error in forkchoiceUpdated handler (#2106)

Browse Source
This commit is contained in:
andri lim 2024-03-26 09:31:21 +07:00 committed by GitHub
parent 32f631534d
commit 33976e8875
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hive_integration/nodocker/engine/engine/forkchoice.nim
View File

@ -85,7 +85,7 @@ method execute(cs: InconsistentForkchoiceTest, env: TestEnv): bool =
let version = env.engine.version(env.clMock.latestPayloadBuilt.timestamp)
var r = env.engine.client.forkchoiceUpdated(version, inconsistentFcU)
r.expectError()
r.expectErrorCode(engineApiInvalidForkchoiceState)
# Return to the canonical chain
r = env.engine.client.forkchoiceUpdated(version, env.clMock.latestForkchoice)

14
nimbus/beacon/api_handler/api_forkchoice.nim
View File

@ -1,5 +1,5 @@
# Nimbus
# Copyright (c) 2023 Status Research & Development GmbH
# Copyright (c) 2023-2024 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@ -147,19 +147,19 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
if not db.getBlockHeader(finalizedBlockHash, finalBlock):
warn "Final block not available in database",
hash=finalizedBlockHash.short
raise invalidParams("finalized block header not available")
raise invalidForkChoiceState("finalized block header not available")
var finalHash: common.Hash256
if not db.getBlockHash(finalBlock.blockNumber, finalHash):
warn "Final block not in canonical chain",
number=finalBlock.blockNumber,
hash=finalizedBlockHash.short
raise invalidParams("finalized block hash not available")
raise invalidForkChoiceState("finalized block hash not available")
if finalHash != finalizedBlockHash:
warn "Final block not in canonical chain",
number=finalBlock.blockNumber,
expect=finalizedBlockHash.short,
get=finalHash.short
raise invalidParams("finalized block not canonical")
raise invalidForkChoiceState("finalized block not canonical")
db.finalizedHeaderHash(finalizedBlockHash)
let safeBlockHash = ethHash update.safeBlockHash
@ -168,18 +168,18 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
if not db.getBlockHeader(safeBlockHash, safeBlock):
warn "Safe block not available in database",
hash = safeBlockHash.short
raise invalidParams("safe head not available")
raise invalidForkChoiceState("safe head not available")
var safeHash: common.Hash256
if not db.getBlockHash(safeBlock.blockNumber, safeHash):
warn "Safe block hash not available in database",
hash = safeHash.short
raise invalidParams("safe block hash not available")
raise invalidForkChoiceState("safe block hash not available")
if safeHash != safeBlockHash:
warn "Safe block not in canonical chain",
blockNumber=safeBlock.blockNumber,
expect=safeBlockHash.short,
get=safeHash.short
raise invalidParams("safe head not canonical")
raise invalidForkChoiceState("safe head not canonical")
db.safeHeaderHash(safeBlockHash)
# If payload generation was requested, create a new block to be potentially

8
nimbus/beacon/api_handler/api_utils.nim
View File

@ -1,5 +1,5 @@
# Nimbus
# Copyright (c) 2022-2023 Status Research & Development GmbH
# Copyright (c) 2022-2024 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@ -135,6 +135,12 @@ proc invalidParams*(msg: string): ref InvalidRequest =
msg: msg
)
proc invalidForkChoiceState*(msg: string): ref InvalidRequest =
(ref InvalidRequest)(
code: engineApiInvalidForkchoiceState,
msg: msg
)
proc unknownPayload*(msg: string): ref InvalidRequest =
(ref InvalidRequest)(
code: engineApiUnknownPayload,