rebase and fix the issues from code comments

utils/utils.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"bytes"
-	"encoding/binary"
 	"sort"
 	"strings"
 
@@ -211,9 +210,3 @@ func SortByPower(
 	}
 	return sortedOperatorAddrs, sortedPubKeys, sortedPowers
 }
-
-func EncodeHeightBytes(height uint64) []byte {
-	buf := make([]byte, 8)
-	binary.BigEndian.PutUint64(buf, height)
-	return buf
-}

x/avs/keeper/keeper.go

@@ -390,10 +390,8 @@ func (k Keeper) GetAVSEpochInfo(ctx sdk.Context, addr string) (*epochstypes.Epoc
 		return nil, err
 	}
 	avsInfo := avsInfoResp.Info
-	epochInfo, found := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier)
-	if !found {
-		return nil, types.ErrEpochNotFound.Wrapf("epoch info not found %s", avsInfo.EpochIdentifier)
-	}
+	// Epoch information must be present because it is checked when setting AVS information.
+	epochInfo, _ := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier)
 	return &epochInfo, nil
 }
 

x/avs/keeper/task_test.go

@@ -3,7 +3,6 @@ package keeper_test
 import (
 	"strconv"
 
-	sdkmath "cosmossdk.io/math"
 	types "github.com/ExocoreNetwork/exocore/x/avs/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
@@ -18,7 +17,7 @@ func (suite *AVSTestSuite) TestTaskInfo() {
 		TaskResponsePeriod:  10000,
 		TaskChallengePeriod: 5000,
 		ThresholdPercentage: 60,
-		TaskTotalPower:      sdk.Dec(sdkmath.ZeroInt()),
+		TaskTotalPower:      sdk.ZeroDec(),
 	}
 	err := suite.App.AVSManagerKeeper.SetTaskInfo(suite.Ctx, info)
 	suite.NoError(err)

x/dogfood/keeper/keeper.go

@@ -86,8 +86,8 @@ func (k Keeper) Hooks() types.DogfoodHooks {
 	return types.MultiDogfoodHooks{}
 }
 
-// MarkUpdateValidatorSetFlag marks the end of the epoch. It is called within the BeginBlocker to inform
-// the module to apply the validator updates at the end of this block.
+// MarkUpdateValidatorSetFlag marks that the validator set needs to be updated at the end of this block.
+// Mostly, these updates occur in response to the epoch ending. In other cases, they are the result of slashing.
 func (k Keeper) MarkUpdateValidatorSetFlag(ctx sdk.Context) {
 	store := ctx.KVStore(k.storeKey)
 	key := types.ShouldUpdateValidatorSetByteKey()

x/operator/keeper/grpc_query.go

@@ -13,7 +13,6 @@ import (
 	assetstype "github.com/ExocoreNetwork/exocore/x/assets/types"
 
 	keytypes "github.com/ExocoreNetwork/exocore/types/keys"
-	assetstype "github.com/ExocoreNetwork/exocore/x/assets/types"
 	avstypes "github.com/ExocoreNetwork/exocore/x/avs/types"
 	"github.com/ExocoreNetwork/exocore/x/operator/types"
 	tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto"

x/operator/keeper/usd_value.go

@@ -470,7 +470,7 @@ func (k *Keeper) CalculateUSDValueForStaker(ctx sdk.Context, stakerID, avsAddr s
 		return sdkmath.LegacyDec{}, err
 	}
 	if optedUSDValues.ActiveUSDValue.IsZero() {
-		return sdkmath.LegacyZeroDec(), err
+		return sdkmath.LegacyZeroDec(), nil
 	}
 
 	// calculate the active voting power for staker

x/operator/types/keys.go

@@ -4,8 +4,6 @@ import (
 	"encoding/binary"
 	"math"
 
-	"github.com/ExocoreNetwork/exocore/utils"
-
 	"golang.org/x/xerrors"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -165,7 +163,7 @@ func KeyForVotingPowerSnapshot(avs common.Address, height int64) []byte {
 	return AppendMany(
 		avs.Bytes(),
 		// Append the height
-		utils.EncodeHeightBytes(uint64(height)),
+		sdk.Uint64ToBigEndian(uint64(height)),
 	)
 }