status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-15 09:04:39 +00:00
Code Issues Projects Releases Wiki Activity

mitigate Eth1Monitor being nil in merge scenario (#3600)

Browse Source
This commit is contained in:
tersec 2022-04-26 09:25:19 +00:00 committed by GitHub
parent 09b2f4c237
commit 0d5bbbc405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/eth1/eth1_monitor.nim
View File

@ -449,7 +449,7 @@ proc getPayload*(p: Eth1Monitor,
payloadId: bellatrix.PayloadID): Future[engine_api.ExecutionPayloadV1] = payloadId: bellatrix.PayloadID): Future[engine_api.ExecutionPayloadV1] =
# Eth1 monitor can recycle connections without (external) warning; at least, # Eth1 monitor can recycle connections without (external) warning; at least,
# don't crash. # don't crash.
if p.dataProvider.isNil: if p.isNil or p.dataProvider.isNil:
var epr: Future[engine_api.ExecutionPayloadV1] var epr: Future[engine_api.ExecutionPayloadV1]
epr.complete(default(engine_api.ExecutionPayloadV1)) epr.complete(default(engine_api.ExecutionPayloadV1))
return epr return epr
@ -472,7 +472,7 @@ proc forkchoiceUpdated*(p: Eth1Monitor,
Future[engine_api.ForkchoiceUpdatedResponse] = Future[engine_api.ForkchoiceUpdatedResponse] =
# Eth1 monitor can recycle connections without (external) warning; at least, # Eth1 monitor can recycle connections without (external) warning; at least,
# don't crash. # don't crash.
if p.dataProvider.isNil: if p.isNil or p.dataProvider.isNil:
var fcuR: Future[engine_api.ForkchoiceUpdatedResponse] var fcuR: Future[engine_api.ForkchoiceUpdatedResponse]
fcuR.complete(engine_api.ForkchoiceUpdatedResponse( fcuR.complete(engine_api.ForkchoiceUpdatedResponse(
payloadStatus: PayloadStatusV1(status: PayloadExecutionStatus.syncing))) payloadStatus: PayloadStatusV1(status: PayloadExecutionStatus.syncing)))
@ -498,7 +498,7 @@ proc forkchoiceUpdated*(p: Eth1Monitor,
Future[engine_api.ForkchoiceUpdatedResponse] = Future[engine_api.ForkchoiceUpdatedResponse] =
# Eth1 monitor can recycle connections without (external) warning; at least, # Eth1 monitor can recycle connections without (external) warning; at least,
# don't crash. # don't crash.
if p.dataProvider.isNil: if p.isNil or p.dataProvider.isNil:
var fcuR: Future[engine_api.ForkchoiceUpdatedResponse] var fcuR: Future[engine_api.ForkchoiceUpdatedResponse]
fcuR.complete(engine_api.ForkchoiceUpdatedResponse( fcuR.complete(engine_api.ForkchoiceUpdatedResponse(
payloadStatus: PayloadStatusV1(status: PayloadExecutionStatus.syncing))) payloadStatus: PayloadStatusV1(status: PayloadExecutionStatus.syncing)))