From eb501ca6519cdb232e89965be963bc4049fe9d1d Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 2 Nov 2022 12:12:53 +0000 Subject: [PATCH] Fix build errors --- .../ccv/provider/v1/keyassignment.proto | 2 +- x/ccv/provider/keeper/genesis.go | 18 ++--- x/ccv/provider/keeper/genesis_test.go | 14 ++-- x/ccv/provider/keeper/keyassignment.go | 37 +++++------ x/ccv/provider/keeper/keyassignment_test.go | 19 +++--- x/ccv/provider/types/consumer.go | 4 +- x/ccv/provider/types/genesis.pb.go | 8 +-- .../{ => provider}/types/keyassignment.pb.go | 66 +++++++++---------- x/ccv/provider/types/tx.pb.go | 1 - 9 files changed, 84 insertions(+), 85 deletions(-) rename x/ccv/{ => provider}/types/keyassignment.pb.go (91%) diff --git a/proto/interchain_security/ccv/provider/v1/keyassignment.proto b/proto/interchain_security/ccv/provider/v1/keyassignment.proto index eaead2c80f..ffbb576e6c 100644 --- a/proto/interchain_security/ccv/provider/v1/keyassignment.proto +++ b/proto/interchain_security/ccv/provider/v1/keyassignment.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/x/ccv/types"; +option go_package = "github.com/cosmos/interchain-security/x/ccv/provider/types"; import "gogoproto/gogo.proto"; import "tendermint/crypto/keys.proto"; diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index 848c0e73d4..fcc275bee2 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -129,21 +129,21 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { } } - keyAssignment := func() *ccv.KeyAssignment { - km := &ccv.KeyAssignment{} - km.ProviderConsAddrToConsumerKey = []ccv.ConsAddrToKey{} - km.ConsumerKeyToProviderKey = []ccv.KeyToKey{} - km.ConsumerConsAddrToLastUpdateMemo = []ccv.ConsAddrToLastUpdateMemo{} + keyAssignment := func() *types.KeyAssignment { + km := &types.KeyAssignment{} + km.ProviderConsAddrToConsumerKey = []types.ConsAddrToKey{} + km.ConsumerKeyToProviderKey = []types.KeyToKey{} + km.ConsumerConsAddrToLastUpdateMemo = []types.ConsAddrToLastUpdateMemo{} k.KeyAssignment(ctx, chainID).Store.IterateProviderConsAddrToConsumerPublicKey(func(pca ProviderConsAddr, ck ConsumerPublicKey) bool { - km.ProviderConsAddrToConsumerKey = append(km.ProviderConsAddrToConsumerKey, ccv.ConsAddrToKey{ConsAddr: pca, Key: &ck}) + km.ProviderConsAddrToConsumerKey = append(km.ProviderConsAddrToConsumerKey, types.ConsAddrToKey{ConsAddr: pca, Key: &ck}) return false }) k.KeyAssignment(ctx, chainID).Store.IterateConsumerPublicKeyToProviderPublicKey(func(ck ConsumerPublicKey, pk ProviderPublicKey) bool { - km.ConsumerKeyToProviderKey = append(km.ConsumerKeyToProviderKey, ccv.KeyToKey{From: &ck, To: &pk}) + km.ConsumerKeyToProviderKey = append(km.ConsumerKeyToProviderKey, types.KeyToKey{From: &ck, To: &pk}) return false }) - k.KeyAssignment(ctx, chainID).Store.IterateConsumerConsAddrToLastUpdateMemo(func(ck ConsumerConsAddr, m ccv.LastUpdateMemo) bool { - km.ConsumerConsAddrToLastUpdateMemo = append(km.ConsumerConsAddrToLastUpdateMemo, ccv.ConsAddrToLastUpdateMemo{ConsAddr: ck, LastUpdateMemo: &m}) + k.KeyAssignment(ctx, chainID).Store.IterateConsumerConsAddrToLastUpdateMemo(func(ck ConsumerConsAddr, m types.LastUpdateMemo) bool { + km.ConsumerConsAddrToLastUpdateMemo = append(km.ConsumerConsAddrToLastUpdateMemo, types.ConsAddrToLastUpdateMemo{ConsAddr: ck, LastUpdateMemo: &m}) return false }) diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index 9d1eda8576..55e585a51f 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -26,16 +26,16 @@ func TestIniAndExportGenesis(t *testing.T) { initHeight, vscID := uint64(5), uint64(1) ubdIndex := []uint64{0, 1, 2} params := providertypes.DefaultParams() - keyAssignments := []ccv.KeyAssignment{ + keyAssignments := []providertypes.KeyAssignment{ { - ProviderConsAddrToConsumerKey: []ccv.ConsAddrToKey{{ConsAddr: sdk.ConsAddress{}, Key: &tmprotocrypto.PublicKey{}}}, - ConsumerKeyToProviderKey: []ccv.KeyToKey{}, - ConsumerConsAddrToLastUpdateMemo: []ccv.ConsAddrToLastUpdateMemo{}, + ProviderConsAddrToConsumerKey: []providertypes.ConsAddrToKey{{ConsAddr: sdk.ConsAddress{}, Key: &tmprotocrypto.PublicKey{}}}, + ConsumerKeyToProviderKey: []providertypes.KeyToKey{}, + ConsumerConsAddrToLastUpdateMemo: []providertypes.ConsAddrToLastUpdateMemo{}, }, { - ProviderConsAddrToConsumerKey: []ccv.ConsAddrToKey{}, - ConsumerKeyToProviderKey: []ccv.KeyToKey{}, - ConsumerConsAddrToLastUpdateMemo: []ccv.ConsAddrToLastUpdateMemo{}, + ProviderConsAddrToConsumerKey: []providertypes.ConsAddrToKey{}, + ConsumerKeyToProviderKey: []providertypes.KeyToKey{}, + ConsumerConsAddrToLastUpdateMemo: []providertypes.ConsAddrToLastUpdateMemo{}, }, } diff --git a/x/ccv/provider/keeper/keyassignment.go b/x/ccv/provider/keeper/keyassignment.go index 51f66d491e..b9dd593067 100644 --- a/x/ccv/provider/keeper/keyassignment.go +++ b/x/ccv/provider/keeper/keyassignment.go @@ -5,7 +5,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" - ccvtypes "github.com/cosmos/interchain-security/x/ccv/types" sdkcryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" @@ -39,16 +38,16 @@ func PubKeyToConsAddr(k tmprotocrypto.PublicKey) sdk.ConsAddress { type Store interface { SetProviderConsAddrToConsumerPublicKey(ProviderConsAddr, ConsumerPublicKey) SetConsumerPublicKeyToProviderPublicKey(ConsumerPublicKey, ProviderPublicKey) - SetConsumerConsAddrToLastUpdateMemo(ConsumerConsAddr, ccvtypes.LastUpdateMemo) + SetConsumerConsAddrToLastUpdateMemo(ConsumerConsAddr, providertypes.LastUpdateMemo) GetProviderConsAddrToConsumerPublicKey(ProviderConsAddr) (ConsumerPublicKey, bool) GetConsumerPublicKeyToProviderPublicKey(ConsumerPublicKey) (ProviderPublicKey, bool) - GetConsumerConsAddrToLastUpdateMemo(ConsumerConsAddr) (ccvtypes.LastUpdateMemo, bool) + GetConsumerConsAddrToLastUpdateMemo(ConsumerConsAddr) (providertypes.LastUpdateMemo, bool) DelProviderConsAddrToConsumerPublicKey(ProviderConsAddr) DelConsumerPublicKeyToProviderPublicKey(ConsumerPublicKey) DelConsumerConsAddrToLastUpdateMemo(ConsumerConsAddr) IterateProviderConsAddrToConsumerPublicKey(func(ProviderConsAddr, ConsumerPublicKey) bool) IterateConsumerPublicKeyToProviderPublicKey(func(ConsumerPublicKey, ProviderPublicKey) bool) - IterateConsumerConsAddrToLastUpdateMemo(func(ConsumerConsAddr, ccvtypes.LastUpdateMemo) bool) + IterateConsumerConsAddrToLastUpdateMemo(func(ConsumerConsAddr, providertypes.LastUpdateMemo) bool) } type KeyAssignment struct { @@ -84,7 +83,7 @@ func (ka *KeyAssignment) DeleteProviderKey(pca ProviderConsAddr) error { } ka.Store.DelProviderConsAddrToConsumerPublicKey(pca) toDelete := []ConsumerConsAddr{} - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, lum ccvtypes.LastUpdateMemo) bool { + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, lum providertypes.LastUpdateMemo) bool { pcaInMemo := PubKeyToConsAddr(*lum.ProviderKey) if pca.Equals(pcaInMemo) { // TODO: find other place where I should have used Equals toDelete = append(toDelete, cca) @@ -114,7 +113,7 @@ func (ka *KeyAssignment) GetProviderPubKeyFromConsumerConsAddress(cca sdk.ConsAd func (ka *KeyAssignment) PruneUnusedKeys(latestVscid VSCID) { toDel := []ConsumerConsAddr{} - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m ccvtypes.LastUpdateMemo) bool { + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m providertypes.LastUpdateMemo) bool { if m.Power == 0 && m.Vscid <= latestVscid { toDel = append(toDel, cca) } @@ -134,7 +133,7 @@ func (ka *KeyAssignment) getProviderKeysForUpdate(stakingUpdates map[ProviderPub // Get provider keys which the consumer is aware of, because the // last update sent to the consumer was a positive power update // and the assigned key has changed since that update. - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m ccvtypes.LastUpdateMemo) bool { + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m providertypes.LastUpdateMemo) bool { pca := PubKeyToConsAddr(*m.ProviderKey) if newCk, ok := ka.Store.GetProviderConsAddrToConsumerPublicKey(pca); ok { // TODO: do away with ok, should always be ok oldCk := m.ConsumerKey @@ -158,9 +157,9 @@ func (ka *KeyAssignment) getProviderKeysForUpdate(stakingUpdates map[ProviderPub return keys, included } -func (ka KeyAssignment) getProviderKeysLastPositiveUpdate(mustCreateUpdate map[string]bool) map[string]ccvtypes.LastUpdateMemo { - lastUpdate := map[string]ccvtypes.LastUpdateMemo{} - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ ConsumerConsAddr, m ccvtypes.LastUpdateMemo) bool { +func (ka KeyAssignment) getProviderKeysLastPositiveUpdate(mustCreateUpdate map[string]bool) map[string]providertypes.LastUpdateMemo { + lastUpdate := map[string]providertypes.LastUpdateMemo{} + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ ConsumerConsAddr, m providertypes.LastUpdateMemo) bool { s := DeterministicStringify(*m.ProviderKey) if 0 < m.Power { if _, found := mustCreateUpdate[s]; found { @@ -196,7 +195,7 @@ func (ka *KeyAssignment) getConsumerUpdates(vscid VSCID, stakingUpdates map[Prov canonicalConsumerKey[s] = *u.ConsumerKey consumerUpdates[*u.ConsumerKey] = 0 cca := PubKeyToConsAddr(*u.ConsumerKey) - ka.Store.SetConsumerConsAddrToLastUpdateMemo(cca, ccvtypes.LastUpdateMemo{ConsumerKey: u.ConsumerKey, ProviderKey: &pk, Vscid: vscid, Power: 0}) + ka.Store.SetConsumerConsAddrToLastUpdateMemo(cca, providertypes.LastUpdateMemo{ConsumerKey: u.ConsumerKey, ProviderKey: &pk, Vscid: vscid, Power: 0}) } } @@ -229,7 +228,7 @@ func (ka *KeyAssignment) getConsumerUpdates(vscid VSCID, stakingUpdates map[Prov panic("must find ck for pk") } cca := PubKeyToConsAddr(ck) - ka.Store.SetConsumerConsAddrToLastUpdateMemo(cca, ccvtypes.LastUpdateMemo{ConsumerKey: &ck, ProviderKey: &pk, Vscid: vscid, Power: power}) + ka.Store.SetConsumerConsAddrToLastUpdateMemo(cca, providertypes.LastUpdateMemo{ConsumerKey: &ck, ProviderKey: &pk, Vscid: vscid, Power: power}) if k, found := canonicalConsumerKey[DeterministicStringify(ck)]; found { consumerUpdates[k] = power } else { @@ -330,7 +329,7 @@ func (ka *KeyAssignment) InternalInvariants() bool { { // All entries in ckToMemo have a consumer consensus // address which is the address held inside - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m ccvtypes.LastUpdateMemo) bool { + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca ConsumerConsAddr, m providertypes.LastUpdateMemo) bool { cons := PubKeyToConsAddr(*m.ConsumerKey) if len(cca) != len(cons) { good = false @@ -348,7 +347,7 @@ func (ka *KeyAssignment) InternalInvariants() bool { // The set of all LastUpdateMemos with positive power // has pairwise unique provider keys seen := map[string]bool{} - ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ ConsumerConsAddr, m ccvtypes.LastUpdateMemo) bool { + ka.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ ConsumerConsAddr, m providertypes.LastUpdateMemo) bool { if 0 < m.Power { s := DeterministicStringify(*m.ProviderKey) if _, ok := seen[s]; ok { @@ -392,7 +391,7 @@ func (s *KeyAssignmentStore) SetConsumerPublicKeyToProviderPublicKey(k ConsumerP } s.Store.Set(providertypes.KeyAssignmentCkToPkKey(s.ChainID, kbz), vbz) } -func (s *KeyAssignmentStore) SetConsumerConsAddrToLastUpdateMemo(k ConsumerConsAddr, v ccvtypes.LastUpdateMemo) { +func (s *KeyAssignmentStore) SetConsumerConsAddrToLastUpdateMemo(k ConsumerConsAddr, v providertypes.LastUpdateMemo) { kbz, err := k.Marshal() if err != nil { panic(err) @@ -431,13 +430,13 @@ func (s *KeyAssignmentStore) GetConsumerPublicKeyToProviderPublicKey(k ConsumerP } return v, false } -func (s *KeyAssignmentStore) GetConsumerConsAddrToLastUpdateMemo(k ConsumerConsAddr) (v ccvtypes.LastUpdateMemo, found bool) { +func (s *KeyAssignmentStore) GetConsumerConsAddrToLastUpdateMemo(k ConsumerConsAddr) (v providertypes.LastUpdateMemo, found bool) { kbz, err := k.Marshal() if err != nil { panic(err) } if vbz := s.Store.Get(providertypes.KeyAssignmentCcaToLastUpdateMemoKey(s.ChainID, kbz)); vbz != nil { - v := ccvtypes.LastUpdateMemo{} + v := providertypes.LastUpdateMemo{} err := v.Unmarshal(vbz) if err != nil { panic(err) @@ -507,7 +506,7 @@ func (s *KeyAssignmentStore) IterateConsumerPublicKeyToProviderPublicKey(cb func } } } -func (s *KeyAssignmentStore) IterateConsumerConsAddrToLastUpdateMemo(cb func(ConsumerConsAddr, ccvtypes.LastUpdateMemo) bool) { +func (s *KeyAssignmentStore) IterateConsumerConsAddrToLastUpdateMemo(cb func(ConsumerConsAddr, providertypes.LastUpdateMemo) bool) { prefix := providertypes.KeyAssignmentCcaToLastUpdateMemoChainPrefix(s.ChainID) iterator := sdk.KVStorePrefixIterator(s.Store, prefix) defer iterator.Close() @@ -517,7 +516,7 @@ func (s *KeyAssignmentStore) IterateConsumerConsAddrToLastUpdateMemo(cb func(Con if err != nil { panic(err) } - v := ccvtypes.LastUpdateMemo{} + v := providertypes.LastUpdateMemo{} err = v.Unmarshal(iterator.Value()) if err != nil { panic(err) diff --git a/x/ccv/provider/keeper/keyassignment_test.go b/x/ccv/provider/keeper/keyassignment_test.go index 980da1dbd7..f0a42891bd 100644 --- a/x/ccv/provider/keeper/keyassignment_test.go +++ b/x/ccv/provider/keeper/keyassignment_test.go @@ -11,7 +11,8 @@ import ( testcrypto "github.com/cosmos/interchain-security/testutil/crypto" testkeeper "github.com/cosmos/interchain-security/testutil/keeper" providerkeeper "github.com/cosmos/interchain-security/x/ccv/provider/keeper" - ccvtypes "github.com/cosmos/interchain-security/x/ccv/types" + providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" + abci "github.com/tendermint/tendermint/abci/types" tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" ) @@ -511,7 +512,7 @@ func TestKeyAssignmentKeySerialization(t *testing.T) { } func TestKeyAssignmentMemo(t *testing.T) { - arr := []ccvtypes.LastUpdateMemo{ + arr := []providertypes.LastUpdateMemo{ {}, {}, } { @@ -531,7 +532,7 @@ func TestKeyAssignmentMemo(t *testing.T) { } func TestKeyAssignmentMemoLoopIteration(t *testing.T) { - m := ccvtypes.LastUpdateMemo{} + m := providertypes.LastUpdateMemo{} { k0 := key(0) m.ProviderKey = &k0 @@ -725,7 +726,7 @@ func TestValidatorRemoval(t *testing.T) { require.False(t, found) } - km.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca providerkeeper.ConsumerConsAddr, lum ccvtypes.LastUpdateMemo) bool { + km.Store.IterateConsumerConsAddrToLastUpdateMemo(func(cca providerkeeper.ConsumerConsAddr, lum providertypes.LastUpdateMemo) bool { pcaQueried := providerkeeper.PubKeyToConsAddr(*lum.ProviderKey) require.False(t, pca.Equals(pcaQueried)) return false @@ -737,7 +738,7 @@ func compareForEquality(t *testing.T, km providerkeeper.KeyAssignment, pcaToCk map[string]providerkeeper.ConsumerPublicKey, ckToPk map[providerkeeper.ConsumerPublicKey]providerkeeper.ProviderPublicKey, - ccaToLastUpdateMemo map[string]ccvtypes.LastUpdateMemo) { + ccaToLastUpdateMemo map[string]providertypes.LastUpdateMemo) { cnt := 0 km.Store.IterateProviderConsAddrToConsumerPublicKey(func(_ providerkeeper.ProviderConsAddr, _ providerkeeper.ConsumerPublicKey) bool { @@ -754,7 +755,7 @@ func compareForEquality(t *testing.T, require.Equal(t, len(ckToPk), cnt) cnt = 0 - km.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ providerkeeper.ConsumerConsAddr, _ ccvtypes.LastUpdateMemo) bool { + km.Store.IterateConsumerConsAddrToLastUpdateMemo(func(_ providerkeeper.ConsumerConsAddr, _ providertypes.LastUpdateMemo) bool { cnt += 1 return false }) @@ -797,19 +798,19 @@ func checkCorrectSerializationAndDeserialization(t *testing.T, pcaToCk := map[string]providerkeeper.ConsumerPublicKey{} ckToPk := map[providerkeeper.ConsumerPublicKey]providerkeeper.ProviderPublicKey{} - ccaToLastUpdateMemo := map[string]ccvtypes.LastUpdateMemo{} + ccaToLastUpdateMemo := map[string]providertypes.LastUpdateMemo{} pcaToCk[string(providerkeeper.PubKeyToConsAddr(keys[0]))] = keys[1] pcaToCk[string(providerkeeper.PubKeyToConsAddr(keys[2]))] = keys[3] ckToPk[keys[4]] = keys[5] ckToPk[keys[6]] = keys[7] - ccaToLastUpdateMemo[string(providerkeeper.PubKeyToConsAddr(keys[8]))] = ccvtypes.LastUpdateMemo{ + ccaToLastUpdateMemo[string(providerkeeper.PubKeyToConsAddr(keys[8]))] = providertypes.LastUpdateMemo{ ConsumerKey: &keys[9], ProviderKey: &keys[10], Vscid: uint64_0, Power: int64_0, } - ccaToLastUpdateMemo[string(providerkeeper.PubKeyToConsAddr(keys[11]))] = ccvtypes.LastUpdateMemo{ + ccaToLastUpdateMemo[string(providerkeeper.PubKeyToConsAddr(keys[11]))] = providertypes.LastUpdateMemo{ ConsumerKey: &keys[12], ProviderKey: &keys[13], Vscid: uint64_1, diff --git a/x/ccv/provider/types/consumer.go b/x/ccv/provider/types/consumer.go index 07f769fc45..c8e346e58b 100644 --- a/x/ccv/provider/types/consumer.go +++ b/x/ccv/provider/types/consumer.go @@ -15,7 +15,7 @@ func NewConsumerStates( unbondingOpsIndexes []UnbondingOpIndex, pendingValsetChanges []ccv.ValidatorSetChangePacketData, slashDowntimeAck []string, - keyassignment *ccv.KeyAssignment, + keyAssignment *KeyAssignment, ) ConsumerState { return ConsumerState{ ChainId: chainID, @@ -27,6 +27,6 @@ func NewConsumerStates( PendingValsetChanges: pendingValsetChanges, ConsumerGenesis: genesis, SlashDowntimeAck: slashDowntimeAck, - KeyAssignment: keyassignment, + KeyAssignment: keyAssignment, } } diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go index ff583dda16..92ba87737b 100644 --- a/x/ccv/provider/types/genesis.pb.go +++ b/x/ccv/provider/types/genesis.pb.go @@ -153,8 +153,8 @@ type ConsumerState struct { PendingValsetChanges []types.ValidatorSetChangePacketData `protobuf:"bytes,7,rep,name=pending_valset_changes,json=pendingValsetChanges,proto3" json:"pending_valset_changes"` SlashDowntimeAck []string `protobuf:"bytes,8,rep,name=slash_downtime_ack,json=slashDowntimeAck,proto3" json:"slash_downtime_ack,omitempty"` // UnbondingOpsIndex defines the unbonding operations on the consumer chain - UnbondingOpsIndex []UnbondingOpIndex `protobuf:"bytes,9,rep,name=unbonding_ops_index,json=unbondingOpsIndex,proto3" json:"unbonding_ops_index"` - KeyAssignment *types.KeyAssignment `protobuf:"bytes,10,opt,name=key_assignment,json=keyAssignment,proto3" json:"key_assignment,omitempty"` + UnbondingOpsIndex []UnbondingOpIndex `protobuf:"bytes,9,rep,name=unbonding_ops_index,json=unbondingOpsIndex,proto3" json:"unbonding_ops_index"` + KeyAssignment *KeyAssignment `protobuf:"bytes,10,opt,name=key_assignment,json=keyAssignment,proto3" json:"key_assignment,omitempty"` } func (m *ConsumerState) Reset() { *m = ConsumerState{} } @@ -253,7 +253,7 @@ func (m *ConsumerState) GetUnbondingOpsIndex() []UnbondingOpIndex { return nil } -func (m *ConsumerState) GetKeyAssignment() *types.KeyAssignment { +func (m *ConsumerState) GetKeyAssignment() *KeyAssignment { if m != nil { return m.KeyAssignment } @@ -1538,7 +1538,7 @@ func (m *ConsumerState) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.KeyAssignment == nil { - m.KeyAssignment = &types.KeyAssignment{} + m.KeyAssignment = &KeyAssignment{} } if err := m.KeyAssignment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/ccv/types/keyassignment.pb.go b/x/ccv/provider/types/keyassignment.pb.go similarity index 91% rename from x/ccv/types/keyassignment.pb.go rename to x/ccv/provider/types/keyassignment.pb.go index ae70e6f524..cd4ed4e835 100644 --- a/x/ccv/types/keyassignment.pb.go +++ b/x/ccv/provider/types/keyassignment.pb.go @@ -322,39 +322,39 @@ func init() { var fileDescriptor_d36beb32b6cd555b = []byte{ // 518 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, - 0x18, 0xcc, 0xc6, 0xe9, 0x4f, 0xfd, 0x6d, 0xda, 0x0a, 0x59, 0x3d, 0x58, 0x25, 0x98, 0xc8, 0x48, - 0x28, 0x07, 0xba, 0x26, 0xe9, 0x81, 0x13, 0x42, 0xa5, 0x47, 0x83, 0x54, 0x59, 0xe5, 0x82, 0x40, - 0x96, 0xb3, 0x5e, 0x52, 0xd3, 0xd8, 0x9f, 0xb5, 0xbb, 0x36, 0xf8, 0xcc, 0x0b, 0x70, 0x81, 0x07, - 0xe0, 0x41, 0x38, 0xf7, 0xd8, 0x23, 0x27, 0x84, 0x92, 0x17, 0x41, 0x6b, 0xc7, 0x4e, 0x1c, 0xfe, - 0xc8, 0xdc, 0xb2, 0xd9, 0xf9, 0x66, 0xe6, 0xf3, 0x8c, 0x16, 0x3f, 0x0a, 0x63, 0xc9, 0x38, 0xbd, - 0xf4, 0xc3, 0xd8, 0x13, 0x8c, 0xa6, 0x3c, 0x94, 0xb9, 0x4d, 0x69, 0x66, 0x27, 0x1c, 0xb2, 0x30, - 0x60, 0xdc, 0xce, 0xc6, 0xf6, 0x15, 0xcb, 0x7d, 0x21, 0xc2, 0x59, 0x1c, 0xb1, 0x58, 0x92, 0x84, - 0x83, 0x04, 0xfd, 0xde, 0x6f, 0x06, 0x09, 0xa5, 0x19, 0xa9, 0x06, 0x49, 0x36, 0x3e, 0x3a, 0x9c, - 0xc1, 0x0c, 0x0a, 0xbc, 0xad, 0x7e, 0x95, 0xa3, 0x47, 0x03, 0xc9, 0xe2, 0x80, 0xf1, 0x28, 0x8c, - 0xa5, 0x4d, 0x79, 0x9e, 0x48, 0x50, 0x0a, 0xa2, 0xbc, 0xb5, 0xbe, 0x22, 0x7c, 0xf0, 0xcc, 0x17, - 0xf2, 0x45, 0x12, 0xf8, 0x92, 0x3d, 0x67, 0x11, 0xe8, 0x4f, 0xf0, 0x1e, 0x85, 0x58, 0xa4, 0x11, - 0xe3, 0xde, 0x15, 0xcb, 0x0d, 0x34, 0x44, 0xa3, 0xfe, 0x64, 0x40, 0xd6, 0x3c, 0xa4, 0xe4, 0x21, - 0xe7, 0xe9, 0x74, 0x1e, 0x52, 0x87, 0xe5, 0x6e, 0xbf, 0x9a, 0x70, 0x58, 0xae, 0x08, 0x2a, 0x5b, - 0x05, 0x41, 0xb7, 0x0d, 0x41, 0x35, 0xa1, 0x08, 0x0e, 0xf1, 0x4e, 0x26, 0x68, 0x18, 0x18, 0xbd, - 0x21, 0x1a, 0xf5, 0xdc, 0xf2, 0xa0, 0xfe, 0x4d, 0xe0, 0x1d, 0xe3, 0xc6, 0xce, 0x10, 0x8d, 0x34, - 0xb7, 0x3c, 0x58, 0xaf, 0xf0, 0xfe, 0x19, 0xc4, 0xe2, 0x34, 0x08, 0xf8, 0x05, 0xa8, 0xe1, 0xdb, - 0xf8, 0x7f, 0x65, 0xc6, 0xf3, 0x83, 0x80, 0x17, 0xde, 0xf7, 0xdc, 0x5d, 0xba, 0x42, 0xe8, 0x04, - 0x6b, 0x6d, 0x1d, 0x29, 0xa0, 0xf5, 0x16, 0xef, 0x3a, 0x2c, 0x2f, 0x89, 0x1f, 0xe2, 0xde, 0x1b, - 0x0e, 0x51, 0xab, 0xef, 0x51, 0x20, 0xf5, 0x07, 0xb8, 0x2b, 0xa1, 0x95, 0x58, 0x57, 0x82, 0xf5, - 0x19, 0x61, 0x63, 0xbd, 0xca, 0x56, 0x28, 0x7f, 0xdd, 0xea, 0x35, 0xbe, 0x35, 0xf7, 0x85, 0xf4, - 0xd2, 0x02, 0xef, 0x45, 0x2c, 0xaa, 0x54, 0x4f, 0x48, 0x8b, 0xe2, 0x90, 0xa6, 0x96, 0x7b, 0x30, - 0x6f, 0x9c, 0xad, 0x2f, 0x1a, 0xde, 0x77, 0x58, 0x7e, 0x5a, 0x97, 0x52, 0xff, 0x80, 0xb0, 0x55, - 0x47, 0x5c, 0xfb, 0xf2, 0x24, 0x78, 0x5b, 0xcd, 0xd1, 0x46, 0xfd, 0xc9, 0xa4, 0x95, 0x87, 0x46, - 0x88, 0x4f, 0x7b, 0xd7, 0xdf, 0xef, 0x76, 0xdc, 0x3b, 0x15, 0x60, 0x7d, 0x79, 0xb6, 0xd1, 0x33, - 0x81, 0x07, 0x9b, 0x72, 0x4a, 0x7e, 0xab, 0x77, 0x4a, 0xfe, 0xb8, 0x95, 0x7c, 0x95, 0xf2, 0x4a, - 0xd9, 0xd8, 0xe8, 0xf3, 0x05, 0x9c, 0x6f, 0x74, 0xf3, 0x13, 0xc2, 0xf7, 0x6b, 0xd5, 0xc6, 0xea, - 0xbf, 0x44, 0xa0, 0x15, 0xfa, 0x8f, 0xff, 0x71, 0xfd, 0x66, 0x18, 0x2b, 0x3f, 0xc3, 0x4a, 0xf2, - 0x8f, 0x38, 0xe7, 0x7a, 0x61, 0xa2, 0x9b, 0x85, 0x89, 0x7e, 0x2c, 0x4c, 0xf4, 0x71, 0x69, 0x76, - 0x6e, 0x96, 0x66, 0xe7, 0xdb, 0xd2, 0xec, 0xbc, 0x1c, 0xcf, 0x42, 0x79, 0x99, 0x4e, 0x09, 0x85, - 0xc8, 0xa6, 0x20, 0x22, 0x10, 0xf6, 0xda, 0xd1, 0x71, 0xfd, 0x0c, 0xbd, 0x2f, 0x1e, 0x22, 0x99, - 0x27, 0x4c, 0x4c, 0xff, 0x2b, 0x1e, 0x87, 0x93, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x3d, - 0x9f, 0xe7, 0xb0, 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x18, 0xcc, 0xc6, 0x29, 0x2a, 0x9b, 0xb6, 0x42, 0x56, 0x0f, 0x56, 0x09, 0x26, 0x32, 0x12, 0xca, + 0x81, 0xae, 0x69, 0x7a, 0x40, 0x42, 0x42, 0xa8, 0xf4, 0x18, 0x90, 0x2a, 0x2b, 0x5c, 0x10, 0xc8, + 0x72, 0xd6, 0x4b, 0x6a, 0x1a, 0xfb, 0xb3, 0x76, 0xd7, 0x06, 0x9f, 0x79, 0x01, 0x2e, 0xf0, 0x00, + 0x3c, 0x08, 0xe7, 0x1e, 0x73, 0xe4, 0x84, 0x50, 0xf2, 0x22, 0x68, 0xed, 0xd8, 0x89, 0xc3, 0x8f, + 0xcc, 0x2d, 0x9b, 0x9d, 0x6f, 0x66, 0x3e, 0xcf, 0x68, 0xf1, 0xa3, 0x20, 0x92, 0x8c, 0xd3, 0x4b, + 0x2f, 0x88, 0x5c, 0xc1, 0x68, 0xc2, 0x03, 0x99, 0xd9, 0x94, 0xa6, 0x76, 0xcc, 0x21, 0x0d, 0x7c, + 0xc6, 0xed, 0xf4, 0xc4, 0xbe, 0x62, 0x99, 0x27, 0x44, 0x30, 0x8d, 0x42, 0x16, 0x49, 0x12, 0x73, + 0x90, 0xa0, 0xdf, 0xfb, 0xc3, 0x20, 0xa1, 0x34, 0x25, 0xe5, 0x20, 0x49, 0x4f, 0x8e, 0x0e, 0xa7, + 0x30, 0x85, 0x1c, 0x6f, 0xab, 0x5f, 0xc5, 0xe8, 0x51, 0x4f, 0xb2, 0xc8, 0x67, 0x3c, 0x0c, 0x22, + 0x69, 0x53, 0x9e, 0xc5, 0x12, 0x94, 0x82, 0x28, 0x6e, 0xad, 0x6f, 0x08, 0x1f, 0x3c, 0xf7, 0x84, + 0x7c, 0x19, 0xfb, 0x9e, 0x64, 0x2f, 0x58, 0x08, 0xfa, 0x53, 0xbc, 0x47, 0x21, 0x12, 0x49, 0xc8, + 0xb8, 0x7b, 0xc5, 0x32, 0x03, 0xf5, 0xd1, 0xa0, 0x3b, 0xec, 0x91, 0x35, 0x0f, 0x29, 0x78, 0xc8, + 0x45, 0x32, 0x99, 0x05, 0x74, 0xc4, 0x32, 0xa7, 0x5b, 0x4e, 0x8c, 0x58, 0xa6, 0x08, 0x4a, 0x5b, + 0x39, 0x41, 0xbb, 0x09, 0x41, 0x39, 0xa1, 0x08, 0x0e, 0xf1, 0x4e, 0x2a, 0x68, 0xe0, 0x1b, 0x9d, + 0x3e, 0x1a, 0x74, 0x9c, 0xe2, 0xa0, 0xfe, 0x8d, 0xe1, 0x3d, 0xe3, 0xc6, 0x4e, 0x1f, 0x0d, 0x34, + 0xa7, 0x38, 0x58, 0xaf, 0xf1, 0xfe, 0x39, 0x44, 0xe2, 0xcc, 0xf7, 0xf9, 0x18, 0xd4, 0xf0, 0x6d, + 0x7c, 0x53, 0x99, 0x71, 0x3d, 0xdf, 0xe7, 0xb9, 0xf7, 0x3d, 0x67, 0x97, 0xae, 0x10, 0x3a, 0xc1, + 0x5a, 0x53, 0x47, 0x0a, 0x68, 0xbd, 0xc3, 0xbb, 0x23, 0x96, 0x15, 0xc4, 0x0f, 0x71, 0xe7, 0x2d, + 0x87, 0xb0, 0xd1, 0xf7, 0xc8, 0x91, 0xfa, 0x03, 0xdc, 0x96, 0xd0, 0x48, 0xac, 0x2d, 0xc1, 0xfa, + 0x82, 0xb0, 0xb1, 0x5e, 0x65, 0x2b, 0x94, 0x7f, 0x6e, 0xf5, 0x06, 0xdf, 0x9a, 0x79, 0x42, 0xba, + 0x49, 0x8e, 0x77, 0x43, 0x16, 0x96, 0xaa, 0xa7, 0xa4, 0x41, 0x71, 0x48, 0x5d, 0xcb, 0x39, 0x98, + 0xd5, 0xce, 0xd6, 0x57, 0x0d, 0xef, 0x8f, 0x58, 0x76, 0x56, 0x95, 0x52, 0xff, 0x88, 0xb0, 0x55, + 0x45, 0x5c, 0xf9, 0x72, 0x25, 0xb8, 0x5b, 0xcd, 0xd1, 0x06, 0xdd, 0xe1, 0xb0, 0x91, 0x87, 0x5a, + 0x88, 0xcf, 0x3a, 0xd7, 0x3f, 0xee, 0xb6, 0x9c, 0x3b, 0x25, 0x60, 0x7d, 0x79, 0xbe, 0xd1, 0x33, + 0x81, 0x7b, 0x9b, 0x72, 0x4a, 0x7e, 0xab, 0x77, 0x4a, 0xfe, 0xb8, 0x91, 0x7c, 0x99, 0xf2, 0x4a, + 0xd9, 0xd8, 0xe8, 0xf3, 0x18, 0x2e, 0x36, 0xba, 0xf9, 0x19, 0xe1, 0xfb, 0x95, 0x6a, 0x6d, 0xf5, + 0xdf, 0x22, 0xd0, 0x72, 0xfd, 0x27, 0xff, 0xb9, 0x7e, 0x3d, 0x8c, 0x95, 0x9f, 0x7e, 0x29, 0xf9, + 0x57, 0xdc, 0xf8, 0x7a, 0x61, 0xa2, 0xf9, 0xc2, 0x44, 0x3f, 0x17, 0x26, 0xfa, 0xb4, 0x34, 0x5b, + 0xf3, 0xa5, 0xd9, 0xfa, 0xbe, 0x34, 0x5b, 0xaf, 0x1e, 0x4f, 0x03, 0x79, 0x99, 0x4c, 0x08, 0x85, + 0xd0, 0xa6, 0x20, 0x42, 0x10, 0xf6, 0xda, 0xd1, 0x71, 0xf5, 0x0c, 0x7d, 0xa8, 0x3f, 0x44, 0x32, + 0x8b, 0x99, 0x98, 0xdc, 0xc8, 0x5f, 0x89, 0xd3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x25, + 0x97, 0xf2, 0xb9, 0x04, 0x00, 0x00, } func (m *LastUpdateMemo) Marshal() (dAtA []byte, err error) { diff --git a/x/ccv/provider/types/tx.pb.go b/x/ccv/provider/types/tx.pb.go index a81719823f..46e8120059 100644 --- a/x/ccv/provider/types/tx.pb.go +++ b/x/ccv/provider/types/tx.pb.go @@ -7,7 +7,6 @@ import ( context "context" fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/interchain-security/x/ccv/types" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto"