sort merged result (#1526)

* sort merged result

* rebase

Author: CoderZhi

action/protocol/poll/nativestaking.go

@@ -78,14 +78,14 @@ func NewNativeStaking(cm protocol.ChainManager, getTipBlockTime GetTipBlockTime,
 }
 
 // Votes returns the votes on height
-func (ns *NativeStaking) Votes() (*VoteTally, error) {
+func (ns *NativeStaking) Votes() (*VoteTally, time.Time, error) {
 	if ns.contract == "" {
-		return nil, ErrNoData
+		return nil, time.Time{}, ErrNoData
 	}
 
 	now, err := ns.getTipBlockTime()
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get current block time")
+		return nil, time.Time{}, errors.Wrap(err, "failed to get current block time")
 	}
 	// read voter list from staking contract
 	votes := VoteTally{
@@ -103,7 +103,7 @@ func (ns *NativeStaking) Votes() (*VoteTally, error) {
 			break
 		}
 		if err != nil {
-			return nil, err
+			return nil, now, err
 		}
 		votes.tally(vote, now)
 		if len(vote) < int(limit.Int64()) {
@@ -112,7 +112,7 @@ func (ns *NativeStaking) Votes() (*VoteTally, error) {
 		}
 		prevIndex.Add(prevIndex, limit)
 	}
-	return &votes, nil
+	return &votes, now, nil
 }
 
 func (ns *NativeStaking) readBuckets(prevIndx, limit *big.Int) ([]*types.Bucket, error) {

action/protocol/poll/staking_committee.go

@@ -8,7 +8,9 @@ package poll
 
 import (
 	"context"
+	"encoding/hex"
 	"math/big"
+	"time"
 
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
@@ -21,6 +23,7 @@ import (
 	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-election/committee"
 	"github.com/iotexproject/iotex-election/types"
+	"github.com/iotexproject/iotex-election/util"
 	"github.com/iotexproject/iotex-proto/golang/iotextypes"
 )
 
@@ -106,7 +109,7 @@ func (sc *stakingCommittee) DelegatesByHeight(height uint64) (state.CandidateLis
 	if sc.nativeStaking == nil {
 		return nil, errors.New("native staking was not set after cook height")
 	}
-	nativeVotes, err := sc.nativeStaking.Votes()
+	nativeVotes, ts, err := sc.nativeStaking.Votes()
 	if err == ErrNoData {
 		// no native staking data
 		return cand, nil
@@ -115,28 +118,35 @@ func (sc *stakingCommittee) DelegatesByHeight(height uint64) (state.CandidateLis
 		return nil, errors.Wrap(err, "failed to get native chain candidates")
 	}
 	sc.currentNativeBuckets = nativeVotes.Buckets
-	return sc.mergeDelegates(cand, nativeVotes), nil
+	return sc.mergeDelegates(cand, nativeVotes, ts), nil
 }
 
 func (sc *stakingCommittee) ReadState(ctx context.Context, sm protocol.StateManager, method []byte, args ...[]byte) ([]byte, error) {
 	return sc.governanceStaking.ReadState(ctx, sm, method, args...)
 }
 
-func (sc *stakingCommittee) mergeDelegates(list state.CandidateList, votes *VoteTally) state.CandidateList {
+func (sc *stakingCommittee) mergeDelegates(list state.CandidateList, votes *VoteTally, ts time.Time) state.CandidateList {
 	// as of now, native staking does not have register contract, only voting/staking contract
 	// it is assumed that all votes done on native staking target for delegates registered on Ethereum
 	// votes cast to all outside address will not be counted and simply ignored
-	var merged state.CandidateList
+	candidates := make(map[string]*state.Candidate)
+	candidateScores := make(map[string]*big.Int)
 	for _, cand := range list {
 		clone := cand.Clone()
 		name := to12Bytes(clone.CanName)
 		if v, ok := votes.Candidates[name]; ok {
 			clone.Votes.Add(clone.Votes, v.Votes)
 		}
 		if clone.Votes.Cmp(sc.scoreThreshold) >= 0 {
-			merged = append(merged, clone)
+			candidates[hex.EncodeToString(name[:])] = clone
+			candidateScores[hex.EncodeToString(name[:])] = clone.Votes
 		}
 	}
+	sorted := util.Sort(candidateScores, uint64(ts.Unix()))
+	var merged state.CandidateList
+	for _, name := range sorted {
+		merged = append(merged, candidates[name])
+	}
 	return merged
 }
 

chainservice/chainservice.go

@@ -104,7 +104,7 @@ func New(
 		committeeConfig.SelfStakingThreshold = cfg.Genesis.SelfStakingThreshold
 
 		if committeeConfig.GravityChainStartHeight != 0 {
-			archive, err := committee.NewArchive(
+			arch, err := committee.NewArchive(
 				cfg.Chain.GravityChainDB.DbPath,
 				cfg.Chain.GravityChainDB.NumRetries,
 				committeeConfig.GravityChainStartHeight,
@@ -113,10 +113,7 @@ func New(
 			if err != nil {
 				return nil, err
 			}
-			if electionCommittee, err = committee.NewCommittee(
-				archive,
-				committeeConfig,
-			); err != nil {
+			if electionCommittee, err = committee.NewCommittee(arch, committeeConfig); err != nil {
 				return nil, err
 			}
 		}