[R4R] minor fix for ramanujan upgrade

consensus/parlia/parlia.go

@@ -1145,7 +1145,11 @@ func backOffTime(snap *Snapshot, val common.Address) uint64 {
  if snap.inturn(val) {
  return 0
  } else {
- dis := snap.distanceToInTurn(val)
+ idx := snap.indexOfVal(val)
+ if idx < 0 {
+ // The backOffTime does not matter when a validator is not authorized.
+ return 0
+ }
  s := rand.NewSource(int64(snap.Number))
  r := rand.New(s)
  n := len(snap.Validators)
@@ -1156,7 +1160,7 @@ func backOffTime(snap *Snapshot, val common.Address) uint64 {
  r.Shuffle(n, func(i, j int) {
  backOffSteps[i], backOffSteps[j] = backOffSteps[j], backOffSteps[i]
  })
- delay := initialBackOffTime + backOffSteps[dis]*wiggleTime
+ delay := initialBackOffTime + backOffSteps[idx]*wiggleTime
  return delay
  }
 }

consensus/parlia/ramanujanfork.go

@@ -14,12 +14,16 @@ const (
 )
 
 func (p *Parlia) delayForRamanujanFork(snap *Snapshot, header *types.Header) time.Duration {
- delay := time.Unix(int64(header.Time), 0).Sub(time.Now()) // nolint: gosimple
+ delay := time.Until(time.Unix(int64(header.Time), 0)) // nolint: gosimple
  if p.chainConfig.IsRamanujan(header.Number) {
  return delay
  }
- wiggle := time.Duration(len(snap.Validators)/2+1) * wiggleTimeBeforeFork
- return delay + time.Duration(fixedBackOffTimeBeforeFork) + time.Duration(rand.Int63n(int64(wiggle)))
+ if header.Difficulty.Cmp(diffNoTurn) == 0 {
+ // It's not our turn explicitly to sign, delay it a bit
+ wiggle := time.Duration(len(snap.Validators)/2+1) * wiggleTimeBeforeFork
+ delay += time.Duration(fixedBackOffTimeBeforeFork) + time.Duration(rand.Int63n(int64(wiggle)))
+ }
+ return delay
 }
 
 func (p *Parlia) blockTimeForRamanujanFork(snap *Snapshot, header, parent *types.Header) uint64 {

consensus/parlia/snapshot.go

@@ -216,18 +216,14 @@ func (s *Snapshot) inturn(validator common.Address) bool {
  return validators[offset] == validator
 }
 
-func (s *Snapshot) distanceToInTurn(validator common.Address) uint64 {
+func (s *Snapshot) indexOfVal(validator common.Address) int {
  validators := s.validators()
- offset := (s.Number + 1) % uint64(len(validators))
- idx := uint64(0)
- for idx < uint64(len(validator)) && validators[idx] != validator {
- idx++
- }
- if offset > idx {
- return uint64(len(validators)) + idx - offset
- } else {
- return idx - offset
+ for idx, val := range validators {
+ if val == validator {
+ return idx
+ }
  }
+ return -1
 }
 
 func (s *Snapshot) supposeValidator() common.Address {

params/config.go

@@ -242,7 +242,7 @@ var (
  PetersburgBlock: big.NewInt(0),
  IstanbulBlock: big.NewInt(0),
  MuirGlacierBlock: big.NewInt(0),
- RamanujanBlock: big.NewInt(260942),
+ RamanujanBlock: big.NewInt(400),
  Parlia: &ParliaConfig{
  Period: 3,
  Epoch: 200,