node: fix finalized only for eth (not moonbeam)

This commit is contained in:
Evan Gray 2022-09-14 21:05:56 +00:00 committed by Evan Gray
parent 58186b8d75
commit 8ad0cf0a02
1 changed files with 10 additions and 10 deletions

View File

@ -36,7 +36,7 @@ type PollImpl struct {
Finalizer PollFinalizer
DelayInMs int
IsEthPoS bool
hasEthSwitched bool
hasEthSwitchedToPoS bool
logger *zap.Logger
rawClient *ethRpc.Client
}
@ -50,7 +50,7 @@ func (e *PollImpl) SetLogger(l *zap.Logger) {
}
func (e *PollImpl) SetEthSwitched() {
e.hasEthSwitched = true
e.hasEthSwitchedToPoS = true
e.logger.Info("switching from latest to finalized", zap.String("eth_network", e.BaseEth.NetworkName), zap.Int("delay_in_ms", e.DelayInMs))
}
@ -235,7 +235,7 @@ func (e *PollImpl) getBlock(ctx context.Context, number *big.Int) (*common.NewBl
var numStr string
if number != nil {
numStr = ethHexUtils.EncodeBig(number)
} else if e.hasEthSwitched {
} else if e.hasEthSwitchedToPoS {
numStr = "finalized"
} else {
numStr = "latest"
@ -261,7 +261,7 @@ func (e *PollImpl) getBlock(ctx context.Context, number *big.Int) (*common.NewBl
return nil, fmt.Errorf("failed to unmarshal block: Number is nil")
}
d := big.Int(*m.Difficulty)
if !e.hasEthSwitched && d.Cmp(big.NewInt(0)) == 0 {
if e.IsEthPoS && !e.hasEthSwitchedToPoS && d.Cmp(big.NewInt(0)) == 0 {
e.SetEthSwitched()
return e.getBlock(ctx, number)
}