From e9fae28ebbd1a42230b638c3b2cdf7c4835a7c06 Mon Sep 17 00:00:00 2001 From: mpoke Date: Wed, 23 Oct 2024 14:31:02 +0400 Subject: [PATCH] update proto files --- .../ccv/consumer/v1/genesis.proto | 30 +- x/ccv/consumer/types/genesis.pb.go | 574 ++---------------- 2 files changed, 63 insertions(+), 541 deletions(-) diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto index 69a765b8e2..499bb44b3a 100644 --- a/proto/interchain_security/ccv/consumer/v1/genesis.proto +++ b/proto/interchain_security/ccv/consumer/v1/genesis.proto @@ -20,6 +20,18 @@ import "tendermint/abci/types.proto"; // Note: this type is only used on consumer side and references shared types with // provider message GenesisState { + // Reserve 5th slot for removed provider_client_state field + reserved 5; + + // Reserve 6th slot for removed provider_consensus_state field + reserved 6; + + // Reserve 7th slot for removed maturing_packets field + reserved 7; + + // Reserve 8th slot for removed initial_val_set field + reserved 8; + // ConsumerParams is a shared type with provider module interchain_security.ccv.v1.ConsumerParams params = 1 [ (gogoproto.nullable) = false ]; @@ -29,15 +41,6 @@ message GenesisState { string provider_channel_id = 3; // true for new chain, false for chain restart. bool new_chain = 4; - // !!! DEPRECATED !!! ProviderClientState is deprecated. Use provider.client_state instead - ibc.lightclients.tendermint.v1.ClientState provider_client_state = 5 [ deprecated = true]; - // !!! DEPRECATED !!! ProviderConsensusState is deprecated. Use provider.consensus_state instead - ibc.lightclients.tendermint.v1.ConsensusState provider_consensus_state = 6 [ deprecated = true]; - // MaturingPackets nil on new chain, filled in on restart. - repeated MaturingVSCPacket maturing_packets = 7 - [ (gogoproto.nullable) = false ]; - // !!! DEPRECATED !!!! InitialValset is deprecated. Use provider.initial_val_set instead - repeated .tendermint.abci.ValidatorUpdate initial_val_set = 8 [ (gogoproto.nullable) = false, deprecated = true ]; // HeightToValsetUpdateId nil on new chain, filled in on restart. repeated HeightToValsetUpdateID height_to_valset_update_id = 9 [ (gogoproto.nullable) = false ]; @@ -73,15 +76,6 @@ message OutstandingDowntime { string validator_consensus_address = 1; } // to the consumer CCV module. message LastTransmissionBlockHeight { int64 height = 1; } -// MaturingVSCPacket represents a vsc packet that is maturing internal to the -// consumer CCV module, where the consumer has not yet relayed a VSCMatured -// packet back to the provider. -message MaturingVSCPacket { - uint64 vscId = 1; - google.protobuf.Timestamp maturity_time = 2 - [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; -} - // ConsumerPacketDataList is a list of consumer packet data packets. // // Note this type is used internally to the consumer CCV module diff --git a/x/ccv/consumer/types/genesis.pb.go b/x/ccv/consumer/types/genesis.pb.go index 34eeb43cfa..33350f3e2c 100644 --- a/x/ccv/consumer/types/genesis.pb.go +++ b/x/ccv/consumer/types/genesis.pb.go @@ -5,24 +5,21 @@ package types import ( fmt "fmt" - types1 "github.com/cometbft/cometbft/abci/types" + _ "github.com/cometbft/cometbft/abci/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _07_tendermint "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" + _ "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" types "github.com/cosmos/interchain-security/v6/x/ccv/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" - time "time" ) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -var _ = time.Kitchen // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -43,14 +40,6 @@ type GenesisState struct { ProviderChannelId string `protobuf:"bytes,3,opt,name=provider_channel_id,json=providerChannelId,proto3" json:"provider_channel_id,omitempty"` // true for new chain, false for chain restart. NewChain bool `protobuf:"varint,4,opt,name=new_chain,json=newChain,proto3" json:"new_chain,omitempty"` - // !!! DEPRECATED !!! ProviderClientState is deprecated. Use provider.client_state instead - ProviderClientState *_07_tendermint.ClientState `protobuf:"bytes,5,opt,name=provider_client_state,json=providerClientState,proto3" json:"provider_client_state,omitempty"` // Deprecated: Do not use. - // !!! DEPRECATED !!! ProviderConsensusState is deprecated. Use provider.consensus_state instead - ProviderConsensusState *_07_tendermint.ConsensusState `protobuf:"bytes,6,opt,name=provider_consensus_state,json=providerConsensusState,proto3" json:"provider_consensus_state,omitempty"` // Deprecated: Do not use. - // MaturingPackets nil on new chain, filled in on restart. - MaturingPackets []MaturingVSCPacket `protobuf:"bytes,7,rep,name=maturing_packets,json=maturingPackets,proto3" json:"maturing_packets"` - // !!! DEPRECATED !!!! InitialValset is deprecated. Use provider.initial_val_set instead - InitialValSet []types1.ValidatorUpdate `protobuf:"bytes,8,rep,name=initial_val_set,json=initialValSet,proto3" json:"initial_val_set"` // Deprecated: Do not use. // HeightToValsetUpdateId nil on new chain, filled in on restart. HeightToValsetUpdateId []HeightToValsetUpdateID `protobuf:"bytes,9,rep,name=height_to_valset_update_id,json=heightToValsetUpdateId,proto3" json:"height_to_valset_update_id"` // OutstandingDowntimes nil on new chain, filled in on restart. @@ -125,37 +114,6 @@ func (m *GenesisState) GetNewChain() bool { return false } -// Deprecated: Do not use. -func (m *GenesisState) GetProviderClientState() *_07_tendermint.ClientState { - if m != nil { - return m.ProviderClientState - } - return nil -} - -// Deprecated: Do not use. -func (m *GenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusState { - if m != nil { - return m.ProviderConsensusState - } - return nil -} - -func (m *GenesisState) GetMaturingPackets() []MaturingVSCPacket { - if m != nil { - return m.MaturingPackets - } - return nil -} - -// Deprecated: Do not use. -func (m *GenesisState) GetInitialValSet() []types1.ValidatorUpdate { - if m != nil { - return m.InitialValSet - } - return nil -} - func (m *GenesisState) GetHeightToValsetUpdateId() []HeightToValsetUpdateID { if m != nil { return m.HeightToValsetUpdateId @@ -346,61 +304,6 @@ func (m *LastTransmissionBlockHeight) GetHeight() int64 { return 0 } -// MaturingVSCPacket represents a vsc packet that is maturing internal to the -// consumer CCV module, where the consumer has not yet relayed a VSCMatured -// packet back to the provider. -type MaturingVSCPacket struct { - VscId uint64 `protobuf:"varint,1,opt,name=vscId,proto3" json:"vscId,omitempty"` - MaturityTime time.Time `protobuf:"bytes,2,opt,name=maturity_time,json=maturityTime,proto3,stdtime" json:"maturity_time"` -} - -func (m *MaturingVSCPacket) Reset() { *m = MaturingVSCPacket{} } -func (m *MaturingVSCPacket) String() string { return proto.CompactTextString(m) } -func (*MaturingVSCPacket) ProtoMessage() {} -func (*MaturingVSCPacket) Descriptor() ([]byte, []int) { - return fileDescriptor_2db73a6057a27482, []int{4} -} -func (m *MaturingVSCPacket) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MaturingVSCPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MaturingVSCPacket.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 *MaturingVSCPacket) XXX_Merge(src proto.Message) { - xxx_messageInfo_MaturingVSCPacket.Merge(m, src) -} -func (m *MaturingVSCPacket) XXX_Size() int { - return m.Size() -} -func (m *MaturingVSCPacket) XXX_DiscardUnknown() { - xxx_messageInfo_MaturingVSCPacket.DiscardUnknown(m) -} - -var xxx_messageInfo_MaturingVSCPacket proto.InternalMessageInfo - -func (m *MaturingVSCPacket) GetVscId() uint64 { - if m != nil { - return m.VscId - } - return 0 -} - -func (m *MaturingVSCPacket) GetMaturityTime() time.Time { - if m != nil { - return m.MaturityTime - } - return time.Time{} -} - // ConsumerPacketDataList is a list of consumer packet data packets. // // Note this type is used internally to the consumer CCV module @@ -413,7 +316,7 @@ func (m *ConsumerPacketDataList) Reset() { *m = ConsumerPacketDataList{} func (m *ConsumerPacketDataList) String() string { return proto.CompactTextString(m) } func (*ConsumerPacketDataList) ProtoMessage() {} func (*ConsumerPacketDataList) Descriptor() ([]byte, []int) { - return fileDescriptor_2db73a6057a27482, []int{5} + return fileDescriptor_2db73a6057a27482, []int{4} } func (m *ConsumerPacketDataList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -454,7 +357,6 @@ func init() { proto.RegisterType((*HeightToValsetUpdateID)(nil), "interchain_security.ccv.consumer.v1.HeightToValsetUpdateID") proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.consumer.v1.OutstandingDowntime") proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.consumer.v1.LastTransmissionBlockHeight") - proto.RegisterType((*MaturingVSCPacket)(nil), "interchain_security.ccv.consumer.v1.MaturingVSCPacket") proto.RegisterType((*ConsumerPacketDataList)(nil), "interchain_security.ccv.consumer.v1.ConsumerPacketDataList") } @@ -463,64 +365,54 @@ func init() { } var fileDescriptor_2db73a6057a27482 = []byte{ - // 912 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x6f, 0x23, 0x35, - 0x14, 0xee, 0xb4, 0xdd, 0x90, 0xb8, 0xed, 0x6e, 0xd7, 0x5d, 0xa2, 0xa1, 0x11, 0x69, 0x14, 0x84, - 0x14, 0xf1, 0xc3, 0x43, 0x8a, 0x58, 0x21, 0x21, 0x10, 0x24, 0x95, 0x68, 0x50, 0x11, 0x55, 0xda, - 0x0d, 0xd2, 0x5e, 0x46, 0x8e, 0xc7, 0x3b, 0xb1, 0x76, 0xc6, 0x1e, 0x8d, 0x9d, 0x09, 0x15, 0xe2, - 0xc2, 0x95, 0xcb, 0xfe, 0x59, 0x7b, 0xdc, 0x03, 0x07, 0x4e, 0x80, 0xda, 0x7f, 0x04, 0xd9, 0xe3, - 0x99, 0x24, 0x34, 0xed, 0xe6, 0x16, 0xcf, 0x7b, 0xef, 0xfb, 0xde, 0xfb, 0xde, 0x7b, 0x76, 0x40, - 0x97, 0x71, 0x45, 0x53, 0x32, 0xc1, 0x8c, 0xfb, 0x92, 0x92, 0x69, 0xca, 0xd4, 0x95, 0x47, 0x48, - 0xe6, 0x11, 0xc1, 0xe5, 0x34, 0xa6, 0xa9, 0x97, 0x75, 0xbd, 0x90, 0x72, 0x2a, 0x99, 0x44, 0x49, - 0x2a, 0x94, 0x80, 0x1f, 0xac, 0x08, 0x41, 0x84, 0x64, 0xa8, 0x08, 0x41, 0x59, 0xf7, 0xf0, 0xb3, - 0xbb, 0x70, 0xb3, 0xae, 0x27, 0x27, 0x38, 0xa5, 0x81, 0x5f, 0xba, 0x1b, 0xd8, 0x43, 0x8f, 0x8d, - 0x89, 0x17, 0xb1, 0x70, 0xa2, 0x48, 0xc4, 0x28, 0x57, 0xd2, 0x53, 0x94, 0x07, 0x34, 0x8d, 0x19, - 0x57, 0x3a, 0x6a, 0x7e, 0xb2, 0x01, 0x4f, 0x42, 0x11, 0x0a, 0xf3, 0xd3, 0xd3, 0xbf, 0xec, 0xd7, - 0x0f, 0xef, 0x21, 0x9e, 0xb1, 0x94, 0x5a, 0xb7, 0xa3, 0x50, 0x88, 0x30, 0xa2, 0x9e, 0x39, 0x8d, - 0xa7, 0x2f, 0x3c, 0xc5, 0x62, 0x2a, 0x15, 0x8e, 0x13, 0xeb, 0xd0, 0x58, 0x60, 0xc7, 0x63, 0xc2, - 0x3c, 0x75, 0x95, 0x50, 0x2b, 0x41, 0xfb, 0xcf, 0x1a, 0xd8, 0xfd, 0x3e, 0x17, 0xe5, 0x42, 0x61, - 0x45, 0xe1, 0x29, 0xa8, 0x24, 0x38, 0xc5, 0xb1, 0x74, 0x9d, 0x96, 0xd3, 0xd9, 0x39, 0xfe, 0x08, - 0xdd, 0x25, 0x52, 0xd6, 0x45, 0x7d, 0x5b, 0xf8, 0xb9, 0x89, 0xe8, 0x6d, 0xbf, 0xfe, 0xfb, 0x68, - 0x63, 0x68, 0xe3, 0xe1, 0x27, 0x00, 0x26, 0xa9, 0xc8, 0x58, 0x40, 0x53, 0x3f, 0x17, 0xc2, 0x67, - 0x81, 0xbb, 0xd9, 0x72, 0x3a, 0xb5, 0xe1, 0x7e, 0x61, 0xe9, 0x1b, 0xc3, 0x20, 0x80, 0x08, 0x1c, - 0xcc, 0xbd, 0x27, 0x98, 0x73, 0x1a, 0x69, 0xf7, 0x2d, 0xe3, 0xfe, 0xb8, 0x74, 0xcf, 0x2d, 0x83, - 0x00, 0x36, 0x40, 0x8d, 0xd3, 0x99, 0x6f, 0xf2, 0x72, 0xb7, 0x5b, 0x4e, 0xa7, 0x3a, 0xac, 0x72, - 0x3a, 0xeb, 0xeb, 0x33, 0x24, 0xe0, 0xdd, 0xff, 0x53, 0x4b, 0x5d, 0x9d, 0xfb, 0xc0, 0xd4, 0xf4, - 0x31, 0x62, 0x63, 0x82, 0x16, 0x3b, 0x84, 0x16, 0x7a, 0xa2, 0xeb, 0x32, 0x5f, 0x8d, 0x20, 0xbd, - 0x4d, 0xd7, 0x19, 0x1e, 0x2c, 0xa7, 0x9b, 0x2b, 0x15, 0x01, 0x77, 0x4e, 0x22, 0xb8, 0xa4, 0x5c, - 0x4e, 0xa5, 0xe5, 0xa9, 0x18, 0x1e, 0xf4, 0x56, 0x9e, 0x22, 0x6c, 0x4e, 0x55, 0x2f, 0xa9, 0x96, - 0x6c, 0x30, 0x04, 0xfb, 0x31, 0x56, 0xd3, 0x94, 0xf1, 0xd0, 0x4f, 0x30, 0x79, 0x49, 0x95, 0x74, - 0xdf, 0x69, 0x6d, 0x75, 0x76, 0x8e, 0x9f, 0xa2, 0x35, 0xc6, 0x18, 0xfd, 0x68, 0x83, 0x47, 0x17, - 0xfd, 0x73, 0x13, 0x6e, 0xbb, 0xf5, 0xa8, 0x40, 0xcd, 0xbf, 0x4a, 0x78, 0x0e, 0x1e, 0x31, 0xce, - 0x14, 0xc3, 0x91, 0x9f, 0xe1, 0xc8, 0x97, 0x54, 0xb9, 0x55, 0xc3, 0xd3, 0x5a, 0x4c, 0x5e, 0x0f, - 0x12, 0x1a, 0xe1, 0x88, 0x05, 0x58, 0x89, 0xf4, 0x59, 0x12, 0xe8, 0xfc, 0x2b, 0x1a, 0xd1, 0x75, - 0x86, 0x7b, 0x16, 0x60, 0x84, 0xa3, 0x0b, 0xaa, 0xe0, 0x6f, 0xe0, 0x70, 0x42, 0xb5, 0x08, 0xbe, - 0x12, 0x1a, 0x53, 0x52, 0xe5, 0x4f, 0x4d, 0x84, 0xee, 0x70, 0xcd, 0x80, 0x7f, 0xb5, 0x56, 0x11, - 0xa7, 0x06, 0xe6, 0x52, 0x8c, 0x0c, 0x48, 0xce, 0x3a, 0x38, 0xb1, 0x95, 0xd4, 0x27, 0xab, 0xac, - 0x01, 0xfc, 0xdd, 0x01, 0xef, 0x8b, 0xa9, 0x92, 0x0a, 0xf3, 0x40, 0xab, 0x17, 0x88, 0x19, 0xd7, - 0x3b, 0xe2, 0xcb, 0x08, 0xcb, 0x09, 0xe3, 0xa1, 0x0b, 0x4c, 0x0a, 0x5f, 0xae, 0x95, 0xc2, 0x4f, - 0x73, 0xa4, 0x13, 0x0b, 0x64, 0xf9, 0x1b, 0xe2, 0xb6, 0xe9, 0xc2, 0x52, 0xc0, 0x5f, 0x81, 0x9b, - 0xd0, 0x9c, 0xbf, 0x40, 0x2b, 0xdb, 0xb8, 0x63, 0x86, 0x65, 0x3d, 0x05, 0xe6, 0x1b, 0xa7, 0x63, - 0x4f, 0xb0, 0xc2, 0x67, 0x4c, 0x16, 0xbd, 0xac, 0x5b, 0x8a, 0x65, 0x27, 0x09, 0xff, 0x70, 0x40, - 0x33, 0xc2, 0x52, 0xf9, 0x2a, 0xc5, 0x5c, 0xc6, 0x4c, 0x4a, 0x26, 0xb8, 0x3f, 0x8e, 0x04, 0x79, - 0xe9, 0xe7, 0xa2, 0xb9, 0xbb, 0x26, 0x87, 0x6f, 0xd7, 0xca, 0xe1, 0x0c, 0x4b, 0x75, 0xb9, 0x80, - 0xd4, 0xd3, 0x40, 0x79, 0x6b, 0x0a, 0x29, 0xa2, 0xbb, 0x5d, 0x60, 0x1d, 0x54, 0x92, 0x94, 0xf6, - 0xfb, 0x23, 0x77, 0xcf, 0xac, 0xad, 0x3d, 0xc1, 0x1f, 0x40, 0xb5, 0x98, 0x7d, 0xf7, 0xa1, 0x49, - 0xa7, 0x73, 0xdf, 0xdd, 0x73, 0x6e, 0x7d, 0x07, 0xfc, 0x85, 0xb0, 0xb4, 0x65, 0x7c, 0xfb, 0x39, - 0xa8, 0xaf, 0x9e, 0x15, 0xcd, 0x6e, 0x4b, 0xd6, 0xf7, 0xdb, 0xf6, 0xd0, 0x9e, 0x60, 0x07, 0xec, - 0xdf, 0x1a, 0xcd, 0x4d, 0xe3, 0xf1, 0x30, 0x5b, 0x9a, 0xa7, 0xf6, 0x33, 0x70, 0xb0, 0x62, 0x08, - 0xe0, 0x37, 0xa0, 0x91, 0x15, 0xfb, 0xb0, 0x70, 0x1f, 0xe0, 0x20, 0x48, 0xa9, 0xcc, 0x6f, 0xd3, - 0xda, 0xf0, 0xbd, 0xd2, 0xa5, 0x5c, 0xef, 0xef, 0x72, 0x87, 0xf6, 0x17, 0xa0, 0x71, 0x76, 0xbf, - 0x6a, 0x0b, 0x79, 0x6f, 0x15, 0x79, 0xb7, 0x15, 0x78, 0x7c, 0x6b, 0xb5, 0xe1, 0x13, 0xf0, 0x20, - 0x93, 0x64, 0x10, 0xd8, 0x1a, 0xf3, 0x03, 0x1c, 0x80, 0xbd, 0x7c, 0xd9, 0xd5, 0x95, 0xaf, 0x53, - 0x36, 0xf5, 0xed, 0x1c, 0x1f, 0xa2, 0xfc, 0x05, 0x41, 0xc5, 0x0b, 0x82, 0x2e, 0x8b, 0x17, 0xa4, - 0x57, 0xd5, 0xba, 0xbe, 0xfa, 0xe7, 0xc8, 0x19, 0xee, 0x16, 0xa1, 0xda, 0xd8, 0x1e, 0x83, 0xfa, - 0xea, 0x49, 0x84, 0xa7, 0x60, 0x3b, 0x62, 0x52, 0x67, 0xb9, 0x95, 0xdf, 0x80, 0xeb, 0xbc, 0x1e, - 0x05, 0x82, 0xed, 0xa3, 0x41, 0xe8, 0xfd, 0xfc, 0xfa, 0xba, 0xe9, 0xbc, 0xb9, 0x6e, 0x3a, 0xff, - 0x5e, 0x37, 0x9d, 0x57, 0x37, 0xcd, 0x8d, 0x37, 0x37, 0xcd, 0x8d, 0xbf, 0x6e, 0x9a, 0x1b, 0xcf, - 0xbf, 0x0e, 0x99, 0x9a, 0x4c, 0xc7, 0x88, 0x88, 0xd8, 0x23, 0x42, 0xc6, 0x42, 0x7a, 0x73, 0x9a, - 0x4f, 0xcb, 0xb7, 0x32, 0x7b, 0xea, 0xfd, 0xb2, 0xfc, 0x0f, 0xc0, 0xbc, 0x7c, 0xe3, 0x8a, 0x29, - 0xf4, 0xf3, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x67, 0x80, 0x40, 0x32, 0x08, 0x00, 0x00, + // 741 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4d, 0x6b, 0xdb, 0x4a, + 0x14, 0xb5, 0x12, 0x3d, 0x47, 0x9e, 0xe4, 0x05, 0x3f, 0xe5, 0x61, 0xf4, 0x62, 0x9e, 0x63, 0x5c, + 0x0a, 0xa6, 0xb4, 0x52, 0x9d, 0xd2, 0x52, 0x28, 0x2d, 0x6d, 0x1c, 0x68, 0x6c, 0x02, 0x0d, 0xce, + 0x47, 0x21, 0x9b, 0x61, 0x2c, 0x4d, 0xa4, 0x21, 0xd2, 0x8c, 0xd0, 0x8c, 0xe5, 0x86, 0xd2, 0x4d, + 0xb7, 0xdd, 0xf4, 0x67, 0x65, 0x99, 0x65, 0x57, 0xa1, 0x24, 0x7f, 0xa4, 0x68, 0x34, 0xb2, 0x13, + 0xe2, 0x04, 0xef, 0x34, 0xbe, 0xe7, 0x9e, 0x7b, 0x74, 0xee, 0xd1, 0x18, 0x74, 0x08, 0x15, 0x38, + 0x71, 0x03, 0x44, 0x28, 0xe4, 0xd8, 0x1d, 0x25, 0x44, 0x9c, 0x39, 0xae, 0x9b, 0x3a, 0x2e, 0xa3, + 0x7c, 0x14, 0xe1, 0xc4, 0x49, 0x3b, 0x8e, 0x8f, 0x29, 0xe6, 0x84, 0xdb, 0x71, 0xc2, 0x04, 0x33, + 0x1f, 0xcd, 0x68, 0xb1, 0x5d, 0x37, 0xb5, 0x8b, 0x16, 0x3b, 0xed, 0xac, 0x3f, 0xbf, 0x8f, 0x37, + 0xed, 0x38, 0x3c, 0x40, 0x09, 0xf6, 0xe0, 0x04, 0x2e, 0x69, 0xd7, 0x1d, 0x32, 0x74, 0x9d, 0x90, + 0xf8, 0x81, 0x70, 0x43, 0x82, 0xa9, 0xe0, 0x8e, 0xc0, 0xd4, 0xc3, 0x49, 0x44, 0xa8, 0xc8, 0xba, + 0xa6, 0x27, 0xd5, 0xf0, 0xaf, 0xcf, 0x7c, 0x26, 0x1f, 0x9d, 0xec, 0x49, 0xfd, 0xfa, 0xf8, 0x81, + 0xc1, 0x63, 0x92, 0x60, 0x05, 0xdb, 0xf0, 0x19, 0xf3, 0x43, 0xec, 0xc8, 0xd3, 0x70, 0x74, 0xe2, + 0x08, 0x12, 0x61, 0x2e, 0x50, 0x14, 0x2b, 0x40, 0xfd, 0xc6, 0x74, 0x34, 0x74, 0x89, 0x23, 0xce, + 0x62, 0xac, 0x2c, 0x68, 0x5d, 0x96, 0xc1, 0xca, 0xc7, 0xdc, 0x94, 0x7d, 0x81, 0x04, 0x36, 0x77, + 0x40, 0x39, 0x46, 0x09, 0x8a, 0xb8, 0xa5, 0x35, 0xb5, 0xf6, 0xf2, 0xe6, 0x13, 0xfb, 0x3e, 0x93, + 0xd2, 0x8e, 0xdd, 0x55, 0x2f, 0xbe, 0x27, 0x3b, 0xb6, 0xf4, 0xf3, 0xcb, 0x8d, 0xd2, 0x40, 0xf5, + 0x9b, 0x4f, 0x81, 0x19, 0x27, 0x2c, 0x25, 0x1e, 0x4e, 0x60, 0x6e, 0x04, 0x24, 0x9e, 0xb5, 0xd0, + 0xd4, 0xda, 0x95, 0x41, 0xb5, 0xa8, 0x74, 0x65, 0xa1, 0xe7, 0x99, 0x36, 0x58, 0x9b, 0xa2, 0x03, + 0x44, 0x29, 0x0e, 0x33, 0xf8, 0xa2, 0x84, 0xff, 0x33, 0x81, 0xe7, 0x95, 0x9e, 0x67, 0xd6, 0x41, + 0x85, 0xe2, 0x31, 0x94, 0xba, 0x2c, 0xbd, 0xa9, 0xb5, 0x8d, 0x81, 0x41, 0xf1, 0xb8, 0x9b, 0x9d, + 0xcd, 0x6f, 0x60, 0x3d, 0xc0, 0xd9, 0x02, 0xa0, 0x60, 0x30, 0x45, 0x21, 0xc7, 0x02, 0x8e, 0x62, + 0x0f, 0x09, 0x9c, 0x71, 0x56, 0x9a, 0x8b, 0xed, 0xe5, 0xcd, 0x37, 0xf6, 0x1c, 0xdb, 0xb7, 0x77, + 0x24, 0xcd, 0x01, 0x3b, 0x92, 0x24, 0x87, 0x92, 0xa3, 0xb7, 0xad, 0xde, 0xb4, 0x16, 0xcc, 0xaa, + 0x7a, 0xe6, 0x77, 0x0d, 0xfc, 0xcf, 0x46, 0x82, 0x0b, 0x44, 0x3d, 0x42, 0x7d, 0xe8, 0xb1, 0x31, + 0xcd, 0xb6, 0x02, 0x79, 0x88, 0x78, 0x40, 0xa8, 0x6f, 0x01, 0x29, 0xe1, 0xf5, 0x5c, 0x12, 0x3e, + 0x4d, 0x99, 0xb6, 0x15, 0x91, 0x9a, 0x5f, 0x67, 0x77, 0x4b, 0xfb, 0x6a, 0x84, 0xf9, 0x15, 0x58, + 0x31, 0xce, 0xe7, 0x17, 0x6c, 0x30, 0x46, 0xee, 0x29, 0x16, 0xdc, 0x5a, 0x96, 0xab, 0x9d, 0xcf, + 0x81, 0xe9, 0x8e, 0xb3, 0xde, 0x6d, 0x24, 0xd0, 0x2e, 0xe1, 0xa2, 0x70, 0x40, 0x8d, 0xb8, 0x0d, + 0xe2, 0xe6, 0x0f, 0x0d, 0x34, 0x42, 0xc4, 0x05, 0x14, 0x09, 0xa2, 0x3c, 0x22, 0x9c, 0x13, 0x46, + 0xe1, 0x30, 0x64, 0xee, 0x29, 0xcc, 0x4d, 0xb3, 0x56, 0xa4, 0x86, 0xf7, 0x73, 0x69, 0xd8, 0x45, + 0x5c, 0x1c, 0xdc, 0x60, 0xda, 0xca, 0x88, 0xf2, 0xd5, 0x14, 0x56, 0x84, 0xf7, 0x43, 0xcc, 0x1a, + 0x28, 0xc7, 0x09, 0xee, 0x76, 0x8f, 0xac, 0xbf, 0x65, 0x50, 0xd4, 0xc9, 0xec, 0x03, 0xa3, 0x08, + 0x96, 0xb5, 0x2a, 0xe5, 0xb4, 0x1f, 0x4a, 0xfb, 0x9e, 0xc2, 0xf6, 0xe8, 0x09, 0x53, 0x63, 0x27, + 0xfd, 0x7d, 0xdd, 0xf8, 0xab, 0x5a, 0xee, 0xeb, 0x46, 0xb9, 0xba, 0xd4, 0xd7, 0x8d, 0xa5, 0xaa, + 0xd1, 0xd7, 0x0d, 0xa3, 0x5a, 0x69, 0x1d, 0x83, 0xda, 0xec, 0x0c, 0x65, 0xaa, 0x94, 0x15, 0xd9, + 0x97, 0xa6, 0x0f, 0xd4, 0xc9, 0x6c, 0x83, 0xea, 0x9d, 0xc8, 0x2e, 0x48, 0xc4, 0x6a, 0x7a, 0x2b, + 0x67, 0xad, 0x43, 0xb0, 0x36, 0x23, 0x1c, 0xe6, 0x3b, 0x50, 0x4f, 0x51, 0x48, 0x3c, 0x24, 0x58, + 0x22, 0x77, 0x8f, 0x29, 0x1f, 0x71, 0x88, 0x3c, 0x2f, 0xc1, 0x3c, 0xff, 0xae, 0x2b, 0x83, 0xff, + 0x26, 0x90, 0x6e, 0x81, 0xf8, 0x90, 0x03, 0x5a, 0x2f, 0x41, 0x7d, 0xf7, 0x61, 0x37, 0x6f, 0xe8, + 0x5e, 0x2c, 0x74, 0xb7, 0x86, 0xa0, 0x36, 0x3b, 0x2b, 0xe6, 0x0e, 0xd0, 0x43, 0xc2, 0x33, 0x7c, + 0x96, 0x7a, 0x7b, 0xbe, 0x1b, 0xa5, 0x60, 0x50, 0x4e, 0x4b, 0x86, 0xad, 0xcf, 0xe7, 0x57, 0x0d, + 0xed, 0xe2, 0xaa, 0xa1, 0xfd, 0xbe, 0x6a, 0x68, 0x3f, 0xaf, 0x1b, 0xa5, 0x8b, 0xeb, 0x46, 0xe9, + 0xd7, 0x75, 0xa3, 0x74, 0xfc, 0xd6, 0x27, 0x22, 0x18, 0x0d, 0x6d, 0x97, 0x45, 0x8e, 0xcb, 0x78, + 0xc4, 0xb8, 0x33, 0x1d, 0xf3, 0x6c, 0x72, 0x7f, 0xa6, 0xaf, 0x9c, 0x2f, 0xb7, 0xff, 0x15, 0xe4, + 0x6d, 0x38, 0x2c, 0xcb, 0xeb, 0xf0, 0xc5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xe7, 0x1e, + 0x4d, 0x46, 0x06, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -611,58 +503,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x4a } } - if len(m.InitialValSet) > 0 { - for iNdEx := len(m.InitialValSet) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.InitialValSet[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } - } - if len(m.MaturingPackets) > 0 { - for iNdEx := len(m.MaturingPackets) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.MaturingPackets[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } - } - if m.ProviderConsensusState != nil { - { - size, err := m.ProviderConsensusState.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - if m.ProviderClientState != nil { - { - size, err := m.ProviderClientState.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } if m.NewChain { i-- if m.NewChain { @@ -791,42 +631,6 @@ func (m *LastTransmissionBlockHeight) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *MaturingVSCPacket) 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 *MaturingVSCPacket) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MaturingVSCPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - n7, err7 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.MaturityTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime):]) - if err7 != nil { - return 0, err7 - } - i -= n7 - i = encodeVarintGenesis(dAtA, i, uint64(n7)) - i-- - dAtA[i] = 0x12 - if m.VscId != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.VscId)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *ConsumerPacketDataList) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -894,26 +698,6 @@ func (m *GenesisState) Size() (n int) { if m.NewChain { n += 2 } - if m.ProviderClientState != nil { - l = m.ProviderClientState.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - if m.ProviderConsensusState != nil { - l = m.ProviderConsensusState.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - if len(m.MaturingPackets) > 0 { - for _, e := range m.MaturingPackets { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } - if len(m.InitialValSet) > 0 { - for _, e := range m.InitialValSet { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } if len(m.HeightToValsetUpdateId) > 0 { for _, e := range m.HeightToValsetUpdateId { l = e.Size() @@ -978,20 +762,6 @@ func (m *LastTransmissionBlockHeight) Size() (n int) { return n } -func (m *MaturingVSCPacket) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.VscId != 0 { - n += 1 + sovGenesis(uint64(m.VscId)) - } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.MaturityTime) - n += 1 + l + sovGenesis(uint64(l)) - return n -} - func (m *ConsumerPacketDataList) Size() (n int) { if m == nil { return 0 @@ -1159,146 +929,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } } m.NewChain = bool(v != 0) - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProviderClientState", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ProviderClientState == nil { - m.ProviderClientState = &_07_tendermint.ClientState{} - } - if err := m.ProviderClientState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProviderConsensusState", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ProviderConsensusState == nil { - m.ProviderConsensusState = &_07_tendermint.ConsensusState{} - } - if err := m.ProviderConsensusState.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MaturingPackets", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MaturingPackets = append(m.MaturingPackets, MaturingVSCPacket{}) - if err := m.MaturingPackets[len(m.MaturingPackets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InitialValSet", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.InitialValSet = append(m.InitialValSet, types1.ValidatorUpdate{}) - if err := m.InitialValSet[len(m.InitialValSet)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeightToValsetUpdateId", wireType) @@ -1746,108 +1376,6 @@ func (m *LastTransmissionBlockHeight) Unmarshal(dAtA []byte) error { } return nil } -func (m *MaturingVSCPacket) 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 ErrIntOverflowGenesis - } - 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: MaturingVSCPacket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MaturingVSCPacket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field VscId", wireType) - } - m.VscId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.VscId |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MaturityTime", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.MaturityTime, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenesis(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenesis - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ConsumerPacketDataList) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0