replace buffer key from height to epoch number (#1885)

Author: CoderZhi

action/protocol/poll/nativestaking.go

@@ -39,7 +39,7 @@ type (
 		getTipBlockTime GetTipBlockTime
 		contract        string
 		abi             abi.ABI
-		bufferHeight    uint64
+		bufferEpochNum  uint64
 		bufferResult    *VoteTally
 	}
 
@@ -77,22 +77,22 @@ func NewNativeStaking(cm protocol.ChainManager, getTipBlockTime GetTipBlockTime)
 		cm:              cm,
 		getTipBlockTime: getTipBlockTime,
 		abi:             abi,
-		bufferHeight:    0,
+		bufferEpochNum:  0,
 		bufferResult:    nil,
 	}, nil
 }
 
 // Votes returns the votes on height
-func (ns *NativeStaking) Votes(height uint64, correctGas bool) (*VoteTally, time.Time, error) {
+func (ns *NativeStaking) Votes(epochNum uint64, height uint64, correctGas bool) (*VoteTally, time.Time, error) {
 	if ns.contract == "" {
 		return nil, time.Time{}, ErrNoData
 	}
 	now, err := ns.getTipBlockTime()
 	if err != nil {
 		return nil, time.Time{}, errors.Wrap(err, "failed to get current block time")
 	}
-	if ns.bufferHeight == height && ns.bufferResult != nil {
-		log.L().Info("Using cache native staking data", zap.Uint64("height", height))
+	if ns.bufferEpochNum == epochNum && ns.bufferResult != nil {
+		log.L().Info("Using cache native staking data", zap.Uint64("epochNum", epochNum))
 		return ns.bufferResult, now, nil
 	}
 	// read voter list from staking contract
@@ -121,8 +121,10 @@ func (ns *NativeStaking) Votes(height uint64, correctGas bool) (*VoteTally, time
 		}
 		prevIndex = index
 	}
-	ns.bufferHeight = height
-	ns.bufferResult = &votes
+	if epochNum > ns.bufferEpochNum {
+		ns.bufferEpochNum = epochNum
+		ns.bufferResult = &votes
+	}
 	return &votes, now, nil
 }
 

action/protocol/poll/staking_committee.go

@@ -122,8 +122,9 @@ func (sc *stakingCommittee) DelegatesByHeight(height uint64) (state.CandidateLis
 	if err != nil {
 		return nil, err
 	}
+	epochNum := sc.getEpochNum(height)
 	// convert to epoch start height
-	epochHeight := sc.getEpochHeight(sc.getEpochNum(height))
+	epochHeight := sc.getEpochHeight(epochNum)
 	if sc.hu.IsPre(config.Cook, epochHeight) {
 		return sc.filterDelegates(cand), nil
 	}
@@ -133,7 +134,7 @@ func (sc *stakingCommittee) DelegatesByHeight(height uint64) (state.CandidateLis
 	}
 
 	timer = sc.timerFactory.NewTimer("Native")
-	nativeVotes, ts, err := sc.nativeStaking.Votes(height, sc.hu.IsPost(config.Daytona, height))
+	nativeVotes, ts, err := sc.nativeStaking.Votes(epochNum, height, sc.hu.IsPost(config.Daytona, height))
 	timer.End()
 	if err == ErrNoData {
 		// no native staking data

e2etest/staking_test.go

@@ -112,9 +112,10 @@ func TestStakingContract(t *testing.T) {
 		})
 		require.NoError(err)
 		ns.SetContract(r.ContractAddress)
-		tally, now, err := ns.Votes(bc.TipHeight()+1, false)
+		// Using a random value for epoch number
+		tally, now, err := ns.Votes(bc.TipHeight(), bc.TipHeight()+1, false)
 		require.Equal(poll.ErrNoData, err)
-		tally, now, err = ns.Votes(bc.TipHeight()+1, true)
+		tally, now, err = ns.Votes(bc.TipHeight(), bc.TipHeight()+1, true)
 		require.NoError(err)
 		require.Equal(fixedTime, now)
 		require.Equal(numVoter*int(numBucket), len(tally.Candidates))