github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 23:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move Slot and Epoch functions from helpers to core pkg (#9519)

Browse Source 
* Move Slot and Epoch functions from helpers to core

* limited viz

* goimports

* fix fuzz build

* fix fuzz build

* fix

* fix

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Preston Van Loon
2021-09-03 15:10:31 -05:00
committed by GitHub
parent 29b851a2b7
commit 4beb352e6f
189 changed files with 750 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
beacon-chain/sync/initial-sync/round_robin.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/libp2p/go-libp2p-core/peer"
"github.com/paulbellamy/ratecounter"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/core"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -51,7 +51,7 @@ func (s *Service) roundRobinSync(genesis time.Time) error {
}
// Already at head, no need for 2nd phase.
if s.cfg.Chain.HeadSlot() == helpers.SlotsSince(genesis) {
if s.cfg.Chain.HeadSlot() == core.SlotsSince(genesis) {
return nil
}
@@ -62,7 +62,7 @@ func (s *Service) roundRobinSync(genesis time.Time) error {
// syncToFinalizedEpoch sync from head to best known finalized epoch.
func (s *Service) syncToFinalizedEpoch(ctx context.Context, genesis time.Time) error {
highestFinalizedSlot, err := helpers.StartSlot(s.highestFinalizedEpoch() + 1)
highestFinalizedSlot, err := core.StartSlot(s.highestFinalizedEpoch() + 1)
if err != nil {
return err
}
@@ -88,7 +88,7 @@ func (s *Service) syncToFinalizedEpoch(ctx context.Context, genesis time.Time) e
log.WithFields(logrus.Fields{
"syncedSlot": s.cfg.Chain.HeadSlot(),
"currentSlot": helpers.SlotsSince(genesis),
"currentSlot": core.SlotsSince(genesis),
}).Info("Synced to finalized epoch - now syncing blocks up to current head")
if err := queue.stop(); err != nil {
log.WithError(err).Debug("Error stopping queue")
@@ -104,7 +104,7 @@ func (s *Service) syncToNonFinalizedEpoch(ctx context.Context, genesis time.Time
p2p: s.cfg.P2P,
db: s.cfg.DB,
chain: s.cfg.Chain,
highestExpectedSlot: helpers.SlotsSince(genesis),
highestExpectedSlot: core.SlotsSince(genesis),
mode: modeNonConstrained,
})
if err := queue.start(); err != nil {
@@ -115,7 +115,7 @@ func (s *Service) syncToNonFinalizedEpoch(ctx context.Context, genesis time.Time
}
log.WithFields(logrus.Fields{
"syncedSlot": s.cfg.Chain.HeadSlot(),
"currentSlot": helpers.SlotsSince(genesis),
"currentSlot": core.SlotsSince(genesis),
}).Info("Synced to head of chain")
if err := queue.stop(); err != nil {
log.WithError(err).Debug("Error stopping queue")
@@ -184,15 +184,15 @@ func (s *Service) logSyncStatus(genesis time.Time, blk block.BeaconBlock, blkRoo
if rate == 0 {
rate = 1
}
if helpers.IsEpochStart(blk.Slot()) {
timeRemaining := time.Duration(float64(helpers.SlotsSince(genesis)-blk.Slot())/rate) * time.Second
if core.IsEpochStart(blk.Slot()) {
timeRemaining := time.Duration(float64(core.SlotsSince(genesis)-blk.Slot())/rate) * time.Second
log.WithFields(logrus.Fields{
"peers": len(s.cfg.P2P.Peers().Connected()),
"blocksPerSecond": fmt.Sprintf("%.1f", rate),
}).Infof(
"Processing block %s %d/%d - estimated time remaining %s",
fmt.Sprintf("0x%s...", hex.EncodeToString(blkRoot[:])[:8]),
blk.Slot(), helpers.SlotsSince(genesis), timeRemaining,
blk.Slot(), core.SlotsSince(genesis), timeRemaining,
)
}
}
@@ -205,14 +205,14 @@ func (s *Service) logBatchSyncStatus(genesis time.Time, blks []block.SignedBeaco
rate = 1
}
firstBlk := blks[0]
timeRemaining := time.Duration(float64(helpers.SlotsSince(genesis)-firstBlk.Block().Slot())/rate) * time.Second
timeRemaining := time.Duration(float64(core.SlotsSince(genesis)-firstBlk.Block().Slot())/rate) * time.Second
log.WithFields(logrus.Fields{
"peers": len(s.cfg.P2P.Peers().Connected()),
"blocksPerSecond": fmt.Sprintf("%.1f", rate),
}).Infof(
"Processing block batch of size %d starting from %s %d/%d - estimated time remaining %s",
len(blks), fmt.Sprintf("0x%s...", hex.EncodeToString(blkRoot[:])[:8]),
firstBlk.Block().Slot(), helpers.SlotsSince(genesis), timeRemaining,
firstBlk.Block().Slot(), core.SlotsSince(genesis), timeRemaining,
)
}
@@ -300,7 +300,7 @@ func (s *Service) updatePeerScorerStats(pid peer.ID, startSlot types.Slot) {
// isProcessedBlock checks DB and local cache for presence of a given block, to avoid duplicates.
func (s *Service) isProcessedBlock(ctx context.Context, blk block.SignedBeaconBlock, blkRoot [32]byte) bool {
finalizedSlot, err := helpers.StartSlot(s.cfg.Chain.FinalizedCheckpt().Epoch)
finalizedSlot, err := core.StartSlot(s.cfg.Chain.FinalizedCheckpt().Epoch)
if err != nil {
return false
}