mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-23 20:07:17 +00:00
81c53c26fb
* Update seed domains (#3872) * Remove Transfers (#3870) * Remove active index roots and compact committee roots (#3869) * Update inclusion reward (#3886) * Alter proposer selection logic (#3884) * Fix early committee bias (#3888) * Remove shards and committees (#3896) * Epoch spec tests v0.9 (#3907) * Block spec test v0.9 (#3905) * rm'ed in protobuf * build proto * build proto * build proto * fix core package * Gazelle * Fixed all the tests * Fixed static test * Comment out spec test for now * One more skip * fix-roundRobinSync (#3862) * Starting but need new seed function * Revert initial sync * Updated Proposer Slashing * Fixed all tests * Lint * Update inclusion reward * Fill randao mixes with eth1 data hash * Test * Fixing test part1 * All tests passing * One last test * Updated config * Build proto * Proper skip message * Conflict and fmt * Removed crosslinks and shards. Built * Format and gazelle * Fixed all the block package tests * Fixed all the helper tests * All epoch package tests pass * All core package tests pass * Fixed operation tests * Started fixing rpc test * RPC tests passed! * Fixed all init sync tests * All tests pass * Fixed blockchain tests * Lint * Lint * Preston's feedback * Starting * Remove container * Fixed block spec tests * All passing except for block_processing test * Failing block processing test * Starting * Add AggregateAndProof * All mainnet test passes * Update deposit contract (#3906) * Proto spec tests v0.9 (#3908) * Starting * Add AggregateAndProof * Unskip block util tests (#3910) * rm'ed in protobuf * build proto * build proto * build proto * fix core package * Gazelle * Fixed all the tests * Fixed static test * Comment out spec test for now * One more skip * fix-roundRobinSync (#3862) * Starting but need new seed function * Revert initial sync * Updated Proposer Slashing * Fixed all tests * Lint * Update inclusion reward * Fill randao mixes with eth1 data hash * Test * Fixing test part1 * All tests passing * One last test * Updated config * Build proto * Proper skip message * Conflict and fmt * Removed crosslinks and shards. Built * Format and gazelle * Fixed all the block package tests * Fixed all the helper tests * All epoch package tests pass * All core package tests pass * Fixed operation tests * Started fixing rpc test * RPC tests passed! * Fixed all init sync tests * All tests pass * Fixed blockchain tests * Lint * Lint * Preston's feedback * Starting * Remove container * Fixed block spec tests * All passing except for block_processing test * Failing block processing test * Starting * Add AggregateAndProof * All mainnet test passes * Unskip block util tests * Slot processing spec test V0.9 (#3912) * Starting * Add AggregateAndProof * Unskip slot processing mainnet test * Unskip minimal spec test for finalization (#3920) * Remove outdated interop tests (#3922) * Rm outdated interop tests * Rm test runner * Gazelle * Update validator to use proposer slot (#3919) * Fix committee assignment (#3931) * Replace shard with committee index (#3930) * Conflict * Clean up (#3933) * Remove shard filter in db (#3936) * Remove lightouse compatibility test (#3939) * Update Committee Cache for v0.9 (#3948) * Updated committee cache * Removed shuffled indices cache * Started testing run time * Lint * Fixed test * Safeguard against nil head state * address edge case * add test * Fixed TestRoundRobinSync by doubling the epochs * Unskip TestProtoCompatability (#3958) * Unskip TestProtoCompatability * Update WORKSPACE * Fix minimal config (#3959) * fix minimal configs * fix hardcoded value in test * Simplify verify att time (#3961) * update readme for deposit contract, regen bindings for vyper 0.1.0b12 (#3963) * update readme for deposit contract, regen bindings * medium * Check nil base state (#3964) * Copy Block When Receiving it From Sync (#3966) * copy block * clone for other service methods too * Change logging of Bitfield (#3956) * change logging of bits * preston's review * Unskip Beacon Server Test (#3962) * run test till the end * fix up proto message types * fmt * resolve broken tests * better error handling * fixing new logic to use archived proposer info * fix up logic * clip using the max effective balance * broken build fix with num arg mismatch * amend archive * archival logic changed * rename test * archive both proposer and attester seeds * page size 100 * further experiments * further experimentation, archivedProposerIndex seems wrong * test passes * rem log * fix broken test * fix test * gaz * fix imports * ethapis
221 lines
6.3 KiB
Go
221 lines
6.3 KiB
Go
package cache
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
"sync"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/client_golang/prometheus/promauto"
|
|
"github.com/prysmaticlabs/prysm/shared/featureconfig"
|
|
"github.com/prysmaticlabs/prysm/shared/params"
|
|
"github.com/prysmaticlabs/prysm/shared/sliceutil"
|
|
"k8s.io/client-go/tools/cache"
|
|
)
|
|
|
|
var (
|
|
// ErrNotCommittee will be returned when a cache object is not a pointer to
|
|
// a Committee struct.
|
|
ErrNotCommittee = errors.New("object is not a committee struct")
|
|
|
|
// maxShuffledIndicesSize defines the max number of shuffled indices list can cache.
|
|
// 3 for previous, current epoch and next epoch.
|
|
maxShuffledIndicesSize = 3
|
|
|
|
// CommitteeCacheMiss tracks the number of committee requests that aren't present in the cache.
|
|
CommitteeCacheMiss = promauto.NewCounter(prometheus.CounterOpts{
|
|
Name: "committee_cache_miss",
|
|
Help: "The number of committee requests that aren't present in the cache.",
|
|
})
|
|
// CommitteeCacheHit tracks the number of committee requests that are in the cache.
|
|
CommitteeCacheHit = promauto.NewCounter(prometheus.CounterOpts{
|
|
Name: "committee_cache_hit",
|
|
Help: "The number of committee requests that are present in the cache.",
|
|
})
|
|
)
|
|
|
|
// Committee defines the committee per epoch and index.
|
|
type Committee struct {
|
|
CommitteeCount uint64
|
|
Epoch uint64
|
|
Committee []uint64
|
|
}
|
|
|
|
// CommitteeCache is a struct with 1 queue for looking up shuffled indices list by epoch and committee index.
|
|
type CommitteeCache struct {
|
|
CommitteeCache *cache.FIFO
|
|
lock sync.RWMutex
|
|
}
|
|
|
|
// committeeKeyFn takes the epoch as the key to retrieve shuffled indices of a committee in a given epoch.
|
|
func committeeKeyFn(obj interface{}) (string, error) {
|
|
info, ok := obj.(*Committee)
|
|
if !ok {
|
|
return "", ErrNotCommittee
|
|
}
|
|
|
|
return strconv.Itoa(int(info.Epoch)), nil
|
|
}
|
|
|
|
// NewCommitteeCache creates a new committee cache for storing/accessing shuffled indices of a committee.
|
|
func NewCommitteeCache() *CommitteeCache {
|
|
return &CommitteeCache{
|
|
CommitteeCache: cache.NewFIFO(committeeKeyFn),
|
|
}
|
|
}
|
|
|
|
// ShuffledIndices fetches the shuffled indices by slot and committee index. Every list of indices
|
|
// represent one committee. Returns true if the list exists with slot and committee index. Otherwise returns false, nil.
|
|
func (c *CommitteeCache) ShuffledIndices(slot uint64, index uint64) ([]uint64, error) {
|
|
if !featureconfig.Get().EnableShuffledIndexCache && !featureconfig.Get().EnableNewCache {
|
|
return nil, nil
|
|
}
|
|
c.lock.RLock()
|
|
defer c.lock.RUnlock()
|
|
|
|
epoch := int(slot / params.BeaconConfig().SlotsPerEpoch)
|
|
obj, exists, err := c.CommitteeCache.GetByKey(strconv.Itoa(epoch))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if exists {
|
|
CommitteeCacheHit.Inc()
|
|
} else {
|
|
CommitteeCacheMiss.Inc()
|
|
return nil, nil
|
|
}
|
|
|
|
item, ok := obj.(*Committee)
|
|
if !ok {
|
|
return nil, ErrNotCommittee
|
|
}
|
|
|
|
committeeCountPerSlot := uint64(1)
|
|
if item.CommitteeCount/params.BeaconConfig().SlotsPerEpoch > 1 {
|
|
committeeCountPerSlot = item.CommitteeCount / params.BeaconConfig().SlotsPerEpoch
|
|
}
|
|
|
|
indexOffSet := index + (slot%params.BeaconConfig().SlotsPerEpoch)*committeeCountPerSlot
|
|
start, end := startEndIndices(item, indexOffSet)
|
|
return item.Committee[start:end], nil
|
|
}
|
|
|
|
// AddCommitteeShuffledList adds Committee shuffled list object to the cache. T
|
|
// his method also trims the least recently list if the cache size has ready the max cache size limit.
|
|
func (c *CommitteeCache) AddCommitteeShuffledList(committee *Committee) error {
|
|
if !featureconfig.Get().EnableShuffledIndexCache && !featureconfig.Get().EnableNewCache {
|
|
return nil
|
|
}
|
|
c.lock.Lock()
|
|
defer c.lock.Unlock()
|
|
if err := c.CommitteeCache.AddIfNotPresent(committee); err != nil {
|
|
return err
|
|
}
|
|
trim(c.CommitteeCache, maxShuffledIndicesSize)
|
|
return nil
|
|
}
|
|
|
|
// Epochs returns the epochs stored in the committee cache. These are the keys to the cache.
|
|
func (c *CommitteeCache) Epochs() ([]uint64, error) {
|
|
if !featureconfig.Get().EnableShuffledIndexCache {
|
|
return nil, nil
|
|
}
|
|
c.lock.RLock()
|
|
defer c.lock.RUnlock()
|
|
|
|
epochs := make([]uint64, len(c.CommitteeCache.ListKeys()))
|
|
for i, s := range c.CommitteeCache.ListKeys() {
|
|
epoch, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
epochs[i] = uint64(epoch)
|
|
}
|
|
return epochs, nil
|
|
}
|
|
|
|
// EpochInCache returns true if an input epoch is part of keys in cache.
|
|
func (c *CommitteeCache) EpochInCache(wantedEpoch uint64) (bool, error) {
|
|
if !featureconfig.Get().EnableShuffledIndexCache && !featureconfig.Get().EnableNewCache {
|
|
return false, nil
|
|
}
|
|
c.lock.RLock()
|
|
defer c.lock.RUnlock()
|
|
|
|
for _, s := range c.CommitteeCache.ListKeys() {
|
|
epoch, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if wantedEpoch == uint64(epoch) {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
// CommitteeCountPerSlot returns the number of committees in a given slot as stored in cache.
|
|
func (c *CommitteeCache) CommitteeCountPerSlot(slot uint64) (uint64, bool, error) {
|
|
if !featureconfig.Get().EnableShuffledIndexCache && !featureconfig.Get().EnableNewCache {
|
|
return 0, false, nil
|
|
}
|
|
c.lock.RLock()
|
|
defer c.lock.RUnlock()
|
|
epoch := int(slot / params.BeaconConfig().SlotsPerEpoch)
|
|
obj, exists, err := c.CommitteeCache.GetByKey(strconv.Itoa(int(epoch)))
|
|
if err != nil {
|
|
return 0, false, err
|
|
}
|
|
|
|
if exists {
|
|
CommitteeCacheHit.Inc()
|
|
} else {
|
|
CommitteeCacheMiss.Inc()
|
|
return 0, false, nil
|
|
}
|
|
|
|
item, ok := obj.(*Committee)
|
|
if !ok {
|
|
return 0, false, ErrNotCommittee
|
|
}
|
|
|
|
return item.CommitteeCount / params.BeaconConfig().SlotsPerEpoch, true, nil
|
|
}
|
|
|
|
// ActiveIndices returns the active indices of a given epoch stored in cache.
|
|
func (c *CommitteeCache) ActiveIndices(epoch uint64) ([]uint64, error) {
|
|
if !featureconfig.Get().EnableShuffledIndexCache && !featureconfig.Get().EnableNewCache {
|
|
return nil, nil
|
|
}
|
|
|
|
c.lock.RLock()
|
|
defer c.lock.RUnlock()
|
|
obj, exists, err := c.CommitteeCache.GetByKey(strconv.Itoa(int(epoch)))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if exists {
|
|
CommitteeCacheHit.Inc()
|
|
} else {
|
|
CommitteeCacheMiss.Inc()
|
|
return nil, nil
|
|
}
|
|
|
|
item, ok := obj.(*Committee)
|
|
if !ok {
|
|
return nil, ErrNotCommittee
|
|
}
|
|
|
|
return item.Committee, nil
|
|
}
|
|
|
|
func startEndIndices(c *Committee, index uint64) (uint64, uint64) {
|
|
validatorCount := uint64(len(c.Committee))
|
|
start := sliceutil.SplitOffset(validatorCount, c.CommitteeCount, index)
|
|
end := sliceutil.SplitOffset(validatorCount, c.CommitteeCount, index+1)
|
|
|
|
return start, end
|
|
}
|