add featureCtx for ActiveCandidates

iotexproject · Jul 5, 2023 · 193d323 · 193d323
1 parent 715fa61
commit 193d323
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/action/protocol/staking/protocol.go b/action/protocol/staking/protocol.go
@@ -471,11 +471,10 @@ func (p *Protocol) ActiveCandidates(ctx context.Context, sr protocol.StateReader
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get ActiveCandidates")
 	}
-	featureCtx, ok := protocol.GetFeatureCtx(ctx)
 	list := c.AllCandidates()
 	cand := make(CandidateList, 0, len(list))
 	for i := range list {
-		if ok && p.contractStakingIndexer != nil && featureCtx.AddContractStakingVotes {
+		if p.contractStakingIndexer != nil && protocol.MustGetFeatureCtx(ctx).AddContractStakingVotes {
 			list[i].Votes.Add(list[i].Votes, p.contractStakingIndexer.CandidateVotes(list[i].Owner))
 		}
 		if list[i].SelfStake.Cmp(p.config.RegistrationConsts.MinSelfStake) >= 0 {

diff --git a/action/protocol/staking/staking_statereader.go b/action/protocol/staking/staking_statereader.go
@@ -83,7 +83,6 @@ func (c *compositeStakingStateReader) readStateBuckets(ctx context.Context, req
 	}
 	// merge native and LSD buckets
 	buckets.Buckets = append(buckets.Buckets, lsdIoTeXBuckets.Buckets...)
-
 	buckets.Buckets = getPageOfArray(buckets.Buckets, int(req.GetPagination().GetOffset()), int(req.GetPagination().GetLimit()))
 	return buckets, height, err
 }

diff --git a/chainservice/builder.go b/chainservice/builder.go
@@ -30,6 +30,7 @@ import (
 	"github.com/iotexproject/iotex-core/blockchain"
 	"github.com/iotexproject/iotex-core/blockchain/block"
 	"github.com/iotexproject/iotex-core/blockchain/blockdao"
+	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/blockindex"
 	"github.com/iotexproject/iotex-core/blockindex/contractstaking"
 	"github.com/iotexproject/iotex-core/blocksync"
@@ -434,9 +435,15 @@ func (builder *Builder) buildNodeInfoManager() error {
 	if stk == nil {
 		return errors.New("cannot find staking protocol")
 	}
-
+	chain := builder.cs.chain
 	dm := nodeinfo.NewInfoManager(&builder.cfg.NodeInfo, cs.p2pAgent, cs.chain, builder.cfg.Chain.ProducerPrivateKey(), func() []string {
-		candidates, err := stk.ActiveCandidates(context.Background(), cs.factory, 0)
+		ctx := protocol.WithFeatureCtx(
+			protocol.WithBlockCtx(
+				genesis.WithGenesisContext(context.Background(), chain.Genesis()),
+				protocol.BlockCtx{BlockHeight: chain.TipHeight()},
+			),
+		)
+		candidates, err := stk.ActiveCandidates(ctx, cs.factory, 0)
 		if err != nil {
 			log.L().Error("failed to get active candidates", zap.Error(errors.WithStack(err)))
 			return nil