status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary field derefs in BlockProcessor.storeBlock (#4823)

This commit is contained in:
henridf 2023-04-16 03:25:17 +02:00 committed by GitHub
parent f6062a2be1
commit 57623af36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_chain/gossip_processing/block_processor.nim
View File

@ -486,8 +486,7 @@ proc storeBlock*(
# otherwise somewhat unpredictable CL head movement. # otherwise somewhat unpredictable CL head movement.
if payloadValid: if payloadValid:
self.consensusManager.dag.markBlockVerified( dag.markBlockVerified(self.consensusManager.quarantine[], signedBlock.root)
self.consensusManager.quarantine[], signedBlock.root)
# Grab the new head according to our latest attestation data; determines how # Grab the new head according to our latest attestation data; determines how
# async this needs to be. # async this needs to be.
@ -521,14 +520,14 @@ proc storeBlock*(
else: else:
let let
headExecutionPayloadHash = headExecutionPayloadHash =
self.consensusManager.dag.loadExecutionBlockHash(newHead.get.blck) dag.loadExecutionBlockHash(newHead.get.blck)
wallSlot = self.getBeaconTime().slotOrZero wallSlot = self.getBeaconTime().slotOrZero
if headExecutionPayloadHash.isZero or if headExecutionPayloadHash.isZero or
NewPayloadStatus.noResponse == payloadStatus: NewPayloadStatus.noResponse == payloadStatus:
# Blocks without execution payloads can't be optimistic, and don't try # Blocks without execution payloads can't be optimistic, and don't try
# to fcU to a block the EL hasn't seen # to fcU to a block the EL hasn't seen
self.consensusManager[].updateHead(newHead.get.blck) self.consensusManager[].updateHead(newHead.get.blck)
elif not self.consensusManager.dag.is_optimistic newHead.get.blck.root: elif not dag.is_optimistic newHead.get.blck.root:
# Not `NOT_VALID`; either `VALID` or `INVALIDATED`, but latter wouldn't # Not `NOT_VALID`; either `VALID` or `INVALIDATED`, but latter wouldn't
# be selected as head, so `VALID`. `forkchoiceUpdated` necessary for EL # be selected as head, so `VALID`. `forkchoiceUpdated` necessary for EL
# client only. # client only.
@ -552,7 +551,7 @@ proc storeBlock*(
newHead.get, self.getBeaconTime) newHead.get, self.getBeaconTime)
else: else:
warn "Head selection failed, using previous head", warn "Head selection failed, using previous head",
head = shortLog(self.consensusManager.dag.head), wallSlot head = shortLog(dag.head), wallSlot
let let
updateHeadTick = Moment.now() updateHeadTick = Moment.now()
@ -563,7 +562,7 @@ proc storeBlock*(
beacon_store_block_duration_seconds.observe(storeBlockDur.toFloatSeconds()) beacon_store_block_duration_seconds.observe(storeBlockDur.toFloatSeconds())
debug "Block processed", debug "Block processed",
localHeadSlot = self.consensusManager.dag.head.slot, localHeadSlot = dag.head.slot,
blockSlot = blck.get().slot, blockSlot = blck.get().slot,
validationDur, queueDur, storeBlockDur, updateHeadDur validationDur, queueDur, storeBlockDur, updateHeadDur