status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-11 14:54:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix validator filtering.

Browse Source
This commit is contained in:
cheatfate 2021-04-02 17:10:21 +03:00 committed by zah
parent a6147f7b9d
commit 878d0e7337
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
beacon_chain/rpc/beacon_rest_api.nim
View File

@ -257,21 +257,32 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
let current_epoch = get_current_epoch(node.chainDag.headState.data.data)
var res: seq[RestValidatorTuple]
for index, validator in state().validators.pairs():
let r1 =
if len(keySet) == 0:
let includeFlag =
if (len(keySet) == 0) and (len(indexSet) == 0):
true
else:
(validator.pubkey in keySet)
let r2 =
if len(indexSet) == 0:
let indexFlag =
if len(indexSet) > 0:
if ValidatorIndex(index) in indexSet:
true
else:
(ValidatorIndex(index) in indexSet)
false
else:
false
let keyFlag =
if len(keySet) > 0:
if validator.pubkey in keySet:
true
else:
false
else:
false
indexFlag or keyFlag
let sres = validator.getStatus(current_epoch)
if sres.isOk():
let vstatus = sres.get()
let r3 = vstatus in validatorsMask
if (r1 or r2) and r3:
let statusFlag = vstatus in validatorsMask
if includeFlag and statusFlag:
res.add((
index: ValidatorIndex(index),
balance: Base10.toString(state().balances[index]),
@ -385,15 +396,31 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
let current_epoch = get_current_epoch(node.chainDag.headState.data.data)
var res: seq[RestValidatorBalanceTuple]
for index, validator in state().validators.pairs():
let rflag =
let includeFlag =
if (len(keySet) == 0) and (len(indexSet) == 0):
true
else:
(validator.pubkey in keySet) or (ValidatorIndex(index) in indexSet)
let indexFlag =
if len(indexSet) > 0:
if ValidatorIndex(index) in indexSet:
true
else:
false
else:
false
let keyFlag =
if len(keySet) > 0:
if validator.pubkey in keySet:
true
else:
false
else:
false
indexFlag or keyFlag
let sres = validator.getStatus(current_epoch)
if sres.isOk():
let vstatus = sres.get()
if rflag:
if includeFlag:
res.add((
index: ValidatorIndex(index),
balance: Base10.toString(state().balances[index]),