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

More Fixes For Powchain (#6278)

Browse Source 
* fix issues

* add check

* Update beacon-chain/powchain/service.go

* Update beacon-chain/powchain/service.go

* Update beacon-chain/powchain/service.go

* Update beacon-chain/powchain/service.go

Co-authored-by: terence tsao <terence@prysmaticlabs.com>
This commit is contained in:
Nishant Das
2020-06-16 10:07:20 +08:00
committed by GitHub
parent 4c143f4ed4
commit ed883c9fff
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
beacon-chain/powchain/service.go
View File

@@ -382,30 +382,33 @@ func (s *Service) initializeConnection(
func (s *Service) waitForConnection() {
errConnect := s.connectToPowChain()
synced, errSynced := s.isEth1NodeSynced()
if errConnect == nil && synced {
s.connectedETH1 = true
log.WithFields(logrus.Fields{
"endpoint": s.httpEndpoint,
}).Info("Connected to eth1 proof-of-work chain")
return
if errConnect == nil {
synced, errSynced := s.isEth1NodeSynced()
// Resume if eth1 node is synced.
if synced {
s.connectedETH1 = true
log.WithFields(logrus.Fields{
"endpoint": s.httpEndpoint,
}).Info("Connected to eth1 proof-of-work chain")
return
}
if errSynced != nil {
log.WithError(errSynced).Error("Could not check sync status of eth1 chain")
}
}
if errConnect != nil {
log.WithError(errConnect).Error("Could not connect to powchain endpoint")
}
if errSynced != nil {
log.WithError(errSynced).Error("Could not check sync status of eth1 chain")
}
ticker := time.NewTicker(backOffPeriod)
for {
select {
case <-ticker.C:
errConnect = s.connectToPowChain()
errConnect := s.connectToPowChain()
if errConnect != nil {
log.WithError(errConnect).Error("Could not connect to powchain endpoint")
continue
}
synced, errSynced = s.isEth1NodeSynced()
synced, errSynced := s.isEth1NodeSynced()
if errSynced != nil {
log.WithError(errSynced).Error("Could not check sync status of eth1 chain")
continue
@@ -437,6 +440,18 @@ func (s *Service) isEth1NodeSynced() (bool, error) {
return syncProg == nil, nil
}
// Reconnect to eth1 node in case of any failure.
func (s *Service) retryETH1Node(err error) {
s.runError = err
s.connectedETH1 = false
// Back off for a while before
// resuming dialing the eth1 node.
time.Sleep(backOffPeriod)
s.waitForConnection()
// Reset run error in the event of a successful connection.
s.runError = nil
}
// initDataFromContract calls the deposit contract and finds the deposit count
// and deposit root.
func (s *Service) initDataFromContract() error {
@@ -583,17 +598,6 @@ func (s *Service) handleETH1FollowDistance() {
}
func (s *Service) initPOWService() {
// Reconnect to eth1 node in case of any failure
retryETH1Node := func(err error) {
s.runError = err
s.connectedETH1 = false
// back off for a while before
// resuming dialing the eth1 node.
time.Sleep(backOffPeriod)
s.waitForConnection()
// reset value in the event of a successful connection.
s.runError = nil
}
// Run in a select loop to retry in the event of any failures.
for {
@@ -604,14 +608,14 @@ func (s *Service) initPOWService() {
err := s.initDataFromContract()
if err != nil {
log.Errorf("Unable to retrieve data from deposit contract %v", err)
retryETH1Node(err)
s.retryETH1Node(err)
continue
}
header, err := s.eth1DataFetcher.HeaderByNumber(context.Background(), nil)
if err != nil {
log.Errorf("Unable to retrieve latest ETH1.0 chain header: %v", err)
retryETH1Node(err)
s.retryETH1Node(err)
continue
}
@@ -621,7 +625,7 @@ func (s *Service) initPOWService() {
if err := s.processPastLogs(context.Background()); err != nil {
log.Errorf("Unable to process past logs %v", err)
retryETH1Node(err)
s.retryETH1Node(err)
continue
}
return
@@ -648,6 +652,7 @@ func (s *Service) run(done <-chan struct{}) {
head, err := s.eth1DataFetcher.HeaderByNumber(s.ctx, nil)
if err != nil {
log.WithError(err).Debug("Could not fetch latest eth1 header")
s.retryETH1Node(err)
continue
}
s.processBlockHeader(head)