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 scaffolding and make get_crosslink_committee(...) a purer wrapper around get_beacon_committee(...)

This commit is contained in:
Dustin Brody 2019-11-07 22:34:23 +01:00
parent c2ebe482a5
commit 13e662c8dd
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
beacon_chain/spec/validator.nim
View File

@ -158,14 +158,18 @@ func compute_committee(indices: seq[ValidatorIndex], seed: Eth2Digest,
indices[stateCache.crosslink_committee_cache[key][it]]) indices[stateCache.crosslink_committee_cache[key][it]])
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.4/specs/core/0_beacon-chain.md#get_beacon_committee # https://github.com/ethereum/eth2.0-specs/blob/v0.8.4/specs/core/0_beacon-chain.md#get_beacon_committee
func get_beacon_committee*(state: BeaconState, slot: Slot, index: uint64, cache: var StateCache, gcc_index: uint64 = 100): seq[ValidatorIndex] = func get_beacon_committee*(state: BeaconState, slot: Slot, index: uint64, cache: var StateCache): seq[ValidatorIndex] =
# Return the beacon committee at ``slot`` for ``index``. # Return the beacon committee at ``slot`` for ``index``.
let let
epoch = compute_epoch_at_slot(slot) epoch = compute_epoch_at_slot(slot)
committees_per_slot = get_committee_count_at_slot(state, slot) committees_per_slot = get_committee_count_at_slot(state, slot)
let gbc_index = (slot mod SLOTS_PER_EPOCH) * committees_per_slot + index ## This is a somewhat more fragile, but high-ROI, caching setup --
doAssert gcc_index == 100 or gbc_index == gcc_index ## get_active_validator_indices() is slow to run in a loop and only
## changes once per epoch.
if epoch notin cache.active_validator_indices_cache:
cache.active_validator_indices_cache[epoch] =
get_active_validator_indices(state, epoch)
if epoch notin cache.committee_count_cache: if epoch notin cache.committee_count_cache:
cache.committee_count_cache[epoch] = get_committee_count(state, epoch) cache.committee_count_cache[epoch] = get_committee_count(state, epoch)
@ -192,40 +196,12 @@ func get_crosslink_committee*(state: BeaconState, epoch: Epoch, shard: Shard,
stateCache: var StateCache): seq[ValidatorIndex] = stateCache: var StateCache): seq[ValidatorIndex] =
doAssert shard >= 0'u64 doAssert shard >= 0'u64
# This seems to be required, basically, to be true? But I'm not entirely sure
#doAssert shard >= get_start_shard(state, epoch)
## This is a somewhat more fragile, but high-ROI, caching setup --
## get_active_validator_indices() is slow to run in a loop and only
## changes once per epoch.
if epoch notin stateCache.active_validator_indices_cache:
stateCache.active_validator_indices_cache[epoch] =
get_active_validator_indices(state, epoch)
if epoch notin stateCache.start_shard_cache: if epoch notin stateCache.start_shard_cache:
stateCache.start_shard_cache[epoch] = get_start_shard(state, epoch) stateCache.start_shard_cache[epoch] = get_start_shard(state, epoch)
if epoch notin stateCache.committee_count_cache: let (gbc_slot, gbc_index) = get_slot_and_index(state, epoch, shard)
stateCache.committee_count_cache[epoch] = get_committee_count(state, epoch) get_beacon_committee(state, gbc_slot, gbc_index, stateCache)
let gcc_index = (shard + SHARD_COUNT - stateCache.start_shard_cache[epoch]) mod SHARD_COUNT
let old = compute_committee(
stateCache.active_validator_indices_cache[epoch],
get_seed(state, epoch),
(shard + SHARD_COUNT - stateCache.start_shard_cache[epoch]) mod
SHARD_COUNT,
stateCache.committee_count_cache[epoch],
stateCache
)
let
(gbc_slot, gbc_index) = get_slot_and_index(state, epoch, shard)
new = get_beacon_committee(
state, gbc_slot, gbc_index, stateCache, gcc_index)
doAssert old == new
result = new
# Not from spec # Not from spec
func get_empty_per_epoch_cache*(): StateCache = func get_empty_per_epoch_cache*(): StateCache =