status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-18 17:37:33 +00:00
Code Issues Projects Releases Wiki Activity

VC: Fix issue when optimistically synced node could block sync committee service functions. (#4878)

Browse Source 
* Fix issue when optimistically synced node could block sync committee service functions.

* Update copyright year.
This commit is contained in:
Eugene Kabanov 2023-05-02 14:54:44 +03:00 committed by GitHub
parent ecaf6c8e92
commit 0c75f9c2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_chain/validator_client/api.nim
View File

@ -20,6 +20,7 @@ const
ResponseNotFoundError = "Received resource missing error response" ResponseNotFoundError = "Received resource missing error response"
ResponseNoSyncError = "Received nosync error response" ResponseNoSyncError = "Received nosync error response"
ResponseDecodeError = "Received response could not be decoded" ResponseDecodeError = "Received response could not be decoded"
ResponseECNotInSyncError* = "Execution client not in sync"
type type
ApiResponse*[T] = Result[T, string] ApiResponse*[T] = Result[T, string]
@ -1138,6 +1139,8 @@ proc getHeadBlockRoot*(
let data = res.get() let data = res.get()
if data.execution_optimistic.get(false): if data.execution_optimistic.get(false):
node.updateStatus(RestBeaconNodeStatus.OptSynced) node.updateStatus(RestBeaconNodeStatus.OptSynced)
ApiResponse[GetBlockRootResponse].err(ResponseECNotInSyncError)
else:
ApiResponse[GetBlockRootResponse].ok(data) ApiResponse[GetBlockRootResponse].ok(data)
of 400: of 400:
debug ResponseInvalidError, response_code = response.status, debug ResponseInvalidError, response_code = response.status,
@ -1189,8 +1192,11 @@ proc getHeadBlockRoot*(
let data = res.get() let data = res.get()
if data.execution_optimistic.get(false): if data.execution_optimistic.get(false):
node.updateStatus(RestBeaconNodeStatus.OptSynced) node.updateStatus(RestBeaconNodeStatus.OptSynced)
failures.add(ApiNodeFailure.init(node, ApiFailure.Invalid))
false
else:
return data return data
else:
debug ResponseDecodeError, response_code = response.status, debug ResponseDecodeError, response_code = response.status,
endpoint = node, reason = res.error endpoint = node, reason = res.error
node.updateStatus(RestBeaconNodeStatus.Unexpected) node.updateStatus(RestBeaconNodeStatus.Unexpected)

5
beacon_chain/validator_client/sync_committee_service.nim
View File

@ -1,5 +1,5 @@
# beacon_chain # beacon_chain
# Copyright (c) 2022 Status Research & Development GmbH # Copyright (c) 2022-2023 Status Research & Development GmbH
# Licensed and distributed under either of # Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * 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). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@ -360,8 +360,7 @@ proc publishSyncMessagesAndContributions(service: SyncCommitteeServiceRef,
res.data.root res.data.root
else: else:
if res.execution_optimistic.get(): if res.execution_optimistic.get():
notice "Execution client not in sync; skipping validator duties " & notice "Execution client not in sync", slot = slot
"for now", slot = slot
return return
res.data.root res.data.root
except ValidatorApiError as exc: except ValidatorApiError as exc: