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

simplify beacon validator sync committee production for blocks slightly (#5364)

This commit is contained in:
tersec 2023-09-05 12:31:33 +02:00 committed by GitHub
parent afb5fdae34
commit 0987628c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_chain/validators/beacon_validators.nim
View File

@ -482,11 +482,6 @@ proc makeBeaconBlockForHeadAndSlot*(
exits = withState(state[]): exits = withState(state[]):
node.validatorChangePool[].getBeaconBlockValidatorChanges( node.validatorChangePool[].getBeaconBlockValidatorChanges(
node.dag.cfg, forkyState.data) node.dag.cfg, forkyState.data)
syncAggregate =
if slot.epoch >= node.dag.cfg.ALTAIR_FORK_EPOCH:
node.syncCommitteeMsgPool[].produceSyncAggregate(head.bid, slot)
else:
SyncAggregate.init()
payload = (await payloadFut).valueOr: payload = (await payloadFut).valueOr:
beacon_block_production_errors.inc() beacon_block_production_errors.inc()
warn "Unable to get execution payload. Skipping block proposal", warn "Unable to get execution payload. Skipping block proposal",
@ -503,7 +498,7 @@ proc makeBeaconBlockForHeadAndSlot*(
attestations, attestations,
eth1Proposal.deposits, eth1Proposal.deposits,
exits, exits,
syncAggregate, node.syncCommitteeMsgPool[].produceSyncAggregate(head.bid, slot),
payload, payload,
noRollback, # Temporary state - no need for rollback noRollback, # Temporary state - no need for rollback
cache, cache,
@ -1539,9 +1534,7 @@ proc getValidatorRegistration(
proc registerValidators*(node: BeaconNode, epoch: Epoch) {.async.} = proc registerValidators*(node: BeaconNode, epoch: Epoch) {.async.} =
try: try:
if (not node.config.payloadBuilderEnable) or if not node.config.payloadBuilderEnable: return
node.currentSlot.epoch < node.dag.cfg.BELLATRIX_FORK_EPOCH:
return
const HttpOk = 200 const HttpOk = 200