Fix Staking

Makefile

@@ -256,7 +256,7 @@ recover:
 
 .PHONY: ioctl
 ioctl:
-	$(GOBUILD) -ldflags "$(PackageFlags)" -o ./bin/$(BUILD_TARGET_IOCTL) -v ./tools/ioctl
+	$(GOBUILD) -tags $(BUILD_TAGS) -ldflags "$(PackageFlags)" -o ./bin/$(BUILD_TARGET_IOCTL) -v ./tools/ioctl
 
 .PHONY: newioctl
 newioctl:

action/protocol/context.go

@@ -325,10 +325,10 @@ func WithFeatureCtx(ctx context.Context) context.Context {
 			TimestampedStakingContract:              g.IsWake(height),
 			PreStateSystemAction:                    !g.IsWake(height),
 			CreatePostActionStates:                  g.IsWake(height),
-			NotSlashUnproductiveDelegates:           !g.IsToBeEnabled(height),
-			CandidateBLSPublicKey:                   g.IsToBeEnabled(height),
-			NotUseMinSelfStakeToBeActive:            !g.IsToBeEnabled(height),
-			StoreVoteOfNFTBucketIntoView:            !g.IsToBeEnabled(height),
+			NotSlashUnproductiveDelegates:           !g.IsXingu(height),
+			CandidateBLSPublicKey:                   g.IsXingu(height),
+			NotUseMinSelfStakeToBeActive:            !g.IsXingu(height),
+			StoreVoteOfNFTBucketIntoView:            !g.IsXingu(height),
 		},
 	)
 }
@@ -351,7 +351,7 @@ func GetFeatureCtx(ctx context.Context) (FeatureCtx, bool) {
 func MustGetFeatureCtx(ctx context.Context) FeatureCtx {
 	fc, ok := ctx.Value(featureContextKey{}).(FeatureCtx)
 	if !ok {
-		log.S().Panic("Miss feature context")
+		log.L().Panic("Miss feature context")
 	}
 	return fc
 }

action/protocol/execution/evm/evmstatedbadapter.go

@@ -1092,7 +1092,7 @@ func (stateDB *StateDBAdapter) CommitContracts() error {
 	sort.Slice(contractAddrs, func(i, j int) bool { return bytes.Compare(contractAddrs[i][:], contractAddrs[j][:]) < 0 })
 
 	for _, addr := range contractAddrs {
-		_, err := stateDB.sm.DelState(protocol.KeyOption(addr[:]))
+		_, err := stateDB.sm.DelState(protocol.KeyOption(addr[:]), protocol.ObjectOption(&state.Account{}))
 		if stateDB.assertError(err, "failed to delete SelfDestruct account/contract", zap.Error(err), zap.String("address", addr.Hex())) {
 			return errors.Wrapf(err, "failed to delete SelfDestruct account/contract %x", addr[:])
 		}

action/protocol/managers.go

@@ -62,13 +62,22 @@ func ObjectOption(obj any) StateOption {
 	}
 }
 
+// ErigonStoreOnlyOption sets the option to only read/write from/to erigon store
+func ErigonStoreOnlyOption() StateOption {
+	return func(cfg *StateConfig) error {
+		cfg.ErigonStoreOnly = true
+		return nil
+	}
+}
+
 type (
 	// StateConfig is the config for accessing stateDB
 	StateConfig struct {
-		Namespace string // namespace used by state's storage
-		Key       []byte
-		Keys      [][]byte
-		Object    any // object used by state's storage
+		Namespace       string // namespace used by state's storage
+		Key             []byte
+		Keys            [][]byte
+		Object          any  // object used by state's storage
+		ErigonStoreOnly bool // whether only read/write from/to erigon store
 	}
 
 	// StateOption sets parameter for access state

action/protocol/rewarding/protocol_test.go

@@ -73,7 +73,7 @@ func testProtocol(t *testing.T, test func(*testing.T, context.Context, protocol.
 	g.Rewarding.NumDelegatesForFoundationBonus = 5
 	g.Rewarding.FoundationBonusLastEpoch = 365
 	g.Rewarding.ProductivityThreshold = 50
-	g.ToBeEnabledBlockHeight = slashHeight
+	g.XinguBlockHeight = slashHeight
 	// Initialize the protocol
 	if withExempt {
 		g.Rewarding.ExemptAddrStrsFromEpochReward = []string{

action/protocol/staking/contractstake_indexer.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/iotexproject/iotex-address/address"
+
 	"github.com/iotexproject/iotex-core/v2/action"
 	"github.com/iotexproject/iotex-core/v2/action/protocol"
 	"github.com/iotexproject/iotex-core/v2/action/protocol/staking/contractstaking"
@@ -64,6 +65,10 @@ type (
 		LoadStakeView(context.Context, protocol.StateReader) (ContractStakeView, error)
 		// CreateEventProcessor creates a new event processor
 		CreateEventProcessor(context.Context, EventHandler) EventProcessor
+		// ContractStakingBuckets returns all the contract staking buckets
+		ContractStakingBuckets() (uint64, map[uint64]*contractstaking.Bucket, error)
+
+		BucketReader
 	}
 	// ContractStakingIndexerWithBucketType defines the interface of contract staking reader with bucket type
 	ContractStakingIndexerWithBucketType interface {