reuse isSelfStakeBucket

action/protocol/poll/nativestakingV2.go

@@ -7,11 +7,12 @@ import (
 
 	"github.com/iotexproject/go-pkgs/hash"
 	"github.com/iotexproject/iotex-address/address"
+	"github.com/iotexproject/iotex-election/util"
+
 	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/action/protocol/staking"
 	"github.com/iotexproject/iotex-core/state"
-	"github.com/iotexproject/iotex-election/util"
 )
 
 type nativeStakingV2 struct {
@@ -83,6 +84,7 @@ func (ns *nativeStakingV2) CalculateCandidatesByHeight(ctx context.Context, sr p
 		return cands, err
 	}
 	bcCtx := protocol.MustGetBlockchainCtx(ctx)
+	// TODO: put candidates which will expired during current or next epoch behind the active candidates
 	return ns.filterAndSortCandidatesByVoteScore(cands, bcCtx.Tip.Timestamp), nil
 }
 

action/protocol/staking/candidate_statereader.go

@@ -66,7 +66,6 @@ type (
 		TotalStakedAmount() *big.Int
 		ActiveBucketsCount() uint64
 		ContainsSelfStakingBucket(index uint64) bool
-		IsActiveCandidateAt(cand *Candidate, height uint64) (bool, error)
 	}
 
 	candSR struct {
@@ -112,37 +111,6 @@ func (c *candSR) AllCandidates() CandidateList {
 	return c.view.candCenter.All()
 }
 
-func (c *candSR) IsActiveCandidateAt(cand *Candidate, height uint64) (bool, error) {
-	// self-stake bucket should be either self-owned or endorsed
-	vb, err := c.getBucket(cand.SelfStakeBucketIdx)
-	if err != nil {
-		return false, errors.Wrapf(err, "failed to get bucket %d", cand.SelfStakeBucketIdx)
-	}
-	// self-owned bucket should not be unstaked
-	if address.Equal(vb.Owner, cand.Owner) {
-		return !vb.isUnstaked(), nil
-	}
-	// endorsed bucket should not be expired
-	if !address.Equal(vb.Candidate, cand.Owner) {
-		return false, nil
-	}
-	esr := NewEndorsementStateReader(c.SR())
-	endorse, err := esr.Get(cand.SelfStakeBucketIdx)
-	switch {
-	case err == nil:
-		// endorsement should not be expired
-		if endorse.Status(height) == EndorseExpired {
-			return false, nil
-		}
-		return true, nil
-	case errors.Is(err, state.ErrStateNotExist):
-		// impossible to happen
-		return false, errors.Wrapf(ErrEndorsementNotExist, "bucket index %d", cand.SelfStakeBucketIdx)
-	default:
-		return false, err
-	}
-}
-
 func (c *candSR) ContainsSelfStakingBucket(index uint64) bool {
 	return c.view.candCenter.ContainsSelfStakingBucket(index)
 }

action/protocol/staking/protocol.go

@@ -474,22 +474,28 @@ func (p *Protocol) Validate(ctx context.Context, act action.Action, sr protocol.
 }
 
 func (p *Protocol) isActiveCandidate(ctx context.Context, csr CandidateStateReader, cand *Candidate) (bool, error) {
+	if cand.SelfStake.Cmp(p.config.RegistrationConsts.MinSelfStake) < 0 {
+		return false, nil
+	}
 	featureCtx := protocol.MustGetFeatureCtx(ctx)
-	// before delegate endorsement enabled, candidate is always active unless it's self-stake bucket is unstaked
 	if featureCtx.DisableDelegateEndorsement {
-		if cand.SelfStake.Cmp(p.config.RegistrationConsts.MinSelfStake) < 0 {
-			return false, nil
-		}
+		// before endorsement feature, candidates with enough amount must be active
 		return true, nil
 	}
-
-	srHeight, err := csr.SR().Height()
+	bucket, err := csr.getBucket(cand.SelfStakeBucketIdx)
+	switch {
+	case errors.Cause(err) == state.ErrStateNotExist:
+		// endorse bucket has been withdrawn
+		return false, nil
+	case err != nil:
+		return false, errors.Wrapf(err, "failed to get bucket %d", cand.SelfStakeBucketIdx)
+	default:
+	}
+	selfStake, err := isSelfStakeBucketCommon(featureCtx, csr.ContainsSelfStakingBucket, csr.SR(), bucket)
 	if err != nil {
-		return false, errors.Wrap(err, "failed to get StateReader height")
+		return false, errors.Wrapf(err, "failed to check self-stake bucket %d", cand.SelfStakeBucketIdx)
 	}
-	rp := rolldpos.MustGetProtocol(protocol.MustGetRegistry(ctx))
-	currentEpochNum := rp.GetEpochNum(srHeight)
-	return csr.IsActiveCandidateAt(cand, rp.GetEpochLastBlockHeight(currentEpochNum+1))
+	return selfStake, nil
 }
 
 // ActiveCandidates returns all active candidates in candidate center
@@ -711,8 +717,16 @@ func writeCandCenterStateToStateDB(sm protocol.StateManager, name, op, owners Ca
 
 // isSelfStakeBucket returns true if the bucket is self-stake bucket and not expired
 func isSelfStakeBucket(featureCtx protocol.FeatureCtx, csm CandidateStateManager, bucket *VoteBucket) (bool, error) {
+	return isSelfStakeBucketCommon(featureCtx, csm.ContainsSelfStakingBucket, csm.SM(), bucket)
+}
+
+func isSelfStakeBucketCommon(
+	featureCtx protocol.FeatureCtx,
+	containsSelfStakingBucket func(uint64) bool,
+	sr protocol.StateReader,
+	bucket *VoteBucket) (bool, error) {
 	// bucket index should be settled in one of candidates
-	selfStake := csm.ContainsSelfStakingBucket(bucket.Index)
+	selfStake := containsSelfStakingBucket(bucket.Index)
 	if featureCtx.DisableDelegateEndorsement || !selfStake {
 		return selfStake, nil
 	}
@@ -722,7 +736,7 @@ func isSelfStakeBucket(featureCtx protocol.FeatureCtx, csm CandidateStateManager
 		return !bucket.isUnstaked(), nil
 	}
 	// otherwise bucket should be an endorse bucket which is not expired
-	esm := NewEndorsementStateManager(csm.SM())
+	esm := NewEndorsementStateReader(sr)
 	height, err := esm.Height()
 	if err != nil {
 		return false, err