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

Address #2487 and #2488.

This commit is contained in:
cheatfate 2021-04-13 13:26:45 +03:00 committed by zah
parent 79d4735355
commit fc5ca8ec35
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
beacon_chain/rpc/validator_rest_api.nim
View File

@ -156,14 +156,9 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) =
res.get() res.get()
let droot = let droot =
if qepoch >= Epoch(2): if qepoch >= Epoch(2):
let bref = node.chainDag.getBlockByPreciseSlot( let bref = node.chainDag.getBlockBySlot(
compute_start_slot_at_epoch(qepoch - 1) - 1 compute_start_slot_at_epoch(qepoch - 1) - 1
) )
if isNil(bref):
if not(node.isSynced(node.chainDag.head)):
return RestApiResponse.jsonError(Http503, BeaconNodeInSyncError)
else:
return RestApiResponse.jsonError(Http400, BlockNotFoundError)
bref.root bref.root
else: else:
node.chainDag.genesis.root node.chainDag.genesis.root
@ -171,7 +166,14 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) =
block: block:
var res: seq[RestProposerDutyTuple] var res: seq[RestProposerDutyTuple]
let epochRef = node.chainDag.getEpochRef(qhead, qepoch) let epochRef = node.chainDag.getEpochRef(qhead, qepoch)
for i in 0 ..< SLOTS_PER_EPOCH: let startSlot =
# Fix for https://github.com/status-im/nimbus-eth2/issues/2488
# Slot(0) at Epoch(0) do not have a proposer.
if (qepoch == Epoch(0)) and (i == 0):
1
else:
0
for i in startSlot ..< SLOTS_PER_EPOCH:
if epochRef.beacon_proposers[i].isSome(): if epochRef.beacon_proposers[i].isSome():
let proposer = epochRef.beacon_proposers[i].get() let proposer = epochRef.beacon_proposers[i].get()
res.add( res.add(