diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto
index 1b5f7a515f..3576b03f55 100644
--- a/proto/interchain_security/ccv/provider/v1/provider.proto
+++ b/proto/interchain_security/ccv/provider/v1/provider.proto
@@ -326,3 +326,16 @@ message ConsumerRewardsAllocation {
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins"
   ];
 }
+
+// OptedInValidator is used to store a opted-in validator 
+// to a consumer chain with the following mapping:  (chainID, providerAddr) -> optedInValidator
+message OptedInValidator {
+  // validator address
+  bytes provider_addr = 1;
+  // block height at which the validator opted-in
+  int64 block_height = 2;
+  // validator voting power at the block it opted-in
+  int64 power = 3;
+  // public key used by the validator on the consumer
+  bytes public_key = 4;
+}
diff --git a/x/ccv/provider/keeper/distribution_test.go b/x/ccv/provider/keeper/distribution_test.go
index b8883177b1..52ac0e0a82 100644
--- a/x/ccv/provider/keeper/distribution_test.go
+++ b/x/ccv/provider/keeper/distribution_test.go
@@ -38,8 +38,12 @@ func TestComputeConsumerTotalVotingPower(t *testing.T) {
 		keeper.SetOptedIn(
 			ctx,
 			chainID,
-			types.NewProviderConsAddress(sdk.ConsAddress(val.Address)),
-			0,
+			types.OptedInValidator{
+				ProviderAddr: val.Address,
+				BlockHeight:  ctx.BlockHeight(),
+				Power:        val.VotingPower,
+				PublicKey:    val.PubKey.Bytes(),
+			},
 		)
 
 		validatorsVotes = append(
@@ -65,7 +69,6 @@ func TestComputeConsumerTotalVotingPower(t *testing.T) {
 }
 
 func TestIdentifyConsumerChainIDFromIBCPacket(t *testing.T) {
-
 	var (
 		chainID    = "consumer"
 		ccvChannel = "channel-0"
diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go
index 42bcb12ace..e6b1c589aa 100644
--- a/x/ccv/provider/keeper/keeper.go
+++ b/x/ccv/provider/keeper/keeper.go
@@ -1189,16 +1189,15 @@ func (k Keeper) IsOptIn(ctx sdk.Context, chainID string) bool {
 func (k Keeper) SetOptedIn(
 	ctx sdk.Context,
 	chainID string,
-	providerAddr types.ProviderConsAddress,
-	blockHeight uint64,
+	validator types.OptedInValidator,
 ) {
 	store := ctx.KVStore(k.storeKey)
+	bz, err := validator.Marshal()
+	if err != nil {
+		panic(fmt.Errorf("failed to marshal OptedInValidator: %w", err))
+	}
 
-	// validator is considered opted in
-	blockHeightBytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(blockHeightBytes, blockHeight)
-
-	store.Set(types.OptedInKey(chainID, providerAddr), blockHeightBytes)
+	store.Set(types.OptedInKey(chainID, validator.ProviderAddr), bz)
 }
 
 func (k Keeper) DeleteOptedIn(
@@ -1207,7 +1206,7 @@ func (k Keeper) DeleteOptedIn(
 	providerAddr types.ProviderConsAddress,
 ) {
 	store := ctx.KVStore(k.storeKey)
-	store.Delete(types.OptedInKey(chainID, providerAddr))
+	store.Delete(types.OptedInKey(chainID, providerAddr.ToSdkConsAddr()))
 }
 
 func (k Keeper) IsOptedIn(
@@ -1216,22 +1215,25 @@ func (k Keeper) IsOptedIn(
 	providerAddr types.ProviderConsAddress,
 ) bool {
 	store := ctx.KVStore(k.storeKey)
-	return store.Get(types.OptedInKey(chainID, providerAddr)) != nil
+	return store.Get(types.OptedInKey(chainID, providerAddr.ToSdkConsAddr())) != nil
 }
 
-func (k Keeper) GetOptedIn(
+// GetAllOptedIn returns all the opted-in validators on chain `chainID`
+func (k Keeper) GetAllOptedIn(
 	ctx sdk.Context,
-	chainID string) (optedInValidators []OptedInValidator) {
+	chainID string) (optedInValidators []types.OptedInValidator) {
 	store := ctx.KVStore(k.storeKey)
 	key := types.ChainIdWithLenKey(types.OptedInBytePrefix, chainID)
 	iterator := sdk.KVStorePrefixIterator(store, key)
 	defer iterator.Close()
 
 	for ; iterator.Valid(); iterator.Next() {
-		optedInValidators = append(optedInValidators, OptedInValidator{
-			ProviderAddr: types.NewProviderConsAddress(iterator.Key()[len(key):]),
-			BlockHeight:  binary.BigEndian.Uint64(iterator.Value()),
-		})
+		iterator.Value()
+		var optedInValidator types.OptedInValidator
+		if err := optedInValidator.Unmarshal(iterator.Value()); err != nil {
+			panic(fmt.Errorf("failed to unmarshal OptedInValidator: %w", err))
+		}
+		optedInValidators = append(optedInValidators, optedInValidator)
 	}
 
 	return optedInValidators
@@ -1264,7 +1266,8 @@ func (k Keeper) IsToBeOptedIn(
 	return store.Get(types.ToBeOptedInKey(chainID, providerAddr)) != nil
 }
 
-func (k Keeper) GetToBeOptedIn(
+// GetAllToBeOptedIn returns all the to-be-opted-in validators on chain `chainID`
+func (k Keeper) GetAllToBeOptedIn(
 	ctx sdk.Context,
 	chainID string) (addresses []types.ProviderConsAddress) {
 
@@ -1308,7 +1311,8 @@ func (k Keeper) IsToBeOptedOut(
 	return store.Get(types.ToBeOptedOutKey(chainID, providerAddr)) != nil
 }
 
-func (k Keeper) GetToBeOptedOut(
+// GetAllToBeOptedOut returns all the to-be-opted-out validators on chain `chainID`
+func (k Keeper) GetAllToBeOptedOut(
 	ctx sdk.Context,
 	chainID string) (addresses []types.ProviderConsAddress) {
 
diff --git a/x/ccv/provider/keeper/keeper_test.go b/x/ccv/provider/keeper/keeper_test.go
index 35380a67aa..a231eb4c0c 100644
--- a/x/ccv/provider/keeper/keeper_test.go
+++ b/x/ccv/provider/keeper/keeper_test.go
@@ -3,7 +3,6 @@ package keeper_test
 import (
 	"bytes"
 	"fmt"
-	"github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper"
 	"sort"
 	"testing"
 	"time"
@@ -662,39 +661,49 @@ func TestTopN(t *testing.T) {
 	}
 }
 
-func TestGetOptedIn(t *testing.T) {
+func TestGetAllOptedIn(t *testing.T) {
 	providerKeeper, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
-	expectedOptedInValidators := []keeper.OptedInValidator{
+	expectedOptedInValidators := []types.OptedInValidator{
 		{
-			ProviderAddr: types.NewProviderConsAddress([]byte("providerAddr1")),
+			ProviderAddr: []byte("providerAddr1"),
 			BlockHeight:  1,
+			Power:        2,
+			PublicKey:    []byte{3},
 		},
 		{
-			ProviderAddr: types.NewProviderConsAddress([]byte("providerAddr2")),
+			ProviderAddr: []byte("providerAddr2"),
 			BlockHeight:  2,
+			Power:        3,
+			PublicKey:    []byte{4},
 		},
 		{
-			ProviderAddr: types.NewProviderConsAddress([]byte("providerAddr3")),
+			ProviderAddr: []byte("providerAddr3"),
 			BlockHeight:  3,
+			Power:        4,
+			PublicKey:    []byte{5},
 		},
 	}
 
 	for _, expectedOptedInValidator := range expectedOptedInValidators {
 		providerKeeper.SetOptedIn(ctx, "chainID",
-			expectedOptedInValidator.ProviderAddr, expectedOptedInValidator.BlockHeight)
+			types.OptedInValidator{
+				ProviderAddr: expectedOptedInValidator.ProviderAddr,
+				BlockHeight:  expectedOptedInValidator.BlockHeight,
+				Power:        expectedOptedInValidator.Power,
+				PublicKey:    expectedOptedInValidator.PublicKey})
 	}
 
-	actualOptedInValidators := providerKeeper.GetOptedIn(ctx, "chainID")
+	actualOptedInValidators := providerKeeper.GetAllOptedIn(ctx, "chainID")
 
 	// sort validators first to be able to compare
-	sortOptedInValidators := func(optedInValidators []keeper.OptedInValidator) {
+	sortOptedInValidators := func(optedInValidators []types.OptedInValidator) {
 		sort.Slice(optedInValidators, func(i int, j int) bool {
 			a := optedInValidators[i]
 			b := optedInValidators[j]
 			return a.BlockHeight < b.BlockHeight ||
-				(a.BlockHeight == b.BlockHeight && bytes.Compare(a.ProviderAddr.ToSdkConsAddr(), b.ProviderAddr.ToSdkConsAddr()) < 0)
+				(a.BlockHeight == b.BlockHeight && bytes.Compare(a.ProviderAddr, b.ProviderAddr) < 0)
 		})
 	}
 	sortOptedInValidators(expectedOptedInValidators)
@@ -707,19 +716,20 @@ func TestOptedIn(t *testing.T) {
 	providerKeeper, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
-	optedInValidator := keeper.OptedInValidator{
-		ProviderAddr: types.NewProviderConsAddress([]byte("providerAddr")),
-		BlockHeight:  1,
+	optedInValidator := types.OptedInValidator{ProviderAddr: []byte("providerAddr"),
+		BlockHeight: 1,
+		Power:       2,
+		PublicKey:   []byte{3},
 	}
 
-	require.False(t, providerKeeper.IsOptedIn(ctx, "chainID", optedInValidator.ProviderAddr))
-	providerKeeper.SetOptedIn(ctx, "chainID", optedInValidator.ProviderAddr, optedInValidator.BlockHeight)
-	require.True(t, providerKeeper.IsOptedIn(ctx, "chainID", optedInValidator.ProviderAddr))
-	providerKeeper.DeleteOptedIn(ctx, "chainID", optedInValidator.ProviderAddr)
-	require.False(t, providerKeeper.IsOptedIn(ctx, "chainID", optedInValidator.ProviderAddr))
+	require.False(t, providerKeeper.IsOptedIn(ctx, "chainID", types.NewProviderConsAddress(optedInValidator.ProviderAddr)))
+	providerKeeper.SetOptedIn(ctx, "chainID", optedInValidator)
+	require.True(t, providerKeeper.IsOptedIn(ctx, "chainID", types.NewProviderConsAddress(optedInValidator.ProviderAddr)))
+	providerKeeper.DeleteOptedIn(ctx, "chainID", types.NewProviderConsAddress(optedInValidator.ProviderAddr))
+	require.False(t, providerKeeper.IsOptedIn(ctx, "chainID", types.NewProviderConsAddress(optedInValidator.ProviderAddr)))
 }
 
-func TestGetToBeOptedIn(t *testing.T) {
+func TestGetAllToBeOptedIn(t *testing.T) {
 	providerKeeper, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
@@ -732,7 +742,7 @@ func TestGetToBeOptedIn(t *testing.T) {
 		providerKeeper.SetToBeOptedIn(ctx, "chainID", addr)
 	}
 
-	actualAddresses := providerKeeper.GetToBeOptedIn(ctx, "chainID")
+	actualAddresses := providerKeeper.GetAllToBeOptedIn(ctx, "chainID")
 
 	// sort addresses first to be able to compare
 	sortAddresses := func(addresses []types.ProviderConsAddress) {
@@ -766,7 +776,7 @@ func TestBeOptedIn(t *testing.T) {
 		providerKeeper.SetToBeOptedIn(ctx, "chainID", addr)
 	}
 
-	actualAddresses := providerKeeper.GetToBeOptedIn(ctx, "chainID")
+	actualAddresses := providerKeeper.GetAllToBeOptedIn(ctx, "chainID")
 
 	// sort addresses first to be able to compare
 	sortAddresses := func(addresses []types.ProviderConsAddress) {
@@ -801,7 +811,7 @@ func TestToBeOptedIn(t *testing.T) {
 	require.False(t, providerKeeper.IsToBeOptedIn(ctx, "chainID", providerAddr))
 }
 
-func TestGetToBeOptedOut(t *testing.T) {
+func TestGetAllToBeOptedOut(t *testing.T) {
 	providerKeeper, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
@@ -814,7 +824,7 @@ func TestGetToBeOptedOut(t *testing.T) {
 		providerKeeper.SetToBeOptedOut(ctx, "chainID", addr)
 	}
 
-	actualAddresses := providerKeeper.GetToBeOptedOut(ctx, "chainID")
+	actualAddresses := providerKeeper.GetAllToBeOptedOut(ctx, "chainID")
 
 	// sort addresses first to be able to compare
 	sortAddresses := func(addresses []types.ProviderConsAddress) {
diff --git a/x/ccv/provider/keeper/partial_set_security.go b/x/ccv/provider/keeper/partial_set_security.go
index e1bf9cc14f..bf76e7d7c8 100644
--- a/x/ccv/provider/keeper/partial_set_security.go
+++ b/x/ccv/provider/keeper/partial_set_security.go
@@ -7,12 +7,6 @@ import (
 	"github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
 )
 
-type OptedInValidator struct {
-	ProviderAddr types.ProviderConsAddress
-	// block height the validator opted in at
-	BlockHeight uint64
-}
-
 func (k Keeper) HandleOptIn(ctx sdk.Context, chainID string, providerAddr types.ProviderConsAddress, consumerKey *string) error {
 	if !k.IsConsumerProposedOrRegistered(ctx, chainID) {
 		return errorsmod.Wrapf(
diff --git a/x/ccv/provider/keeper/partial_set_security_test.go b/x/ccv/provider/keeper/partial_set_security_test.go
index 4831723bec..1af5f58c7c 100644
--- a/x/ccv/provider/keeper/partial_set_security_test.go
+++ b/x/ccv/provider/keeper/partial_set_security_test.go
@@ -1,6 +1,8 @@
 package keeper_test
 
 import (
+	"testing"
+
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -10,7 +12,6 @@ import (
 	ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestHandleOptIn(t *testing.T) {
@@ -32,7 +33,9 @@ func TestHandleOptIn(t *testing.T) {
 	require.False(t, providerKeeper.IsToBeOptedOut(ctx, "chainID", providerAddr))
 
 	// if validator (`providerAddr`) is already opted in, then the validator cannot be opted in
-	providerKeeper.SetOptedIn(ctx, "chainID", providerAddr, 1)
+
+	providerKeeper.SetOptedIn(ctx, "chainID",
+		types.OptedInValidator{ProviderAddr: providerAddr.ToSdkConsAddr(), BlockHeight: 1, Power: 1, PublicKey: []byte{1}})
 	providerKeeper.HandleOptIn(ctx, "chainID", providerAddr, nil)
 	require.False(t, providerKeeper.IsToBeOptedIn(ctx, "chainID", providerAddr))
 }
diff --git a/x/ccv/provider/types/keys.go b/x/ccv/provider/types/keys.go
index b82346b674..e0b25bf9a0 100644
--- a/x/ccv/provider/types/keys.go
+++ b/x/ccv/provider/types/keys.go
@@ -547,9 +547,9 @@ func TopNKey(chainID string) []byte {
 }
 
 // OptedInKey returns the key of consumer chain `chainID` and validator with `providerAddr`
-func OptedInKey(chainID string, providerAddr ProviderConsAddress) []byte {
+func OptedInKey(chainID string, providerAddr []byte) []byte {
 	prefix := ChainIdWithLenKey(OptedInBytePrefix, chainID)
-	return append(prefix, providerAddr.ToSdkConsAddr().Bytes()...)
+	return append(prefix, providerAddr...)
 }
 
 // ToBeOptedInKey returns the key of consumer chain `chainID` and validator with `providerAddr`
diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go
index dee8a9520a..c2771de119 100644
--- a/x/ccv/provider/types/provider.pb.go
+++ b/x/ccv/provider/types/provider.pb.go
@@ -1513,6 +1513,80 @@ func (m *ConsumerRewardsAllocation) GetRewards() github_com_cosmos_cosmos_sdk_ty
 	return nil
 }
 
+// OptedInValidator is used to store a opted-in validator
+// to a consumer chain with the following mapping:  (chainID, providerAddr) -> optedInValidator
+type OptedInValidator struct {
+	// validator address
+	ProviderAddr []byte `protobuf:"bytes,1,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"`
+	// block height at which the validator opted-in
+	BlockHeight int64 `protobuf:"varint,2,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"`
+	// validator voting power at the block it opted-in
+	Power int64 `protobuf:"varint,3,opt,name=power,proto3" json:"power,omitempty"`
+	// public key used by the validator on the consumer
+	PublicKey []byte `protobuf:"bytes,4,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"`
+}
+
+func (m *OptedInValidator) Reset()         { *m = OptedInValidator{} }
+func (m *OptedInValidator) String() string { return proto.CompactTextString(m) }
+func (*OptedInValidator) ProtoMessage()    {}
+func (*OptedInValidator) Descriptor() ([]byte, []int) {
+	return fileDescriptor_f22ec409a72b7b72, []int{24}
+}
+func (m *OptedInValidator) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *OptedInValidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_OptedInValidator.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *OptedInValidator) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OptedInValidator.Merge(m, src)
+}
+func (m *OptedInValidator) XXX_Size() int {
+	return m.Size()
+}
+func (m *OptedInValidator) XXX_DiscardUnknown() {
+	xxx_messageInfo_OptedInValidator.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OptedInValidator proto.InternalMessageInfo
+
+func (m *OptedInValidator) GetProviderAddr() []byte {
+	if m != nil {
+		return m.ProviderAddr
+	}
+	return nil
+}
+
+func (m *OptedInValidator) GetBlockHeight() int64 {
+	if m != nil {
+		return m.BlockHeight
+	}
+	return 0
+}
+
+func (m *OptedInValidator) GetPower() int64 {
+	if m != nil {
+		return m.Power
+	}
+	return 0
+}
+
+func (m *OptedInValidator) GetPublicKey() []byte {
+	if m != nil {
+		return m.PublicKey
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*ConsumerAdditionProposal)(nil), "interchain_security.ccv.provider.v1.ConsumerAdditionProposal")
 	proto.RegisterType((*ConsumerRemovalProposal)(nil), "interchain_security.ccv.provider.v1.ConsumerRemovalProposal")
@@ -1538,6 +1612,7 @@ func init() {
 	proto.RegisterType((*ConsumerAddrsToPrune)(nil), "interchain_security.ccv.provider.v1.ConsumerAddrsToPrune")
 	proto.RegisterType((*ConsumerValidator)(nil), "interchain_security.ccv.provider.v1.ConsumerValidator")
 	proto.RegisterType((*ConsumerRewardsAllocation)(nil), "interchain_security.ccv.provider.v1.ConsumerRewardsAllocation")
+	proto.RegisterType((*OptedInValidator)(nil), "interchain_security.ccv.provider.v1.OptedInValidator")
 }
 
 func init() {
@@ -1545,123 +1620,126 @@ func init() {
 }
 
 var fileDescriptor_f22ec409a72b7b72 = []byte{
-	// 1852 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4d, 0x6f, 0x1c, 0xc7,
-	0xd1, 0xe6, 0x70, 0x97, 0x1f, 0x5b, 0xcb, 0xcf, 0x21, 0x6d, 0x0d, 0xf5, 0xf2, 0x5d, 0x52, 0xe3,
-	0xd8, 0x61, 0xa2, 0x68, 0x26, 0xa4, 0x13, 0x40, 0x10, 0x62, 0x18, 0xe4, 0x52, 0xb6, 0x28, 0xda,
-	0x12, 0x3d, 0x64, 0x28, 0x24, 0x39, 0x0c, 0x7a, 0x7b, 0x5a, 0xbb, 0x0d, 0xce, 0x4e, 0x8f, 0xba,
-	0x7b, 0x47, 0xde, 0x4b, 0xce, 0xb9, 0x04, 0x70, 0x6e, 0x46, 0x2e, 0x71, 0x02, 0x04, 0x08, 0x72,
-	0x49, 0x7e, 0x86, 0x8f, 0x3e, 0xe6, 0x64, 0x07, 0xd2, 0x21, 0x87, 0x5c, 0xf3, 0x03, 0x82, 0xee,
-	0xf9, 0xdc, 0x25, 0xa9, 0xac, 0xe0, 0xe4, 0x42, 0xce, 0x54, 0x57, 0x3d, 0x55, 0xdd, 0x55, 0xf5,
-	0x54, 0xef, 0xc0, 0x1e, 0x8d, 0x24, 0xe1, 0xb8, 0x87, 0x68, 0xe4, 0x0b, 0x82, 0x07, 0x9c, 0xca,
-	0xa1, 0x8b, 0x71, 0xe2, 0xc6, 0x9c, 0x25, 0x34, 0x20, 0xdc, 0x4d, 0x76, 0x8b, 0x67, 0x27, 0xe6,
-	0x4c, 0x32, 0xf3, 0xad, 0x2b, 0x6c, 0x1c, 0x8c, 0x13, 0xa7, 0xd0, 0x4b, 0x76, 0x6f, 0xbe, 0x7d,
-	0x1d, 0x70, 0xb2, 0xeb, 0x3e, 0xa7, 0x9c, 0xa4, 0x58, 0x37, 0xd7, 0xbb, 0xac, 0xcb, 0xf4, 0xa3,
-	0xab, 0x9e, 0x32, 0xe9, 0x56, 0x97, 0xb1, 0x6e, 0x48, 0x5c, 0xfd, 0xd6, 0x19, 0x3c, 0x75, 0x25,
-	0xed, 0x13, 0x21, 0x51, 0x3f, 0xce, 0x14, 0x5a, 0xe3, 0x0a, 0xc1, 0x80, 0x23, 0x49, 0x59, 0x94,
-	0x03, 0xd0, 0x0e, 0x76, 0x31, 0xe3, 0xc4, 0xc5, 0x21, 0x25, 0x91, 0x54, 0x5e, 0xd3, 0xa7, 0x4c,
-	0xc1, 0x55, 0x0a, 0x21, 0xed, 0xf6, 0x64, 0x2a, 0x16, 0xae, 0x24, 0x51, 0x40, 0x78, 0x9f, 0xa6,
-	0xca, 0xe5, 0x5b, 0x66, 0xb0, 0x59, 0x59, 0xc7, 0x7c, 0x18, 0x4b, 0xe6, 0x5e, 0x90, 0xa1, 0xc8,
-	0x56, 0xdf, 0xc1, 0x4c, 0xf4, 0x99, 0x70, 0x89, 0xda, 0x7f, 0x84, 0x89, 0x9b, 0xec, 0x76, 0x88,
-	0x44, 0xbb, 0x85, 0x20, 0x8f, 0x3b, 0xd3, 0xeb, 0x20, 0x51, 0xea, 0x60, 0x46, 0xf3, 0xb8, 0x57,
-	0x51, 0x9f, 0x46, 0xcc, 0xd5, 0x7f, 0x53, 0x91, 0xfd, 0xaf, 0x59, 0xb0, 0xda, 0x2c, 0x12, 0x83,
-	0x3e, 0xe1, 0xfb, 0x41, 0x40, 0xd5, 0x2e, 0x4f, 0x38, 0x8b, 0x99, 0x40, 0xa1, 0xb9, 0x0e, 0x33,
-	0x92, 0xca, 0x90, 0x58, 0xc6, 0xb6, 0xb1, 0xd3, 0xf0, 0xd2, 0x17, 0x73, 0x1b, 0x9a, 0x01, 0x11,
-	0x98, 0xd3, 0x58, 0x29, 0x5b, 0xd3, 0x7a, 0xad, 0x2a, 0x32, 0x37, 0x60, 0x3e, 0x4d, 0x0d, 0x0d,
-	0xac, 0x9a, 0x5e, 0x9e, 0xd3, 0xef, 0x47, 0x81, 0xf9, 0x21, 0x2c, 0xd1, 0x88, 0x4a, 0x8a, 0x42,
-	0xbf, 0x47, 0xd4, 0x01, 0x59, 0xf5, 0x6d, 0x63, 0xa7, 0xb9, 0x77, 0xd3, 0xa1, 0x1d, 0xec, 0xa8,
-	0x33, 0x75, 0xb2, 0x93, 0x4c, 0x76, 0x9d, 0x07, 0x5a, 0xe3, 0xa0, 0xfe, 0xe5, 0xd7, 0x5b, 0x53,
-	0xde, 0x62, 0x66, 0x97, 0x0a, 0xcd, 0x5b, 0xb0, 0xd0, 0x25, 0x11, 0x11, 0x54, 0xf8, 0x3d, 0x24,
-	0x7a, 0xd6, 0xcc, 0xb6, 0xb1, 0xb3, 0xe0, 0x35, 0x33, 0xd9, 0x03, 0x24, 0x7a, 0xe6, 0x16, 0x34,
-	0x3b, 0x34, 0x42, 0x7c, 0x98, 0x6a, 0xcc, 0x6a, 0x0d, 0x48, 0x45, 0x5a, 0xa1, 0x0d, 0x20, 0x62,
-	0xf4, 0x3c, 0xf2, 0x55, 0x01, 0x58, 0x73, 0x59, 0x20, 0x69, 0xf2, 0x9d, 0x3c, 0xf9, 0xce, 0x59,
-	0x5e, 0x1d, 0x07, 0xf3, 0x2a, 0x90, 0xcf, 0xbe, 0xd9, 0x32, 0xbc, 0x86, 0xb6, 0x53, 0x2b, 0xe6,
-	0x23, 0x58, 0x19, 0x44, 0x1d, 0x16, 0x05, 0x34, 0xea, 0xfa, 0x31, 0xe1, 0x94, 0x05, 0xd6, 0xbc,
-	0x86, 0xda, 0xb8, 0x04, 0x75, 0x98, 0xd5, 0x51, 0x8a, 0xf4, 0xb9, 0x42, 0x5a, 0x2e, 0x8c, 0x4f,
-	0xb4, 0xad, 0xf9, 0x09, 0x98, 0x18, 0x27, 0x3a, 0x24, 0x36, 0x90, 0x39, 0x62, 0x63, 0x72, 0xc4,
-	0x15, 0x8c, 0x93, 0xb3, 0xd4, 0x3a, 0x83, 0xfc, 0x05, 0xdc, 0x90, 0x1c, 0x45, 0xe2, 0x29, 0xe1,
-	0xe3, 0xb8, 0x30, 0x39, 0xee, 0x1b, 0x39, 0xc6, 0x28, 0xf8, 0x03, 0xd8, 0xc6, 0x59, 0x01, 0xf9,
-	0x9c, 0x04, 0x54, 0x48, 0x4e, 0x3b, 0x03, 0x65, 0xeb, 0x3f, 0xe5, 0x08, 0xeb, 0x1a, 0x69, 0xea,
-	0x22, 0x68, 0xe5, 0x7a, 0xde, 0x88, 0xda, 0x07, 0x99, 0x96, 0xf9, 0x18, 0xbe, 0xd3, 0x09, 0x19,
-	0xbe, 0x10, 0x2a, 0x38, 0x7f, 0x04, 0x49, 0xbb, 0xee, 0x53, 0x21, 0x14, 0xda, 0xc2, 0xb6, 0xb1,
-	0x53, 0xf3, 0x6e, 0xa5, 0xba, 0x27, 0x84, 0x1f, 0x56, 0x34, 0xcf, 0x2a, 0x8a, 0xe6, 0x1d, 0x30,
-	0x7b, 0x54, 0x48, 0xc6, 0x29, 0x46, 0xa1, 0x4f, 0x22, 0xc9, 0x29, 0x11, 0xd6, 0xa2, 0x36, 0x5f,
-	0x2d, 0x57, 0xee, 0xa7, 0x0b, 0xe6, 0x43, 0xb8, 0x75, 0xad, 0x53, 0x1f, 0xf7, 0x50, 0x14, 0x91,
-	0xd0, 0x5a, 0xd2, 0x5b, 0xd9, 0x0a, 0xae, 0xf1, 0xd9, 0x4e, 0xd5, 0xcc, 0x35, 0x98, 0x91, 0x2c,
-	0xf6, 0x1f, 0x59, 0xcb, 0xdb, 0xc6, 0xce, 0xa2, 0x57, 0x97, 0x2c, 0x7e, 0x74, 0x6f, 0xfe, 0x57,
-	0x5f, 0x6c, 0x4d, 0x7d, 0xfe, 0xc5, 0xd6, 0x94, 0xfd, 0x17, 0x03, 0x6e, 0xb4, 0x8b, 0xd3, 0xe8,
-	0xb3, 0x04, 0x85, 0xff, 0xcb, 0xae, 0xdb, 0x87, 0x86, 0x50, 0xe1, 0xe8, 0x3a, 0xaf, 0xbf, 0x46,
-	0x9d, 0xcf, 0x2b, 0x33, 0xb5, 0x60, 0xff, 0xce, 0x80, 0xf5, 0xfb, 0xcf, 0x06, 0x34, 0x61, 0x18,
-	0xfd, 0x57, 0x48, 0xe2, 0x18, 0x16, 0x49, 0x05, 0x4f, 0x58, 0xb5, 0xed, 0xda, 0x4e, 0x73, 0xef,
-	0x6d, 0x27, 0x25, 0x31, 0xa7, 0xe0, 0xb6, 0x8c, 0xc8, 0x9c, 0xaa, 0x77, 0x6f, 0xd4, 0xf6, 0xde,
-	0xb4, 0x65, 0xd8, 0x7f, 0x30, 0xe0, 0xa6, 0x3a, 0xfe, 0x2e, 0xf1, 0xc8, 0x73, 0xc4, 0x83, 0x43,
-	0x12, 0xb1, 0xbe, 0xf8, 0xd6, 0x71, 0xda, 0xb0, 0x18, 0x68, 0x24, 0x5f, 0x32, 0x1f, 0x05, 0x81,
-	0x8e, 0x53, 0xeb, 0x28, 0xe1, 0x19, 0xdb, 0x0f, 0x02, 0x73, 0x07, 0x56, 0x4a, 0x1d, 0xae, 0xf2,
-	0xa9, 0x8e, 0x59, 0xa9, 0x2d, 0xe5, 0x6a, 0x3a, 0xcb, 0xc4, 0xfe, 0xa7, 0x01, 0x2b, 0x1f, 0x86,
-	0xac, 0x83, 0xc2, 0xd3, 0x10, 0x89, 0x9e, 0x2a, 0xbd, 0xa1, 0x4a, 0x0f, 0x27, 0x59, 0xcf, 0xeb,
-	0xf0, 0x26, 0x4e, 0x8f, 0x32, 0xd3, 0x2c, 0xf4, 0x3e, 0xac, 0x16, 0x5d, 0x58, 0x54, 0x81, 0xde,
-	0xcd, 0xc1, 0xda, 0x8b, 0xaf, 0xb7, 0x96, 0xf3, 0x62, 0x6b, 0xeb, 0x8a, 0x38, 0xf4, 0x96, 0xf1,
-	0x88, 0x20, 0x30, 0x5b, 0xd0, 0xa4, 0x1d, 0xec, 0x0b, 0xf2, 0xcc, 0x8f, 0x06, 0x7d, 0x5d, 0x40,
-	0x75, 0xaf, 0x41, 0x3b, 0xf8, 0x94, 0x3c, 0x7b, 0x34, 0xe8, 0x9b, 0xef, 0xc2, 0x9b, 0xf9, 0x00,
-	0xf6, 0x13, 0x14, 0xfa, 0xca, 0x5e, 0x1d, 0x07, 0xd7, 0xf5, 0xb4, 0xe0, 0xad, 0xe5, 0xab, 0xe7,
-	0x28, 0x54, 0xce, 0xf6, 0x83, 0x80, 0xdb, 0x2f, 0x67, 0x60, 0xf6, 0x04, 0x71, 0xd4, 0x17, 0xe6,
-	0x19, 0x2c, 0x4b, 0xd2, 0x8f, 0x43, 0x24, 0x89, 0x9f, 0x32, 0x7c, 0xb6, 0xd3, 0xdb, 0x9a, 0xf9,
-	0xab, 0xc3, 0xd2, 0xa9, 0x8c, 0xc7, 0x64, 0xd7, 0x69, 0x6b, 0xe9, 0xa9, 0x44, 0x92, 0x78, 0x4b,
-	0x39, 0x46, 0x2a, 0x34, 0xef, 0x82, 0x25, 0xf9, 0x40, 0xc8, 0x92, 0x7b, 0x4b, 0xd2, 0x49, 0x73,
-	0xf9, 0x66, 0xbe, 0x9e, 0xd2, 0x55, 0x41, 0x36, 0x57, 0xd3, 0x6c, 0xed, 0xdb, 0xd0, 0xec, 0x29,
-	0xac, 0xa9, 0x19, 0x35, 0x8e, 0x59, 0x9f, 0x1c, 0x73, 0x55, 0xd9, 0x8f, 0x82, 0x7e, 0x02, 0x66,
-	0x22, 0xf0, 0x38, 0xe6, 0xcc, 0x6b, 0xc4, 0x99, 0x08, 0x3c, 0x0a, 0x19, 0xc0, 0xa6, 0x50, 0xc5,
-	0xe7, 0xf7, 0x89, 0xd4, 0xa4, 0x1d, 0x87, 0x24, 0xa2, 0xa2, 0x97, 0x83, 0xcf, 0x4e, 0x0e, 0xbe,
-	0xa1, 0x81, 0x3e, 0x56, 0x38, 0x5e, 0x0e, 0x93, 0x79, 0x69, 0x43, 0xeb, 0x6a, 0x2f, 0x45, 0x82,
-	0xe6, 0x74, 0x82, 0xfe, 0xef, 0x0a, 0x88, 0x22, 0x4b, 0x02, 0xde, 0xa9, 0x0c, 0x17, 0xd5, 0xd5,
-	0xbe, 0x6e, 0x28, 0x9f, 0x93, 0xae, 0x62, 0x60, 0x94, 0xce, 0x19, 0x42, 0x8a, 0x01, 0x99, 0xb1,
-	0x87, 0xba, 0x02, 0x15, 0xcc, 0xd1, 0x66, 0x34, 0xca, 0x6e, 0x11, 0x76, 0x39, 0x83, 0x0a, 0x8e,
-	0xf0, 0x2a, 0x58, 0x1f, 0x10, 0xa2, 0xba, 0xb9, 0x32, 0x87, 0x48, 0xcc, 0x70, 0x4f, 0xcf, 0xc9,
-	0x9a, 0xb7, 0x54, 0xcc, 0x9c, 0xfb, 0x4a, 0xfa, 0xb0, 0x3e, 0x3f, 0xbf, 0xd2, 0xb0, 0xbf, 0x07,
-	0x0d, 0xdd, 0xcc, 0xfb, 0xf8, 0x42, 0x98, 0x9b, 0xd0, 0x50, 0x5d, 0x41, 0x84, 0x20, 0xc2, 0x32,
-	0x34, 0x07, 0x94, 0x02, 0x5b, 0xc2, 0xc6, 0x75, 0xb7, 0x2d, 0x61, 0x3e, 0x81, 0xb9, 0x98, 0xe8,
-	0xab, 0x80, 0x36, 0x6c, 0xee, 0xbd, 0xe7, 0x4c, 0x70, 0x17, 0x76, 0xae, 0x03, 0xf4, 0x72, 0x34,
-	0x9b, 0x97, 0x77, 0xbc, 0xb1, 0x61, 0x23, 0xcc, 0xf3, 0x71, 0xa7, 0x3f, 0x79, 0x2d, 0xa7, 0x63,
-	0x78, 0xa5, 0xcf, 0xdb, 0xd0, 0xdc, 0x4f, 0xb7, 0xfd, 0x11, 0x15, 0xf2, 0xf2, 0xb1, 0x2c, 0x54,
-	0x8f, 0xe5, 0x21, 0x2c, 0x65, 0x83, 0xf3, 0x8c, 0x69, 0x42, 0x32, 0xff, 0x1f, 0x20, 0x9b, 0xb8,
-	0x8a, 0xc8, 0x52, 0xca, 0x6e, 0x64, 0x92, 0xa3, 0x60, 0x64, 0xd6, 0x4d, 0x8f, 0xcc, 0x3a, 0xdb,
-	0x83, 0xe5, 0x73, 0x81, 0x7f, 0x9a, 0xdf, 0xaa, 0x1e, 0xc7, 0xc2, 0x7c, 0x03, 0x66, 0x55, 0x0f,
-	0x65, 0x40, 0x75, 0x6f, 0x26, 0x11, 0xf8, 0x48, 0xb3, 0x76, 0x79, 0x73, 0x63, 0xb1, 0x4f, 0x03,
-	0x61, 0x4d, 0x6f, 0xd7, 0x76, 0xea, 0xde, 0xd2, 0xa0, 0x34, 0x3f, 0x0a, 0x84, 0xfd, 0x33, 0x68,
-	0x56, 0x00, 0xcd, 0x25, 0x98, 0x2e, 0xb0, 0xa6, 0x69, 0x60, 0xde, 0x83, 0x8d, 0x12, 0x68, 0x94,
-	0x86, 0x53, 0xc4, 0x86, 0x77, 0xa3, 0x50, 0x18, 0x61, 0x62, 0x61, 0x3f, 0x86, 0xf5, 0xa3, 0xb2,
-	0xe9, 0x0b, 0x92, 0x1f, 0xd9, 0xa1, 0x31, 0x3a, 0xcd, 0x37, 0xa1, 0x51, 0xfc, 0x62, 0xd1, 0xbb,
-	0xaf, 0x7b, 0xa5, 0xc0, 0xee, 0xc3, 0xca, 0xb9, 0xc0, 0xa7, 0x24, 0x0a, 0x4a, 0xb0, 0x6b, 0x0e,
-	0xe0, 0x60, 0x1c, 0x68, 0xe2, 0xeb, 0x6f, 0xe9, 0x8e, 0xc1, 0xc6, 0x39, 0x0a, 0x69, 0x80, 0x24,
-	0xe3, 0xa7, 0x44, 0xa6, 0x03, 0xf8, 0x04, 0xe1, 0x0b, 0x22, 0x85, 0xe9, 0x41, 0x3d, 0xa4, 0x42,
-	0x66, 0x95, 0x75, 0xf7, 0xda, 0xca, 0x4a, 0x76, 0x9d, 0xeb, 0x40, 0x0e, 0x91, 0x44, 0x59, 0xef,
-	0x6a, 0x2c, 0xfb, 0xbb, 0xb0, 0xf6, 0x31, 0x92, 0x03, 0x4e, 0x82, 0x91, 0x1c, 0xaf, 0x40, 0x4d,
-	0xe5, 0xcf, 0xd0, 0xf9, 0x53, 0x8f, 0xea, 0x3e, 0x60, 0xdd, 0xff, 0x34, 0x66, 0x5c, 0x92, 0xe0,
-	0xd2, 0x89, 0xbc, 0xe2, 0x78, 0x2f, 0x60, 0x4d, 0x1d, 0x96, 0x20, 0x51, 0xe0, 0x17, 0xfb, 0x4c,
-	0xf3, 0xd8, 0xdc, 0xfb, 0xf1, 0x44, 0xdd, 0x31, 0xee, 0x2e, 0xdb, 0xc0, 0x6a, 0x32, 0x26, 0x17,
-	0xf6, 0x6f, 0x0c, 0xb0, 0x8e, 0xc9, 0x70, 0x5f, 0x08, 0xda, 0x8d, 0xfa, 0x24, 0x92, 0x8a, 0x03,
-	0x11, 0x26, 0xea, 0xd1, 0x7c, 0x0b, 0x16, 0x8b, 0x99, 0xab, 0x47, 0xad, 0xa1, 0x47, 0xed, 0x42,
-	0x2e, 0x54, 0x0d, 0x66, 0xde, 0x03, 0x88, 0x39, 0x49, 0x7c, 0xec, 0x5f, 0x90, 0x61, 0x96, 0xc5,
-	0xcd, 0xea, 0x08, 0x4d, 0x7f, 0x4f, 0x3a, 0x27, 0x83, 0x4e, 0x48, 0xf1, 0x31, 0x19, 0x7a, 0xf3,
-	0x4a, 0xbf, 0x7d, 0x4c, 0x86, 0xea, 0x4e, 0x14, 0xb3, 0xe7, 0x84, 0xeb, 0xb9, 0x57, 0xf3, 0xd2,
-	0x17, 0xfb, 0xb7, 0x06, 0xdc, 0x28, 0xd2, 0x91, 0x97, 0xeb, 0xc9, 0xa0, 0xa3, 0x2c, 0x5e, 0x71,
-	0x6e, 0x97, 0xa2, 0x9d, 0xbe, 0x22, 0xda, 0xf7, 0x61, 0xa1, 0x68, 0x10, 0x15, 0x6f, 0x6d, 0x82,
-	0x78, 0x9b, 0xb9, 0xc5, 0x31, 0x19, 0xda, 0xbf, 0xac, 0xc4, 0x76, 0x30, 0xac, 0x70, 0x1f, 0xff,
-	0x0f, 0xb1, 0x15, 0x6e, 0xab, 0xb1, 0xe1, 0xaa, 0xfd, 0xa5, 0x0d, 0xd4, 0x2e, 0x6f, 0xc0, 0xfe,
-	0xbd, 0x01, 0xeb, 0x55, 0xaf, 0xe2, 0x8c, 0x9d, 0xf0, 0x41, 0x44, 0x5e, 0xe5, 0xbd, 0x6c, 0xbf,
-	0xe9, 0x6a, 0xfb, 0x3d, 0x81, 0xa5, 0x91, 0xa0, 0x44, 0x76, 0x1a, 0x3f, 0x9c, 0xa8, 0xc6, 0x2a,
-	0xec, 0xea, 0x2d, 0x56, 0xf7, 0x21, 0xec, 0x3f, 0x1a, 0xb0, 0x9a, 0xc7, 0x58, 0x1c, 0x96, 0xf9,
-	0x03, 0x30, 0x8b, 0xed, 0x95, 0xb7, 0xb7, 0xb4, 0xa4, 0x56, 0xf2, 0x95, 0xfc, 0xea, 0x56, 0x96,
-	0xc6, 0x74, 0xa5, 0x34, 0xcc, 0x8f, 0x60, 0xad, 0x08, 0x39, 0xd6, 0x09, 0x9a, 0x38, 0x8b, 0xc5,
-	0xfd, 0xb4, 0x10, 0xd9, 0xbf, 0x36, 0xca, 0x71, 0x98, 0xce, 0x63, 0xb1, 0x1f, 0x86, 0xd9, 0xa5,
-	0xde, 0x8c, 0x61, 0x2e, 0x1d, 0xf9, 0x22, 0xe3, 0x8f, 0xcd, 0x2b, 0x87, 0xfb, 0x21, 0xc1, 0x7a,
-	0xbe, 0xdf, 0x55, 0x2d, 0xf6, 0xe7, 0x6f, 0xb6, 0x6e, 0x77, 0xa9, 0xec, 0x0d, 0x3a, 0x0e, 0x66,
-	0x7d, 0x37, 0xfb, 0x1e, 0x92, 0xfe, 0xbb, 0x23, 0x82, 0x0b, 0x57, 0x0e, 0x63, 0x22, 0x72, 0x1b,
-	0xf1, 0xa7, 0x7f, 0xfc, 0xf5, 0xfb, 0x86, 0x97, 0xbb, 0x39, 0x78, 0xf2, 0xe5, 0x8b, 0x96, 0xf1,
-	0xd5, 0x8b, 0x96, 0xf1, 0xf7, 0x17, 0x2d, 0xe3, 0xb3, 0x97, 0xad, 0xa9, 0xaf, 0x5e, 0xb6, 0xa6,
-	0xfe, 0xf6, 0xb2, 0x35, 0xf5, 0xf3, 0xf7, 0x2e, 0x83, 0x96, 0x39, 0xba, 0x53, 0x7c, 0x81, 0x4a,
-	0x7e, 0xe4, 0x7e, 0x3a, 0xfa, 0x7d, 0x4b, 0xfb, 0xeb, 0xcc, 0x6a, 0x36, 0x7d, 0xf7, 0xdf, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x8f, 0xff, 0x87, 0xe4, 0x10, 0x13, 0x00, 0x00,
+	// 1892 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x73, 0x1c, 0x47,
+	0x15, 0xd7, 0x68, 0x57, 0x1f, 0xfb, 0x56, 0x9f, 0x23, 0x25, 0x1e, 0x19, 0xb1, 0x92, 0x27, 0x24,
+	0x08, 0x82, 0x67, 0x90, 0x02, 0x55, 0x2e, 0x17, 0xa9, 0x94, 0xb4, 0x72, 0x62, 0x59, 0x89, 0xad,
+	0x8c, 0x84, 0x5c, 0xc0, 0x61, 0xaa, 0xb7, 0xa7, 0xbd, 0xdb, 0xa5, 0xd9, 0xe9, 0x71, 0x77, 0xef,
+	0x38, 0x7b, 0xe1, 0xcc, 0x85, 0x22, 0xdc, 0x52, 0x5c, 0x08, 0x54, 0x51, 0x45, 0x71, 0x81, 0x3f,
+	0x23, 0xc7, 0x1c, 0x39, 0x25, 0x94, 0x7d, 0xe0, 0xc0, 0x95, 0x3f, 0x80, 0xea, 0x9e, 0xcf, 0x5d,
+	0x49, 0x66, 0x5d, 0x81, 0x8b, 0x34, 0xf3, 0xfa, 0xbd, 0xdf, 0x7b, 0xfd, 0xbe, 0x77, 0x60, 0x8f,
+	0x46, 0x92, 0x70, 0xdc, 0x43, 0x34, 0xf2, 0x05, 0xc1, 0x03, 0x4e, 0xe5, 0xd0, 0xc5, 0x38, 0x71,
+	0x63, 0xce, 0x12, 0x1a, 0x10, 0xee, 0x26, 0xbb, 0xc5, 0xb3, 0x13, 0x73, 0x26, 0x99, 0xf9, 0xc6,
+	0x15, 0x32, 0x0e, 0xc6, 0x89, 0x53, 0xf0, 0x25, 0xbb, 0x37, 0xdf, 0xbc, 0x0e, 0x38, 0xd9, 0x75,
+	0x9f, 0x51, 0x4e, 0x52, 0xac, 0x9b, 0xeb, 0x5d, 0xd6, 0x65, 0xfa, 0xd1, 0x55, 0x4f, 0x19, 0x75,
+	0xab, 0xcb, 0x58, 0x37, 0x24, 0xae, 0x7e, 0xeb, 0x0c, 0x9e, 0xb8, 0x92, 0xf6, 0x89, 0x90, 0xa8,
+	0x1f, 0x67, 0x0c, 0xad, 0x71, 0x86, 0x60, 0xc0, 0x91, 0xa4, 0x2c, 0xca, 0x01, 0x68, 0x07, 0xbb,
+	0x98, 0x71, 0xe2, 0xe2, 0x90, 0x92, 0x48, 0x2a, 0xad, 0xe9, 0x53, 0xc6, 0xe0, 0x2a, 0x86, 0x90,
+	0x76, 0x7b, 0x32, 0x25, 0x0b, 0x57, 0x92, 0x28, 0x20, 0xbc, 0x4f, 0x53, 0xe6, 0xf2, 0x2d, 0x13,
+	0xd8, 0xac, 0x9c, 0x63, 0x3e, 0x8c, 0x25, 0x73, 0x2f, 0xc8, 0x50, 0x64, 0xa7, 0x6f, 0x61, 0x26,
+	0xfa, 0x4c, 0xb8, 0x44, 0xdd, 0x3f, 0xc2, 0xc4, 0x4d, 0x76, 0x3b, 0x44, 0xa2, 0xdd, 0x82, 0x90,
+	0xdb, 0x9d, 0xf1, 0x75, 0x90, 0x28, 0x79, 0x30, 0xa3, 0xb9, 0xdd, 0xab, 0xa8, 0x4f, 0x23, 0xe6,
+	0xea, 0xbf, 0x29, 0xc9, 0xfe, 0xf7, 0x2c, 0x58, 0x6d, 0x16, 0x89, 0x41, 0x9f, 0xf0, 0xfd, 0x20,
+	0xa0, 0xea, 0x96, 0x27, 0x9c, 0xc5, 0x4c, 0xa0, 0xd0, 0x5c, 0x87, 0x19, 0x49, 0x65, 0x48, 0x2c,
+	0x63, 0xdb, 0xd8, 0x69, 0x78, 0xe9, 0x8b, 0xb9, 0x0d, 0xcd, 0x80, 0x08, 0xcc, 0x69, 0xac, 0x98,
+	0xad, 0x69, 0x7d, 0x56, 0x25, 0x99, 0x1b, 0x30, 0x9f, 0x86, 0x86, 0x06, 0x56, 0x4d, 0x1f, 0xcf,
+	0xe9, 0xf7, 0xa3, 0xc0, 0xfc, 0x00, 0x96, 0x68, 0x44, 0x25, 0x45, 0xa1, 0xdf, 0x23, 0xca, 0x41,
+	0x56, 0x7d, 0xdb, 0xd8, 0x69, 0xee, 0xdd, 0x74, 0x68, 0x07, 0x3b, 0xca, 0xa7, 0x4e, 0xe6, 0xc9,
+	0x64, 0xd7, 0xb9, 0xaf, 0x39, 0x0e, 0xea, 0x5f, 0x7c, 0xb5, 0x35, 0xe5, 0x2d, 0x66, 0x72, 0x29,
+	0xd1, 0xbc, 0x05, 0x0b, 0x5d, 0x12, 0x11, 0x41, 0x85, 0xdf, 0x43, 0xa2, 0x67, 0xcd, 0x6c, 0x1b,
+	0x3b, 0x0b, 0x5e, 0x33, 0xa3, 0xdd, 0x47, 0xa2, 0x67, 0x6e, 0x41, 0xb3, 0x43, 0x23, 0xc4, 0x87,
+	0x29, 0xc7, 0xac, 0xe6, 0x80, 0x94, 0xa4, 0x19, 0xda, 0x00, 0x22, 0x46, 0xcf, 0x22, 0x5f, 0x25,
+	0x80, 0x35, 0x97, 0x19, 0x92, 0x06, 0xdf, 0xc9, 0x83, 0xef, 0x9c, 0xe5, 0xd9, 0x71, 0x30, 0xaf,
+	0x0c, 0xf9, 0xf4, 0xeb, 0x2d, 0xc3, 0x6b, 0x68, 0x39, 0x75, 0x62, 0x3e, 0x84, 0x95, 0x41, 0xd4,
+	0x61, 0x51, 0x40, 0xa3, 0xae, 0x1f, 0x13, 0x4e, 0x59, 0x60, 0xcd, 0x6b, 0xa8, 0x8d, 0x4b, 0x50,
+	0x87, 0x59, 0x1e, 0xa5, 0x48, 0x9f, 0x29, 0xa4, 0xe5, 0x42, 0xf8, 0x44, 0xcb, 0x9a, 0x1f, 0x83,
+	0x89, 0x71, 0xa2, 0x4d, 0x62, 0x03, 0x99, 0x23, 0x36, 0x26, 0x47, 0x5c, 0xc1, 0x38, 0x39, 0x4b,
+	0xa5, 0x33, 0xc8, 0x5f, 0xc0, 0x0d, 0xc9, 0x51, 0x24, 0x9e, 0x10, 0x3e, 0x8e, 0x0b, 0x93, 0xe3,
+	0xbe, 0x96, 0x63, 0x8c, 0x82, 0xdf, 0x87, 0x6d, 0x9c, 0x25, 0x90, 0xcf, 0x49, 0x40, 0x85, 0xe4,
+	0xb4, 0x33, 0x50, 0xb2, 0xfe, 0x13, 0x8e, 0xb0, 0xce, 0x91, 0xa6, 0x4e, 0x82, 0x56, 0xce, 0xe7,
+	0x8d, 0xb0, 0xbd, 0x9f, 0x71, 0x99, 0x8f, 0xe0, 0x3b, 0x9d, 0x90, 0xe1, 0x0b, 0xa1, 0x8c, 0xf3,
+	0x47, 0x90, 0xb4, 0xea, 0x3e, 0x15, 0x42, 0xa1, 0x2d, 0x6c, 0x1b, 0x3b, 0x35, 0xef, 0x56, 0xca,
+	0x7b, 0x42, 0xf8, 0x61, 0x85, 0xf3, 0xac, 0xc2, 0x68, 0xde, 0x06, 0xb3, 0x47, 0x85, 0x64, 0x9c,
+	0x62, 0x14, 0xfa, 0x24, 0x92, 0x9c, 0x12, 0x61, 0x2d, 0x6a, 0xf1, 0xd5, 0xf2, 0xe4, 0x5e, 0x7a,
+	0x60, 0x3e, 0x80, 0x5b, 0xd7, 0x2a, 0xf5, 0x71, 0x0f, 0x45, 0x11, 0x09, 0xad, 0x25, 0x7d, 0x95,
+	0xad, 0xe0, 0x1a, 0x9d, 0xed, 0x94, 0xcd, 0x5c, 0x83, 0x19, 0xc9, 0x62, 0xff, 0xa1, 0xb5, 0xbc,
+	0x6d, 0xec, 0x2c, 0x7a, 0x75, 0xc9, 0xe2, 0x87, 0x77, 0xe7, 0x7f, 0xf5, 0xf9, 0xd6, 0xd4, 0x67,
+	0x9f, 0x6f, 0x4d, 0xd9, 0x7f, 0x35, 0xe0, 0x46, 0xbb, 0xf0, 0x46, 0x9f, 0x25, 0x28, 0xfc, 0x7f,
+	0x56, 0xdd, 0x3e, 0x34, 0x84, 0x32, 0x47, 0xe7, 0x79, 0xfd, 0x15, 0xf2, 0x7c, 0x5e, 0x89, 0xa9,
+	0x03, 0xfb, 0xf7, 0x06, 0xac, 0xdf, 0x7b, 0x3a, 0xa0, 0x09, 0xc3, 0xe8, 0x7f, 0xd2, 0x24, 0x8e,
+	0x61, 0x91, 0x54, 0xf0, 0x84, 0x55, 0xdb, 0xae, 0xed, 0x34, 0xf7, 0xde, 0x74, 0xd2, 0x26, 0xe6,
+	0x14, 0xbd, 0x2d, 0x6b, 0x64, 0x4e, 0x55, 0xbb, 0x37, 0x2a, 0x7b, 0x77, 0xda, 0x32, 0xec, 0x3f,
+	0x1a, 0x70, 0x53, 0xb9, 0xbf, 0x4b, 0x3c, 0xf2, 0x0c, 0xf1, 0xe0, 0x90, 0x44, 0xac, 0x2f, 0xbe,
+	0xb1, 0x9d, 0x36, 0x2c, 0x06, 0x1a, 0xc9, 0x97, 0xcc, 0x47, 0x41, 0xa0, 0xed, 0xd4, 0x3c, 0x8a,
+	0x78, 0xc6, 0xf6, 0x83, 0xc0, 0xdc, 0x81, 0x95, 0x92, 0x87, 0xab, 0x78, 0x2a, 0x37, 0x2b, 0xb6,
+	0xa5, 0x9c, 0x4d, 0x47, 0x99, 0xd8, 0xff, 0x32, 0x60, 0xe5, 0x83, 0x90, 0x75, 0x50, 0x78, 0x1a,
+	0x22, 0xd1, 0x53, 0xa9, 0x37, 0x54, 0xe1, 0xe1, 0x24, 0xab, 0x79, 0x6d, 0xde, 0xc4, 0xe1, 0x51,
+	0x62, 0xba, 0x0b, 0xbd, 0x07, 0xab, 0x45, 0x15, 0x16, 0x59, 0xa0, 0x6f, 0x73, 0xb0, 0xf6, 0xfc,
+	0xab, 0xad, 0xe5, 0x3c, 0xd9, 0xda, 0x3a, 0x23, 0x0e, 0xbd, 0x65, 0x3c, 0x42, 0x08, 0xcc, 0x16,
+	0x34, 0x69, 0x07, 0xfb, 0x82, 0x3c, 0xf5, 0xa3, 0x41, 0x5f, 0x27, 0x50, 0xdd, 0x6b, 0xd0, 0x0e,
+	0x3e, 0x25, 0x4f, 0x1f, 0x0e, 0xfa, 0xe6, 0x3b, 0xf0, 0x7a, 0x3e, 0x80, 0xfd, 0x04, 0x85, 0xbe,
+	0x92, 0x57, 0xee, 0xe0, 0x3a, 0x9f, 0x16, 0xbc, 0xb5, 0xfc, 0xf4, 0x1c, 0x85, 0x4a, 0xd9, 0x7e,
+	0x10, 0x70, 0xfb, 0xc5, 0x0c, 0xcc, 0x9e, 0x20, 0x8e, 0xfa, 0xc2, 0x3c, 0x83, 0x65, 0x49, 0xfa,
+	0x71, 0x88, 0x24, 0xf1, 0xd3, 0x0e, 0x9f, 0xdd, 0xf4, 0x6d, 0xdd, 0xf9, 0xab, 0xc3, 0xd2, 0xa9,
+	0x8c, 0xc7, 0x64, 0xd7, 0x69, 0x6b, 0xea, 0xa9, 0x44, 0x92, 0x78, 0x4b, 0x39, 0x46, 0x4a, 0x34,
+	0xef, 0x80, 0x25, 0xf9, 0x40, 0xc8, 0xb2, 0xf7, 0x96, 0x4d, 0x27, 0x8d, 0xe5, 0xeb, 0xf9, 0x79,
+	0xda, 0xae, 0x8a, 0x66, 0x73, 0x75, 0x9b, 0xad, 0x7d, 0x93, 0x36, 0x7b, 0x0a, 0x6b, 0x6a, 0x46,
+	0x8d, 0x63, 0xd6, 0x27, 0xc7, 0x5c, 0x55, 0xf2, 0xa3, 0xa0, 0x1f, 0x83, 0x99, 0x08, 0x3c, 0x8e,
+	0x39, 0xf3, 0x0a, 0x76, 0x26, 0x02, 0x8f, 0x42, 0x06, 0xb0, 0x29, 0x54, 0xf2, 0xf9, 0x7d, 0x22,
+	0x75, 0xd3, 0x8e, 0x43, 0x12, 0x51, 0xd1, 0xcb, 0xc1, 0x67, 0x27, 0x07, 0xdf, 0xd0, 0x40, 0x1f,
+	0x29, 0x1c, 0x2f, 0x87, 0xc9, 0xb4, 0xb4, 0xa1, 0x75, 0xb5, 0x96, 0x22, 0x40, 0x73, 0x3a, 0x40,
+	0xdf, 0xba, 0x02, 0xa2, 0x88, 0x92, 0x80, 0xb7, 0x2a, 0xc3, 0x45, 0x55, 0xb5, 0xaf, 0x0b, 0xca,
+	0xe7, 0xa4, 0xab, 0x3a, 0x30, 0x4a, 0xe7, 0x0c, 0x21, 0xc5, 0x80, 0xcc, 0xba, 0x87, 0x5a, 0x81,
+	0x8a, 0xce, 0xd1, 0x66, 0x34, 0xca, 0xb6, 0x08, 0xbb, 0x9c, 0x41, 0x45, 0x8f, 0xf0, 0x2a, 0x58,
+	0xef, 0x13, 0xa2, 0xaa, 0xb9, 0x32, 0x87, 0x48, 0xcc, 0x70, 0x4f, 0xcf, 0xc9, 0x9a, 0xb7, 0x54,
+	0xcc, 0x9c, 0x7b, 0x8a, 0xfa, 0xa0, 0x3e, 0x3f, 0xbf, 0xd2, 0xb0, 0xbf, 0x07, 0x0d, 0x5d, 0xcc,
+	0xfb, 0xf8, 0x42, 0x98, 0x9b, 0xd0, 0x50, 0x55, 0x41, 0x84, 0x20, 0xc2, 0x32, 0x74, 0x0f, 0x28,
+	0x09, 0xb6, 0x84, 0x8d, 0xeb, 0xb6, 0x2d, 0x61, 0x3e, 0x86, 0xb9, 0x98, 0xe8, 0x55, 0x40, 0x0b,
+	0x36, 0xf7, 0xde, 0x75, 0x26, 0xd8, 0x85, 0x9d, 0xeb, 0x00, 0xbd, 0x1c, 0xcd, 0xe6, 0xe5, 0x8e,
+	0x37, 0x36, 0x6c, 0x84, 0x79, 0x3e, 0xae, 0xf4, 0x27, 0xaf, 0xa4, 0x74, 0x0c, 0xaf, 0xd4, 0xf9,
+	0x36, 0x34, 0xf7, 0xd3, 0x6b, 0x7f, 0x48, 0x85, 0xbc, 0xec, 0x96, 0x85, 0xaa, 0x5b, 0x1e, 0xc0,
+	0x52, 0x36, 0x38, 0xcf, 0x98, 0x6e, 0x48, 0xe6, 0xb7, 0x01, 0xb2, 0x89, 0xab, 0x1a, 0x59, 0xda,
+	0xb2, 0x1b, 0x19, 0xe5, 0x28, 0x18, 0x99, 0x75, 0xd3, 0x23, 0xb3, 0xce, 0xf6, 0x60, 0xf9, 0x5c,
+	0xe0, 0x9f, 0xe6, 0x5b, 0xd5, 0xa3, 0x58, 0x98, 0xaf, 0xc1, 0xac, 0xaa, 0xa1, 0x0c, 0xa8, 0xee,
+	0xcd, 0x24, 0x02, 0x1f, 0xe9, 0xae, 0x5d, 0x6e, 0x6e, 0x2c, 0xf6, 0x69, 0x20, 0xac, 0xe9, 0xed,
+	0xda, 0x4e, 0xdd, 0x5b, 0x1a, 0x94, 0xe2, 0x47, 0x81, 0xb0, 0x7f, 0x06, 0xcd, 0x0a, 0xa0, 0xb9,
+	0x04, 0xd3, 0x05, 0xd6, 0x34, 0x0d, 0xcc, 0xbb, 0xb0, 0x51, 0x02, 0x8d, 0xb6, 0xe1, 0x14, 0xb1,
+	0xe1, 0xdd, 0x28, 0x18, 0x46, 0x3a, 0xb1, 0xb0, 0x1f, 0xc1, 0xfa, 0x51, 0x59, 0xf4, 0x45, 0x93,
+	0x1f, 0xb9, 0xa1, 0x31, 0x3a, 0xcd, 0x37, 0xa1, 0x51, 0xfc, 0x62, 0xd1, 0xb7, 0xaf, 0x7b, 0x25,
+	0xc1, 0xee, 0xc3, 0xca, 0xb9, 0xc0, 0xa7, 0x24, 0x0a, 0x4a, 0xb0, 0x6b, 0x1c, 0x70, 0x30, 0x0e,
+	0x34, 0xf1, 0xfa, 0x5b, 0xaa, 0x63, 0xb0, 0x71, 0x8e, 0x42, 0x1a, 0x20, 0xc9, 0xf8, 0x29, 0x91,
+	0xe9, 0x00, 0x3e, 0x41, 0xf8, 0x82, 0x48, 0x61, 0x7a, 0x50, 0x0f, 0xa9, 0x90, 0x59, 0x66, 0xdd,
+	0xb9, 0x36, 0xb3, 0x92, 0x5d, 0xe7, 0x3a, 0x90, 0x43, 0x24, 0x51, 0x56, 0xbb, 0x1a, 0xcb, 0xfe,
+	0x2e, 0xac, 0x7d, 0x84, 0xe4, 0x80, 0x93, 0x60, 0x24, 0xc6, 0x2b, 0x50, 0x53, 0xf1, 0x33, 0x74,
+	0xfc, 0xd4, 0xa3, 0xda, 0x07, 0xac, 0x7b, 0x9f, 0xc4, 0x8c, 0x4b, 0x12, 0x5c, 0xf2, 0xc8, 0x4b,
+	0xdc, 0x7b, 0x01, 0x6b, 0xca, 0x59, 0x82, 0x44, 0x81, 0x5f, 0xdc, 0x33, 0x8d, 0x63, 0x73, 0xef,
+	0xc7, 0x13, 0x55, 0xc7, 0xb8, 0xba, 0xec, 0x02, 0xab, 0xc9, 0x18, 0x5d, 0xd8, 0xbf, 0x35, 0xc0,
+	0x3a, 0x26, 0xc3, 0x7d, 0x21, 0x68, 0x37, 0xea, 0x93, 0x48, 0xaa, 0x1e, 0x88, 0x30, 0x51, 0x8f,
+	0xe6, 0x1b, 0xb0, 0x58, 0xcc, 0x5c, 0x3d, 0x6a, 0x0d, 0x3d, 0x6a, 0x17, 0x72, 0xa2, 0x2a, 0x30,
+	0xf3, 0x2e, 0x40, 0xcc, 0x49, 0xe2, 0x63, 0xff, 0x82, 0x0c, 0xb3, 0x28, 0x6e, 0x56, 0x47, 0x68,
+	0xfa, 0x7b, 0xd2, 0x39, 0x19, 0x74, 0x42, 0x8a, 0x8f, 0xc9, 0xd0, 0x9b, 0x57, 0xfc, 0xed, 0x63,
+	0x32, 0x54, 0x3b, 0x51, 0xcc, 0x9e, 0x11, 0xae, 0xe7, 0x5e, 0xcd, 0x4b, 0x5f, 0xec, 0xdf, 0x19,
+	0x70, 0xa3, 0x08, 0x47, 0x9e, 0xae, 0x27, 0x83, 0x8e, 0x92, 0x78, 0x89, 0xdf, 0x2e, 0x59, 0x3b,
+	0x7d, 0x85, 0xb5, 0xef, 0xc1, 0x42, 0x51, 0x20, 0xca, 0xde, 0xda, 0x04, 0xf6, 0x36, 0x73, 0x89,
+	0x63, 0x32, 0xb4, 0x7f, 0x59, 0xb1, 0xed, 0x60, 0x58, 0xe9, 0x7d, 0xfc, 0xbf, 0xd8, 0x56, 0xa8,
+	0xad, 0xda, 0x86, 0xab, 0xf2, 0x97, 0x2e, 0x50, 0xbb, 0x7c, 0x01, 0xfb, 0x0f, 0x06, 0xac, 0x57,
+	0xb5, 0x8a, 0x33, 0x76, 0xc2, 0x07, 0x11, 0x79, 0x99, 0xf6, 0xb2, 0xfc, 0xa6, 0xab, 0xe5, 0xf7,
+	0x18, 0x96, 0x46, 0x8c, 0x12, 0x99, 0x37, 0x7e, 0x38, 0x51, 0x8e, 0x55, 0xba, 0xab, 0xb7, 0x58,
+	0xbd, 0x87, 0xb0, 0xff, 0x64, 0xc0, 0x6a, 0x6e, 0x63, 0xe1, 0x2c, 0xf3, 0x07, 0x60, 0x16, 0xd7,
+	0x2b, 0xb7, 0xb7, 0x34, 0xa5, 0x56, 0xf2, 0x93, 0x7c, 0x75, 0x2b, 0x53, 0x63, 0xba, 0x92, 0x1a,
+	0xe6, 0x87, 0xb0, 0x56, 0x98, 0x1c, 0xeb, 0x00, 0x4d, 0x1c, 0xc5, 0x62, 0x3f, 0x2d, 0x48, 0xf6,
+	0xaf, 0x8d, 0x72, 0x1c, 0xa6, 0xf3, 0x58, 0xec, 0x87, 0x61, 0xb6, 0xd4, 0x9b, 0x31, 0xcc, 0xa5,
+	0x23, 0x5f, 0x64, 0xfd, 0x63, 0xf3, 0xca, 0xe1, 0x7e, 0x48, 0xb0, 0x9e, 0xef, 0x77, 0x54, 0x89,
+	0xfd, 0xe5, 0xeb, 0xad, 0xb7, 0xbb, 0x54, 0xf6, 0x06, 0x1d, 0x07, 0xb3, 0xbe, 0x9b, 0x7d, 0x0f,
+	0x49, 0xff, 0xdd, 0x16, 0xc1, 0x85, 0x2b, 0x87, 0x31, 0x11, 0xb9, 0x8c, 0xf8, 0xf3, 0x3f, 0xff,
+	0xf6, 0x7d, 0xc3, 0xcb, 0xd5, 0xd8, 0xbf, 0x31, 0x60, 0xe5, 0x51, 0x2c, 0x49, 0x70, 0x14, 0x95,
+	0x6e, 0x9b, 0xa8, 0x08, 0x6f, 0xc1, 0x82, 0x5e, 0x0d, 0xf2, 0x8f, 0x1a, 0xa9, 0xd3, 0x9a, 0x9a,
+	0x96, 0x7d, 0xb0, 0xb8, 0xb2, 0xd6, 0xd4, 0x9c, 0xab, 0xf8, 0x31, 0x5d, 0xa5, 0x1b, 0x71, 0xee,
+	0xa1, 0x83, 0xc7, 0x5f, 0x3c, 0x6f, 0x19, 0x5f, 0x3e, 0x6f, 0x19, 0xff, 0x78, 0xde, 0x32, 0x3e,
+	0x7d, 0xd1, 0x9a, 0xfa, 0xf2, 0x45, 0x6b, 0xea, 0xef, 0x2f, 0x5a, 0x53, 0x3f, 0x7f, 0xf7, 0xf2,
+	0x35, 0xcb, 0xac, 0xb9, 0x5d, 0x7c, 0x13, 0x4b, 0x7e, 0xe4, 0x7e, 0x32, 0xfa, 0xc5, 0x4d, 0x7b,
+	0xa0, 0x33, 0xab, 0xfb, 0xfb, 0x3b, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x12, 0x76, 0xb8,
+	0xa2, 0x13, 0x00, 0x00,
 }
 
 func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) {
@@ -2819,6 +2897,53 @@ func (m *ConsumerRewardsAllocation) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	return len(dAtA) - i, nil
 }
 
+func (m *OptedInValidator) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *OptedInValidator) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *OptedInValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.PublicKey) > 0 {
+		i -= len(m.PublicKey)
+		copy(dAtA[i:], m.PublicKey)
+		i = encodeVarintProvider(dAtA, i, uint64(len(m.PublicKey)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.Power != 0 {
+		i = encodeVarintProvider(dAtA, i, uint64(m.Power))
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.BlockHeight != 0 {
+		i = encodeVarintProvider(dAtA, i, uint64(m.BlockHeight))
+		i--
+		dAtA[i] = 0x10
+	}
+	if len(m.ProviderAddr) > 0 {
+		i -= len(m.ProviderAddr)
+		copy(dAtA[i:], m.ProviderAddr)
+		i = encodeVarintProvider(dAtA, i, uint64(len(m.ProviderAddr)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintProvider(dAtA []byte, offset int, v uint64) int {
 	offset -= sovProvider(v)
 	base := offset
@@ -3328,6 +3453,29 @@ func (m *ConsumerRewardsAllocation) Size() (n int) {
 	return n
 }
 
+func (m *OptedInValidator) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.ProviderAddr)
+	if l > 0 {
+		n += 1 + l + sovProvider(uint64(l))
+	}
+	if m.BlockHeight != 0 {
+		n += 1 + sovProvider(uint64(m.BlockHeight))
+	}
+	if m.Power != 0 {
+		n += 1 + sovProvider(uint64(m.Power))
+	}
+	l = len(m.PublicKey)
+	if l > 0 {
+		n += 1 + l + sovProvider(uint64(l))
+	}
+	return n
+}
+
 func sovProvider(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -6863,6 +7011,162 @@ func (m *ConsumerRewardsAllocation) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *OptedInValidator) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowProvider
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: OptedInValidator: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: OptedInValidator: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ProviderAddr", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthProvider
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ProviderAddr = append(m.ProviderAddr[:0], dAtA[iNdEx:postIndex]...)
+			if m.ProviderAddr == nil {
+				m.ProviderAddr = []byte{}
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlockHeight", wireType)
+			}
+			m.BlockHeight = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.BlockHeight |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Power", wireType)
+			}
+			m.Power = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Power |= int64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PublicKey", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProvider
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthProvider
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.PublicKey = append(m.PublicKey[:0], dAtA[iNdEx:postIndex]...)
+			if m.PublicKey == nil {
+				m.PublicKey = []byte{}
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProvider(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthProvider
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipProvider(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0