refactor: change byte prefixing scheme for provider

docs/docs/adrs/adr-001-key-assignment.md

@@ -25,15 +25,15 @@ It is possible to change the keys at any time by submitting a transaction (i.e.,
 
 - `ValidatorConsumerPubKey` - Stores the validator assigned keys for every consumer chain.
 ```golang
-ConsumerValidatorsBytePrefix | len(chainID) | chainID | providerConsAddress -> consumerKey
+0x16 | len(chainID) | chainID | providerConsAddress -> consumerKey
 ```
 - `ValidatorByConsumerAddr` - Stores the mapping from validator addresses on consumer chains to validator addresses on the provider chain. Needed for the consumer initiated slashing sub-protocol.
 ```golang
-ValidatorsByConsumerAddrBytePrefix | len(chainID) | chainID | consumerConsAddress -> providerConsAddress
+0x17 | len(chainID) | chainID | consumerConsAddress -> providerConsAddress
 ```
 - `ConsumerAddrsToPrune` - Stores the mapping from VSC ids to consumer validators addresses. Needed for pruning `ValidatorByConsumerAddr`. 
 ```golang
-ConsumerAddrsToPruneBytePrefix | len(chainID) | chainID | vscID -> []consumerConsAddresses
+0x19 | len(chainID) | chainID | vscID -> []consumerConsAddresses
 ```
 
 ### Protocol overview 

docs/docs/adrs/adr-015-partial-set-security.md

@@ -66,7 +66,7 @@ In a future version of PSS, we intend to introduce a `ConsumerModificationPropos
 We augment the provider module’s state to keep track of the `top_N` value for each consumer chain. The key to store this information would be:
 
 ```
-topNBytePrefix | len(chainID) | chainID
+0x21 | len(chainID) | chainID
 ```
 
 To create the above key, we can use [`ChainIdWithLenKey`](https://github.com/cosmos/interchain-security/blob/v4.0.0/x/ccv/provider/types/keys.go#L418).
@@ -116,10 +116,10 @@ Naturally, a validator can always change the consumer key on a consumer chain by
 For each validator, we store a pair `(blockHeight, isOptedIn)` that contains the block height the validator opted in and whether the validator is currently opted in or not, under the key:
 
 ```
-optedInBytePrefix | len(chainID) | chainID | addr
+0x20 | len(chainID) | chainID | addr
 ```
 
-By using a prefix iterator on `optedInBytePrefix | len(chainID) | chainID` we retrieve all the opted in validators.
+By using a prefix iterator on `0x20 | len(chainID) | chainID` we retrieve all the opted in validators.
 
 We introduce the following `Keeper` methods.
 
@@ -173,7 +173,7 @@ Additionally, a validator that belongs to the top `N%` validators cannot opt out
 We also update the state of the opted-in validators when a validator has opted out by removing the opted-out validator.
 
 Note that only opted-in validators can be punished for downtime on a consumer chain.
-For this, we use historical info of all the validators that have opted in; We can examine the `blockHeight` stored under the key `optedInBytePrefix | len(chainID) | chainID | addr` to see if a validator was opted in.
+For this, we use historical info of all the validators that have opted in; We can examine the `blockHeight` stored under the key `0x20 | len(chainID) | chainID | addr` to see if a validator was opted in.
 This way we can jail validators for downtime knowing that indeed the validators have opted in at some point in the past.
 Otherwise, we can think of a scenario where a validator `V` is down for a period of time, but before `V` gets punished for downtime, validator `V` opts out, and then we do not know whether `V` should be punished or not.
 

x/ccv/consumer/keeper/keeper.go

@@ -387,7 +387,7 @@ func (k Keeper) GetElapsedPacketMaturityTimes(ctx sdk.Context) (maturingVSCPacke
 // GetAllPacketMaturityTimes returns a slice of all PacketMaturityTimes, sorted by maturity times.
 //
 // Note that PacketMaturityTimes are stored under keys with the following format:
-// PacketMaturityTimeBytePrefix | maturityTime.UnixNano() | vscID
+// PacketMaturityTimeKeyPrefix | maturityTime.UnixNano() | vscID
 // Thus, the returned array is in ascending order of maturityTimes.
 // If two entries have the same maturityTime, then they are ordered by vscID.
 func (k Keeper) GetAllPacketMaturityTimes(ctx sdk.Context) (maturingVSCPackets []types.MaturingVSCPacket) {
@@ -489,7 +489,7 @@ func (k Keeper) DeleteHeightValsetUpdateID(ctx sdk.Context, height uint64) {
 // GetAllHeightToValsetUpdateIDs returns a list of all the block heights to valset update IDs in the store
 //
 // Note that the block height to vscID mapping is stored under keys with the following format:
-// HeightValsetUpdateIDBytePrefix | height
+// HeightValsetUpdateIDKeyPrefix | height
 // Thus, the returned array is in ascending order of heights.
 func (k Keeper) GetAllHeightToValsetUpdateIDs(ctx sdk.Context) (heightToValsetUpdateIDs []types.HeightToValsetUpdateID) {
 	store := ctx.KVStore(k.storeKey)
@@ -531,7 +531,7 @@ func (k Keeper) DeleteOutstandingDowntime(ctx sdk.Context, address sdk.ConsAddre
 // GetAllOutstandingDowntimes gets an array of the validator addresses of outstanding downtime flags
 //
 // Note that the outstanding downtime flags are stored under keys with the following format:
-// OutstandingDowntimeBytePrefix | consAddress
+// OutstandingDowntimeKeyPrefix | consAddress
 // Thus, the returned array is in ascending order of consAddresses.
 func (k Keeper) GetAllOutstandingDowntimes(ctx sdk.Context) (downtimes []types.OutstandingDowntime) {
 	store := ctx.KVStore(k.storeKey)
@@ -580,7 +580,7 @@ func (k Keeper) DeleteCCValidator(ctx sdk.Context, addr []byte) {
 // GetAllCCValidator returns all cross-chain validators
 //
 // Note that the cross-chain validators are stored under keys with the following format:
-// CrossChainValidatorBytePrefix | address
+// CrossChainValidatorKeyPrefix | address
 // Thus, the returned array is in ascending order of addresses.
 func (k Keeper) GetAllCCValidator(ctx sdk.Context) (validators []types.CrossChainValidator) {
 	store := ctx.KVStore(k.storeKey)

x/ccv/provider/keeper/distribution.go

@@ -56,7 +56,7 @@ func (k Keeper) DeleteConsumerRewardDenom(
 
 func (k Keeper) GetAllConsumerRewardDenoms(ctx sdk.Context) (consumerRewardDenoms []string) {
 	store := ctx.KVStore(k.storeKey)
-	iterator := storetypes.KVStorePrefixIterator(store, []byte{types.ConsumerRewardDenomsBytePrefix})
+	iterator := storetypes.KVStorePrefixIterator(store, types.ConsumerRewardDenomsKeyPrefix())
 	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		key := iterator.Key()[1:]

x/ccv/provider/keeper/distribution_test.go

@@ -16,7 +16,6 @@ import (
 	tmtypes "github.com/cometbft/cometbft/types"
 
 	testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper"
-	"github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 )
 
@@ -54,7 +53,7 @@ func TestComputeConsumerTotalVotingPower(t *testing.T) {
 		keeper.SetConsumerValidator(
 			ctx,
 			chainID,
-			types.ConsumerValidator{
+			providertypes.ConsumerValidator{
 				ProviderConsAddr: val.Address,
 				Power:            val.VotingPower,
 			},

x/ccv/provider/keeper/grpc_query_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/golang/mock/gomock"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	cryptotestutil "github.com/cosmos/interchain-security/v5/testutil/crypto"
 	testkeeper "github.com/cosmos/interchain-security/v5/testutil/keeper"
 	"github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
@@ -22,7 +21,7 @@ import (
 func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) {
 	chainID := consumer
 
-	providerConsAddress, err := sdktypes.ConsAddressFromBech32("cosmosvalcons1wpex7anfv3jhystyv3eq20r35a")
+	providerConsAddress, err := sdk.ConsAddressFromBech32("cosmosvalcons1wpex7anfv3jhystyv3eq20r35a")
 	require.NoError(t, err)
 	providerAddr := types.NewProviderConsAddress(providerConsAddress)
 

x/ccv/provider/keeper/hooks.go

@@ -10,7 +10,6 @@ import (
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 	ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
 )
@@ -95,7 +94,7 @@ func (h Hooks) AfterUnbondingInitiated(goCtx context.Context, id uint64) error {
 
 	// get all consumers where the validator is in the validator set
 	for _, chainID := range h.k.GetAllRegisteredConsumerChainIDs(ctx) {
-		if h.k.IsConsumerValidator(ctx, chainID, types.NewProviderConsAddress(consAddr)) {
+		if h.k.IsConsumerValidator(ctx, chainID, providertypes.NewProviderConsAddress(consAddr)) {
 			consumerChainIDS = append(consumerChainIDS, chainID)
 		}
 	}