From 142efeee7f97f4c30c40f0c6307157e53d505ec2 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Fri, 23 Jun 2023 12:53:12 +0200 Subject: [PATCH 1/9] fix: add InitTimeoutTimestamps and VscSendTimestamps to genesis --- go.sum | 1 + .../ccv/consumer/v1/consumer.proto | 2 +- .../ccv/consumer/v1/genesis.proto | 4 +- .../ccv/consumer/v1/query.proto | 2 +- .../ccv/provider/v1/genesis.proto | 8 +- .../ccv/provider/v1/provider.proto | 7 +- .../ccv/provider/v1/query.proto | 2 +- .../ccv/provider/v1/tx.proto | 4 +- proto/interchain_security/ccv/v1/ccv.proto | 4 +- scripts/protocgen.sh | 2 +- x/ccv/consumer/types/consumer.pb.go | 70 ++--- x/ccv/consumer/types/genesis.pb.go | 94 +++---- x/ccv/consumer/types/query.pb.go | 66 ++--- x/ccv/provider/keeper/genesis.go | 12 + x/ccv/provider/keeper/keeper.go | 1 + x/ccv/provider/types/genesis.go | 4 + x/ccv/provider/types/genesis.pb.go | 240 ++++++++++++---- x/ccv/provider/types/provider.pb.go | 259 +++++++++++------- x/ccv/provider/types/query.pb.go | 6 +- x/ccv/provider/types/tx.pb.go | 18 +- x/ccv/types/ccv.pb.go | 6 +- 21 files changed, 508 insertions(+), 304 deletions(-) diff --git a/go.sum b/go.sum index b79f6784cb..cafdd80e8c 100644 --- a/go.sum +++ b/go.sum @@ -1129,6 +1129,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= diff --git a/proto/interchain_security/ccv/consumer/v1/consumer.proto b/proto/interchain_security/ccv/consumer/v1/consumer.proto index 1487e579a8..97ba14f6da 100644 --- a/proto/interchain_security/ccv/consumer/v1/consumer.proto +++ b/proto/interchain_security/ccv/consumer/v1/consumer.proto @@ -3,7 +3,7 @@ package interchain_security.ccv.consumer.v1; import "interchain_security/ccv/v1/ccv.proto"; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/interchain_security/ccv/consumer/v1/genesis.proto b/proto/interchain_security/ccv/consumer/v1/genesis.proto index 739ac2798e..3511f3f349 100644 --- a/proto/interchain_security/ccv/consumer/v1/genesis.proto +++ b/proto/interchain_security/ccv/consumer/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.consumer.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"; import "interchain_security/ccv/v1/ccv.proto"; import "interchain_security/ccv/consumer/v1/consumer.proto"; @@ -55,4 +55,4 @@ message HeightToValsetUpdateID { // OutstandingDowntime defines the genesis information for each validator // flagged with an outstanding downtime slashing. -message OutstandingDowntime { string validator_consensus_address = 1; } \ No newline at end of file +message OutstandingDowntime { string validator_consensus_address = 1; } diff --git a/proto/interchain_security/ccv/consumer/v1/query.proto b/proto/interchain_security/ccv/consumer/v1/query.proto index b5576b57fe..df90b1d0aa 100644 --- a/proto/interchain_security/ccv/consumer/v1/query.proto +++ b/proto/interchain_security/ccv/consumer/v1/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.consumer.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto index e1c241413b..4abc5db8d0 100644 --- a/proto/interchain_security/ccv/provider/v1/genesis.proto +++ b/proto/interchain_security/ccv/provider/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"; import "gogoproto/gogo.proto"; import "interchain_security/ccv/v1/ccv.proto"; @@ -44,6 +44,12 @@ message GenesisState { // empty for a new chain repeated ConsumerAddrsToPrune consumer_addrs_to_prune = 11 [ (gogoproto.nullable) = false ]; + + repeated interchain_security.ccv.provider.v1.InitTimeoutTimestamp init_timeout_timestamps = 12 + [ (gogoproto.nullable) = false ]; + + repeated interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamps = 13 + [ (gogoproto.nullable) = false ]; } // consumer chain diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto index f235f0831a..497595b5f7 100644 --- a/proto/interchain_security/ccv/provider/v1/provider.proto +++ b/proto/interchain_security/ccv/provider/v1/provider.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; @@ -216,8 +216,9 @@ message InitTimeoutTimestamp { } message VscSendTimestamp { - uint64 vsc_id = 1; - google.protobuf.Timestamp timestamp = 2 + string chain_id = 1; + uint64 vsc_id = 2; + google.protobuf.Timestamp timestamp = 3 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; } diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 4709b287dd..431099be79 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/interchain_security/ccv/provider/v1/tx.proto b/proto/interchain_security/ccv/provider/v1/tx.proto index 3093132727..952ba31c09 100644 --- a/proto/interchain_security/ccv/provider/v1/tx.proto +++ b/proto/interchain_security/ccv/provider/v1/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package interchain_security.ccv.provider.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; @@ -44,4 +44,4 @@ message MsgRegisterConsumerRewardDenom { // MsgRegisterConsumerRewardDenomResponse defines the // Msg/RegisterConsumerRewardDenom response type. -message MsgRegisterConsumerRewardDenomResponse {} \ No newline at end of file +message MsgRegisterConsumerRewardDenomResponse {} diff --git a/proto/interchain_security/ccv/v1/ccv.proto b/proto/interchain_security/ccv/v1/ccv.proto index 730366ea7f..9e8fc5ddb6 100644 --- a/proto/interchain_security/ccv/v1/ccv.proto +++ b/proto/interchain_security/ccv/v1/ccv.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package interchain_security.ccv.v1; -option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/types"; +option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/types"; import "cosmos/staking/v1beta1/staking.proto"; @@ -84,4 +84,4 @@ enum ConsumerPacketDataType { // VSCMatured packet CONSUMER_PACKET_TYPE_VSCM = 2 [ (gogoproto.enumvalue_customname) = "VscMaturedPacket" ]; -} \ No newline at end of file +} diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index a6ca6098e4..7332a554f2 100644 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -16,6 +16,6 @@ done cd .. # move proto files to the right places -cp -r github.com/cosmos/interchain-security/v2/* ./ +cp -r github.com/cosmos/interchain-security/v3/* ./ rm -rf github.com diff --git a/x/ccv/consumer/types/consumer.pb.go b/x/ccv/consumer/types/consumer.pb.go index 6ab018cf26..90d5d6e12b 100644 --- a/x/ccv/consumer/types/consumer.pb.go +++ b/x/ccv/consumer/types/consumer.pb.go @@ -369,53 +369,53 @@ var fileDescriptor_5b27a82b276e7f93 = []byte{ // 786 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x6e, 0xdb, 0x36, 0x18, 0x8f, 0x96, 0xd6, 0x4d, 0x98, 0x14, 0x6b, 0x59, 0x2f, 0x55, 0x33, 0x40, 0x76, 0xdd, 0x1e, - 0x7c, 0x89, 0x84, 0x3a, 0xdb, 0xa5, 0xc0, 0x0e, 0x8d, 0xb3, 0xa2, 0xdd, 0xbf, 0x78, 0xaa, 0xd1, + 0x7c, 0x89, 0x84, 0x26, 0xdb, 0xa5, 0xc0, 0x0e, 0xb5, 0xb3, 0xa2, 0xdd, 0xbf, 0x78, 0xaa, 0xd1, 0x01, 0xdb, 0x81, 0xa0, 0x28, 0x5a, 0x22, 0x22, 0x91, 0x02, 0x49, 0xa9, 0xd3, 0x7d, 0x0f, 0xd0, 0xe3, 0x1e, 0x61, 0x0f, 0xb0, 0x87, 0x28, 0x76, 0xea, 0x71, 0xa7, 0x6e, 0x48, 0xde, 0x60, 0x4f, 0x30, 0x90, 0x92, 0x5c, 0x3b, 0x6d, 0x80, 0xdc, 0xf8, 0xe9, 0xf7, 0xfb, 0x7e, 0xfa, 0xfe, 0x83, - 0x09, 0xe3, 0x9a, 0x4a, 0x92, 0x62, 0xc6, 0x91, 0xa2, 0xa4, 0x94, 0x4c, 0xd7, 0x01, 0x21, 0x55, - 0x40, 0x04, 0x57, 0x65, 0x4e, 0x65, 0x50, 0x3d, 0x5a, 0xbe, 0xfd, 0x42, 0x0a, 0x2d, 0xe0, 0x83, - 0x8f, 0xf8, 0xf8, 0x84, 0x54, 0xfe, 0x92, 0x57, 0x3d, 0xda, 0x7f, 0x78, 0x99, 0xb0, 0xd1, 0x23, - 0x55, 0x23, 0xb5, 0x7f, 0x2f, 0x11, 0x22, 0xc9, 0x68, 0x60, 0xad, 0xa8, 0x5c, 0x04, 0x98, 0xd7, - 0x2d, 0xd4, 0x4f, 0x44, 0x22, 0xec, 0x33, 0x30, 0xaf, 0xce, 0x81, 0x08, 0x95, 0x0b, 0x85, 0x1a, - 0xa0, 0x31, 0x5a, 0xc8, 0xbb, 0xa8, 0x15, 0x97, 0x12, 0x6b, 0x26, 0x78, 0x8b, 0x0f, 0x2e, 0xe2, - 0x9a, 0xe5, 0x54, 0x69, 0x9c, 0x17, 0x0d, 0x61, 0xf4, 0x5b, 0x0f, 0xf4, 0x66, 0x58, 0xe2, 0x5c, - 0x41, 0x17, 0xdc, 0xa0, 0x1c, 0x47, 0x19, 0x8d, 0x5d, 0x67, 0xe8, 0x8c, 0xb7, 0xc2, 0xce, 0x84, - 0x27, 0xe0, 0x61, 0x94, 0x09, 0x72, 0xaa, 0x50, 0x41, 0x25, 0x8a, 0x99, 0xd2, 0x92, 0x45, 0xa5, - 0xf9, 0x0d, 0xd2, 0x12, 0x73, 0x95, 0x33, 0xa5, 0x98, 0xe0, 0xee, 0x27, 0x43, 0x67, 0xbc, 0x19, - 0xde, 0x6f, 0xb8, 0x33, 0x2a, 0x8f, 0x57, 0x98, 0xf3, 0x15, 0x22, 0xfc, 0x06, 0xdc, 0xbf, 0x54, - 0x05, 0x91, 0x14, 0x73, 0x4e, 0x33, 0x77, 0x73, 0xe8, 0x8c, 0xb7, 0xc3, 0x41, 0x7c, 0x89, 0xc8, - 0xb4, 0xa1, 0xc1, 0xc7, 0x60, 0xbf, 0x90, 0xa2, 0x62, 0x31, 0x95, 0x68, 0x41, 0x29, 0x2a, 0x84, - 0xc8, 0x10, 0x8e, 0x63, 0x89, 0x94, 0x96, 0xee, 0x35, 0x2b, 0xb2, 0xd7, 0x31, 0x9e, 0x52, 0x3a, - 0x13, 0x22, 0x7b, 0x12, 0xc7, 0xf2, 0x85, 0x96, 0xf0, 0x47, 0x00, 0x09, 0xa9, 0x90, 0x29, 0x8a, - 0x28, 0xb5, 0xc9, 0x8e, 0x89, 0xd8, 0xbd, 0x3e, 0x74, 0xc6, 0x3b, 0x93, 0x7b, 0x7e, 0x53, 0x3b, - 0xbf, 0xab, 0x9d, 0x7f, 0xdc, 0xd6, 0xf6, 0x68, 0xeb, 0xcd, 0xbb, 0xc1, 0xc6, 0xef, 0xff, 0x0c, - 0x9c, 0xf0, 0x16, 0x21, 0xd5, 0xbc, 0xf1, 0x9e, 0x59, 0x67, 0xf8, 0x0b, 0xb8, 0x6b, 0xb3, 0x59, - 0x50, 0x79, 0x51, 0xb7, 0x77, 0x75, 0xdd, 0xcf, 0x3a, 0x8d, 0x75, 0xf1, 0x67, 0x60, 0xd8, 0xcd, - 0x1b, 0x92, 0x74, 0xad, 0x84, 0x0b, 0x89, 0x89, 0x79, 0xb8, 0x37, 0x6c, 0xc6, 0x5e, 0xc7, 0x0b, - 0xd7, 0x68, 0x4f, 0x5b, 0x16, 0x3c, 0x00, 0x30, 0x65, 0x4a, 0x0b, 0xc9, 0x08, 0xce, 0x10, 0xe5, - 0x5a, 0x32, 0xaa, 0xdc, 0x2d, 0xdb, 0xc0, 0xdb, 0xef, 0x91, 0xaf, 0x1b, 0x00, 0xfe, 0x00, 0x6e, - 0x95, 0x3c, 0x12, 0x3c, 0x66, 0x3c, 0xe9, 0xd2, 0xd9, 0xbe, 0x7a, 0x3a, 0x9f, 0x2e, 0x9d, 0xdb, - 0x44, 0x0e, 0xc1, 0x9e, 0x12, 0x0b, 0x8d, 0x44, 0xa1, 0x91, 0xa9, 0x90, 0x4e, 0x25, 0x55, 0xa9, - 0xc8, 0x62, 0x17, 0xd8, 0xf0, 0xef, 0x18, 0xf4, 0xa4, 0xd0, 0x27, 0xa5, 0x9e, 0x77, 0x10, 0x7c, - 0x00, 0x6e, 0x4a, 0xfa, 0x0a, 0xcb, 0x18, 0xc5, 0x94, 0x8b, 0x5c, 0xb9, 0x3b, 0xc3, 0xcd, 0xf1, - 0x76, 0xb8, 0xdb, 0x7c, 0x3c, 0xb6, 0xdf, 0xe0, 0x17, 0x60, 0xd9, 0x6c, 0xb4, 0xce, 0xde, 0xb5, - 0xec, 0x7e, 0x87, 0x86, 0x2b, 0x5e, 0xa3, 0x2f, 0xc1, 0xe7, 0xdf, 0x61, 0xa5, 0x57, 0xe7, 0xeb, - 0xc8, 0x4c, 0xf1, 0x33, 0xca, 0x92, 0x54, 0xc3, 0x3d, 0xd0, 0x4b, 0xed, 0xcb, 0x6e, 0xc6, 0x66, + 0x43, 0xc6, 0x35, 0x95, 0x24, 0xc5, 0x8c, 0x23, 0x45, 0x49, 0x29, 0x99, 0xae, 0x03, 0x42, 0xaa, + 0x80, 0x08, 0xae, 0xca, 0x9c, 0xca, 0xa0, 0x7a, 0xb4, 0x7c, 0xfb, 0x85, 0x14, 0x5a, 0xc0, 0x07, + 0x1f, 0xf1, 0xf1, 0x09, 0xa9, 0xfc, 0x25, 0xaf, 0x7a, 0xb4, 0xff, 0xf0, 0x32, 0x61, 0xa3, 0x47, + 0xaa, 0x46, 0x6a, 0xff, 0x5e, 0x22, 0x44, 0x92, 0xd1, 0xc0, 0x5a, 0x51, 0xb9, 0x08, 0x30, 0xaf, + 0x5b, 0xa8, 0x9f, 0x88, 0x44, 0xd8, 0x67, 0x60, 0x5e, 0x9d, 0x03, 0x11, 0x2a, 0x17, 0x0a, 0x35, + 0x40, 0x63, 0xb4, 0x90, 0x77, 0x51, 0x2b, 0x2e, 0x25, 0xd6, 0x4c, 0xf0, 0x16, 0x1f, 0x5c, 0xc4, + 0x35, 0xcb, 0xa9, 0xd2, 0x38, 0x2f, 0x1a, 0xc2, 0xe8, 0xb7, 0x1e, 0xe8, 0xcd, 0xb0, 0xc4, 0xb9, + 0x82, 0x2e, 0xb8, 0x41, 0x39, 0x8e, 0x32, 0x1a, 0xbb, 0xce, 0xd0, 0x19, 0x6f, 0x85, 0x9d, 0x09, + 0x4f, 0xc0, 0xc3, 0x28, 0x13, 0xe4, 0x54, 0xa1, 0x82, 0x4a, 0x14, 0x33, 0xa5, 0x25, 0x8b, 0x4a, + 0xf3, 0x1b, 0xa4, 0x25, 0xe6, 0x2a, 0x67, 0x4a, 0x31, 0xc1, 0xdd, 0x4f, 0x86, 0xce, 0x78, 0x33, + 0xbc, 0xdf, 0x70, 0x67, 0x54, 0x1e, 0xaf, 0x30, 0xe7, 0x2b, 0x44, 0xf8, 0x0d, 0xb8, 0x7f, 0xa9, + 0x0a, 0x22, 0x29, 0xe6, 0x9c, 0x66, 0xee, 0xe6, 0xd0, 0x19, 0x6f, 0x87, 0x83, 0xf8, 0x12, 0x91, + 0x69, 0x43, 0x83, 0x8f, 0xc1, 0x7e, 0x21, 0x45, 0xc5, 0x62, 0x2a, 0xd1, 0x82, 0x52, 0x54, 0x08, + 0x91, 0x21, 0x1c, 0xc7, 0x12, 0x29, 0x2d, 0xdd, 0x6b, 0x56, 0x64, 0xaf, 0x63, 0x3c, 0xa5, 0x74, + 0x26, 0x44, 0xf6, 0x24, 0x8e, 0xe5, 0x0b, 0x2d, 0xe1, 0x8f, 0x00, 0x12, 0x52, 0x21, 0x53, 0x14, + 0x51, 0x6a, 0x93, 0x1d, 0x13, 0xb1, 0x7b, 0x7d, 0xe8, 0x8c, 0x77, 0x0e, 0xef, 0xf9, 0x4d, 0xed, + 0xfc, 0xae, 0x76, 0xfe, 0x71, 0x5b, 0xdb, 0xc9, 0xd6, 0x9b, 0x77, 0x83, 0x8d, 0xdf, 0xff, 0x19, + 0x38, 0xe1, 0x2d, 0x42, 0xaa, 0x79, 0xe3, 0x3d, 0xb3, 0xce, 0xf0, 0x17, 0x70, 0xd7, 0x66, 0xb3, + 0xa0, 0xf2, 0xa2, 0x6e, 0xef, 0xea, 0xba, 0x9f, 0x75, 0x1a, 0xeb, 0xe2, 0xcf, 0xc0, 0xb0, 0x9b, + 0x37, 0x24, 0xe9, 0x5a, 0x09, 0x17, 0x12, 0x13, 0xf3, 0x70, 0x6f, 0xd8, 0x8c, 0xbd, 0x8e, 0x17, + 0xae, 0xd1, 0x9e, 0xb6, 0x2c, 0x78, 0x00, 0x60, 0xca, 0x94, 0x16, 0x92, 0x11, 0x9c, 0x21, 0xca, + 0xb5, 0x64, 0x54, 0xb9, 0x5b, 0xb6, 0x81, 0xb7, 0xdf, 0x23, 0x5f, 0x37, 0x00, 0xfc, 0x01, 0xdc, + 0x2a, 0x79, 0x24, 0x78, 0xcc, 0x78, 0xd2, 0xa5, 0xb3, 0x7d, 0xf5, 0x74, 0x3e, 0x5d, 0x3a, 0xb7, + 0x89, 0x1c, 0x81, 0x3d, 0x25, 0x16, 0x1a, 0x89, 0x42, 0x23, 0x53, 0x21, 0x9d, 0x4a, 0xaa, 0x52, + 0x91, 0xc5, 0x2e, 0xb0, 0xe1, 0xdf, 0x31, 0xe8, 0x49, 0xa1, 0x4f, 0x4a, 0x3d, 0xef, 0x20, 0xf8, + 0x00, 0xdc, 0x94, 0xf4, 0x15, 0x96, 0x31, 0x8a, 0x29, 0x17, 0xb9, 0x72, 0x77, 0x86, 0x9b, 0xe3, + 0xed, 0x70, 0xb7, 0xf9, 0x78, 0x6c, 0xbf, 0xc1, 0x2f, 0xc0, 0xb2, 0xd9, 0x68, 0x9d, 0xbd, 0x6b, + 0xd9, 0xfd, 0x0e, 0x0d, 0x57, 0xbc, 0x46, 0x5f, 0x82, 0xcf, 0xbf, 0xc3, 0x4a, 0xaf, 0xce, 0xd7, + 0xc4, 0x4c, 0xf1, 0x33, 0xca, 0x92, 0x54, 0xc3, 0x3d, 0xd0, 0x4b, 0xed, 0xcb, 0x6e, 0xc6, 0x66, 0xd8, 0x5a, 0xa3, 0x3f, 0x1c, 0x70, 0x67, 0x2a, 0x85, 0x52, 0x53, 0xb3, 0xf3, 0x2f, 0x71, 0xc6, 0x62, 0xac, 0x85, 0x34, 0xab, 0x64, 0x26, 0x90, 0x2a, 0x65, 0x1d, 0x76, 0xc3, 0xce, 0x84, 0x7d, 0x70, 0xbd, 0x10, 0xaf, 0xa8, 0x6c, 0x77, 0xa5, 0x31, 0x20, 0x06, 0xbd, 0xa2, 0x8c, 0x4e, 0x69, - 0x6d, 0x87, 0x7e, 0x67, 0xd2, 0xff, 0xa0, 0xa8, 0x4f, 0x78, 0x7d, 0x74, 0xf8, 0xdf, 0xbb, 0xc1, + 0x6d, 0x87, 0x7e, 0xe7, 0xb0, 0xff, 0x41, 0x51, 0x9f, 0xf0, 0x7a, 0x72, 0xf4, 0xdf, 0xbb, 0xc1, 0xdd, 0x1a, 0xe7, 0xd9, 0xe3, 0x91, 0xe9, 0x2e, 0xe5, 0xaa, 0x54, 0xa8, 0xf1, 0x1b, 0xfd, 0xf5, 0xe7, 0x41, 0xbf, 0xbd, 0x0c, 0x44, 0xd6, 0x85, 0x16, 0xfe, 0xac, 0x8c, 0xbe, 0xa5, 0x75, 0xd8, 0x0a, 0x8f, 0x34, 0xb8, 0xfd, 0x3d, 0xd6, 0xa5, 0x64, 0x3c, 0x79, 0xf9, 0x62, 0x3a, 0xc3, 0xe4, 0x94, 0x6a, 0x13, 0x4d, 0xa5, 0xc8, 0xf3, 0x66, 0xe1, 0xaf, 0x85, 0x8d, 0x01, 0x9f, 0x83, 0x9b, - 0xb9, 0xa5, 0xea, 0xda, 0x8e, 0xb0, 0x8d, 0x75, 0x67, 0xb2, 0xff, 0x41, 0x50, 0xf3, 0xee, 0x98, - 0x34, 0xad, 0x7e, 0x6d, 0x5a, 0xbd, 0xdb, 0xb9, 0x1a, 0xf0, 0xe8, 0xa7, 0x37, 0x67, 0x9e, 0xf3, + 0xb9, 0xa5, 0xea, 0xda, 0x8e, 0xb0, 0x8d, 0x75, 0xe7, 0x70, 0xff, 0x83, 0xa0, 0xe6, 0xdd, 0x31, + 0x69, 0x5a, 0xfd, 0xda, 0xb4, 0x7a, 0xb7, 0x73, 0x35, 0xe0, 0xe4, 0xa7, 0x37, 0x67, 0x9e, 0xf3, 0xf6, 0xcc, 0x73, 0xfe, 0x3d, 0xf3, 0x9c, 0xd7, 0xe7, 0xde, 0xc6, 0xdb, 0x73, 0x6f, 0xe3, 0xef, 0x73, 0x6f, 0xe3, 0xe7, 0xaf, 0x12, 0xa6, 0xd3, 0x32, 0xf2, 0x89, 0xc8, 0xdb, 0x93, 0x16, 0xbc, - 0xbf, 0x9e, 0x07, 0xcb, 0xeb, 0x59, 0x4d, 0x82, 0x5f, 0xd7, 0x6f, 0xb3, 0xae, 0x0b, 0xaa, 0xa2, - 0x9e, 0x0d, 0xe2, 0xf0, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x03, 0xd8, 0xe3, 0xcc, 0x05, + 0xbf, 0x9e, 0x07, 0xcb, 0xeb, 0x59, 0x1d, 0x05, 0xbf, 0xae, 0xdf, 0x66, 0x5d, 0x17, 0x54, 0x45, + 0x3d, 0x1b, 0xc4, 0xd1, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe0, 0xb8, 0xdf, 0xcc, 0x05, 0x00, 0x00, } diff --git a/x/ccv/consumer/types/genesis.pb.go b/x/ccv/consumer/types/genesis.pb.go index 1511df9ccd..7a503f0e77 100644 --- a/x/ccv/consumer/types/genesis.pb.go +++ b/x/ccv/consumer/types/genesis.pb.go @@ -291,53 +291,53 @@ var fileDescriptor_2db73a6057a27482 = []byte{ // 786 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4b, 0x8f, 0xe3, 0x34, 0x1c, 0x6f, 0x76, 0x87, 0xd2, 0x7a, 0x76, 0xd9, 0xc1, 0x03, 0x55, 0x68, 0x45, 0x28, 0x03, 0x87, - 0x4a, 0x40, 0xac, 0x16, 0x09, 0x21, 0x21, 0x10, 0x4c, 0x47, 0x82, 0x4a, 0x0b, 0xac, 0xda, 0xdd, - 0x22, 0xed, 0x25, 0x72, 0x1d, 0x93, 0x58, 0x9b, 0xd8, 0x91, 0xed, 0x64, 0xd8, 0x03, 0x17, 0xae, - 0x5c, 0xf8, 0x58, 0x7b, 0x9c, 0x23, 0x27, 0x84, 0x66, 0xbe, 0x03, 0x67, 0x14, 0xdb, 0xe9, 0x83, - 0xe9, 0x88, 0x9e, 0x12, 0xe7, 0xff, 0x7b, 0xfc, 0x1f, 0x8e, 0x0d, 0xc6, 0x8c, 0x6b, 0x2a, 0x49, - 0x8a, 0x19, 0x8f, 0x14, 0x25, 0xa5, 0x64, 0xfa, 0x25, 0x22, 0xa4, 0x42, 0x44, 0x70, 0x55, 0xe6, - 0x54, 0xa2, 0x6a, 0x8c, 0x12, 0xca, 0xa9, 0x62, 0x2a, 0x2c, 0xa4, 0xd0, 0x02, 0x7e, 0xb0, 0x87, - 0x12, 0x12, 0x52, 0x85, 0x0d, 0x25, 0xac, 0xc6, 0xfd, 0x0f, 0xef, 0xd2, 0xad, 0xc6, 0xf5, 0xc3, - 0x4a, 0xf5, 0x27, 0x87, 0xb8, 0xaf, 0x65, 0x2d, 0x67, 0xa0, 0x29, 0x8f, 0xa9, 0xcc, 0x19, 0xd7, - 0x08, 0xaf, 0x08, 0x43, 0xfa, 0x65, 0x41, 0x5d, 0x6e, 0x7d, 0xc4, 0x56, 0x04, 0x65, 0x2c, 0x49, - 0x35, 0xc9, 0x18, 0xe5, 0x5a, 0xa1, 0x2d, 0x74, 0x35, 0xde, 0x5a, 0x39, 0xc2, 0xfb, 0x35, 0x81, - 0x08, 0x49, 0x11, 0x49, 0x31, 0xe7, 0x34, 0x33, 0x8e, 0xf6, 0xd5, 0x41, 0x82, 0x44, 0x88, 0x24, - 0xa3, 0xc8, 0xac, 0x56, 0xe5, 0xcf, 0x28, 0x2e, 0x25, 0xd6, 0x4c, 0x70, 0x17, 0x7f, 0x2b, 0x11, - 0x89, 0x30, 0xaf, 0xa8, 0x7e, 0xb3, 0x5f, 0xcf, 0xfe, 0xe9, 0x80, 0x07, 0xdf, 0xda, 0xbe, 0x2d, - 0x34, 0xd6, 0x14, 0xce, 0x40, 0xbb, 0xc0, 0x12, 0xe7, 0xca, 0xf7, 0x86, 0xde, 0xe8, 0x78, 0xf2, - 0x51, 0x78, 0x40, 0x1f, 0xc3, 0x27, 0x86, 0x72, 0x7e, 0xf4, 0xea, 0xaf, 0xf7, 0x5a, 0x73, 0x27, - 0x00, 0x3f, 0x06, 0xb0, 0x90, 0xa2, 0x62, 0x31, 0x95, 0x91, 0xad, 0x33, 0x62, 0xb1, 0x7f, 0x6f, - 0xe8, 0x8d, 0xba, 0xf3, 0x93, 0x26, 0x32, 0x35, 0x81, 0x59, 0x0c, 0x43, 0x70, 0xba, 0x41, 0xdb, - 0xca, 0x6a, 0xf8, 0x7d, 0x03, 0x7f, 0x73, 0x0d, 0xb7, 0x91, 0x59, 0x0c, 0x07, 0xa0, 0xcb, 0xe9, - 0x65, 0x64, 0x12, 0xf3, 0x8f, 0x86, 0xde, 0xa8, 0x33, 0xef, 0x70, 0x7a, 0x39, 0xad, 0xd7, 0x30, - 0x02, 0x6f, 0xff, 0xd7, 0x5a, 0xd5, 0xe5, 0xf9, 0xaf, 0x35, 0x45, 0xad, 0x48, 0xb8, 0x3d, 0x80, - 0x70, 0xab, 0xe5, 0xd5, 0x38, 0xb4, 0x59, 0x99, 0x8e, 0xcc, 0x4f, 0x77, 0x53, 0xb5, 0x6d, 0x4a, - 0x81, 0xbf, 0x31, 0x10, 0x5c, 0x51, 0xae, 0x4a, 0xe5, 0x3c, 0xda, 0xc6, 0x23, 0xfc, 0x5f, 0x8f, - 0x86, 0x66, 0x6d, 0x7a, 0x6b, 0x9b, 0x9d, 0xef, 0x30, 0x01, 0x27, 0x39, 0xd6, 0xa5, 0x64, 0x3c, - 0x89, 0x0a, 0x4c, 0x5e, 0x50, 0xad, 0xfc, 0xd7, 0x87, 0xf7, 0x47, 0xc7, 0x93, 0xcf, 0x0e, 0x1a, - 0xcd, 0xf7, 0x8e, 0xbc, 0x5c, 0x4c, 0x9f, 0x18, 0xba, 0x9b, 0xd2, 0xa3, 0x46, 0xd5, 0x7e, 0x55, - 0xf0, 0x07, 0xf0, 0x88, 0x71, 0xa6, 0x19, 0xce, 0xa2, 0x0a, 0x67, 0x91, 0xa2, 0xda, 0xef, 0x18, - 0x9f, 0xe1, 0x76, 0xe2, 0xf5, 0x5e, 0x0e, 0x97, 0x38, 0x63, 0x31, 0xd6, 0x42, 0x3e, 0x2b, 0x62, - 0xac, 0xa9, 0x53, 0x7c, 0xe8, 0xe8, 0x4b, 0x9c, 0x2d, 0xa8, 0x86, 0xbf, 0x82, 0x7e, 0x4a, 0xeb, - 0xf2, 0x23, 0x2d, 0x6a, 0x45, 0x45, 0x75, 0x54, 0x1a, 0x7c, 0x3d, 0xd7, 0xae, 0x91, 0xfe, 0xe2, - 0xa0, 0x12, 0xbe, 0x33, 0x32, 0x4f, 0xc5, 0xd2, 0x88, 0x58, 0xcf, 0xd9, 0x85, 0x73, 0xed, 0xa5, - 0xfb, 0xa2, 0x31, 0xfc, 0xcd, 0x03, 0xef, 0x8a, 0x52, 0x2b, 0x8d, 0x79, 0x5c, 0xf7, 0x2e, 0x16, - 0x97, 0x5c, 0xb3, 0x9c, 0x46, 0x2a, 0xc3, 0x2a, 0x65, 0x3c, 0xf1, 0x81, 0x49, 0xe1, 0xf3, 0x83, - 0x52, 0xf8, 0x71, 0xa3, 0x74, 0xe1, 0x84, 0x9c, 0xff, 0x40, 0xdc, 0x0e, 0x2d, 0x9c, 0x05, 0x94, - 0xc0, 0x2f, 0xa8, 0xf5, 0x6f, 0xd4, 0xd6, 0x43, 0x3c, 0x36, 0xdb, 0x64, 0x72, 0xa7, 0xbd, 0xdb, - 0x22, 0x35, 0xc7, 0x8e, 0xe8, 0x02, 0x6b, 0xfc, 0x98, 0xa9, 0x66, 0x80, 0x3d, 0xa7, 0xbc, 0x0b, - 0x52, 0xf0, 0x77, 0x0f, 0x04, 0x19, 0x56, 0x3a, 0xd2, 0x12, 0x73, 0x95, 0x33, 0xa5, 0x98, 0xe0, - 0xd1, 0x2a, 0x13, 0xe4, 0x45, 0x64, 0x7b, 0xe5, 0x3f, 0x30, 0xd6, 0x5f, 0x1f, 0x54, 0xf9, 0x63, - 0xac, 0xf4, 0xd3, 0x2d, 0xa5, 0xf3, 0x5a, 0xc8, 0x4e, 0xa4, 0xe9, 0x40, 0x76, 0x37, 0x04, 0xf6, - 0x40, 0xbb, 0x90, 0x74, 0x3a, 0x5d, 0xfa, 0x0f, 0xcd, 0x3f, 0xea, 0x56, 0x67, 0xcf, 0x41, 0x6f, - 0xff, 0x58, 0x6b, 0x86, 0x4b, 0xb3, 0x3e, 0x81, 0x8e, 0xe6, 0x6e, 0x05, 0x47, 0xe0, 0xe4, 0xd6, - 0x2e, 0xba, 0x67, 0x10, 0x6f, 0x54, 0x3b, 0xa3, 0x3f, 0x7b, 0x06, 0x4e, 0xf7, 0xcc, 0x0b, 0x7e, - 0x05, 0x06, 0x55, 0xb3, 0x71, 0xb7, 0x7e, 0x5a, 0x1c, 0xc7, 0x92, 0x2a, 0x7b, 0xde, 0x75, 0xe7, - 0xef, 0xac, 0x21, 0xeb, 0xff, 0xf0, 0x1b, 0x0b, 0x38, 0xff, 0xe9, 0xd5, 0x75, 0xe0, 0x5d, 0x5d, - 0x07, 0xde, 0xdf, 0xd7, 0x81, 0xf7, 0xc7, 0x4d, 0xd0, 0xba, 0xba, 0x09, 0x5a, 0x7f, 0xde, 0x04, - 0xad, 0xe7, 0x5f, 0x26, 0x4c, 0xa7, 0xe5, 0x2a, 0x24, 0x22, 0x47, 0x44, 0xa8, 0x5c, 0x28, 0xb4, - 0x69, 0xed, 0x27, 0xeb, 0x2b, 0xa3, 0x9a, 0xa0, 0x5f, 0x76, 0xef, 0x0d, 0x73, 0x29, 0xac, 0xda, - 0xe6, 0x2c, 0xfe, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x37, 0xab, 0xfd, 0xe6, 0x06, + 0x4a, 0x40, 0xac, 0x76, 0x25, 0x84, 0x84, 0x40, 0x30, 0x1d, 0x09, 0x2a, 0x2d, 0xb0, 0x6a, 0x77, + 0x8b, 0xb4, 0x97, 0xc8, 0x75, 0x4c, 0x62, 0x6d, 0x62, 0x47, 0xb6, 0x93, 0x61, 0x0f, 0x5c, 0xb8, + 0x72, 0xe1, 0x63, 0xed, 0x71, 0x8f, 0x9c, 0x10, 0x9a, 0xf9, 0x0e, 0x9c, 0x51, 0x6c, 0xa7, 0x0f, + 0xa6, 0xa3, 0xed, 0x29, 0x71, 0xfe, 0xbf, 0xc7, 0xff, 0xe1, 0xd8, 0x60, 0xcc, 0xb8, 0xa6, 0x92, + 0xa4, 0x98, 0xf1, 0x48, 0x51, 0x52, 0x4a, 0xa6, 0x5f, 0x20, 0x42, 0x2a, 0x44, 0x04, 0x57, 0x65, + 0x4e, 0x25, 0xaa, 0xc6, 0x28, 0xa1, 0x9c, 0x2a, 0xa6, 0xc2, 0x42, 0x0a, 0x2d, 0xe0, 0x47, 0x7b, + 0x28, 0x21, 0x21, 0x55, 0xd8, 0x50, 0xc2, 0x6a, 0xdc, 0xff, 0xf8, 0x36, 0xdd, 0x6a, 0x5c, 0x3f, + 0xac, 0x54, 0x7f, 0x72, 0x88, 0xfb, 0x5a, 0xd6, 0x72, 0x06, 0x9a, 0xf2, 0x98, 0xca, 0x9c, 0x71, + 0x8d, 0xf0, 0x8a, 0x30, 0xa4, 0x5f, 0x14, 0xd4, 0xe5, 0xd6, 0x47, 0x6c, 0x45, 0x50, 0xc6, 0x92, + 0x54, 0x93, 0x8c, 0x51, 0xae, 0x15, 0xda, 0x42, 0x57, 0xe3, 0xad, 0x95, 0x23, 0x7c, 0x58, 0x13, + 0x88, 0x90, 0x14, 0x91, 0x14, 0x73, 0x4e, 0x33, 0xe3, 0x68, 0x5f, 0x1d, 0x24, 0x48, 0x84, 0x48, + 0x32, 0x8a, 0xcc, 0x6a, 0x55, 0xfe, 0x82, 0xe2, 0x52, 0x62, 0xcd, 0x04, 0x77, 0xf1, 0x77, 0x12, + 0x91, 0x08, 0xf3, 0x8a, 0xea, 0x37, 0xfb, 0xf5, 0xec, 0xdf, 0x0e, 0xb8, 0xf7, 0x9d, 0xed, 0xdb, + 0x42, 0x63, 0x4d, 0xe1, 0x0c, 0xb4, 0x0b, 0x2c, 0x71, 0xae, 0x7c, 0x6f, 0xe8, 0x8d, 0x8e, 0x27, + 0x9f, 0x84, 0x07, 0xf4, 0x31, 0x7c, 0x6c, 0x28, 0xe7, 0x47, 0x2f, 0xff, 0xfe, 0xa0, 0x35, 0x77, + 0x02, 0xf0, 0x53, 0x00, 0x0b, 0x29, 0x2a, 0x16, 0x53, 0x19, 0xd9, 0x3a, 0x23, 0x16, 0xfb, 0x77, + 0x86, 0xde, 0xa8, 0x3b, 0x3f, 0x69, 0x22, 0x53, 0x13, 0x98, 0xc5, 0x30, 0x04, 0xa7, 0x1b, 0xb4, + 0xad, 0xac, 0x86, 0xdf, 0x35, 0xf0, 0xb7, 0xd7, 0x70, 0x1b, 0x99, 0xc5, 0x70, 0x00, 0xba, 0x9c, + 0x5e, 0x46, 0x26, 0x31, 0xff, 0x68, 0xe8, 0x8d, 0x3a, 0xf3, 0x0e, 0xa7, 0x97, 0xd3, 0x7a, 0x0d, + 0x23, 0xf0, 0xee, 0xff, 0xad, 0x55, 0x5d, 0x9e, 0xff, 0x46, 0x53, 0xd4, 0x8a, 0x84, 0xdb, 0x03, + 0x08, 0xb7, 0x5a, 0x5e, 0x8d, 0x43, 0x9b, 0x95, 0xe9, 0xc8, 0xfc, 0x74, 0x37, 0x55, 0xdb, 0xa6, + 0x14, 0xf8, 0x1b, 0x03, 0xc1, 0x15, 0xe5, 0xaa, 0x54, 0xce, 0xa3, 0x6d, 0x3c, 0xc2, 0xd7, 0x7a, + 0x34, 0x34, 0x6b, 0xd3, 0x5b, 0xdb, 0xec, 0x7c, 0x87, 0x09, 0x38, 0xc9, 0xb1, 0x2e, 0x25, 0xe3, + 0x49, 0x54, 0x60, 0xf2, 0x9c, 0x6a, 0xe5, 0xbf, 0x39, 0xbc, 0x3b, 0x3a, 0x9e, 0x7c, 0x7e, 0xd0, + 0x68, 0x7e, 0x70, 0xe4, 0xe5, 0x62, 0xfa, 0xd8, 0xd0, 0xdd, 0x94, 0x1e, 0x34, 0xaa, 0xf6, 0xab, + 0x82, 0x3f, 0x82, 0x07, 0x8c, 0x33, 0xcd, 0x70, 0x16, 0x55, 0x38, 0x8b, 0x14, 0xd5, 0x7e, 0xc7, + 0xf8, 0x0c, 0xb7, 0x13, 0xaf, 0xf7, 0x72, 0xb8, 0xc4, 0x19, 0x8b, 0xb1, 0x16, 0xf2, 0x69, 0x11, + 0x63, 0x4d, 0x9d, 0xe2, 0x7d, 0x47, 0x5f, 0xe2, 0x6c, 0x41, 0x35, 0xfc, 0x0d, 0xf4, 0x53, 0x5a, + 0x97, 0x1f, 0x69, 0x51, 0x2b, 0x2a, 0xaa, 0xa3, 0xd2, 0xe0, 0xeb, 0xb9, 0x76, 0x8d, 0xf4, 0x97, + 0x07, 0x95, 0xf0, 0xbd, 0x91, 0x79, 0x22, 0x96, 0x46, 0xc4, 0x7a, 0xce, 0x2e, 0x9c, 0x6b, 0x2f, + 0xdd, 0x17, 0x8d, 0xe1, 0xef, 0x1e, 0x78, 0x5f, 0x94, 0x5a, 0x69, 0xcc, 0xe3, 0xba, 0x77, 0xb1, + 0xb8, 0xe4, 0x9a, 0xe5, 0x34, 0x52, 0x19, 0x56, 0x29, 0xe3, 0x89, 0x0f, 0x4c, 0x0a, 0x5f, 0x1c, + 0x94, 0xc2, 0x4f, 0x1b, 0xa5, 0x0b, 0x27, 0xe4, 0xfc, 0x07, 0xe2, 0x66, 0x68, 0xe1, 0x2c, 0xa0, + 0x04, 0x7e, 0x41, 0xad, 0x7f, 0xa3, 0xb6, 0x1e, 0xe2, 0xb1, 0xd9, 0x26, 0x93, 0x5b, 0xed, 0xdd, + 0x16, 0xa9, 0x39, 0x76, 0x44, 0x17, 0x58, 0xe3, 0x47, 0x4c, 0x35, 0x03, 0xec, 0x39, 0xe5, 0x5d, + 0x90, 0x82, 0x7f, 0x78, 0x20, 0xc8, 0xb0, 0xd2, 0x91, 0x96, 0x98, 0xab, 0x9c, 0x29, 0xc5, 0x04, + 0x8f, 0x56, 0x99, 0x20, 0xcf, 0x23, 0xdb, 0x2b, 0xff, 0x9e, 0xb1, 0xfe, 0xe6, 0xa0, 0xca, 0x1f, + 0x61, 0xa5, 0x9f, 0x6c, 0x29, 0x9d, 0xd7, 0x42, 0x76, 0x22, 0x4d, 0x07, 0xb2, 0xdb, 0x21, 0xb0, + 0x07, 0xda, 0x85, 0xa4, 0xd3, 0xe9, 0xd2, 0xbf, 0x6f, 0xfe, 0x51, 0xb7, 0x3a, 0x7b, 0x06, 0x7a, + 0xfb, 0xc7, 0x5a, 0x33, 0x5c, 0x9a, 0xf5, 0x09, 0x74, 0x34, 0x77, 0x2b, 0x38, 0x02, 0x27, 0x37, + 0x76, 0xd1, 0x1d, 0x83, 0x78, 0xab, 0xda, 0x19, 0xfd, 0xd9, 0x53, 0x70, 0xba, 0x67, 0x5e, 0xf0, + 0x6b, 0x30, 0xa8, 0x9a, 0x8d, 0xbb, 0xf5, 0xd3, 0xe2, 0x38, 0x96, 0x54, 0xd9, 0xf3, 0xae, 0x3b, + 0x7f, 0x6f, 0x0d, 0x59, 0xff, 0x87, 0xdf, 0x5a, 0xc0, 0xf9, 0xcf, 0x2f, 0xaf, 0x02, 0xef, 0xd5, + 0x55, 0xe0, 0xfd, 0x73, 0x15, 0x78, 0x7f, 0x5e, 0x07, 0xad, 0x57, 0xd7, 0x41, 0xeb, 0xaf, 0xeb, + 0xa0, 0xf5, 0xec, 0xab, 0x84, 0xe9, 0xb4, 0x5c, 0x85, 0x44, 0xe4, 0x88, 0x08, 0x95, 0x0b, 0x85, + 0x36, 0xad, 0xfd, 0x6c, 0x7d, 0x65, 0x54, 0x0f, 0xd1, 0xaf, 0xbb, 0xf7, 0x86, 0xb9, 0x14, 0x56, + 0x6d, 0x73, 0x16, 0x3f, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xd4, 0xcb, 0xc1, 0xe6, 0x06, 0x00, 0x00, } diff --git a/x/ccv/consumer/types/query.pb.go b/x/ccv/consumer/types/query.pb.go index a89562d8e1..5b9c52d962 100644 --- a/x/ccv/consumer/types/query.pb.go +++ b/x/ccv/consumer/types/query.pb.go @@ -308,40 +308,40 @@ func init() { } var fileDescriptor_f627751d3cc10225 = []byte{ - // 522 bytes of a gzipped FileDescriptorProto + // 521 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x8b, 0xd3, 0x40, - 0x14, 0x6e, 0xb6, 0x3f, 0xc4, 0x59, 0xbc, 0x8c, 0x15, 0x42, 0x95, 0xb8, 0x44, 0xc1, 0xaa, 0x34, - 0xe3, 0x76, 0x0f, 0xab, 0x07, 0x51, 0x56, 0x5d, 0x14, 0x54, 0xd6, 0x22, 0x08, 0x5e, 0xd6, 0xe9, - 0xf4, 0x6d, 0x3a, 0xd0, 0x64, 0xb2, 0x33, 0x93, 0xd0, 0xde, 0xc4, 0x3f, 0x40, 0x04, 0xff, 0x13, - 0x2f, 0xfe, 0x0b, 0x7b, 0x5c, 0xf0, 0xe2, 0x49, 0xa4, 0xf5, 0x8f, 0xf0, 0x28, 0x99, 0x24, 0x6b, - 0x0a, 0xba, 0x8d, 0xe0, 0x6d, 0xfa, 0x7d, 0xef, 0x7d, 0xef, 0x9b, 0x6f, 0x5e, 0x83, 0x08, 0x0f, - 0x35, 0x48, 0x36, 0xa6, 0x3c, 0xdc, 0x57, 0xc0, 0x62, 0xc9, 0xf5, 0x8c, 0x30, 0x96, 0x10, 0x26, - 0x42, 0x15, 0x07, 0x20, 0x49, 0xb2, 0x49, 0x0e, 0x63, 0x90, 0x33, 0x2f, 0x92, 0x42, 0x0b, 0x7c, - 0xe5, 0x0f, 0x0d, 0x1e, 0x63, 0x89, 0x57, 0x34, 0x78, 0xc9, 0x66, 0xa7, 0xed, 0x0b, 0x5f, 0x98, - 0x7a, 0x92, 0x9e, 0xb2, 0xd6, 0xce, 0x25, 0x5f, 0x08, 0x7f, 0x02, 0x84, 0x46, 0x9c, 0xd0, 0x30, - 0x14, 0x9a, 0x6a, 0x2e, 0x42, 0x95, 0xb3, 0xfd, 0x2a, 0x4e, 0x4e, 0x86, 0x98, 0x1e, 0xf7, 0xfd, - 0x1a, 0xba, 0xf8, 0x1c, 0xa6, 0x7a, 0x17, 0xe0, 0x21, 0x57, 0x5a, 0xf2, 0x61, 0x9c, 0x4a, 0x3e, - 0x52, 0x9a, 0x07, 0x54, 0x03, 0xbe, 0x8a, 0xce, 0xb1, 0x58, 0x4a, 0x08, 0xf5, 0x63, 0xe0, 0xfe, - 0x58, 0xdb, 0xd6, 0x86, 0xd5, 0xad, 0x0f, 0x96, 0x41, 0xec, 0x20, 0x34, 0xa1, 0xaa, 0x28, 0x59, - 0x33, 0x25, 0x25, 0x24, 0xe5, 0x43, 0x98, 0x16, 0x7c, 0x3d, 0xe3, 0x7f, 0x23, 0x78, 0x0b, 0x5d, - 0x18, 0x95, 0xa6, 0xef, 0x1f, 0x48, 0xca, 0xd2, 0x83, 0xdd, 0xd8, 0xb0, 0xba, 0x67, 0x07, 0xed, - 0x32, 0xb9, 0x9b, 0x73, 0xb8, 0x8d, 0x9a, 0x5a, 0x68, 0x3a, 0xb1, 0x9b, 0xa6, 0x28, 0xfb, 0x91, - 0x8e, 0xd2, 0x62, 0x4f, 0x8a, 0x84, 0x8f, 0x40, 0xda, 0x2d, 0x43, 0x95, 0x90, 0x8c, 0x7f, 0x90, - 0x87, 0x60, 0x9f, 0x29, 0xf8, 0x02, 0x71, 0xaf, 0xa3, 0x6b, 0x2f, 0xd2, 0xc7, 0x3a, 0x25, 0x94, - 0x01, 0x1c, 0xc6, 0xa0, 0xb4, 0xfb, 0xd6, 0x42, 0xdd, 0xd5, 0xb5, 0x2a, 0x12, 0xa1, 0x02, 0xfc, - 0x12, 0x35, 0x46, 0x54, 0x53, 0x93, 0xdf, 0x7a, 0xff, 0xbe, 0x57, 0x61, 0x09, 0xbc, 0xd3, 0x74, - 0x8d, 0x9a, 0xdb, 0x46, 0xd8, 0x38, 0xd8, 0xa3, 0x92, 0x06, 0xaa, 0x30, 0xf6, 0x06, 0x9d, 0x5f, - 0x42, 0x73, 0x0b, 0x4f, 0x50, 0x2b, 0x32, 0x48, 0x6e, 0xe2, 0x66, 0x25, 0x13, 0x99, 0xc8, 0x4e, - 0xe3, 0xe8, 0xdb, 0xe5, 0xda, 0x20, 0x17, 0xe8, 0x7f, 0xae, 0xa3, 0xa6, 0x19, 0x81, 0x7f, 0x5a, - 0xc8, 0xfe, 0x5b, 0x08, 0xf8, 0x69, 0xa5, 0x09, 0x15, 0xf3, 0xee, 0x3c, 0xfb, 0x4f, 0x6a, 0x59, - 0x1c, 0xee, 0xbd, 0x77, 0x5f, 0x7e, 0x7c, 0x5c, 0xbb, 0x83, 0xb7, 0x57, 0xff, 0x83, 0xd3, 0x55, - 0xed, 0x1d, 0x00, 0xf4, 0xca, 0x8b, 0x88, 0x3f, 0x59, 0x68, 0xbd, 0x94, 0x33, 0xde, 0xae, 0xee, - 0x6f, 0xe9, 0xbd, 0x3a, 0xb7, 0xff, 0xbd, 0x31, 0xbf, 0xc3, 0x2d, 0x73, 0x87, 0x1b, 0xb8, 0xbb, - 0xfa, 0x0e, 0xd9, 0xcb, 0xed, 0xbc, 0x3a, 0x9a, 0x3b, 0xd6, 0xf1, 0xdc, 0xb1, 0xbe, 0xcf, 0x1d, - 0xeb, 0xc3, 0xc2, 0xa9, 0x1d, 0x2f, 0x9c, 0xda, 0xd7, 0x85, 0x53, 0x7b, 0x7d, 0xd7, 0xe7, 0x7a, - 0x1c, 0x0f, 0x3d, 0x26, 0x02, 0xc2, 0x84, 0x0a, 0x84, 0x2a, 0x89, 0xf6, 0x4e, 0x44, 0x93, 0x3e, - 0x99, 0x2e, 0x2b, 0xeb, 0x59, 0x04, 0x6a, 0xd8, 0x32, 0x1f, 0x94, 0xad, 0x5f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xc4, 0xb4, 0x4e, 0xea, 0x10, 0x05, 0x00, 0x00, + 0x14, 0x6e, 0xfa, 0x4b, 0x9c, 0xc5, 0xcb, 0x58, 0x21, 0x54, 0x89, 0x4b, 0x15, 0xac, 0x4a, 0x33, + 0x6e, 0x7b, 0x58, 0x3d, 0x88, 0xb2, 0xea, 0xa2, 0xa0, 0xb2, 0x16, 0x41, 0xf0, 0xb2, 0x4e, 0xa7, + 0x6f, 0xd3, 0x81, 0x26, 0x93, 0x9d, 0x99, 0x84, 0xf6, 0x26, 0xfe, 0x01, 0x22, 0xf8, 0x9f, 0x78, + 0xf1, 0x5f, 0xd8, 0xe3, 0x82, 0x17, 0x4f, 0x22, 0xad, 0x7f, 0x84, 0x47, 0xc9, 0x24, 0x59, 0x53, + 0xd0, 0x6d, 0x04, 0x6f, 0xd3, 0xef, 0x7b, 0xef, 0x7b, 0xdf, 0x7c, 0xf3, 0x1a, 0x44, 0x78, 0xa0, + 0x41, 0xb2, 0x09, 0xe5, 0xc1, 0xbe, 0x02, 0x16, 0x49, 0xae, 0xe7, 0x84, 0xb1, 0x98, 0x30, 0x11, + 0xa8, 0xc8, 0x07, 0x49, 0xe2, 0x2d, 0x72, 0x18, 0x81, 0x9c, 0xbb, 0xa1, 0x14, 0x5a, 0xe0, 0x2b, + 0x7f, 0x68, 0x70, 0x19, 0x8b, 0xdd, 0xbc, 0xc1, 0x8d, 0xb7, 0xda, 0x2d, 0x4f, 0x78, 0xc2, 0xd4, + 0x93, 0xe4, 0x94, 0xb6, 0xb6, 0x2f, 0x79, 0x42, 0x78, 0x53, 0x20, 0x34, 0xe4, 0x84, 0x06, 0x81, + 0xd0, 0x54, 0x73, 0x11, 0xa8, 0x8c, 0xed, 0x97, 0x71, 0x72, 0x32, 0xc4, 0xf4, 0x74, 0xde, 0x57, + 0xd1, 0xc5, 0xe7, 0x30, 0xd3, 0xbb, 0x00, 0x0f, 0xb9, 0xd2, 0x92, 0x8f, 0xa2, 0x44, 0xf2, 0x91, + 0xd2, 0xdc, 0xa7, 0x1a, 0xf0, 0x55, 0x74, 0x8e, 0x45, 0x52, 0x42, 0xa0, 0x1f, 0x03, 0xf7, 0x26, + 0xda, 0xb6, 0x36, 0xad, 0x6e, 0x6d, 0xb8, 0x0a, 0x62, 0x07, 0xa1, 0x29, 0x55, 0x79, 0x49, 0xd5, + 0x94, 0x14, 0x90, 0x84, 0x0f, 0x60, 0x96, 0xf3, 0xb5, 0x94, 0xff, 0x8d, 0xe0, 0x01, 0xba, 0x30, + 0x2e, 0x4c, 0xdf, 0x3f, 0x90, 0x94, 0x25, 0x07, 0xbb, 0xbe, 0x69, 0x75, 0xcf, 0x0e, 0x5b, 0x45, + 0x72, 0x37, 0xe3, 0x70, 0x0b, 0x35, 0xb4, 0xd0, 0x74, 0x6a, 0x37, 0x4c, 0x51, 0xfa, 0x23, 0x19, + 0xa5, 0xc5, 0x9e, 0x14, 0x31, 0x1f, 0x83, 0xb4, 0x9b, 0x86, 0x2a, 0x20, 0x29, 0xff, 0x20, 0x0b, + 0xc1, 0x3e, 0x93, 0xf3, 0x39, 0xd2, 0xb9, 0x8e, 0xae, 0xbd, 0x48, 0x1e, 0xeb, 0x94, 0x50, 0x86, + 0x70, 0x18, 0x81, 0xd2, 0x9d, 0xb7, 0x16, 0xea, 0xae, 0xaf, 0x55, 0xa1, 0x08, 0x14, 0xe0, 0x97, + 0xa8, 0x3e, 0xa6, 0x9a, 0x9a, 0xfc, 0x36, 0xfa, 0xf7, 0xdd, 0x12, 0x4b, 0xe0, 0x9e, 0xa6, 0x6b, + 0xd4, 0x3a, 0x2d, 0x84, 0x8d, 0x83, 0x3d, 0x2a, 0xa9, 0xaf, 0x72, 0x63, 0x6f, 0xd0, 0xf9, 0x15, + 0x34, 0xb3, 0xf0, 0x04, 0x35, 0x43, 0x83, 0x64, 0x26, 0x6e, 0x96, 0x32, 0x91, 0x8a, 0xec, 0xd4, + 0x8f, 0xbe, 0x5d, 0xae, 0x0c, 0x33, 0x81, 0xfe, 0xe7, 0x1a, 0x6a, 0x98, 0x11, 0xf8, 0xa7, 0x85, + 0xec, 0xbf, 0x85, 0x80, 0x9f, 0x96, 0x9a, 0x50, 0x32, 0xef, 0xf6, 0xb3, 0xff, 0xa4, 0x96, 0xc6, + 0xd1, 0xb9, 0xf7, 0xee, 0xcb, 0x8f, 0x8f, 0xd5, 0x3b, 0x78, 0x7b, 0xfd, 0x3f, 0x38, 0x59, 0xd5, + 0xde, 0x01, 0x40, 0xaf, 0xb8, 0x88, 0xf8, 0x93, 0x85, 0x36, 0x0a, 0x39, 0xe3, 0xed, 0xf2, 0xfe, + 0x56, 0xde, 0xab, 0x7d, 0xfb, 0xdf, 0x1b, 0xb3, 0x3b, 0xdc, 0x32, 0x77, 0xb8, 0x81, 0xbb, 0xeb, + 0xef, 0x90, 0xbe, 0xdc, 0xce, 0xab, 0xa3, 0x85, 0x63, 0x1d, 0x2f, 0x1c, 0xeb, 0xfb, 0xc2, 0xb1, + 0x3e, 0x2c, 0x9d, 0xca, 0xf1, 0xd2, 0xa9, 0x7c, 0x5d, 0x3a, 0x95, 0xd7, 0x77, 0x3d, 0xae, 0x27, + 0xd1, 0xc8, 0x65, 0xc2, 0x27, 0x4c, 0x28, 0x5f, 0xa8, 0x82, 0x68, 0xef, 0x44, 0x34, 0x1e, 0x90, + 0xd9, 0xaa, 0xb2, 0x9e, 0x87, 0xa0, 0x46, 0x4d, 0xf3, 0x41, 0x19, 0xfc, 0x0a, 0x00, 0x00, 0xff, + 0xff, 0xcc, 0x57, 0x2e, 0xd6, 0x10, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index 996b73d4a5..2a5e33ce02 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -90,6 +90,14 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { } } + for _, item := range genState.InitTimeoutTimestamps { + k.SetInitTimeoutTimestamp(ctx, item.ChainId, item.Timestamp) + } + + for _, item := range genState.VscSendTimestamps { + k.SetVscSendTimestamp(ctx, item.ChainId, item.VscId, item.Timestamp) + } + k.SetParams(ctx, genState.Params) k.InitializeSlashMeter(ctx) } @@ -99,6 +107,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { // get a list of all registered consumer chains registeredChains := k.GetAllConsumerChains(ctx) + var vscSendTimestamps []types.VscSendTimestamp // export states for each consumer chains var consumerStates []types.ConsumerState for _, chain := range registeredChains { @@ -129,6 +138,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { cs.PendingValsetChanges = k.GetPendingVSCPackets(ctx, chain.ChainId) consumerStates = append(consumerStates, cs) + vscSendTimestamps = append(vscSendTimestamps, k.GetAllVscSendTimestamps(ctx, chain.ChainId)...) } // ConsumerAddrsToPrune are added only for registered consumer chains @@ -151,5 +161,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { k.GetAllValidatorConsumerPubKeys(ctx, nil), k.GetAllValidatorsByConsumerAddr(ctx, nil), consumerAddrsToPrune, + k.GetAllInitTimeoutTimestamps(ctx), + vscSendTimestamps, ) } diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go index 03caf0aba5..083dd96820 100644 --- a/x/ccv/provider/keeper/keeper.go +++ b/x/ccv/provider/keeper/keeper.go @@ -986,6 +986,7 @@ func (k Keeper) GetAllVscSendTimestamps(ctx sdk.Context, chainID string) (vscSen } vscSendTimestamps = append(vscSendTimestamps, types.VscSendTimestamp{ + ChainId: chainID, VscId: vscID, Timestamp: ts, }) diff --git a/x/ccv/provider/types/genesis.go b/x/ccv/provider/types/genesis.go index 5a9358e736..8e12ba10e8 100644 --- a/x/ccv/provider/types/genesis.go +++ b/x/ccv/provider/types/genesis.go @@ -22,6 +22,8 @@ func NewGenesisState( validatorConsumerPubkeys []ValidatorConsumerPubKey, validatorsByConsumerAddr []ValidatorByConsumerAddr, consumerAddrsToPrune []ConsumerAddrsToPrune, + initTimeoutTimestamps []InitTimeoutTimestamp, + vscSendTimestamps []VscSendTimestamp, ) *GenesisState { return &GenesisState{ ValsetUpdateId: vscID, @@ -35,6 +37,8 @@ func NewGenesisState( ValidatorConsumerPubkeys: validatorConsumerPubkeys, ValidatorsByConsumerAddr: validatorsByConsumerAddr, ConsumerAddrsToPrune: consumerAddrsToPrune, + InitTimeoutTimestamps: initTimeoutTimestamps, + VscSendTimestamps: vscSendTimestamps, } } diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go index 4737530390..5c152e5b50 100644 --- a/x/ccv/provider/types/genesis.pb.go +++ b/x/ccv/provider/types/genesis.pb.go @@ -48,7 +48,9 @@ type GenesisState struct { // empty for a new chain ValidatorsByConsumerAddr []ValidatorByConsumerAddr `protobuf:"bytes,10,rep,name=validators_by_consumer_addr,json=validatorsByConsumerAddr,proto3" json:"validators_by_consumer_addr"` // empty for a new chain - ConsumerAddrsToPrune []ConsumerAddrsToPrune `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"` + ConsumerAddrsToPrune []ConsumerAddrsToPrune `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"` + InitTimeoutTimestamps []InitTimeoutTimestamp `protobuf:"bytes,12,rep,name=init_timeout_timestamps,json=initTimeoutTimestamps,proto3" json:"init_timeout_timestamps"` + VscSendTimestamps []VscSendTimestamp `protobuf:"bytes,13,rep,name=vsc_send_timestamps,json=vscSendTimestamps,proto3" json:"vsc_send_timestamps"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -161,6 +163,20 @@ func (m *GenesisState) GetConsumerAddrsToPrune() []ConsumerAddrsToPrune { return nil } +func (m *GenesisState) GetInitTimeoutTimestamps() []InitTimeoutTimestamp { + if m != nil { + return m.InitTimeoutTimestamps + } + return nil +} + +func (m *GenesisState) GetVscSendTimestamps() []VscSendTimestamp { + if m != nil { + return m.VscSendTimestamps + } + return nil +} + // consumer chain type ConsumerState struct { // ChainID defines the chain ID for the consumer chain @@ -336,61 +352,65 @@ func init() { } var fileDescriptor_48411d9c7900d48e = []byte{ - // 856 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0x5e, 0xef, 0xa6, 0xdb, 0xcd, 0x6c, 0x77, 0x59, 0x86, 0x55, 0x70, 0xb3, 0x90, 0xae, 0x02, - 0x48, 0x91, 0x00, 0x1b, 0x07, 0x2e, 0xf8, 0xeb, 0x45, 0xd3, 0x4a, 0x10, 0x21, 0x44, 0x94, 0xfe, - 0x20, 0x95, 0x0b, 0x6b, 0x32, 0x1e, 0x25, 0x43, 0xec, 0x19, 0x6b, 0x66, 0x6c, 0x6a, 0x21, 0x24, - 0x2a, 0x5e, 0x80, 0xb7, 0xa2, 0x97, 0xbd, 0xe4, 0xaa, 0x42, 0xbb, 0x6f, 0xc0, 0x13, 0x20, 0x8f, - 0xc7, 0xae, 0xbd, 0x24, 0x90, 0xf4, 0x2e, 0x3e, 0xdf, 0x9c, 0xef, 0x3b, 0x67, 0xce, 0xcc, 0x37, - 0x01, 0x1e, 0x65, 0x8a, 0x08, 0xbc, 0x40, 0x94, 0xf9, 0x92, 0xe0, 0x44, 0x50, 0x95, 0xb9, 0x18, - 0xa7, 0x6e, 0x2c, 0x78, 0x4a, 0x03, 0x22, 0xdc, 0xd4, 0x73, 0xe7, 0x84, 0x11, 0x49, 0xa5, 0x13, - 0x0b, 0xae, 0x38, 0x7c, 0x67, 0x45, 0x8a, 0x83, 0x71, 0xea, 0x94, 0x29, 0x4e, 0xea, 0x75, 0x4f, - 0xe7, 0x7c, 0xce, 0xf5, 0x7a, 0x37, 0xff, 0x55, 0xa4, 0x76, 0xdf, 0x5d, 0xa7, 0x96, 0x7a, 0xae, - 0x61, 0x50, 0xbc, 0x3b, 0xdc, 0xa4, 0xa6, 0x4a, 0xec, 0x7f, 0x72, 0x30, 0x67, 0x32, 0x89, 0x8a, - 0x9c, 0xf2, 0xb7, 0xc9, 0xf1, 0x36, 0xc9, 0x69, 0xf4, 0xde, 0x7d, 0x4b, 0x11, 0x16, 0x10, 0x11, - 0x51, 0xa6, 0x5c, 0x2c, 0xb2, 0x58, 0x71, 0x77, 0x49, 0x32, 0x83, 0xf6, 0xff, 0x68, 0x83, 0x1b, - 0x5f, 0x15, 0xeb, 0xef, 0x2b, 0xa4, 0x08, 0x1c, 0x80, 0x93, 0x14, 0x85, 0x92, 0x28, 0x3f, 0x89, - 0x03, 0xa4, 0x88, 0x4f, 0x03, 0xdb, 0x3a, 0xb7, 0x06, 0xad, 0xe9, 0x71, 0x11, 0x7f, 0xa8, 0xc3, - 0xe3, 0x00, 0xfe, 0x0c, 0x5e, 0x2b, 0x55, 0x7d, 0x99, 0xe7, 0x4a, 0x7b, 0xf7, 0x7c, 0x6f, 0x70, - 0x38, 0x1c, 0x3a, 0x1b, 0x6c, 0xb7, 0x73, 0xd7, 0xe4, 0x6a, 0xd9, 0x51, 0xef, 0xd9, 0x8b, 0x5b, - 0x3b, 0x7f, 0xbf, 0xb8, 0xd5, 0xc9, 0x50, 0x14, 0x7e, 0xde, 0xbf, 0x42, 0xdc, 0x9f, 0x1e, 0xe3, - 0xfa, 0x72, 0x09, 0x7f, 0x00, 0x47, 0x09, 0x9b, 0x71, 0x16, 0x50, 0x36, 0xf7, 0x79, 0x2c, 0xed, - 0x3d, 0x2d, 0xfd, 0xd1, 0x46, 0xd2, 0x0f, 0xcb, 0xcc, 0xef, 0xe2, 0x51, 0x2b, 0x17, 0x9e, 0xde, - 0x48, 0x5e, 0x86, 0x24, 0x44, 0xe0, 0x34, 0x42, 0x2a, 0x11, 0xc4, 0x6f, 0x6a, 0xb4, 0xce, 0xad, - 0xc1, 0xe1, 0xd0, 0x5d, 0xab, 0x91, 0x7a, 0xce, 0xb7, 0x3a, 0x2f, 0xa8, 0x29, 0xc8, 0x29, 0x2c, - 0xc8, 0xea, 0x31, 0xf8, 0x0b, 0xe8, 0x5e, 0xdd, 0x66, 0x5f, 0x71, 0x7f, 0x41, 0xe8, 0x7c, 0xa1, - 0xec, 0x6b, 0xba, 0x99, 0x2f, 0x36, 0x6a, 0xe6, 0x51, 0x63, 0x2a, 0x0f, 0xf8, 0xd7, 0x9a, 0xc2, - 0xf4, 0xd5, 0x49, 0x57, 0xa2, 0xf0, 0x37, 0x0b, 0x9c, 0x55, 0x7b, 0x8c, 0x82, 0x80, 0x2a, 0xca, - 0x99, 0x1f, 0x0b, 0x1e, 0x73, 0x89, 0x42, 0x69, 0xef, 0xeb, 0x02, 0x6e, 0x6f, 0x35, 0xc8, 0x3b, - 0x86, 0x66, 0x62, 0x58, 0x4c, 0x09, 0x37, 0xf1, 0x1a, 0x5c, 0xc2, 0x5f, 0x2d, 0xd0, 0xad, 0xaa, - 0x10, 0x24, 0xe2, 0x29, 0x0a, 0x6b, 0x45, 0x5c, 0xd7, 0x45, 0x7c, 0xb9, 0x55, 0x11, 0xd3, 0x82, - 0xe5, 0x4a, 0x0d, 0x36, 0x5e, 0x0d, 0x4b, 0x38, 0x06, 0xfb, 0x31, 0x12, 0x28, 0x92, 0xf6, 0x81, - 0x1e, 0xee, 0xfb, 0x1b, 0xa9, 0x4d, 0x74, 0x8a, 0x21, 0x37, 0x04, 0xba, 0x9b, 0x14, 0x85, 0x34, - 0x40, 0x8a, 0x0b, 0xbf, 0xea, 0x2b, 0x4e, 0x66, 0xf9, 0x7d, 0xb3, 0xdb, 0x5b, 0x74, 0xf3, 0xa8, - 0xa4, 0x29, 0xdb, 0x9a, 0x24, 0xb3, 0x6f, 0x48, 0x56, 0x76, 0x93, 0xae, 0x80, 0x73, 0x0d, 0xf8, - 0xd4, 0x02, 0x67, 0x15, 0x28, 0xfd, 0x59, 0xe6, 0xd7, 0x87, 0x2c, 0x6c, 0xf0, 0x2a, 0x35, 0x8c, - 0xb2, 0xda, 0x84, 0xc5, 0xbf, 0x6a, 0x90, 0x4d, 0x1c, 0xa6, 0xe0, 0xcd, 0x86, 0xa8, 0xcc, 0xcf, - 0x75, 0x2c, 0x12, 0x46, 0xec, 0x43, 0x2d, 0xff, 0xd9, 0xb6, 0xa7, 0x4a, 0xc8, 0x07, 0x7c, 0x92, - 0x13, 0x18, 0xed, 0x53, 0xbc, 0x02, 0xeb, 0x3f, 0x6d, 0x81, 0xa3, 0x86, 0xa7, 0xc0, 0x9b, 0xe0, - 0xa0, 0x10, 0x31, 0x16, 0xd6, 0x9e, 0x5e, 0xd7, 0xdf, 0xe3, 0x00, 0xbe, 0x0d, 0x00, 0x5e, 0x20, - 0xc6, 0x48, 0x98, 0x83, 0xbb, 0x1a, 0x6c, 0x9b, 0xc8, 0x38, 0x80, 0x67, 0xa0, 0x8d, 0x43, 0x4a, - 0x98, 0xca, 0xd1, 0x3d, 0x8d, 0x1e, 0x14, 0x81, 0x71, 0x00, 0xdf, 0x03, 0xc7, 0x94, 0x51, 0x45, - 0x51, 0x58, 0x5e, 0xd7, 0x96, 0xf6, 0xc7, 0x23, 0x13, 0x35, 0x57, 0x6c, 0x06, 0x4e, 0xaa, 0x7d, - 0x30, 0x8e, 0x6c, 0x5f, 0xd3, 0x67, 0xcc, 0x5b, 0xbb, 0x01, 0x95, 0xdb, 0xa7, 0x9e, 0x53, 0x77, - 0x65, 0xd3, 0x78, 0xe5, 0xb7, 0x06, 0x83, 0x0a, 0x74, 0x62, 0x52, 0xf8, 0x93, 0x71, 0x93, 0xbc, - 0x87, 0x39, 0x29, 0x2f, 0xf0, 0xa7, 0xff, 0x65, 0x55, 0xd5, 0x80, 0xef, 0x13, 0x75, 0x57, 0xa7, - 0x4d, 0x10, 0x5e, 0x12, 0x75, 0x0f, 0x29, 0x54, 0xee, 0xb4, 0x61, 0x2f, 0x3c, 0xa6, 0x58, 0x24, - 0xe1, 0x07, 0x00, 0xca, 0x10, 0xc9, 0x85, 0x1f, 0xf0, 0x9f, 0x98, 0xa2, 0x11, 0xf1, 0x11, 0x5e, - 0xea, 0xdb, 0xda, 0x9e, 0x9e, 0x68, 0xe4, 0x9e, 0x01, 0xee, 0xe0, 0x25, 0xfc, 0x11, 0xbc, 0xd1, - 0x70, 0x51, 0x9f, 0xb2, 0x80, 0x3c, 0xb1, 0x0f, 0x74, 0x81, 0x9f, 0x6c, 0x76, 0x14, 0x25, 0xae, - 0x9b, 0xa7, 0x29, 0xee, 0xf5, 0xba, 0x67, 0x8f, 0x73, 0xd2, 0xfe, 0x63, 0xd0, 0x59, 0x6d, 0x87, - 0x5b, 0x3c, 0x6b, 0x1d, 0xb0, 0x6f, 0xc6, 0xba, 0xab, 0x71, 0xf3, 0x35, 0xfa, 0xfe, 0xd9, 0x45, - 0xcf, 0x7a, 0x7e, 0xd1, 0xb3, 0xfe, 0xba, 0xe8, 0x59, 0xbf, 0x5f, 0xf6, 0x76, 0x9e, 0x5f, 0xf6, - 0x76, 0xfe, 0xbc, 0xec, 0xed, 0x3c, 0xbe, 0x3d, 0xa7, 0x6a, 0x91, 0xcc, 0x1c, 0xcc, 0x23, 0x17, - 0x73, 0x19, 0x71, 0xe9, 0xbe, 0xec, 0xea, 0xc3, 0xea, 0x99, 0x4e, 0x87, 0xee, 0x93, 0xe6, 0x7f, - 0x02, 0x95, 0xc5, 0x44, 0xce, 0xf6, 0xf5, 0x4b, 0xfc, 0xf1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xae, 0x7b, 0x97, 0x91, 0xd8, 0x08, 0x00, 0x00, + // 920 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1b, 0x45, + 0x14, 0x8e, 0x13, 0x37, 0x8d, 0x27, 0x3f, 0x84, 0x69, 0x70, 0xb7, 0x0e, 0xb8, 0x91, 0x01, 0x29, + 0x12, 0xb0, 0x8b, 0x53, 0x90, 0xf8, 0xeb, 0x45, 0xd3, 0x4a, 0x60, 0x21, 0x84, 0xe5, 0xa4, 0x45, + 0x2a, 0x17, 0xa3, 0xf1, 0xcc, 0xc8, 0x1e, 0xbc, 0x3b, 0xb3, 0xda, 0x99, 0x9d, 0xd6, 0x42, 0x48, + 0x54, 0xbc, 0x00, 0x2f, 0xc2, 0x7b, 0xf4, 0xb2, 0x97, 0x5c, 0x55, 0x28, 0x79, 0x03, 0x9e, 0x00, + 0xed, 0xec, 0xec, 0x76, 0x6d, 0x1c, 0xb0, 0x7b, 0x65, 0xfb, 0x7c, 0x7b, 0xbe, 0xef, 0x7c, 0x73, + 0xc6, 0xe7, 0x2c, 0xe8, 0x72, 0xa1, 0x59, 0x42, 0xc6, 0x98, 0x0b, 0xa4, 0x18, 0x49, 0x13, 0xae, + 0xa7, 0x01, 0x21, 0x26, 0x88, 0x13, 0x69, 0x38, 0x65, 0x49, 0x60, 0xba, 0xc1, 0x88, 0x09, 0xa6, + 0xb8, 0xf2, 0xe3, 0x44, 0x6a, 0x09, 0xdf, 0x5d, 0x90, 0xe2, 0x13, 0x62, 0xfc, 0x22, 0xc5, 0x37, + 0xdd, 0xd6, 0xc1, 0x48, 0x8e, 0xa4, 0x7d, 0x3e, 0xc8, 0xbe, 0xe5, 0xa9, 0xad, 0xf7, 0xae, 0x52, + 0x33, 0xdd, 0xc0, 0x31, 0x68, 0xd9, 0x3a, 0x59, 0xa6, 0xa6, 0x52, 0xec, 0x7f, 0x72, 0x88, 0x14, + 0x2a, 0x8d, 0xf2, 0x9c, 0xe2, 0xbb, 0xcb, 0xe9, 0x2e, 0x93, 0x33, 0xe3, 0xbd, 0xf5, 0xb6, 0x66, + 0x82, 0xb2, 0x24, 0xe2, 0x42, 0x07, 0x24, 0x99, 0xc6, 0x5a, 0x06, 0x13, 0x36, 0x75, 0x68, 0xe7, + 0x8f, 0x6d, 0xb0, 0xf3, 0x75, 0xfe, 0xfc, 0x99, 0xc6, 0x9a, 0xc1, 0x63, 0xb0, 0x6f, 0x70, 0xa8, + 0x98, 0x46, 0x69, 0x4c, 0xb1, 0x66, 0x88, 0x53, 0xaf, 0x76, 0x54, 0x3b, 0xae, 0x0f, 0xf6, 0xf2, + 0xf8, 0x43, 0x1b, 0xee, 0x51, 0xf8, 0x33, 0x78, 0xa3, 0x50, 0x45, 0x2a, 0xcb, 0x55, 0xde, 0xfa, + 0xd1, 0xc6, 0xf1, 0xf6, 0xc9, 0x89, 0xbf, 0xc4, 0x71, 0xfb, 0xf7, 0x5d, 0xae, 0x95, 0x3d, 0x6d, + 0x3f, 0x7f, 0x79, 0x7b, 0xed, 0xef, 0x97, 0xb7, 0x9b, 0x53, 0x1c, 0x85, 0x5f, 0x74, 0xe6, 0x88, + 0x3b, 0x83, 0x3d, 0x52, 0x7d, 0x5c, 0xc1, 0x1f, 0xc1, 0x6e, 0x2a, 0x86, 0x52, 0x50, 0x2e, 0x46, + 0x48, 0xc6, 0xca, 0xdb, 0xb0, 0xd2, 0x1f, 0x2f, 0x25, 0xfd, 0xb0, 0xc8, 0xfc, 0x3e, 0x3e, 0xad, + 0x67, 0xc2, 0x83, 0x9d, 0xf4, 0x55, 0x48, 0x41, 0x0c, 0x0e, 0x22, 0xac, 0xd3, 0x84, 0xa1, 0x59, + 0x8d, 0xfa, 0x51, 0xed, 0x78, 0xfb, 0x24, 0xb8, 0x52, 0xc3, 0x74, 0xfd, 0xef, 0x6c, 0x1e, 0xad, + 0x28, 0xa8, 0x01, 0xcc, 0xc9, 0xaa, 0x31, 0xf8, 0x0b, 0x68, 0xcd, 0x1f, 0x33, 0xd2, 0x12, 0x8d, + 0x19, 0x1f, 0x8d, 0xb5, 0x77, 0xcd, 0x9a, 0xf9, 0x72, 0x29, 0x33, 0x8f, 0x66, 0xba, 0x72, 0x2e, + 0xbf, 0xb1, 0x14, 0xce, 0x57, 0xd3, 0x2c, 0x44, 0xe1, 0x6f, 0x35, 0x70, 0x58, 0x9e, 0x31, 0xa6, + 0x94, 0x6b, 0x2e, 0x05, 0x8a, 0x13, 0x19, 0x4b, 0x85, 0x43, 0xe5, 0x6d, 0xda, 0x02, 0xee, 0xae, + 0xd4, 0xc8, 0x7b, 0x8e, 0xa6, 0xef, 0x58, 0x5c, 0x09, 0xb7, 0xc8, 0x15, 0xb8, 0x82, 0xbf, 0xd6, + 0x40, 0xab, 0xac, 0x22, 0x61, 0x91, 0x34, 0x38, 0xac, 0x14, 0x71, 0xdd, 0x16, 0xf1, 0xd5, 0x4a, + 0x45, 0x0c, 0x72, 0x96, 0xb9, 0x1a, 0x3c, 0xb2, 0x18, 0x56, 0xb0, 0x07, 0x36, 0x63, 0x9c, 0xe0, + 0x48, 0x79, 0x5b, 0xb6, 0xb9, 0x1f, 0x2c, 0xa5, 0xd6, 0xb7, 0x29, 0x8e, 0xdc, 0x11, 0x58, 0x37, + 0x06, 0x87, 0x9c, 0x62, 0x2d, 0x13, 0x54, 0xfa, 0x8a, 0xd3, 0x61, 0xf6, 0x7f, 0xf3, 0x1a, 0x2b, + 0xb8, 0x79, 0x54, 0xd0, 0x14, 0xb6, 0xfa, 0xe9, 0xf0, 0x5b, 0x36, 0x2d, 0xdc, 0x98, 0x05, 0x70, + 0xa6, 0x01, 0x9f, 0xd5, 0xc0, 0x61, 0x09, 0x2a, 0x34, 0x9c, 0xa2, 0x6a, 0x93, 0x13, 0x0f, 0xbc, + 0x4e, 0x0d, 0xa7, 0xd3, 0x4a, 0x87, 0x93, 0x7f, 0xd5, 0xa0, 0x66, 0x71, 0x68, 0xc0, 0xcd, 0x19, + 0x51, 0x95, 0xdd, 0xeb, 0x38, 0x49, 0x05, 0xf3, 0xb6, 0xad, 0xfc, 0xe7, 0xab, 0xde, 0xaa, 0x44, + 0x9d, 0xcb, 0x7e, 0x46, 0xe0, 0xb4, 0x0f, 0xc8, 0x02, 0x0c, 0x3e, 0x01, 0x37, 0xb9, 0xe0, 0x1a, + 0x69, 0x1e, 0x31, 0x99, 0xe6, 0x9f, 0x4a, 0xe3, 0x28, 0x56, 0xde, 0xce, 0x0a, 0xba, 0x3d, 0xc1, + 0xf5, 0x79, 0x4e, 0x71, 0x5e, 0x30, 0x38, 0xdd, 0xb7, 0xf8, 0x02, 0x4c, 0xc1, 0x09, 0xb8, 0x61, + 0x14, 0x41, 0x8a, 0x09, 0x5a, 0x15, 0xdd, 0xb5, 0xa2, 0x9f, 0x2e, 0x77, 0xd6, 0x8a, 0x9c, 0x31, + 0x41, 0xe7, 0x05, 0xdf, 0x34, 0x73, 0x71, 0xd5, 0x79, 0x56, 0x07, 0xbb, 0x33, 0x93, 0x13, 0xde, + 0x02, 0x5b, 0x39, 0xbb, 0x1b, 0xd4, 0x8d, 0xc1, 0x75, 0xfb, 0xbb, 0x47, 0xe1, 0x3b, 0x00, 0x90, + 0x31, 0x16, 0x82, 0x85, 0x19, 0xb8, 0x6e, 0xc1, 0x86, 0x8b, 0xf4, 0x28, 0x3c, 0x04, 0x0d, 0x12, + 0x72, 0x26, 0x74, 0x86, 0x6e, 0x58, 0x74, 0x2b, 0x0f, 0xf4, 0x28, 0x7c, 0x1f, 0xec, 0x65, 0x76, + 0x39, 0x0e, 0x8b, 0xa1, 0x54, 0xb7, 0x5b, 0x60, 0xd7, 0x45, 0xdd, 0x20, 0x19, 0x82, 0xfd, 0xb2, + 0xdb, 0x6e, 0xef, 0x78, 0xd7, 0xec, 0x3f, 0xa9, 0x7b, 0xa5, 0xf3, 0x72, 0xa7, 0x99, 0xae, 0x5f, + 0xdd, 0x3d, 0xce, 0x75, 0xb9, 0x55, 0x1c, 0x06, 0x35, 0x68, 0xc6, 0x2c, 0x9f, 0xc2, 0x6e, 0x66, + 0x66, 0x1e, 0x46, 0xac, 0x18, 0x53, 0x9f, 0xfd, 0xd7, 0x40, 0x2e, 0xaf, 0xf1, 0x19, 0xd3, 0xf7, + 0x6d, 0x5a, 0x1f, 0x93, 0x09, 0xd3, 0x0f, 0xb0, 0xc6, 0xc5, 0x7d, 0x72, 0xec, 0xf9, 0x24, 0xcd, + 0x1f, 0x52, 0xf0, 0x43, 0x00, 0x55, 0x88, 0xd5, 0x18, 0x51, 0xf9, 0x44, 0x64, 0x7d, 0x45, 0x98, + 0x4c, 0xec, 0x4c, 0x6a, 0x0c, 0xf6, 0x2d, 0xf2, 0xc0, 0x01, 0xf7, 0xc8, 0x04, 0xfe, 0x04, 0x6e, + 0xcc, 0xec, 0x0a, 0xc4, 0x05, 0x65, 0x4f, 0xbd, 0x2d, 0x5b, 0xe0, 0x27, 0xcb, 0x5e, 0x82, 0xea, + 0x8a, 0x28, 0xee, 0x40, 0x75, 0x33, 0xf5, 0x32, 0xd2, 0xce, 0x63, 0xd0, 0x5c, 0x3c, 0xf4, 0x57, + 0x58, 0xde, 0x4d, 0xb0, 0xe9, 0xda, 0xba, 0x6e, 0x71, 0xf7, 0xeb, 0xf4, 0x87, 0xe7, 0x17, 0xed, + 0xda, 0x8b, 0x8b, 0x76, 0xed, 0xaf, 0x8b, 0x76, 0xed, 0xf7, 0xcb, 0xf6, 0xda, 0x8b, 0xcb, 0xf6, + 0xda, 0x9f, 0x97, 0xed, 0xb5, 0xc7, 0x77, 0x47, 0x5c, 0x8f, 0xd3, 0xa1, 0x4f, 0x64, 0x14, 0x10, + 0xa9, 0x22, 0xa9, 0x82, 0x57, 0xae, 0x3e, 0x2a, 0x5f, 0x46, 0xcc, 0x9d, 0xe0, 0xe9, 0xec, 0x9b, + 0x8f, 0x9e, 0xc6, 0x4c, 0x0d, 0x37, 0xed, 0xfb, 0xc6, 0x9d, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x67, 0x16, 0xe6, 0xf2, 0xbe, 0x09, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -413,6 +433,34 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VscSendTimestamps) > 0 { + for iNdEx := len(m.VscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6a + } + } + if len(m.InitTimeoutTimestamps) > 0 { + for iNdEx := len(m.InitTimeoutTimestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.InitTimeoutTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x62 + } + } if len(m.ConsumerAddrsToPrune) > 0 { for iNdEx := len(m.ConsumerAddrsToPrune) - 1; iNdEx >= 0; iNdEx-- { { @@ -758,6 +806,18 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } + if len(m.InitTimeoutTimestamps) > 0 { + for _, e := range m.InitTimeoutTimestamps { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.VscSendTimestamps) > 0 { + for _, e := range m.VscSendTimestamps { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } return n } @@ -1215,6 +1275,74 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InitTimeoutTimestamps", 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.InitTimeoutTimestamps = append(m.InitTimeoutTimestamps, InitTimeoutTimestamp{}) + if err := m.InitTimeoutTimestamps[len(m.InitTimeoutTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamps", 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.VscSendTimestamps = append(m.VscSendTimestamps, VscSendTimestamp{}) + if err := m.VscSendTimestamps[len(m.VscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go index 49c2bb7cda..b06c0e35d8 100644 --- a/x/ccv/provider/types/provider.pb.go +++ b/x/ccv/provider/types/provider.pb.go @@ -920,8 +920,9 @@ func (m *InitTimeoutTimestamp) GetTimestamp() uint64 { } type VscSendTimestamp struct { - VscId uint64 `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,2,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VscId uint64 `protobuf:"varint,2,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` } func (m *VscSendTimestamp) Reset() { *m = VscSendTimestamp{} } @@ -957,6 +958,13 @@ func (m *VscSendTimestamp) XXX_DiscardUnknown() { var xxx_messageInfo_VscSendTimestamp proto.InternalMessageInfo +func (m *VscSendTimestamp) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + func (m *VscSendTimestamp) GetVscId() uint64 { if m != nil { return m.VscId @@ -1246,107 +1254,107 @@ func init() { } var fileDescriptor_f22ec409a72b7b72 = []byte{ - // 1598 bytes of a gzipped FileDescriptorProto + // 1600 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x73, 0xdc, 0xc6, 0x11, 0x26, 0xb8, 0x7c, 0xed, 0x2c, 0x1f, 0x12, 0x44, 0x59, 0x4b, 0x85, 0x59, 0xae, 0xe0, 0xc4, - 0xc5, 0x94, 0xcb, 0xd8, 0x90, 0xbe, 0xa4, 0x54, 0x71, 0xb9, 0xc8, 0x95, 0x65, 0xd1, 0x8c, 0xad, - 0x35, 0xc8, 0x50, 0x95, 0xe4, 0x80, 0x1a, 0x0c, 0x5a, 0xbb, 0x53, 0x04, 0x30, 0xd0, 0xcc, 0x00, - 0xd2, 0x5e, 0x72, 0xce, 0xd1, 0xb9, 0xb9, 0x92, 0x8b, 0xf3, 0x0b, 0xf2, 0x37, 0x7c, 0xf4, 0x31, - 0x27, 0x3b, 0x45, 0x1d, 0x72, 0xc8, 0x9f, 0x48, 0xcd, 0xe0, 0xcd, 0x87, 0xb2, 0xaa, 0xc4, 0x37, - 0xcc, 0x4c, 0xf7, 0xd7, 0xdd, 0xd3, 0xdd, 0x5f, 0x0f, 0xd0, 0x3e, 0x8d, 0x24, 0x70, 0x32, 0xc1, - 0x34, 0x72, 0x05, 0x90, 0x84, 0x53, 0x39, 0x1d, 0x10, 0x92, 0x0e, 0x62, 0xce, 0x52, 0xea, 0x03, - 0x1f, 0xa4, 0x7b, 0xe5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xee, 0x35, 0x3a, 0x36, 0x21, 0xa9, - 0x5d, 0xca, 0xa5, 0x7b, 0xf7, 0x37, 0xc7, 0x6c, 0xcc, 0xb4, 0xfc, 0x40, 0x7d, 0x65, 0xaa, 0xf7, - 0x77, 0xc6, 0x8c, 0x8d, 0x03, 0x18, 0xe8, 0x95, 0x97, 0x3c, 0x1f, 0x48, 0x1a, 0x82, 0x90, 0x38, - 0x8c, 0x73, 0x81, 0xde, 0x65, 0x01, 0x3f, 0xe1, 0x58, 0x52, 0x16, 0x15, 0x00, 0xd4, 0x23, 0x03, - 0xc2, 0x38, 0x0c, 0x48, 0x40, 0x21, 0x92, 0xca, 0xbd, 0xec, 0x2b, 0x17, 0x18, 0x28, 0x81, 0x80, - 0x8e, 0x27, 0x32, 0xdb, 0x16, 0x03, 0x09, 0x91, 0x0f, 0x3c, 0xa4, 0x99, 0x70, 0xb5, 0xca, 0x15, - 0xb6, 0x6b, 0xe7, 0x84, 0x4f, 0x63, 0xc9, 0x06, 0xe7, 0x30, 0x15, 0xf9, 0xe9, 0x7b, 0x84, 0x89, - 0x90, 0x89, 0x01, 0xa8, 0xc0, 0x22, 0x02, 0x83, 0x74, 0xcf, 0x03, 0x89, 0xf7, 0xca, 0x8d, 0xc2, - 0xef, 0x5c, 0xce, 0xc3, 0xa2, 0x92, 0x21, 0x8c, 0xe6, 0x7e, 0x5b, 0x3f, 0x2c, 0xa1, 0xee, 0x90, - 0x45, 0x22, 0x09, 0x81, 0x1f, 0xf8, 0x3e, 0x55, 0x21, 0x8d, 0x38, 0x8b, 0x99, 0xc0, 0x81, 0xb9, - 0x89, 0x16, 0x25, 0x95, 0x01, 0x74, 0x8d, 0xbe, 0xb1, 0xdb, 0x76, 0xb2, 0x85, 0xd9, 0x47, 0x1d, - 0x1f, 0x04, 0xe1, 0x34, 0x56, 0xc2, 0xdd, 0x79, 0x7d, 0x56, 0xdf, 0x32, 0xb7, 0xd0, 0x4a, 0x96, - 0x05, 0xea, 0x77, 0x5b, 0xfa, 0x78, 0x59, 0xaf, 0x8f, 0x7c, 0xf3, 0x53, 0xb4, 0x4e, 0x23, 0x2a, - 0x29, 0x0e, 0xdc, 0x09, 0xa8, 0xdb, 0xe8, 0x2e, 0xf4, 0x8d, 0xdd, 0xce, 0xfe, 0x7d, 0x9b, 0x7a, - 0xc4, 0x56, 0x17, 0x68, 0xe7, 0xd7, 0x96, 0xee, 0xd9, 0x4f, 0xb4, 0xc4, 0xe1, 0xc2, 0xb7, 0xdf, - 0xef, 0xcc, 0x39, 0x6b, 0xb9, 0x5e, 0xb6, 0x69, 0x3e, 0x40, 0xab, 0x63, 0x88, 0x40, 0x50, 0xe1, - 0x4e, 0xb0, 0x98, 0x74, 0x17, 0xfb, 0xc6, 0xee, 0xaa, 0xd3, 0xc9, 0xf7, 0x9e, 0x60, 0x31, 0x31, - 0x77, 0x50, 0xc7, 0xa3, 0x11, 0xe6, 0xd3, 0x4c, 0x62, 0x49, 0x4b, 0xa0, 0x6c, 0x4b, 0x0b, 0x0c, - 0x11, 0x12, 0x31, 0x7e, 0x19, 0xb9, 0x2a, 0xdb, 0xdd, 0xe5, 0xdc, 0x91, 0x2c, 0xd3, 0x76, 0x91, - 0x69, 0xfb, 0xb4, 0x28, 0x85, 0xc3, 0x15, 0xe5, 0xc8, 0x57, 0x3f, 0xec, 0x18, 0x4e, 0x5b, 0xeb, - 0xa9, 0x13, 0xf3, 0x0b, 0x74, 0x2b, 0x89, 0x3c, 0x16, 0xf9, 0x34, 0x1a, 0xbb, 0x31, 0x70, 0xca, - 0xfc, 0xee, 0x8a, 0x86, 0xda, 0xba, 0x02, 0xf5, 0x28, 0x2f, 0x9a, 0x0c, 0xe9, 0x6b, 0x85, 0xb4, - 0x51, 0x2a, 0x8f, 0xb4, 0xae, 0xf9, 0x25, 0x32, 0x09, 0x49, 0xb5, 0x4b, 0x2c, 0x91, 0x05, 0x62, - 0x7b, 0x76, 0xc4, 0x5b, 0x84, 0xa4, 0xa7, 0x99, 0x76, 0x0e, 0xf9, 0x07, 0x74, 0x4f, 0x72, 0x1c, - 0x89, 0xe7, 0xc0, 0x2f, 0xe3, 0xa2, 0xd9, 0x71, 0xef, 0x16, 0x18, 0x4d, 0xf0, 0x27, 0xa8, 0x4f, - 0xf2, 0x02, 0x72, 0x39, 0xf8, 0x54, 0x48, 0x4e, 0xbd, 0x44, 0xe9, 0xba, 0xcf, 0x39, 0x26, 0xba, - 0x46, 0x3a, 0xba, 0x08, 0x7a, 0x85, 0x9c, 0xd3, 0x10, 0x7b, 0x9c, 0x4b, 0x99, 0x4f, 0xd1, 0xcf, - 0xbc, 0x80, 0x91, 0x73, 0xa1, 0x9c, 0x73, 0x1b, 0x48, 0xda, 0x74, 0x48, 0x85, 0x50, 0x68, 0xab, - 0x7d, 0x63, 0xb7, 0xe5, 0x3c, 0xc8, 0x64, 0x47, 0xc0, 0x1f, 0xd5, 0x24, 0x4f, 0x6b, 0x82, 0xe6, - 0x07, 0xc8, 0x9c, 0x50, 0x21, 0x19, 0xa7, 0x04, 0x07, 0x2e, 0x44, 0x92, 0x53, 0x10, 0xdd, 0x35, - 0xad, 0x7e, 0xbb, 0x3a, 0xf9, 0x24, 0x3b, 0x30, 0x3f, 0x43, 0x0f, 0x6e, 0x34, 0xea, 0x92, 0x09, - 0x8e, 0x22, 0x08, 0xba, 0xeb, 0x3a, 0x94, 0x1d, 0xff, 0x06, 0x9b, 0xc3, 0x4c, 0xec, 0xe1, 0xca, - 0x9f, 0xbe, 0xd9, 0x99, 0xfb, 0xfa, 0x9b, 0x9d, 0x39, 0xeb, 0xef, 0x06, 0xba, 0x37, 0x2c, 0x03, - 0x0f, 0x59, 0x8a, 0x83, 0x1f, 0xb3, 0xc1, 0x0e, 0x50, 0x5b, 0x48, 0x16, 0x67, 0x25, 0xbd, 0xf0, - 0x16, 0x25, 0xbd, 0xa2, 0xd4, 0xd4, 0x81, 0xf5, 0x57, 0x03, 0x6d, 0x7e, 0xf2, 0x22, 0xa1, 0x29, - 0x23, 0xf8, 0xff, 0xc2, 0x07, 0xc7, 0x68, 0x0d, 0x6a, 0x78, 0xa2, 0xdb, 0xea, 0xb7, 0x76, 0x3b, - 0xfb, 0x3f, 0xb7, 0x33, 0x72, 0xb2, 0x4b, 0xce, 0xca, 0x09, 0xca, 0xae, 0x5b, 0x77, 0x9a, 0xba, - 0xd6, 0xbf, 0x0d, 0x74, 0xeb, 0xd3, 0x80, 0x79, 0x38, 0x38, 0x09, 0xb0, 0x98, 0xa8, 0xe4, 0x4d, - 0x55, 0xd4, 0x1c, 0xf2, 0xae, 0xd1, 0xde, 0xcd, 0x1c, 0xb5, 0x52, 0xd3, 0x7d, 0xfc, 0x31, 0xba, - 0x5d, 0xd6, 0x71, 0x79, 0xb9, 0x3a, 0x98, 0xc3, 0x3b, 0x17, 0xdf, 0xef, 0x6c, 0x14, 0x39, 0x1c, - 0xea, 0x8b, 0x7e, 0xe4, 0x6c, 0x90, 0xc6, 0x86, 0x6f, 0xf6, 0x50, 0x87, 0x7a, 0xc4, 0x15, 0xf0, - 0xc2, 0x8d, 0x92, 0x50, 0xe7, 0x65, 0xc1, 0x69, 0x53, 0x8f, 0x9c, 0xc0, 0x8b, 0x2f, 0x92, 0xd0, - 0xfc, 0x10, 0xbd, 0x53, 0x0c, 0x22, 0x37, 0xc5, 0x81, 0xab, 0xf4, 0x5d, 0xec, 0xfb, 0x5c, 0xa7, - 0x69, 0xd5, 0xb9, 0x53, 0x9c, 0x9e, 0xe1, 0x40, 0x19, 0x3b, 0xf0, 0x7d, 0x6e, 0xfd, 0x6b, 0x11, - 0x2d, 0x8d, 0x30, 0xc7, 0xa1, 0x30, 0x4f, 0xd1, 0x86, 0x84, 0x30, 0x0e, 0xb0, 0x04, 0x37, 0xe3, - 0xc8, 0x3c, 0xd2, 0xf7, 0x35, 0x77, 0xd6, 0x67, 0x8b, 0x5d, 0x9b, 0x26, 0xe9, 0x9e, 0x3d, 0xd4, - 0xbb, 0x27, 0x12, 0x4b, 0x70, 0xd6, 0x0b, 0x8c, 0x6c, 0xd3, 0xfc, 0x15, 0xea, 0x4a, 0x9e, 0x08, - 0x59, 0xb1, 0x57, 0xd5, 0xb6, 0x59, 0x2a, 0xdf, 0x29, 0xce, 0xb3, 0x86, 0x2f, 0xdb, 0xf5, 0x7a, - 0xa2, 0x6a, 0xfd, 0x2f, 0x44, 0x75, 0x82, 0xee, 0x28, 0x96, 0xbf, 0x8c, 0xb9, 0x30, 0x3b, 0xe6, - 0x6d, 0xa5, 0xdf, 0x04, 0xfd, 0x12, 0x99, 0xa9, 0x20, 0x97, 0x31, 0x17, 0xdf, 0xc2, 0xcf, 0x54, - 0x90, 0x26, 0xa4, 0x8f, 0xb6, 0x85, 0x2a, 0x3e, 0x37, 0x04, 0xa9, 0x69, 0x2f, 0x0e, 0x20, 0xa2, - 0x62, 0x52, 0x80, 0x2f, 0xcd, 0x0e, 0xbe, 0xa5, 0x81, 0x3e, 0x57, 0x38, 0x4e, 0x01, 0x93, 0x5b, - 0x19, 0xa2, 0xde, 0xf5, 0x56, 0xca, 0x04, 0x2d, 0xeb, 0x04, 0xfd, 0xe4, 0x1a, 0x88, 0x32, 0x4b, - 0xfb, 0xe8, 0x6e, 0x88, 0x5f, 0xb9, 0x72, 0xc2, 0x99, 0x94, 0x01, 0xf8, 0x6e, 0x8c, 0xc9, 0x39, - 0x48, 0xa1, 0x67, 0x54, 0xcb, 0xb9, 0x13, 0xe2, 0x57, 0xa7, 0xc5, 0xd9, 0x28, 0x3b, 0x32, 0x05, - 0x7a, 0xaf, 0x46, 0xe9, 0x2f, 0x31, 0xf7, 0x5d, 0x1f, 0x22, 0x16, 0xba, 0x1c, 0xc6, 0x8a, 0xf7, - 0x70, 0xc6, 0xee, 0x00, 0xe5, 0x58, 0xca, 0x1b, 0x59, 0xbd, 0x32, 0xca, 0x26, 0x1e, 0x32, 0x1a, - 0xe5, 0xb3, 0xdb, 0xaa, 0x98, 0x5f, 0xa1, 0x3d, 0x52, 0x60, 0x4e, 0x0d, 0xeb, 0x31, 0x80, 0xe5, - 0xa1, 0xdb, 0x4f, 0x70, 0xe4, 0x8b, 0x09, 0x3e, 0x87, 0xcf, 0x41, 0x62, 0x1f, 0x4b, 0xdc, 0xe8, - 0x99, 0xe7, 0x00, 0x6e, 0xcc, 0x58, 0x90, 0xf5, 0x4c, 0x46, 0x41, 0x65, 0xcf, 0x3c, 0x06, 0x18, - 0x31, 0x16, 0xa8, 0x9e, 0x31, 0xbb, 0x68, 0x39, 0x05, 0x2e, 0xaa, 0x0a, 0x2e, 0x96, 0xd6, 0x2f, - 0x50, 0x5b, 0x93, 0xc6, 0x01, 0x39, 0x17, 0xe6, 0x36, 0x6a, 0x2b, 0x24, 0x10, 0x02, 0x44, 0xd7, - 0xe8, 0xb7, 0x76, 0xdb, 0x4e, 0xb5, 0x61, 0x49, 0xb4, 0x75, 0xd3, 0xbb, 0x48, 0x98, 0xcf, 0xd0, - 0x72, 0x0c, 0x7a, 0x68, 0x6b, 0xc5, 0xce, 0xfe, 0x47, 0xf6, 0x0c, 0x6f, 0x4f, 0xfb, 0x26, 0x40, - 0xa7, 0x40, 0xb3, 0x78, 0xf5, 0x1a, 0xbb, 0x34, 0x2b, 0x84, 0x79, 0x76, 0xd9, 0xe8, 0xaf, 0xdf, - 0xca, 0xe8, 0x25, 0xbc, 0xca, 0xe6, 0xfb, 0xa8, 0x73, 0x90, 0x85, 0xfd, 0x1b, 0x2a, 0xe4, 0xd5, - 0x6b, 0x59, 0xad, 0x5f, 0xcb, 0x67, 0x68, 0x3d, 0x1f, 0x71, 0xa7, 0x4c, 0x13, 0x9f, 0xf9, 0x53, - 0x84, 0xf2, 0xd9, 0xa8, 0x08, 0x33, 0x4b, 0x4b, 0x3b, 0xdf, 0x39, 0xf2, 0x1b, 0xa3, 0x6a, 0xbe, - 0x31, 0xaa, 0x2c, 0x07, 0x6d, 0x9c, 0x09, 0xf2, 0xdb, 0xe2, 0xfd, 0xf3, 0x34, 0x16, 0xe6, 0x5d, - 0xb4, 0xa4, 0x7a, 0x35, 0x07, 0x5a, 0x70, 0x16, 0x53, 0x41, 0x8e, 0x7c, 0x73, 0xb7, 0xfe, 0xc6, - 0x62, 0xb1, 0x4b, 0x7d, 0xd1, 0x9d, 0xef, 0xb7, 0x76, 0x17, 0x9c, 0xf5, 0xa4, 0x52, 0x3f, 0xf2, - 0x85, 0xf5, 0x3b, 0xd4, 0xa9, 0x01, 0x9a, 0xeb, 0x68, 0xbe, 0xc4, 0x9a, 0xa7, 0xbe, 0xf9, 0x10, - 0x6d, 0x55, 0x40, 0x4d, 0xba, 0xcf, 0x10, 0xdb, 0xce, 0xbd, 0x52, 0xa0, 0xc1, 0xf8, 0xc2, 0x7a, - 0x8a, 0x36, 0x8f, 0x2a, 0x72, 0x29, 0x87, 0x49, 0x23, 0x42, 0xa3, 0x39, 0x8c, 0xb7, 0x51, 0xbb, - 0xfc, 0x91, 0xd0, 0xd1, 0x2f, 0x38, 0xd5, 0x86, 0x15, 0xa2, 0x5b, 0x67, 0x82, 0x9c, 0x40, 0xe4, - 0x57, 0x60, 0x37, 0x5c, 0xc0, 0xe1, 0x65, 0xa0, 0x99, 0x1f, 0xaa, 0x95, 0xb9, 0x3f, 0x1b, 0xa8, - 0x7b, 0x0c, 0xd3, 0x03, 0x21, 0xe8, 0x38, 0x0a, 0x21, 0x92, 0x8a, 0x2c, 0x30, 0x01, 0xf5, 0x69, - 0xbe, 0x8b, 0xd6, 0xca, 0x46, 0x2b, 0xfb, 0x6b, 0xd5, 0x59, 0x2d, 0x36, 0x75, 0x63, 0x3d, 0x44, - 0x28, 0xe6, 0x90, 0xba, 0xc4, 0x3d, 0x87, 0x69, 0xee, 0xc6, 0x76, 0x7d, 0xd6, 0x64, 0xff, 0x29, - 0xf6, 0x28, 0xf1, 0x02, 0x4a, 0x8e, 0x61, 0xea, 0xac, 0x28, 0xf9, 0xe1, 0x31, 0x4c, 0xd5, 0xdb, - 0x21, 0x66, 0x2f, 0x81, 0xeb, 0x01, 0xd1, 0x72, 0xb2, 0x85, 0xf5, 0x17, 0x03, 0xdd, 0x3b, 0xc3, - 0x01, 0xf5, 0xb1, 0x64, 0xbc, 0xb8, 0xef, 0x51, 0xe2, 0x29, 0x8d, 0x37, 0xdc, 0xeb, 0x15, 0x6f, - 0xe7, 0xaf, 0xf1, 0xf6, 0x63, 0xb4, 0x5a, 0x66, 0x58, 0xf9, 0xdb, 0x9a, 0xc1, 0xdf, 0x4e, 0xa1, - 0x71, 0x0c, 0x53, 0xeb, 0x8f, 0x35, 0xdf, 0x0e, 0xa7, 0xb5, 0xe6, 0xe5, 0xff, 0xc5, 0xb7, 0xd2, - 0x6c, 0xdd, 0x37, 0x52, 0xd7, 0xbf, 0x12, 0x40, 0xeb, 0x6a, 0x00, 0xd6, 0xdf, 0x0c, 0xb4, 0x59, - 0xb7, 0x2a, 0x4e, 0xd9, 0x88, 0x27, 0x11, 0xbc, 0xc9, 0x7a, 0x55, 0x3f, 0xf3, 0xf5, 0xfa, 0x79, - 0x86, 0xd6, 0x1b, 0x4e, 0x89, 0xfc, 0x36, 0x7e, 0x39, 0x13, 0x85, 0xd4, 0xe8, 0xc1, 0x59, 0xab, - 0xc7, 0x21, 0x0e, 0x9f, 0x7d, 0x7b, 0xd1, 0x33, 0xbe, 0xbb, 0xe8, 0x19, 0xff, 0xbc, 0xe8, 0x19, - 0x5f, 0xbd, 0xee, 0xcd, 0x7d, 0xf7, 0xba, 0x37, 0xf7, 0x8f, 0xd7, 0xbd, 0xb9, 0xdf, 0x7f, 0x34, - 0xa6, 0x72, 0x92, 0x78, 0x36, 0x61, 0xe1, 0x20, 0xff, 0x09, 0xad, 0x6c, 0x7d, 0x50, 0xfe, 0xd3, - 0xa7, 0xfb, 0x83, 0x57, 0xcd, 0x1f, 0x7b, 0x39, 0x8d, 0x41, 0x78, 0x4b, 0xba, 0xac, 0x3f, 0xfc, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x4c, 0xb0, 0x24, 0x09, 0x10, 0x00, 0x00, + 0xb5, 0x29, 0x97, 0xb1, 0x21, 0x75, 0x49, 0xa9, 0xe2, 0x72, 0x91, 0x2b, 0xcb, 0xa2, 0x19, 0x5b, + 0x6b, 0x90, 0xa1, 0x2a, 0xc9, 0x01, 0x35, 0x18, 0xb4, 0x76, 0xa7, 0x08, 0x60, 0xa0, 0x99, 0x01, + 0xa4, 0xbd, 0xe4, 0xec, 0xa3, 0x73, 0x73, 0x25, 0x17, 0xe7, 0x17, 0xe4, 0x6f, 0xf8, 0xe8, 0x63, + 0x4e, 0x76, 0x4a, 0x3a, 0xe4, 0x90, 0x3f, 0x91, 0x9a, 0xc1, 0x9b, 0xa4, 0x92, 0x55, 0x1e, 0x37, + 0x4c, 0x4f, 0xf7, 0xd7, 0xdd, 0xd3, 0xd3, 0x5f, 0x0f, 0xd0, 0x01, 0x8d, 0x24, 0x70, 0x32, 0xc5, + 0x34, 0x72, 0x05, 0x90, 0x84, 0x53, 0x39, 0x1b, 0x12, 0x92, 0x0e, 0x63, 0xce, 0x52, 0xea, 0x03, + 0x1f, 0xa6, 0xfb, 0xe5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xee, 0x35, 0x36, 0x36, 0x21, 0xa9, + 0x5d, 0xea, 0xa5, 0xfb, 0x77, 0xb7, 0x27, 0x6c, 0xc2, 0xb4, 0xfe, 0x50, 0x7d, 0x65, 0xa6, 0x77, + 0xf7, 0x26, 0x8c, 0x4d, 0x02, 0x18, 0xea, 0x95, 0x97, 0x3c, 0x1b, 0x4a, 0x1a, 0x82, 0x90, 0x38, + 0x8c, 0x73, 0x85, 0xde, 0x65, 0x05, 0x3f, 0xe1, 0x58, 0x52, 0x16, 0x15, 0x00, 0xd4, 0x23, 0x43, + 0xc2, 0x38, 0x0c, 0x49, 0x40, 0x21, 0x92, 0x2a, 0xbc, 0xec, 0x2b, 0x57, 0x18, 0x2a, 0x85, 0x80, + 0x4e, 0xa6, 0x32, 0x13, 0x8b, 0xa1, 0x84, 0xc8, 0x07, 0x1e, 0xd2, 0x4c, 0xb9, 0x5a, 0xe5, 0x06, + 0xbb, 0xb5, 0x7d, 0xc2, 0x67, 0xb1, 0x64, 0xc3, 0x0b, 0x98, 0x89, 0x7c, 0xf7, 0x3d, 0xc2, 0x44, + 0xc8, 0xc4, 0x10, 0x54, 0x62, 0x11, 0x81, 0x61, 0xba, 0xef, 0x81, 0xc4, 0xfb, 0xa5, 0xa0, 0x88, + 0x3b, 0xd7, 0xf3, 0xb0, 0xa8, 0x74, 0x08, 0xa3, 0x79, 0xdc, 0xd6, 0x0f, 0x2b, 0xa8, 0x3b, 0x62, + 0x91, 0x48, 0x42, 0xe0, 0x87, 0xbe, 0x4f, 0x55, 0x4a, 0x63, 0xce, 0x62, 0x26, 0x70, 0x60, 0x6e, + 0xa3, 0x65, 0x49, 0x65, 0x00, 0x5d, 0xa3, 0x6f, 0x0c, 0xda, 0x4e, 0xb6, 0x30, 0xfb, 0xa8, 0xe3, + 0x83, 0x20, 0x9c, 0xc6, 0x4a, 0xb9, 0xbb, 0xa8, 0xf7, 0xea, 0x22, 0x73, 0x07, 0xad, 0x65, 0x55, + 0xa0, 0x7e, 0xb7, 0xa5, 0xb7, 0x57, 0xf5, 0xfa, 0xd8, 0x37, 0x3f, 0x41, 0x9b, 0x34, 0xa2, 0x92, + 0xe2, 0xc0, 0x9d, 0x82, 0x3a, 0x8d, 0xee, 0x52, 0xdf, 0x18, 0x74, 0x0e, 0xee, 0xda, 0xd4, 0x23, + 0xb6, 0x3a, 0x40, 0x3b, 0x3f, 0xb6, 0x74, 0xdf, 0x7e, 0xac, 0x35, 0x8e, 0x96, 0xbe, 0xfd, 0x7e, + 0x6f, 0xc1, 0xd9, 0xc8, 0xed, 0x32, 0xa1, 0x79, 0x0f, 0xad, 0x4f, 0x20, 0x02, 0x41, 0x85, 0x3b, + 0xc5, 0x62, 0xda, 0x5d, 0xee, 0x1b, 0x83, 0x75, 0xa7, 0x93, 0xcb, 0x1e, 0x63, 0x31, 0x35, 0xf7, + 0x50, 0xc7, 0xa3, 0x11, 0xe6, 0xb3, 0x4c, 0x63, 0x45, 0x6b, 0xa0, 0x4c, 0xa4, 0x15, 0x46, 0x08, + 0x89, 0x18, 0xbf, 0x88, 0x5c, 0x55, 0xed, 0xee, 0x6a, 0x1e, 0x48, 0x56, 0x69, 0xbb, 0xa8, 0xb4, + 0x7d, 0x56, 0x5c, 0x85, 0xa3, 0x35, 0x15, 0xc8, 0x57, 0x3f, 0xec, 0x19, 0x4e, 0x5b, 0xdb, 0xa9, + 0x1d, 0xf3, 0x73, 0x74, 0x23, 0x89, 0x3c, 0x16, 0xf9, 0x34, 0x9a, 0xb8, 0x31, 0x70, 0xca, 0xfc, + 0xee, 0x9a, 0x86, 0xda, 0xb9, 0x02, 0xf5, 0x30, 0xbf, 0x34, 0x19, 0xd2, 0xd7, 0x0a, 0x69, 0xab, + 0x34, 0x1e, 0x6b, 0x5b, 0xf3, 0x0b, 0x64, 0x12, 0x92, 0xea, 0x90, 0x58, 0x22, 0x0b, 0xc4, 0xf6, + 0xfc, 0x88, 0x37, 0x08, 0x49, 0xcf, 0x32, 0xeb, 0x1c, 0xf2, 0x77, 0xe8, 0x8e, 0xe4, 0x38, 0x12, + 0xcf, 0x80, 0x5f, 0xc6, 0x45, 0xf3, 0xe3, 0xde, 0x2e, 0x30, 0x9a, 0xe0, 0x8f, 0x51, 0x9f, 0xe4, + 0x17, 0xc8, 0xe5, 0xe0, 0x53, 0x21, 0x39, 0xf5, 0x12, 0x65, 0xeb, 0x3e, 0xe3, 0x98, 0xe8, 0x3b, + 0xd2, 0xd1, 0x97, 0xa0, 0x57, 0xe8, 0x39, 0x0d, 0xb5, 0x47, 0xb9, 0x96, 0xf9, 0x04, 0xfd, 0xc4, + 0x0b, 0x18, 0xb9, 0x10, 0x2a, 0x38, 0xb7, 0x81, 0xa4, 0x5d, 0x87, 0x54, 0x08, 0x85, 0xb6, 0xde, + 0x37, 0x06, 0x2d, 0xe7, 0x5e, 0xa6, 0x3b, 0x06, 0xfe, 0xb0, 0xa6, 0x79, 0x56, 0x53, 0x34, 0x3f, + 0x40, 0xe6, 0x94, 0x0a, 0xc9, 0x38, 0x25, 0x38, 0x70, 0x21, 0x92, 0x9c, 0x82, 0xe8, 0x6e, 0x68, + 0xf3, 0x9b, 0xd5, 0xce, 0xc7, 0xd9, 0x86, 0xf9, 0x29, 0xba, 0xf7, 0x46, 0xa7, 0x2e, 0x99, 0xe2, + 0x28, 0x82, 0xa0, 0xbb, 0xa9, 0x53, 0xd9, 0xf3, 0xdf, 0xe0, 0x73, 0x94, 0xa9, 0x3d, 0x58, 0xfb, + 0xf2, 0x9b, 0xbd, 0x85, 0xaf, 0xbf, 0xd9, 0x5b, 0xb0, 0xfe, 0x62, 0xa0, 0x3b, 0xa3, 0x32, 0xf1, + 0x90, 0xa5, 0x38, 0xf8, 0x7f, 0x36, 0xd8, 0x21, 0x6a, 0x0b, 0xc9, 0xe2, 0xec, 0x4a, 0x2f, 0xbd, + 0xc5, 0x95, 0x5e, 0x53, 0x66, 0x6a, 0xc3, 0xfa, 0x93, 0x81, 0xb6, 0x3f, 0x7e, 0x9e, 0xd0, 0x94, + 0x11, 0xfc, 0x3f, 0xe1, 0x83, 0x13, 0xb4, 0x01, 0x35, 0x3c, 0xd1, 0x6d, 0xf5, 0x5b, 0x83, 0xce, + 0xc1, 0x4f, 0xed, 0x8c, 0x9c, 0xec, 0x92, 0xb3, 0x72, 0x82, 0xb2, 0xeb, 0xde, 0x9d, 0xa6, 0xad, + 0xf5, 0x0f, 0x03, 0xdd, 0xf8, 0x24, 0x60, 0x1e, 0x0e, 0x4e, 0x03, 0x2c, 0xa6, 0xaa, 0x78, 0x33, + 0x95, 0x35, 0x87, 0xbc, 0x6b, 0x74, 0x74, 0x73, 0x67, 0xad, 0xcc, 0x74, 0x1f, 0x7f, 0x84, 0x6e, + 0x96, 0xf7, 0xb8, 0x3c, 0x5c, 0x9d, 0xcc, 0xd1, 0xad, 0x57, 0xdf, 0xef, 0x6d, 0x15, 0x35, 0x1c, + 0xe9, 0x83, 0x7e, 0xe8, 0x6c, 0x91, 0x86, 0xc0, 0x37, 0x7b, 0xa8, 0x43, 0x3d, 0xe2, 0x0a, 0x78, + 0xee, 0x46, 0x49, 0xa8, 0xeb, 0xb2, 0xe4, 0xb4, 0xa9, 0x47, 0x4e, 0xe1, 0xf9, 0xe7, 0x49, 0x68, + 0xde, 0x47, 0xef, 0x14, 0x83, 0xc8, 0x4d, 0x71, 0xe0, 0x2a, 0x7b, 0x17, 0xfb, 0x3e, 0xd7, 0x65, + 0x5a, 0x77, 0x6e, 0x15, 0xbb, 0xe7, 0x38, 0x50, 0xce, 0x0e, 0x7d, 0x9f, 0x5b, 0x7f, 0x5f, 0x46, + 0x2b, 0x63, 0xcc, 0x71, 0x28, 0xcc, 0x33, 0xb4, 0x25, 0x21, 0x8c, 0x03, 0x2c, 0xc1, 0xcd, 0x38, + 0x32, 0xcf, 0xf4, 0x7d, 0xcd, 0x9d, 0xf5, 0xd9, 0x62, 0xd7, 0xa6, 0x49, 0xba, 0x6f, 0x8f, 0xb4, + 0xf4, 0x54, 0x62, 0x09, 0xce, 0x66, 0x81, 0x91, 0x09, 0xcd, 0x5f, 0xa0, 0xae, 0xe4, 0x89, 0x90, + 0x15, 0x7b, 0x55, 0x6d, 0x9b, 0x95, 0xf2, 0x9d, 0x62, 0x3f, 0x6b, 0xf8, 0xb2, 0x5d, 0xaf, 0x27, + 0xaa, 0xd6, 0x7f, 0x43, 0x54, 0xa7, 0xe8, 0x96, 0x62, 0xf9, 0xcb, 0x98, 0x4b, 0xf3, 0x63, 0xde, + 0x54, 0xf6, 0x4d, 0xd0, 0x2f, 0x90, 0x99, 0x0a, 0x72, 0x19, 0x73, 0xf9, 0x2d, 0xe2, 0x4c, 0x05, + 0x69, 0x42, 0xfa, 0x68, 0x57, 0xa8, 0xcb, 0xe7, 0x86, 0x20, 0x35, 0xed, 0xc5, 0x01, 0x44, 0x54, + 0x4c, 0x0b, 0xf0, 0x95, 0xf9, 0xc1, 0x77, 0x34, 0xd0, 0x67, 0x0a, 0xc7, 0x29, 0x60, 0x72, 0x2f, + 0x23, 0xd4, 0xbb, 0xde, 0x4b, 0x59, 0xa0, 0x55, 0x5d, 0xa0, 0x1f, 0x5d, 0x03, 0x51, 0x56, 0xe9, + 0x00, 0xdd, 0x0e, 0xf1, 0x4b, 0x57, 0x4e, 0x39, 0x93, 0x32, 0x00, 0xdf, 0x8d, 0x31, 0xb9, 0x00, + 0x29, 0xf4, 0x8c, 0x6a, 0x39, 0xb7, 0x42, 0xfc, 0xf2, 0xac, 0xd8, 0x1b, 0x67, 0x5b, 0xa6, 0x40, + 0xef, 0xd5, 0x28, 0xfd, 0x05, 0xe6, 0xbe, 0xeb, 0x43, 0xc4, 0x42, 0x97, 0xc3, 0x44, 0xf1, 0x1e, + 0xce, 0xd8, 0x1d, 0xa0, 0x1c, 0x4b, 0x79, 0x23, 0xab, 0x57, 0x46, 0xd9, 0xc4, 0x23, 0x46, 0xa3, + 0x7c, 0x76, 0x5b, 0x15, 0xf3, 0x2b, 0xb4, 0x87, 0x0a, 0xcc, 0xa9, 0x61, 0x3d, 0x02, 0xb0, 0x3c, + 0x74, 0xf3, 0x31, 0x8e, 0x7c, 0x31, 0xc5, 0x17, 0xf0, 0x19, 0x48, 0xec, 0x63, 0x89, 0x1b, 0x3d, + 0xf3, 0x0c, 0xc0, 0x8d, 0x19, 0x0b, 0xb2, 0x9e, 0xc9, 0x28, 0xa8, 0xec, 0x99, 0x47, 0x00, 0x63, + 0xc6, 0x02, 0xd5, 0x33, 0x66, 0x17, 0xad, 0xa6, 0xc0, 0x45, 0x75, 0x83, 0x8b, 0xa5, 0xf5, 0x33, + 0xd4, 0xd6, 0xa4, 0x71, 0x48, 0x2e, 0x84, 0xb9, 0x8b, 0xda, 0x0a, 0x09, 0x84, 0x00, 0xd1, 0x35, + 0xfa, 0xad, 0x41, 0xdb, 0xa9, 0x04, 0x96, 0x44, 0x3b, 0x6f, 0x7a, 0x17, 0x09, 0xf3, 0x29, 0x5a, + 0x8d, 0x41, 0x0f, 0x6d, 0x6d, 0xd8, 0x39, 0xf8, 0xd0, 0x9e, 0xe3, 0xed, 0x69, 0xbf, 0x09, 0xd0, + 0x29, 0xd0, 0x2c, 0x5e, 0xbd, 0xc6, 0x2e, 0xcd, 0x0a, 0x61, 0x9e, 0x5f, 0x76, 0xfa, 0xcb, 0xb7, + 0x72, 0x7a, 0x09, 0xaf, 0xf2, 0xf9, 0x3e, 0xea, 0x1c, 0x66, 0x69, 0xff, 0x8a, 0x0a, 0x79, 0xf5, + 0x58, 0xd6, 0xeb, 0xc7, 0xf2, 0x29, 0xda, 0xcc, 0x47, 0xdc, 0x19, 0xd3, 0xc4, 0x67, 0xfe, 0x18, + 0xa1, 0x7c, 0x36, 0x2a, 0xc2, 0xcc, 0xca, 0xd2, 0xce, 0x25, 0xc7, 0x7e, 0x63, 0x54, 0x2d, 0x36, + 0x46, 0x95, 0xe5, 0xa0, 0xad, 0x73, 0x41, 0x7e, 0x5d, 0xbc, 0x7f, 0x9e, 0xc4, 0xc2, 0xbc, 0x8d, + 0x56, 0x54, 0xaf, 0xe6, 0x40, 0x4b, 0xce, 0x72, 0x2a, 0xc8, 0xb1, 0x6f, 0x0e, 0xea, 0x6f, 0x2c, + 0x16, 0xbb, 0xd4, 0x17, 0xdd, 0xc5, 0x7e, 0x6b, 0xb0, 0xe4, 0x6c, 0x26, 0x95, 0xf9, 0xb1, 0x2f, + 0xac, 0xdf, 0xa0, 0x4e, 0x0d, 0xd0, 0xdc, 0x44, 0x8b, 0x25, 0xd6, 0x22, 0xf5, 0xcd, 0x07, 0x68, + 0xa7, 0x02, 0x6a, 0xd2, 0x7d, 0x86, 0xd8, 0x76, 0xee, 0x94, 0x0a, 0x0d, 0xc6, 0x17, 0xd6, 0x13, + 0xb4, 0x7d, 0x5c, 0x91, 0x4b, 0x39, 0x4c, 0x1a, 0x19, 0x1a, 0xcd, 0x61, 0xbc, 0x8b, 0xda, 0xe5, + 0x8f, 0x84, 0xce, 0x7e, 0xc9, 0xa9, 0x04, 0xd6, 0x97, 0x06, 0xba, 0x71, 0x2e, 0xc8, 0x29, 0x44, + 0xfe, 0x5c, 0x68, 0xd5, 0xe1, 0x2c, 0xd6, 0x0f, 0xe7, 0xa8, 0xee, 0xa4, 0xf5, 0x36, 0x8f, 0xd8, + 0x2a, 0x94, 0x3f, 0x18, 0xa8, 0x7b, 0x02, 0xb3, 0x43, 0x21, 0xe8, 0x24, 0x0a, 0x21, 0x92, 0x8a, + 0x48, 0x30, 0x01, 0xf5, 0x69, 0xbe, 0x8b, 0x36, 0xca, 0x26, 0x2c, 0x7b, 0x6f, 0xdd, 0x59, 0x2f, + 0x84, 0xba, 0xe9, 0x1e, 0x20, 0x14, 0x73, 0x48, 0x5d, 0xe2, 0x5e, 0xc0, 0x4c, 0x07, 0xd8, 0x39, + 0xd8, 0xad, 0xcf, 0xa1, 0xec, 0x1f, 0xc6, 0x1e, 0x27, 0x5e, 0x40, 0xc9, 0x09, 0xcc, 0x9c, 0x35, + 0xa5, 0x3f, 0x3a, 0x81, 0x99, 0x7a, 0x57, 0xc4, 0xec, 0x05, 0x70, 0x1d, 0x7d, 0xcb, 0xc9, 0x16, + 0xd6, 0x1f, 0x0d, 0x74, 0xe7, 0x1c, 0x07, 0xd4, 0xc7, 0x92, 0xf1, 0xa2, 0x16, 0xe3, 0xc4, 0x53, + 0x16, 0xff, 0xe2, 0x94, 0xae, 0x44, 0xbb, 0x78, 0x4d, 0xb4, 0x1f, 0xa1, 0xf5, 0xb2, 0xfa, 0x2a, + 0xde, 0xd6, 0x1c, 0xf1, 0x76, 0x0a, 0x8b, 0x13, 0x98, 0x59, 0xbf, 0xaf, 0xc5, 0x76, 0x34, 0xab, + 0x35, 0x36, 0xff, 0x37, 0xb1, 0x95, 0x6e, 0xeb, 0xb1, 0x91, 0xba, 0xfd, 0x95, 0x04, 0x5a, 0x57, + 0x13, 0xb0, 0xfe, 0x6c, 0xa0, 0xed, 0xba, 0x57, 0x71, 0xc6, 0xc6, 0x3c, 0x89, 0xe0, 0x3f, 0xb8, + 0x3f, 0x4f, 0xd1, 0x66, 0x23, 0x28, 0x91, 0x9f, 0xc6, 0xcf, 0xe7, 0xa2, 0x97, 0x1a, 0x75, 0x38, + 0x1b, 0xf5, 0x3c, 0xc4, 0xd1, 0xd3, 0x6f, 0x5f, 0xf5, 0x8c, 0xef, 0x5e, 0xf5, 0x8c, 0xbf, 0xbd, + 0xea, 0x19, 0x5f, 0xbd, 0xee, 0x2d, 0x7c, 0xf7, 0xba, 0xb7, 0xf0, 0xd7, 0xd7, 0xbd, 0x85, 0xdf, + 0x7e, 0x38, 0xa1, 0x72, 0x9a, 0x78, 0x36, 0x61, 0xe1, 0x30, 0xff, 0x41, 0xad, 0x7c, 0x7d, 0x50, + 0xfe, 0xef, 0xa7, 0xf7, 0x87, 0x2f, 0x9b, 0x3f, 0xfd, 0x72, 0x16, 0x83, 0xf0, 0x56, 0xf4, 0xb5, + 0xbe, 0xff, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xa3, 0x18, 0xf3, 0x25, 0x10, 0x00, 0x00, } func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) { @@ -2079,11 +2087,18 @@ func (m *VscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n16 i = encodeVarintProvider(dAtA, i, uint64(n16)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a if m.VscId != 0 { i = encodeVarintProvider(dAtA, i, uint64(m.VscId)) i-- - dAtA[i] = 0x8 + dAtA[i] = 0x10 + } + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintProvider(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -2594,6 +2609,10 @@ func (m *VscSendTimestamp) Size() (n int) { } var l int _ = l + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovProvider(uint64(l)) + } if m.VscId != 0 { n += 1 + sovProvider(uint64(m.VscId)) } @@ -4937,6 +4956,38 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProvider + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthProvider + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProvider + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field VscId", wireType) } @@ -4955,7 +5006,7 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { break } } - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) } diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index f8a4f04d23..f82376da05 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -1150,9 +1150,9 @@ var fileDescriptor_422512d7b7586cd7 = []byte{ 0x2c, 0xc3, 0xc5, 0xc1, 0x76, 0xf8, 0x4d, 0xc4, 0x96, 0x23, 0x3e, 0xc7, 0x34, 0xa2, 0x78, 0x52, 0xbd, 0xf3, 0x78, 0x37, 0x2f, 0x3d, 0xd9, 0xcd, 0x4b, 0x7f, 0xee, 0xe6, 0xa5, 0x87, 0x7b, 0xf9, 0xcc, 0x93, 0xbd, 0x7c, 0xe6, 0xd9, 0x5e, 0x3e, 0xf3, 0xd1, 0x7c, 0xcd, 0x66, 0x5b, 0x8d, 0x4d, - 0xd5, 0x24, 0x75, 0xcd, 0x24, 0xb4, 0x4e, 0x68, 0x5b, 0xbf, 0x77, 0x9a, 0xfd, 0x82, 0x92, 0x76, - 0x7f, 0xdf, 0xfc, 0xed, 0x78, 0x98, 0x6e, 0x4e, 0xf0, 0xaf, 0x95, 0xcb, 0xff, 0x07, 0x00, 0x00, - 0xff, 0xff, 0xb7, 0x37, 0x44, 0xeb, 0x42, 0x13, 0x00, 0x00, + 0xd5, 0x24, 0x75, 0xcd, 0x24, 0xb4, 0x4e, 0x68, 0x5b, 0xbf, 0x77, 0x9a, 0xfd, 0x82, 0xcb, 0xda, + 0xfd, 0x7d, 0xf3, 0xb7, 0xe3, 0x61, 0xba, 0x39, 0xc1, 0xbf, 0x56, 0x2e, 0xff, 0x1f, 0x00, 0x00, + 0xff, 0xff, 0xbf, 0xd4, 0x24, 0xd7, 0x42, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ccv/provider/types/tx.pb.go b/x/ccv/provider/types/tx.pb.go index 746f92b417..32bca37998 100644 --- a/x/ccv/provider/types/tx.pb.go +++ b/x/ccv/provider/types/tx.pb.go @@ -207,7 +207,7 @@ var fileDescriptor_43221a4391e9fbf4 = []byte{ // 453 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x3d, 0x6b, 0x14, 0x41, 0x18, 0xc7, 0x77, 0x13, 0xd4, 0x64, 0x8c, 0x82, 0xc3, 0x15, 0x97, 0xf3, 0xd8, 0xd3, 0x15, 0x24, - 0x85, 0xee, 0x90, 0x58, 0x88, 0x01, 0x8b, 0x4b, 0x6c, 0x24, 0x5c, 0xb3, 0x8d, 0x60, 0xe1, 0xb1, + 0x85, 0xee, 0x10, 0x53, 0x88, 0x01, 0x8b, 0x4b, 0x6c, 0x24, 0x5c, 0xb3, 0x8d, 0x60, 0xe1, 0xb1, 0x37, 0x33, 0x4e, 0x06, 0xb3, 0xf3, 0x2c, 0xf3, 0xcc, 0xad, 0xd9, 0x6f, 0x60, 0xa9, 0x95, 0x6d, 0xbe, 0x81, 0x5f, 0x43, 0xb0, 0x49, 0x69, 0x25, 0x72, 0xd7, 0x58, 0xfb, 0x09, 0x64, 0xdf, 0x3c, 0xc5, 0xe3, 0x08, 0x92, 0xee, 0x79, 0xdb, 0xff, 0xff, 0xb7, 0x33, 0xf3, 0x90, 0x07, 0xda, 0x38, @@ -226,14 +226,14 @@ var fileDescriptor_43221a4391e9fbf4 = []byte{ 0x91, 0x60, 0x84, 0x2a, 0x96, 0x4a, 0xa3, 0x93, 0xb6, 0x9d, 0x88, 0xe5, 0xdb, 0xc4, 0x8a, 0x67, 0xd2, 0x40, 0x4a, 0x3b, 0xe4, 0x8a, 0x28, 0x83, 0x86, 0xbf, 0x4e, 0x68, 0x9f, 0x6c, 0x0a, 0x99, 0x01, 0x6a, 0x07, 0x0d, 0x79, 0xbc, 0x28, 0xfc, 0xe1, 0xbf, 0x43, 0xee, 0xaf, 0xd6, 0x6f, 0x49, - 0xf6, 0xbe, 0xac, 0x91, 0xf5, 0x11, 0x2a, 0xfa, 0xc1, 0x27, 0xb7, 0xfe, 0x3d, 0xc8, 0x27, 0xd1, - 0x05, 0x6e, 0x3c, 0x5a, 0xf6, 0xab, 0xbd, 0xe1, 0x7f, 0x7f, 0xda, 0xb2, 0xd1, 0x4f, 0x3e, 0xb9, - 0xbd, 0xea, 0x8c, 0x0e, 0x2f, 0x6a, 0xb1, 0x42, 0xa4, 0x77, 0x74, 0x09, 0x22, 0x2d, 0xf1, 0xc1, - 0x8b, 0xcf, 0xb3, 0xc0, 0x3f, 0x9f, 0x05, 0xfe, 0xf7, 0x59, 0xe0, 0xbf, 0x9f, 0x07, 0xde, 0xf9, - 0x3c, 0xf0, 0xbe, 0xce, 0x03, 0xef, 0xe5, 0x53, 0xa5, 0xdd, 0xf1, 0x74, 0x12, 0x71, 0x48, 0x9b, - 0xf7, 0xcd, 0x16, 0xbe, 0x0f, 0x7f, 0xaf, 0x5e, 0xbe, 0xc7, 0x4e, 0xff, 0xde, 0x3f, 0x57, 0x64, - 0x12, 0x27, 0x57, 0xab, 0x17, 0xff, 0xe8, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x53, 0xb5, - 0xb8, 0xb0, 0x03, 0x00, 0x00, + 0x1e, 0x7d, 0x59, 0x23, 0xeb, 0x23, 0x54, 0xf4, 0x83, 0x4f, 0x6e, 0xfd, 0x7b, 0x90, 0x4f, 0xa2, + 0x0b, 0xdc, 0x78, 0xb4, 0xec, 0x57, 0x7b, 0xc3, 0xff, 0xfe, 0xb4, 0x65, 0xa3, 0x9f, 0x7c, 0x72, + 0x7b, 0xd5, 0x19, 0x1d, 0x5e, 0xd4, 0x62, 0x85, 0x48, 0xef, 0xe8, 0x12, 0x44, 0x5a, 0xe2, 0x83, + 0x17, 0x9f, 0x67, 0x81, 0x7f, 0x3e, 0x0b, 0xfc, 0xef, 0xb3, 0xc0, 0x7f, 0x3f, 0x0f, 0xbc, 0xf3, + 0x79, 0xe0, 0x7d, 0x9d, 0x07, 0xde, 0xcb, 0xa7, 0x4a, 0xbb, 0xe3, 0xe9, 0x24, 0xe2, 0x90, 0x36, + 0xef, 0x9b, 0x2d, 0x7c, 0x1f, 0xfe, 0x5e, 0xbd, 0x7c, 0x8f, 0x9d, 0xfe, 0xbd, 0x7f, 0xae, 0xc8, + 0x24, 0x4e, 0xae, 0x56, 0x2f, 0x7e, 0xef, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72, 0xb0, 0xd5, + 0x84, 0xb0, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ccv/types/ccv.pb.go b/x/ccv/types/ccv.pb.go index ea2d38dc84..21d0b32f0b 100644 --- a/x/ccv/types/ccv.pb.go +++ b/x/ccv/types/ccv.pb.go @@ -524,9 +524,9 @@ var fileDescriptor_68bd5f3242e6f29c = []byte{ 0x48, 0x1d, 0x88, 0xc8, 0x89, 0x4b, 0x72, 0xee, 0xec, 0x5c, 0x15, 0x4f, 0x66, 0x68, 0xc9, 0xc2, 0xd7, 0xef, 0x0a, 0x57, 0x3a, 0xbc, 0xb8, 0x51, 0xf8, 0xcb, 0x1b, 0x85, 0xff, 0x7d, 0xa3, 0xf0, 0xdf, 0x6e, 0x15, 0xee, 0xf2, 0x56, 0xe1, 0xae, 0x6e, 0x15, 0xee, 0xf3, 0xeb, 0x16, 0x66, 0xed, - 0x41, 0x53, 0x77, 0x49, 0xcf, 0x48, 0x56, 0xeb, 0x1d, 0xaa, 0x97, 0x93, 0x1d, 0x1d, 0x9a, 0xc6, - 0x97, 0x78, 0x51, 0xc7, 0x2b, 0xb3, 0xb9, 0x1c, 0xef, 0xcc, 0xed, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x5e, 0x61, 0xe5, 0xc6, 0xd0, 0x05, 0x00, 0x00, + 0x41, 0x53, 0x77, 0x49, 0xcf, 0x48, 0x56, 0xeb, 0x1d, 0xaa, 0x97, 0x93, 0x1d, 0x1d, 0x6e, 0x1b, + 0x5f, 0xe2, 0x45, 0x1d, 0xaf, 0xcc, 0xe6, 0x72, 0xbc, 0x33, 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff, + 0xff, 0xc0, 0xe2, 0x3f, 0x59, 0xd0, 0x05, 0x00, 0x00, } func (m *ValidatorSetChangePacketData) Marshal() (dAtA []byte, err error) { From 9fc44d5a1bfd664877bb71dfaf77157555882f25 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Fri, 23 Jun 2023 13:08:41 +0200 Subject: [PATCH 2/9] fix: add chainID to vscSendTimestamp --- x/ccv/provider/keeper/keeper.go | 1 + x/ccv/provider/keeper/keeper_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go index 083dd96820..03e83560bd 100644 --- a/x/ccv/provider/keeper/keeper.go +++ b/x/ccv/provider/keeper/keeper.go @@ -1033,6 +1033,7 @@ func (k Keeper) GetFirstVscSendTimestamp(ctx sdk.Context, chainID string) (vscSe } return types.VscSendTimestamp{ + ChainId: chainID, VscId: vscID, Timestamp: ts, }, true diff --git a/x/ccv/provider/keeper/keeper_test.go b/x/ccv/provider/keeper/keeper_test.go index f34bf262a5..494c023393 100644 --- a/x/ccv/provider/keeper/keeper_test.go +++ b/x/ccv/provider/keeper/keeper_test.go @@ -357,7 +357,7 @@ func TestVscSendTimestamp(t *testing.T) { expectedGetAllOrder := []types.VscSendTimestamp{} for _, tc := range testCases { if tc.chainID == chainID { - expectedGetAllOrder = append(expectedGetAllOrder, types.VscSendTimestamp{VscId: tc.vscID, Timestamp: tc.ts}) + expectedGetAllOrder = append(expectedGetAllOrder, types.VscSendTimestamp{ChainId: tc.chainID, VscId: tc.vscID, Timestamp: tc.ts}) } } // sorting by vscID From 709990385d6f11168645cd4a3f34a27d6eb77a14 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Fri, 23 Jun 2023 14:36:05 +0200 Subject: [PATCH 3/9] test: fix tests --- x/ccv/provider/types/genesis_test.go | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/x/ccv/provider/types/genesis_test.go b/x/ccv/provider/types/genesis_test.go index de5c77a803..b9e94c7b45 100644 --- a/x/ccv/provider/types/genesis_test.go +++ b/x/ccv/provider/types/genesis_test.go @@ -40,6 +40,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), true, }, @@ -62,6 +64,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), true, }, @@ -81,6 +85,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), true, }, @@ -100,6 +106,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -119,6 +127,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -138,6 +148,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -163,6 +175,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -188,6 +202,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -213,6 +229,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -238,6 +256,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -263,6 +283,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -288,6 +310,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -313,6 +337,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -338,6 +364,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -355,6 +383,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -372,6 +402,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -389,6 +421,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -406,6 +440,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -426,6 +462,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -447,6 +485,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -468,6 +508,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -493,6 +535,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -518,6 +562,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -543,6 +589,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -577,6 +625,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -623,6 +673,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -643,6 +695,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -662,6 +716,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, @@ -681,6 +737,8 @@ func TestValidateGenesisState(t *testing.T) { nil, nil, nil, + nil, + nil, ), false, }, From 6d94704b2fbb62fbf4814cf6d192171f4fc7289b Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Fri, 23 Jun 2023 15:21:10 +0200 Subject: [PATCH 4/9] test: fixgenesis test --- x/ccv/provider/keeper/genesis_test.go | 23 +++++++++++++++++++++++ x/ccv/provider/module_test.go | 2 ++ 2 files changed, 25 insertions(+) diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index fe666dcc2c..1b56c4a79f 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -35,6 +35,8 @@ func TestInitAndExportGenesis(t *testing.T) { consumerTmPubKey := consumerCryptoId.TMProtoCryptoPublicKey() consumerConsAddr := consumerCryptoId.ConsumerConsAddress() + initTimeoutTime := uint64(time.Now().UTC().UnixNano()) + 10 + vscSendTime := time.Now().Add(-30 * time.Minute) // create genesis struct provGenesis := providertypes.NewGenesisState(vscID, []providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}}, @@ -97,6 +99,19 @@ func TestInitAndExportGenesis(t *testing.T) { ConsumerAddrs: &providertypes.AddressList{Addresses: [][]byte{consumerConsAddr.ToSdkConsAddr()}}, }, }, + []providertypes.InitTimeoutTimestamp{ + { + ChainId: cChainIDs[0], + Timestamp: initTimeoutTime, + }, + }, + []providertypes.VscSendTimestamp{ + { + ChainId: cChainIDs[0], + VscId: vscID, + Timestamp: vscSendTime, + }, + }, ) // Instantiate in-mem provider keeper with mocks @@ -163,6 +178,14 @@ func TestInitAndExportGenesis(t *testing.T) { // check the exported genesis require.Equal(t, provGenesis, pk.ExportGenesis(ctx)) + + initTimeoutTimestamp, found := pk.GetInitTimeoutTimestamp(ctx, cChainIDs[0]) + require.Equal(t, initTimeoutTimestamp, initTimeoutTime) + require.True(t, found) + + vscSendTimestamp, found := pk.GetVscSendTimestamp(ctx, cChainIDs[0], vscID) + require.Equal(t, vscSendTimestamp, vscSendTime) + require.True(t, found) } func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) { diff --git a/x/ccv/provider/module_test.go b/x/ccv/provider/module_test.go index 0eee81cc1f..b0c312e56f 100644 --- a/x/ccv/provider/module_test.go +++ b/x/ccv/provider/module_test.go @@ -109,6 +109,8 @@ func TestInitGenesis(t *testing.T) { nil, nil, nil, + nil, + nil, ) cdc := keeperParams.Cdc From b845cbb91f78eaaa7f27ad52ab5015f7b88917e2 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Mon, 26 Jun 2023 10:52:25 +0200 Subject: [PATCH 5/9] test: fix test TestInitAndExportGenesis --- x/ccv/provider/keeper/genesis_test.go | 58 +++++++++++++++++---------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index 1b56c4a79f..bf327680d1 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + "sort" "testing" "time" @@ -35,8 +36,22 @@ func TestInitAndExportGenesis(t *testing.T) { consumerTmPubKey := consumerCryptoId.TMProtoCryptoPublicKey() consumerConsAddr := consumerCryptoId.ConsumerConsAddress() - initTimeoutTime := uint64(time.Now().UTC().UnixNano()) + 10 - vscSendTime := time.Now().Add(-30 * time.Minute) + initTimeoutTimeStamps := []providertypes.InitTimeoutTimestamp{ + {ChainId: cChainIDs[0], Timestamp: uint64(time.Now().UTC().UnixNano()) + 10}, + {ChainId: cChainIDs[1], Timestamp: uint64(time.Now().UTC().UnixNano()) + 15}, + } + + now := time.Now().UTC() + vscSendTimeStampsC0 := []providertypes.VscSendTimestamp{ + {ChainId: "c0", VscId: 1, Timestamp: now.Add(time.Hour)}, + {ChainId: "c0", VscId: 2, Timestamp: now.Add(2 * time.Hour)}, + } + + vscSendTimeStampsC1 := []providertypes.VscSendTimestamp{ + {ChainId: "c1", VscId: 1, Timestamp: now.Add(-time.Hour)}, + {ChainId: "c1", VscId: 2, Timestamp: now.Add(time.Hour)}, + } + vscSendTimeStampsAll := append(vscSendTimeStampsC0, vscSendTimeStampsC1...) // create genesis struct provGenesis := providertypes.NewGenesisState(vscID, []providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}}, @@ -99,19 +114,8 @@ func TestInitAndExportGenesis(t *testing.T) { ConsumerAddrs: &providertypes.AddressList{Addresses: [][]byte{consumerConsAddr.ToSdkConsAddr()}}, }, }, - []providertypes.InitTimeoutTimestamp{ - { - ChainId: cChainIDs[0], - Timestamp: initTimeoutTime, - }, - }, - []providertypes.VscSendTimestamp{ - { - ChainId: cChainIDs[0], - VscId: vscID, - Timestamp: vscSendTime, - }, - }, + initTimeoutTimeStamps, + vscSendTimeStampsAll, ) // Instantiate in-mem provider keeper with mocks @@ -179,13 +183,23 @@ func TestInitAndExportGenesis(t *testing.T) { // check the exported genesis require.Equal(t, provGenesis, pk.ExportGenesis(ctx)) - initTimeoutTimestamp, found := pk.GetInitTimeoutTimestamp(ctx, cChainIDs[0]) - require.Equal(t, initTimeoutTimestamp, initTimeoutTime) - require.True(t, found) - - vscSendTimestamp, found := pk.GetVscSendTimestamp(ctx, cChainIDs[0], vscID) - require.Equal(t, vscSendTimestamp, vscSendTime) - require.True(t, found) + initTimeoutTimestampInStore := pk.GetAllInitTimeoutTimestamps(ctx) + sort.Slice(initTimeoutTimestampInStore, func(i, j int) bool { + return initTimeoutTimestampInStore[i].Timestamp < initTimeoutTimestampInStore[j].Timestamp + }) + require.Equal(t, initTimeoutTimestampInStore, initTimeoutTimeStamps) + + vscSendTimestampsC0InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[0]) + sort.Slice(vscSendTimestampsC0InStore, func(i, j int) bool { + return vscSendTimestampsC0InStore[i].VscId < vscSendTimestampsC0InStore[j].VscId + }) + require.Equal(t, vscSendTimestampsC0InStore, vscSendTimeStampsC0) + + vscSendTimestampsC1InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[1]) + sort.Slice(vscSendTimestampsC1InStore, func(i, j int) bool { + return vscSendTimestampsC1InStore[i].VscId < vscSendTimestampsC1InStore[j].VscId + }) + require.Equal(t, vscSendTimestampsC1InStore, vscSendTimeStampsC1) } func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) { From cb6588bcca3927a1365986bae93593e7af3a1733 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Mon, 26 Jun 2023 12:18:25 +0200 Subject: [PATCH 6/9] feat: add exportedVscSendTimestamps --- .../ccv/provider/v1/genesis.proto | 2 +- .../ccv/provider/v1/provider.proto | 12 +- x/ccv/provider/keeper/genesis.go | 13 +- x/ccv/provider/keeper/genesis_test.go | 34 +- x/ccv/provider/keeper/keeper.go | 2 - x/ccv/provider/keeper/keeper_test.go | 2 +- x/ccv/provider/types/genesis.go | 4 +- x/ccv/provider/types/genesis.pb.go | 145 +++--- x/ccv/provider/types/provider.pb.go | 448 ++++++++++++------ 9 files changed, 430 insertions(+), 232 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/genesis.proto b/proto/interchain_security/ccv/provider/v1/genesis.proto index 4abc5db8d0..1bc412262c 100644 --- a/proto/interchain_security/ccv/provider/v1/genesis.proto +++ b/proto/interchain_security/ccv/provider/v1/genesis.proto @@ -48,7 +48,7 @@ message GenesisState { repeated interchain_security.ccv.provider.v1.InitTimeoutTimestamp init_timeout_timestamps = 12 [ (gogoproto.nullable) = false ]; - repeated interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamps = 13 + repeated interchain_security.ccv.provider.v1.ExportedVscSendTimestamp exported_vsc_send_timestamps = 13 [ (gogoproto.nullable) = false ]; } diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto index 497595b5f7..2357443d00 100644 --- a/proto/interchain_security/ccv/provider/v1/provider.proto +++ b/proto/interchain_security/ccv/provider/v1/provider.proto @@ -216,12 +216,18 @@ message InitTimeoutTimestamp { } message VscSendTimestamp { - string chain_id = 1; - uint64 vsc_id = 2; - google.protobuf.Timestamp timestamp = 3 + uint64 vsc_id = 1; + google.protobuf.Timestamp timestamp = 2 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; } +// ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis +message ExportedVscSendTimestamp { + string chain_id = 1; + VscSendTimestamp vsc_send_timestamp = 2 + [ (gogoproto.nullable) = false ]; +} + // // Key assignment section // diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index 2a5e33ce02..1174df8653 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -94,8 +94,8 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { k.SetInitTimeoutTimestamp(ctx, item.ChainId, item.Timestamp) } - for _, item := range genState.VscSendTimestamps { - k.SetVscSendTimestamp(ctx, item.ChainId, item.VscId, item.Timestamp) + for _, item := range genState.ExportedVscSendTimestamps { + k.SetVscSendTimestamp(ctx, item.ChainId, item.VscSendTimestamp.VscId, item.VscSendTimestamp.Timestamp) } k.SetParams(ctx, genState.Params) @@ -107,7 +107,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { // get a list of all registered consumer chains registeredChains := k.GetAllConsumerChains(ctx) - var vscSendTimestamps []types.VscSendTimestamp + var exportedVscSendTimestamps []types.ExportedVscSendTimestamp // export states for each consumer chains var consumerStates []types.ConsumerState for _, chain := range registeredChains { @@ -138,7 +138,10 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { cs.PendingValsetChanges = k.GetPendingVSCPackets(ctx, chain.ChainId) consumerStates = append(consumerStates, cs) - vscSendTimestamps = append(vscSendTimestamps, k.GetAllVscSendTimestamps(ctx, chain.ChainId)...) + vscSendTimestamps := k.GetAllVscSendTimestamps(ctx, chain.ChainId) + for _, vscSendTimestamp := range vscSendTimestamps { + exportedVscSendTimestamps = append(exportedVscSendTimestamps, types.ExportedVscSendTimestamp{ChainId: chain.ChainId, VscSendTimestamp: vscSendTimestamp}) + } } // ConsumerAddrsToPrune are added only for registered consumer chains @@ -162,6 +165,6 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { k.GetAllValidatorsByConsumerAddr(ctx, nil), consumerAddrsToPrune, k.GetAllInitTimeoutTimestamps(ctx), - vscSendTimestamps, + exportedVscSendTimestamps, ) } diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index bf327680d1..46ca68cc83 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -42,16 +42,16 @@ func TestInitAndExportGenesis(t *testing.T) { } now := time.Now().UTC() - vscSendTimeStampsC0 := []providertypes.VscSendTimestamp{ - {ChainId: "c0", VscId: 1, Timestamp: now.Add(time.Hour)}, - {ChainId: "c0", VscId: 2, Timestamp: now.Add(2 * time.Hour)}, + exportedVscSendTimeStampsC0 := []providertypes.ExportedVscSendTimestamp{ + {ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(time.Hour)}}, + {ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(2 * time.Hour)}}, } - vscSendTimeStampsC1 := []providertypes.VscSendTimestamp{ - {ChainId: "c1", VscId: 1, Timestamp: now.Add(-time.Hour)}, - {ChainId: "c1", VscId: 2, Timestamp: now.Add(time.Hour)}, + exportedVscSendTimeStampsC1 := []providertypes.ExportedVscSendTimestamp{ + {ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(-time.Hour)}}, + {ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(time.Hour)}}, } - vscSendTimeStampsAll := append(vscSendTimeStampsC0, vscSendTimeStampsC1...) + exportedVscSendTimeStampsAll := append(exportedVscSendTimeStampsC0, exportedVscSendTimeStampsC1...) // create genesis struct provGenesis := providertypes.NewGenesisState(vscID, []providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}}, @@ -115,7 +115,7 @@ func TestInitAndExportGenesis(t *testing.T) { }, }, initTimeoutTimeStamps, - vscSendTimeStampsAll, + exportedVscSendTimeStampsAll, ) // Instantiate in-mem provider keeper with mocks @@ -193,13 +193,27 @@ func TestInitAndExportGenesis(t *testing.T) { sort.Slice(vscSendTimestampsC0InStore, func(i, j int) bool { return vscSendTimestampsC0InStore[i].VscId < vscSendTimestampsC0InStore[j].VscId }) - require.Equal(t, vscSendTimestampsC0InStore, vscSendTimeStampsC0) + + require.Equal(t, vscSendTimestampsC0InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC0)) vscSendTimestampsC1InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[1]) sort.Slice(vscSendTimestampsC1InStore, func(i, j int) bool { return vscSendTimestampsC1InStore[i].VscId < vscSendTimestampsC1InStore[j].VscId }) - require.Equal(t, vscSendTimestampsC1InStore, vscSendTimeStampsC1) + require.Equal(t, vscSendTimestampsC1InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC1)) +} + +func exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStamps []providertypes.ExportedVscSendTimestamp) []providertypes.VscSendTimestamp { + vscSendTimeStamps := []providertypes.VscSendTimestamp{} + for _, exportedVscSendTimeStamp := range exportedVscSendTimeStamps { + vscSendTimeStamps = append(vscSendTimeStamps, exportedVscSendTimeStamp.VscSendTimestamp) + } + + sort.Slice(vscSendTimeStamps, func(i, j int) bool { + return vscSendTimeStamps[i].VscId < vscSendTimeStamps[j].VscId + }) + + return vscSendTimeStamps } func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) { diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go index 03e83560bd..03caf0aba5 100644 --- a/x/ccv/provider/keeper/keeper.go +++ b/x/ccv/provider/keeper/keeper.go @@ -986,7 +986,6 @@ func (k Keeper) GetAllVscSendTimestamps(ctx sdk.Context, chainID string) (vscSen } vscSendTimestamps = append(vscSendTimestamps, types.VscSendTimestamp{ - ChainId: chainID, VscId: vscID, Timestamp: ts, }) @@ -1033,7 +1032,6 @@ func (k Keeper) GetFirstVscSendTimestamp(ctx sdk.Context, chainID string) (vscSe } return types.VscSendTimestamp{ - ChainId: chainID, VscId: vscID, Timestamp: ts, }, true diff --git a/x/ccv/provider/keeper/keeper_test.go b/x/ccv/provider/keeper/keeper_test.go index 494c023393..f34bf262a5 100644 --- a/x/ccv/provider/keeper/keeper_test.go +++ b/x/ccv/provider/keeper/keeper_test.go @@ -357,7 +357,7 @@ func TestVscSendTimestamp(t *testing.T) { expectedGetAllOrder := []types.VscSendTimestamp{} for _, tc := range testCases { if tc.chainID == chainID { - expectedGetAllOrder = append(expectedGetAllOrder, types.VscSendTimestamp{ChainId: tc.chainID, VscId: tc.vscID, Timestamp: tc.ts}) + expectedGetAllOrder = append(expectedGetAllOrder, types.VscSendTimestamp{VscId: tc.vscID, Timestamp: tc.ts}) } } // sorting by vscID diff --git a/x/ccv/provider/types/genesis.go b/x/ccv/provider/types/genesis.go index 8e12ba10e8..8b2d353017 100644 --- a/x/ccv/provider/types/genesis.go +++ b/x/ccv/provider/types/genesis.go @@ -23,7 +23,7 @@ func NewGenesisState( validatorsByConsumerAddr []ValidatorByConsumerAddr, consumerAddrsToPrune []ConsumerAddrsToPrune, initTimeoutTimestamps []InitTimeoutTimestamp, - vscSendTimestamps []VscSendTimestamp, + exportedVscSendTimestamps []ExportedVscSendTimestamp, ) *GenesisState { return &GenesisState{ ValsetUpdateId: vscID, @@ -38,7 +38,7 @@ func NewGenesisState( ValidatorsByConsumerAddr: validatorsByConsumerAddr, ConsumerAddrsToPrune: consumerAddrsToPrune, InitTimeoutTimestamps: initTimeoutTimestamps, - VscSendTimestamps: vscSendTimestamps, + ExportedVscSendTimestamps: exportedVscSendTimestamps, } } diff --git a/x/ccv/provider/types/genesis.pb.go b/x/ccv/provider/types/genesis.pb.go index 5c152e5b50..ddd7d478b6 100644 --- a/x/ccv/provider/types/genesis.pb.go +++ b/x/ccv/provider/types/genesis.pb.go @@ -48,9 +48,9 @@ type GenesisState struct { // empty for a new chain ValidatorsByConsumerAddr []ValidatorByConsumerAddr `protobuf:"bytes,10,rep,name=validators_by_consumer_addr,json=validatorsByConsumerAddr,proto3" json:"validators_by_consumer_addr"` // empty for a new chain - ConsumerAddrsToPrune []ConsumerAddrsToPrune `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"` - InitTimeoutTimestamps []InitTimeoutTimestamp `protobuf:"bytes,12,rep,name=init_timeout_timestamps,json=initTimeoutTimestamps,proto3" json:"init_timeout_timestamps"` - VscSendTimestamps []VscSendTimestamp `protobuf:"bytes,13,rep,name=vsc_send_timestamps,json=vscSendTimestamps,proto3" json:"vsc_send_timestamps"` + ConsumerAddrsToPrune []ConsumerAddrsToPrune `protobuf:"bytes,11,rep,name=consumer_addrs_to_prune,json=consumerAddrsToPrune,proto3" json:"consumer_addrs_to_prune"` + InitTimeoutTimestamps []InitTimeoutTimestamp `protobuf:"bytes,12,rep,name=init_timeout_timestamps,json=initTimeoutTimestamps,proto3" json:"init_timeout_timestamps"` + ExportedVscSendTimestamps []ExportedVscSendTimestamp `protobuf:"bytes,13,rep,name=exported_vsc_send_timestamps,json=exportedVscSendTimestamps,proto3" json:"exported_vsc_send_timestamps"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -170,9 +170,9 @@ func (m *GenesisState) GetInitTimeoutTimestamps() []InitTimeoutTimestamp { return nil } -func (m *GenesisState) GetVscSendTimestamps() []VscSendTimestamp { +func (m *GenesisState) GetExportedVscSendTimestamps() []ExportedVscSendTimestamp { if m != nil { - return m.VscSendTimestamps + return m.ExportedVscSendTimestamps } return nil } @@ -352,65 +352,66 @@ func init() { } var fileDescriptor_48411d9c7900d48e = []byte{ - // 920 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0x8e, 0x13, 0x37, 0x8d, 0x27, 0x3f, 0x84, 0x69, 0x70, 0xb7, 0x0e, 0xb8, 0x91, 0x01, 0x29, - 0x12, 0xb0, 0x8b, 0x53, 0x90, 0xf8, 0xeb, 0x45, 0xd3, 0x4a, 0x60, 0x21, 0x84, 0xe5, 0xa4, 0x45, - 0x2a, 0x17, 0xa3, 0xf1, 0xcc, 0xc8, 0x1e, 0xbc, 0x3b, 0xb3, 0xda, 0x99, 0x9d, 0xd6, 0x42, 0x48, - 0x54, 0xbc, 0x00, 0x2f, 0xc2, 0x7b, 0xf4, 0xb2, 0x97, 0x5c, 0x55, 0x28, 0x79, 0x03, 0x9e, 0x00, - 0xed, 0xec, 0xec, 0x76, 0x6d, 0x1c, 0xb0, 0x7b, 0x65, 0xfb, 0x7c, 0x7b, 0xbe, 0xef, 0x7c, 0x73, - 0xc6, 0xe7, 0x2c, 0xe8, 0x72, 0xa1, 0x59, 0x42, 0xc6, 0x98, 0x0b, 0xa4, 0x18, 0x49, 0x13, 0xae, - 0xa7, 0x01, 0x21, 0x26, 0x88, 0x13, 0x69, 0x38, 0x65, 0x49, 0x60, 0xba, 0xc1, 0x88, 0x09, 0xa6, - 0xb8, 0xf2, 0xe3, 0x44, 0x6a, 0x09, 0xdf, 0x5d, 0x90, 0xe2, 0x13, 0x62, 0xfc, 0x22, 0xc5, 0x37, - 0xdd, 0xd6, 0xc1, 0x48, 0x8e, 0xa4, 0x7d, 0x3e, 0xc8, 0xbe, 0xe5, 0xa9, 0xad, 0xf7, 0xae, 0x52, - 0x33, 0xdd, 0xc0, 0x31, 0x68, 0xd9, 0x3a, 0x59, 0xa6, 0xa6, 0x52, 0xec, 0x7f, 0x72, 0x88, 0x14, - 0x2a, 0x8d, 0xf2, 0x9c, 0xe2, 0xbb, 0xcb, 0xe9, 0x2e, 0x93, 0x33, 0xe3, 0xbd, 0xf5, 0xb6, 0x66, - 0x82, 0xb2, 0x24, 0xe2, 0x42, 0x07, 0x24, 0x99, 0xc6, 0x5a, 0x06, 0x13, 0x36, 0x75, 0x68, 0xe7, - 0x8f, 0x6d, 0xb0, 0xf3, 0x75, 0xfe, 0xfc, 0x99, 0xc6, 0x9a, 0xc1, 0x63, 0xb0, 0x6f, 0x70, 0xa8, - 0x98, 0x46, 0x69, 0x4c, 0xb1, 0x66, 0x88, 0x53, 0xaf, 0x76, 0x54, 0x3b, 0xae, 0x0f, 0xf6, 0xf2, - 0xf8, 0x43, 0x1b, 0xee, 0x51, 0xf8, 0x33, 0x78, 0xa3, 0x50, 0x45, 0x2a, 0xcb, 0x55, 0xde, 0xfa, - 0xd1, 0xc6, 0xf1, 0xf6, 0xc9, 0x89, 0xbf, 0xc4, 0x71, 0xfb, 0xf7, 0x5d, 0xae, 0x95, 0x3d, 0x6d, - 0x3f, 0x7f, 0x79, 0x7b, 0xed, 0xef, 0x97, 0xb7, 0x9b, 0x53, 0x1c, 0x85, 0x5f, 0x74, 0xe6, 0x88, - 0x3b, 0x83, 0x3d, 0x52, 0x7d, 0x5c, 0xc1, 0x1f, 0xc1, 0x6e, 0x2a, 0x86, 0x52, 0x50, 0x2e, 0x46, - 0x48, 0xc6, 0xca, 0xdb, 0xb0, 0xd2, 0x1f, 0x2f, 0x25, 0xfd, 0xb0, 0xc8, 0xfc, 0x3e, 0x3e, 0xad, - 0x67, 0xc2, 0x83, 0x9d, 0xf4, 0x55, 0x48, 0x41, 0x0c, 0x0e, 0x22, 0xac, 0xd3, 0x84, 0xa1, 0x59, - 0x8d, 0xfa, 0x51, 0xed, 0x78, 0xfb, 0x24, 0xb8, 0x52, 0xc3, 0x74, 0xfd, 0xef, 0x6c, 0x1e, 0xad, - 0x28, 0xa8, 0x01, 0xcc, 0xc9, 0xaa, 0x31, 0xf8, 0x0b, 0x68, 0xcd, 0x1f, 0x33, 0xd2, 0x12, 0x8d, - 0x19, 0x1f, 0x8d, 0xb5, 0x77, 0xcd, 0x9a, 0xf9, 0x72, 0x29, 0x33, 0x8f, 0x66, 0xba, 0x72, 0x2e, - 0xbf, 0xb1, 0x14, 0xce, 0x57, 0xd3, 0x2c, 0x44, 0xe1, 0x6f, 0x35, 0x70, 0x58, 0x9e, 0x31, 0xa6, - 0x94, 0x6b, 0x2e, 0x05, 0x8a, 0x13, 0x19, 0x4b, 0x85, 0x43, 0xe5, 0x6d, 0xda, 0x02, 0xee, 0xae, - 0xd4, 0xc8, 0x7b, 0x8e, 0xa6, 0xef, 0x58, 0x5c, 0x09, 0xb7, 0xc8, 0x15, 0xb8, 0x82, 0xbf, 0xd6, - 0x40, 0xab, 0xac, 0x22, 0x61, 0x91, 0x34, 0x38, 0xac, 0x14, 0x71, 0xdd, 0x16, 0xf1, 0xd5, 0x4a, - 0x45, 0x0c, 0x72, 0x96, 0xb9, 0x1a, 0x3c, 0xb2, 0x18, 0x56, 0xb0, 0x07, 0x36, 0x63, 0x9c, 0xe0, - 0x48, 0x79, 0x5b, 0xb6, 0xb9, 0x1f, 0x2c, 0xa5, 0xd6, 0xb7, 0x29, 0x8e, 0xdc, 0x11, 0x58, 0x37, - 0x06, 0x87, 0x9c, 0x62, 0x2d, 0x13, 0x54, 0xfa, 0x8a, 0xd3, 0x61, 0xf6, 0x7f, 0xf3, 0x1a, 0x2b, - 0xb8, 0x79, 0x54, 0xd0, 0x14, 0xb6, 0xfa, 0xe9, 0xf0, 0x5b, 0x36, 0x2d, 0xdc, 0x98, 0x05, 0x70, - 0xa6, 0x01, 0x9f, 0xd5, 0xc0, 0x61, 0x09, 0x2a, 0x34, 0x9c, 0xa2, 0x6a, 0x93, 0x13, 0x0f, 0xbc, - 0x4e, 0x0d, 0xa7, 0xd3, 0x4a, 0x87, 0x93, 0x7f, 0xd5, 0xa0, 0x66, 0x71, 0x68, 0xc0, 0xcd, 0x19, - 0x51, 0x95, 0xdd, 0xeb, 0x38, 0x49, 0x05, 0xf3, 0xb6, 0xad, 0xfc, 0xe7, 0xab, 0xde, 0xaa, 0x44, - 0x9d, 0xcb, 0x7e, 0x46, 0xe0, 0xb4, 0x0f, 0xc8, 0x02, 0x0c, 0x3e, 0x01, 0x37, 0xb9, 0xe0, 0x1a, - 0x69, 0x1e, 0x31, 0x99, 0xe6, 0x9f, 0x4a, 0xe3, 0x28, 0x56, 0xde, 0xce, 0x0a, 0xba, 0x3d, 0xc1, - 0xf5, 0x79, 0x4e, 0x71, 0x5e, 0x30, 0x38, 0xdd, 0xb7, 0xf8, 0x02, 0x4c, 0xc1, 0x09, 0xb8, 0x61, - 0x14, 0x41, 0x8a, 0x09, 0x5a, 0x15, 0xdd, 0xb5, 0xa2, 0x9f, 0x2e, 0x77, 0xd6, 0x8a, 0x9c, 0x31, - 0x41, 0xe7, 0x05, 0xdf, 0x34, 0x73, 0x71, 0xd5, 0x79, 0x56, 0x07, 0xbb, 0x33, 0x93, 0x13, 0xde, - 0x02, 0x5b, 0x39, 0xbb, 0x1b, 0xd4, 0x8d, 0xc1, 0x75, 0xfb, 0xbb, 0x47, 0xe1, 0x3b, 0x00, 0x90, - 0x31, 0x16, 0x82, 0x85, 0x19, 0xb8, 0x6e, 0xc1, 0x86, 0x8b, 0xf4, 0x28, 0x3c, 0x04, 0x0d, 0x12, - 0x72, 0x26, 0x74, 0x86, 0x6e, 0x58, 0x74, 0x2b, 0x0f, 0xf4, 0x28, 0x7c, 0x1f, 0xec, 0x65, 0x76, - 0x39, 0x0e, 0x8b, 0xa1, 0x54, 0xb7, 0x5b, 0x60, 0xd7, 0x45, 0xdd, 0x20, 0x19, 0x82, 0xfd, 0xb2, - 0xdb, 0x6e, 0xef, 0x78, 0xd7, 0xec, 0x3f, 0xa9, 0x7b, 0xa5, 0xf3, 0x72, 0xa7, 0x99, 0xae, 0x5f, - 0xdd, 0x3d, 0xce, 0x75, 0xb9, 0x55, 0x1c, 0x06, 0x35, 0x68, 0xc6, 0x2c, 0x9f, 0xc2, 0x6e, 0x66, - 0x66, 0x1e, 0x46, 0xac, 0x18, 0x53, 0x9f, 0xfd, 0xd7, 0x40, 0x2e, 0xaf, 0xf1, 0x19, 0xd3, 0xf7, - 0x6d, 0x5a, 0x1f, 0x93, 0x09, 0xd3, 0x0f, 0xb0, 0xc6, 0xc5, 0x7d, 0x72, 0xec, 0xf9, 0x24, 0xcd, - 0x1f, 0x52, 0xf0, 0x43, 0x00, 0x55, 0x88, 0xd5, 0x18, 0x51, 0xf9, 0x44, 0x64, 0x7d, 0x45, 0x98, - 0x4c, 0xec, 0x4c, 0x6a, 0x0c, 0xf6, 0x2d, 0xf2, 0xc0, 0x01, 0xf7, 0xc8, 0x04, 0xfe, 0x04, 0x6e, - 0xcc, 0xec, 0x0a, 0xc4, 0x05, 0x65, 0x4f, 0xbd, 0x2d, 0x5b, 0xe0, 0x27, 0xcb, 0x5e, 0x82, 0xea, - 0x8a, 0x28, 0xee, 0x40, 0x75, 0x33, 0xf5, 0x32, 0xd2, 0xce, 0x63, 0xd0, 0x5c, 0x3c, 0xf4, 0x57, - 0x58, 0xde, 0x4d, 0xb0, 0xe9, 0xda, 0xba, 0x6e, 0x71, 0xf7, 0xeb, 0xf4, 0x87, 0xe7, 0x17, 0xed, - 0xda, 0x8b, 0x8b, 0x76, 0xed, 0xaf, 0x8b, 0x76, 0xed, 0xf7, 0xcb, 0xf6, 0xda, 0x8b, 0xcb, 0xf6, - 0xda, 0x9f, 0x97, 0xed, 0xb5, 0xc7, 0x77, 0x47, 0x5c, 0x8f, 0xd3, 0xa1, 0x4f, 0x64, 0x14, 0x10, - 0xa9, 0x22, 0xa9, 0x82, 0x57, 0xae, 0x3e, 0x2a, 0x5f, 0x46, 0xcc, 0x9d, 0xe0, 0xe9, 0xec, 0x9b, - 0x8f, 0x9e, 0xc6, 0x4c, 0x0d, 0x37, 0xed, 0xfb, 0xc6, 0x9d, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x67, 0x16, 0xe6, 0xf2, 0xbe, 0x09, 0x00, 0x00, + // 930 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x23, 0x35, + 0x14, 0xee, 0xb4, 0xd9, 0x6e, 0xe3, 0xfe, 0x50, 0x4c, 0xc9, 0x4e, 0xd3, 0x25, 0x5b, 0x05, 0x90, + 0x2a, 0x01, 0x33, 0xa4, 0xcb, 0x05, 0x7f, 0x7b, 0xb1, 0xdd, 0x45, 0x10, 0x21, 0x44, 0x94, 0x76, + 0x8b, 0xb4, 0x5c, 0x58, 0x8e, 0x6d, 0x25, 0xa6, 0x33, 0xf6, 0x68, 0xec, 0x99, 0x6d, 0x84, 0x90, + 0x58, 0xc1, 0x03, 0xf0, 0x56, 0xec, 0xe5, 0x5e, 0x72, 0xb5, 0x42, 0xed, 0x1b, 0xf0, 0x04, 0x68, + 0x3c, 0x9e, 0xe9, 0x24, 0x24, 0x90, 0x70, 0x95, 0xcc, 0xf9, 0x7c, 0xbe, 0xef, 0x1c, 0x1f, 0xfb, + 0x1c, 0x83, 0x0e, 0x17, 0x9a, 0xc5, 0x64, 0x84, 0xb9, 0x40, 0x8a, 0x91, 0x24, 0xe6, 0x7a, 0xec, + 0x13, 0x92, 0xfa, 0x51, 0x2c, 0x53, 0x4e, 0x59, 0xec, 0xa7, 0x1d, 0x7f, 0xc8, 0x04, 0x53, 0x5c, + 0x79, 0x51, 0x2c, 0xb5, 0x84, 0x6f, 0xcf, 0x70, 0xf1, 0x08, 0x49, 0xbd, 0xc2, 0xc5, 0x4b, 0x3b, + 0xcd, 0xbd, 0xa1, 0x1c, 0x4a, 0xb3, 0xde, 0xcf, 0xfe, 0xe5, 0xae, 0xcd, 0x77, 0xe6, 0xa9, 0xa5, + 0x1d, 0xdf, 0x32, 0x68, 0xd9, 0x3c, 0x5e, 0x24, 0xa6, 0x52, 0xec, 0x3f, 0x7c, 0x88, 0x14, 0x2a, + 0x09, 0x73, 0x9f, 0xe2, 0xbf, 0xf5, 0xe9, 0x2c, 0xe2, 0x33, 0x91, 0x7b, 0xf3, 0xae, 0x66, 0x82, + 0xb2, 0x38, 0xe4, 0x42, 0xfb, 0x24, 0x1e, 0x47, 0x5a, 0xfa, 0x17, 0x6c, 0x6c, 0xd1, 0xf6, 0xef, + 0x9b, 0x60, 0xeb, 0xcb, 0x7c, 0xfd, 0xa9, 0xc6, 0x9a, 0xc1, 0x23, 0xb0, 0x9b, 0xe2, 0x40, 0x31, + 0x8d, 0x92, 0x88, 0x62, 0xcd, 0x10, 0xa7, 0xae, 0x73, 0xe8, 0x1c, 0xd5, 0xfa, 0x3b, 0xb9, 0xfd, + 0x89, 0x31, 0x77, 0x29, 0xfc, 0x11, 0xbc, 0x56, 0xa8, 0x22, 0x95, 0xf9, 0x2a, 0x77, 0xf5, 0x70, + 0xed, 0x68, 0xf3, 0xf8, 0xd8, 0x5b, 0x60, 0xbb, 0xbd, 0x47, 0xd6, 0xd7, 0xc8, 0x9e, 0xb4, 0x5e, + 0xbc, 0xba, 0xb7, 0xf2, 0xd7, 0xab, 0x7b, 0x8d, 0x31, 0x0e, 0x83, 0x4f, 0xdb, 0x53, 0xc4, 0xed, + 0xfe, 0x0e, 0xa9, 0x2e, 0x57, 0xf0, 0x7b, 0xb0, 0x9d, 0x88, 0x81, 0x14, 0x94, 0x8b, 0x21, 0x92, + 0x91, 0x72, 0xd7, 0x8c, 0xf4, 0x87, 0x0b, 0x49, 0x3f, 0x29, 0x3c, 0xbf, 0x8d, 0x4e, 0x6a, 0x99, + 0x70, 0x7f, 0x2b, 0xb9, 0x31, 0x29, 0x88, 0xc1, 0x5e, 0x88, 0x75, 0x12, 0x33, 0x34, 0xa9, 0x51, + 0x3b, 0x74, 0x8e, 0x36, 0x8f, 0xfd, 0xb9, 0x1a, 0x69, 0xc7, 0xfb, 0xc6, 0xf8, 0xd1, 0x8a, 0x82, + 0xea, 0xc3, 0x9c, 0xac, 0x6a, 0x83, 0x3f, 0x81, 0xe6, 0xf4, 0x36, 0x23, 0x2d, 0xd1, 0x88, 0xf1, + 0xe1, 0x48, 0xbb, 0xb7, 0x4c, 0x32, 0x9f, 0x2d, 0x94, 0xcc, 0xf9, 0x44, 0x55, 0xce, 0xe4, 0x57, + 0x86, 0xc2, 0xe6, 0xd5, 0x48, 0x67, 0xa2, 0xf0, 0x17, 0x07, 0x1c, 0x94, 0x7b, 0x8c, 0x29, 0xe5, + 0x9a, 0x4b, 0x81, 0xa2, 0x58, 0x46, 0x52, 0xe1, 0x40, 0xb9, 0xeb, 0x26, 0x80, 0x07, 0x4b, 0x15, + 0xf2, 0xa1, 0xa5, 0xe9, 0x59, 0x16, 0x1b, 0xc2, 0x3e, 0x99, 0x83, 0x2b, 0xf8, 0xb3, 0x03, 0x9a, + 0x65, 0x14, 0x31, 0x0b, 0x65, 0x8a, 0x83, 0x4a, 0x10, 0xb7, 0x4d, 0x10, 0x9f, 0x2f, 0x15, 0x44, + 0x3f, 0x67, 0x99, 0x8a, 0xc1, 0x25, 0xb3, 0x61, 0x05, 0xbb, 0x60, 0x3d, 0xc2, 0x31, 0x0e, 0x95, + 0xbb, 0x61, 0x8a, 0xfb, 0xde, 0x42, 0x6a, 0x3d, 0xe3, 0x62, 0xc9, 0x2d, 0x81, 0xc9, 0x26, 0xc5, + 0x01, 0xa7, 0x58, 0xcb, 0x18, 0x95, 0x79, 0x45, 0xc9, 0x20, 0xbb, 0x6f, 0x6e, 0x7d, 0x89, 0x6c, + 0xce, 0x0b, 0x9a, 0x22, 0xad, 0x5e, 0x32, 0xf8, 0x9a, 0x8d, 0x8b, 0x6c, 0xd2, 0x19, 0x70, 0xa6, + 0x01, 0x9f, 0x3b, 0xe0, 0xa0, 0x04, 0x15, 0x1a, 0x8c, 0x51, 0xb5, 0xc8, 0xb1, 0x0b, 0xfe, 0x4f, + 0x0c, 0x27, 0xe3, 0x4a, 0x85, 0xe3, 0x7f, 0xc4, 0xa0, 0x26, 0x71, 0x98, 0x82, 0x3b, 0x13, 0xa2, + 0x2a, 0x3b, 0xd7, 0x51, 0x9c, 0x08, 0xe6, 0x6e, 0x1a, 0xf9, 0x4f, 0x96, 0x3d, 0x55, 0xb1, 0x3a, + 0x93, 0xbd, 0x8c, 0xc0, 0x6a, 0xef, 0x91, 0x19, 0x18, 0x7c, 0x06, 0xee, 0x70, 0xc1, 0x35, 0xd2, + 0x3c, 0x64, 0x32, 0xc9, 0x7f, 0x95, 0xc6, 0x61, 0xa4, 0xdc, 0xad, 0x25, 0x74, 0xbb, 0x82, 0xeb, + 0xb3, 0x9c, 0xe2, 0xac, 0x60, 0xb0, 0xba, 0x6f, 0xf2, 0x19, 0x98, 0x82, 0xbf, 0x3a, 0xe0, 0x2e, + 0xbb, 0x8c, 0x64, 0xac, 0x19, 0x45, 0xa9, 0x22, 0x48, 0x31, 0x41, 0xab, 0xf2, 0xdb, 0x4b, 0x5c, + 0xa6, 0x2f, 0x2c, 0xd1, 0xb9, 0x22, 0xa7, 0x4c, 0xd0, 0xe9, 0x10, 0xf6, 0xd9, 0x1c, 0x5c, 0xb5, + 0x9f, 0xd7, 0xc0, 0xf6, 0x44, 0x4f, 0x85, 0xfb, 0x60, 0x23, 0x57, 0xb3, 0x2d, 0xbc, 0xde, 0xbf, + 0x6d, 0xbe, 0xbb, 0x14, 0xbe, 0x05, 0x00, 0x19, 0x61, 0x21, 0x58, 0x90, 0x81, 0xab, 0x06, 0xac, + 0x5b, 0x4b, 0x97, 0xc2, 0x03, 0x50, 0x27, 0x01, 0x67, 0x42, 0x67, 0xe8, 0x9a, 0x41, 0x37, 0x72, + 0x43, 0x97, 0xc2, 0x77, 0xc1, 0x4e, 0xb6, 0x11, 0x1c, 0x07, 0x45, 0xbb, 0xaa, 0x99, 0xf9, 0xb0, + 0x6d, 0xad, 0xb6, 0xc5, 0x0c, 0xc0, 0x6e, 0x79, 0x0e, 0xec, 0x44, 0x72, 0x6f, 0x99, 0x3b, 0xd6, + 0x99, 0xbb, 0x13, 0xe5, 0xb4, 0x4b, 0x3b, 0x5e, 0x75, 0x2a, 0xd9, 0xec, 0xcb, 0x79, 0x63, 0x31, + 0xa8, 0x41, 0x23, 0x62, 0x79, 0x7f, 0xb6, 0xdd, 0x34, 0xcb, 0x61, 0xc8, 0x8a, 0x06, 0xf6, 0xf1, + 0xbf, 0xb5, 0xea, 0xf2, 0x80, 0x9f, 0x32, 0xfd, 0xc8, 0xb8, 0xf5, 0x30, 0xb9, 0x60, 0xfa, 0x31, + 0xd6, 0xb8, 0x38, 0x69, 0x96, 0x3d, 0xef, 0xb1, 0xf9, 0x22, 0x05, 0xdf, 0x07, 0x50, 0x05, 0x58, + 0x8d, 0x10, 0x95, 0xcf, 0x44, 0x56, 0x67, 0x84, 0xc9, 0x85, 0xe9, 0x56, 0xf5, 0xfe, 0xae, 0x41, + 0x1e, 0x5b, 0xe0, 0x21, 0xb9, 0x80, 0x3f, 0x80, 0x37, 0x26, 0xa6, 0x08, 0xe2, 0x82, 0xb2, 0x4b, + 0x77, 0xc3, 0x04, 0xf8, 0xd1, 0x62, 0x57, 0x51, 0x91, 0xea, 0xf0, 0xb0, 0xc1, 0xbd, 0x5e, 0x9d, + 0x59, 0xdd, 0x8c, 0xb4, 0xfd, 0x14, 0x34, 0x66, 0x8f, 0x83, 0x25, 0xc6, 0x7a, 0x03, 0xac, 0xdb, + 0xb2, 0xae, 0x1a, 0xdc, 0x7e, 0x9d, 0x7c, 0xf7, 0xe2, 0xaa, 0xe5, 0xbc, 0xbc, 0x6a, 0x39, 0x7f, + 0x5e, 0xb5, 0x9c, 0xdf, 0xae, 0x5b, 0x2b, 0x2f, 0xaf, 0x5b, 0x2b, 0x7f, 0x5c, 0xb7, 0x56, 0x9e, + 0x3e, 0x18, 0x72, 0x3d, 0x4a, 0x06, 0x1e, 0x91, 0xa1, 0x4f, 0xa4, 0x0a, 0xa5, 0xf2, 0x6f, 0xb2, + 0xfa, 0xa0, 0x7c, 0xa6, 0xa4, 0xf7, 0xfd, 0xcb, 0xc9, 0x37, 0x91, 0x1e, 0x47, 0x4c, 0x0d, 0xd6, + 0xcd, 0x4b, 0xe4, 0xfe, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xe2, 0xfe, 0x45, 0xd8, 0x09, + 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -433,10 +434,10 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.VscSendTimestamps) > 0 { - for iNdEx := len(m.VscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- { + if len(m.ExportedVscSendTimestamps) > 0 { + for iNdEx := len(m.ExportedVscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.VscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ExportedVscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -812,8 +813,8 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - if len(m.VscSendTimestamps) > 0 { - for _, e := range m.VscSendTimestamps { + if len(m.ExportedVscSendTimestamps) > 0 { + for _, e := range m.ExportedVscSendTimestamps { l = e.Size() n += 1 + l + sovGenesis(uint64(l)) } @@ -1311,7 +1312,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 13: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamps", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ExportedVscSendTimestamps", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1338,8 +1339,8 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.VscSendTimestamps = append(m.VscSendTimestamps, VscSendTimestamp{}) - if err := m.VscSendTimestamps[len(m.VscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.ExportedVscSendTimestamps = append(m.ExportedVscSendTimestamps, ExportedVscSendTimestamp{}) + if err := m.ExportedVscSendTimestamps[len(m.ExportedVscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go index b06c0e35d8..3acb5d01e8 100644 --- a/x/ccv/provider/types/provider.pb.go +++ b/x/ccv/provider/types/provider.pb.go @@ -920,9 +920,8 @@ func (m *InitTimeoutTimestamp) GetTimestamp() uint64 { } type VscSendTimestamp struct { - ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - VscId uint64 `protobuf:"varint,2,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + VscId uint64 `protobuf:"varint,1,opt,name=vsc_id,json=vscId,proto3" json:"vsc_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,2,opt,name=timestamp,proto3,stdtime" json:"timestamp"` } func (m *VscSendTimestamp) Reset() { *m = VscSendTimestamp{} } @@ -958,13 +957,6 @@ func (m *VscSendTimestamp) XXX_DiscardUnknown() { var xxx_messageInfo_VscSendTimestamp proto.InternalMessageInfo -func (m *VscSendTimestamp) GetChainId() string { - if m != nil { - return m.ChainId - } - return "" -} - func (m *VscSendTimestamp) GetVscId() uint64 { if m != nil { return m.VscId @@ -979,6 +971,59 @@ func (m *VscSendTimestamp) GetTimestamp() time.Time { return time.Time{} } +// ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis +type ExportedVscSendTimestamp struct { + ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VscSendTimestamp VscSendTimestamp `protobuf:"bytes,2,opt,name=vsc_send_timestamp,json=vscSendTimestamp,proto3" json:"vsc_send_timestamp"` +} + +func (m *ExportedVscSendTimestamp) Reset() { *m = ExportedVscSendTimestamp{} } +func (m *ExportedVscSendTimestamp) String() string { return proto.CompactTextString(m) } +func (*ExportedVscSendTimestamp) ProtoMessage() {} +func (*ExportedVscSendTimestamp) Descriptor() ([]byte, []int) { + return fileDescriptor_f22ec409a72b7b72, []int{15} +} +func (m *ExportedVscSendTimestamp) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ExportedVscSendTimestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ExportedVscSendTimestamp.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 *ExportedVscSendTimestamp) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExportedVscSendTimestamp.Merge(m, src) +} +func (m *ExportedVscSendTimestamp) XXX_Size() int { + return m.Size() +} +func (m *ExportedVscSendTimestamp) XXX_DiscardUnknown() { + xxx_messageInfo_ExportedVscSendTimestamp.DiscardUnknown(m) +} + +var xxx_messageInfo_ExportedVscSendTimestamp proto.InternalMessageInfo + +func (m *ExportedVscSendTimestamp) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + +func (m *ExportedVscSendTimestamp) GetVscSendTimestamp() VscSendTimestamp { + if m != nil { + return m.VscSendTimestamp + } + return VscSendTimestamp{} +} + type KeyAssignmentReplacement struct { ProviderAddr []byte `protobuf:"bytes,1,opt,name=provider_addr,json=providerAddr,proto3" json:"provider_addr,omitempty"` PrevCKey *crypto.PublicKey `protobuf:"bytes,2,opt,name=prev_c_key,json=prevCKey,proto3" json:"prev_c_key,omitempty"` @@ -989,7 +1034,7 @@ func (m *KeyAssignmentReplacement) Reset() { *m = KeyAssignmentReplaceme func (m *KeyAssignmentReplacement) String() string { return proto.CompactTextString(m) } func (*KeyAssignmentReplacement) ProtoMessage() {} func (*KeyAssignmentReplacement) Descriptor() ([]byte, []int) { - return fileDescriptor_f22ec409a72b7b72, []int{15} + return fileDescriptor_f22ec409a72b7b72, []int{16} } func (m *KeyAssignmentReplacement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1052,7 +1097,7 @@ func (m *ValidatorConsumerPubKey) Reset() { *m = ValidatorConsumerPubKey func (m *ValidatorConsumerPubKey) String() string { return proto.CompactTextString(m) } func (*ValidatorConsumerPubKey) ProtoMessage() {} func (*ValidatorConsumerPubKey) Descriptor() ([]byte, []int) { - return fileDescriptor_f22ec409a72b7b72, []int{16} + return fileDescriptor_f22ec409a72b7b72, []int{17} } func (m *ValidatorConsumerPubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1115,7 +1160,7 @@ func (m *ValidatorByConsumerAddr) Reset() { *m = ValidatorByConsumerAddr func (m *ValidatorByConsumerAddr) String() string { return proto.CompactTextString(m) } func (*ValidatorByConsumerAddr) ProtoMessage() {} func (*ValidatorByConsumerAddr) Descriptor() ([]byte, []int) { - return fileDescriptor_f22ec409a72b7b72, []int{17} + return fileDescriptor_f22ec409a72b7b72, []int{18} } func (m *ValidatorByConsumerAddr) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1177,7 +1222,7 @@ func (m *ConsumerAddrsToPrune) Reset() { *m = ConsumerAddrsToPrune{} } func (m *ConsumerAddrsToPrune) String() string { return proto.CompactTextString(m) } func (*ConsumerAddrsToPrune) ProtoMessage() {} func (*ConsumerAddrsToPrune) Descriptor() ([]byte, []int) { - return fileDescriptor_f22ec409a72b7b72, []int{18} + return fileDescriptor_f22ec409a72b7b72, []int{19} } func (m *ConsumerAddrsToPrune) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1243,6 +1288,7 @@ func init() { proto.RegisterType((*UnbondingOp)(nil), "interchain_security.ccv.provider.v1.UnbondingOp") proto.RegisterType((*InitTimeoutTimestamp)(nil), "interchain_security.ccv.provider.v1.InitTimeoutTimestamp") proto.RegisterType((*VscSendTimestamp)(nil), "interchain_security.ccv.provider.v1.VscSendTimestamp") + proto.RegisterType((*ExportedVscSendTimestamp)(nil), "interchain_security.ccv.provider.v1.ExportedVscSendTimestamp") proto.RegisterType((*KeyAssignmentReplacement)(nil), "interchain_security.ccv.provider.v1.KeyAssignmentReplacement") proto.RegisterType((*ValidatorConsumerPubKey)(nil), "interchain_security.ccv.provider.v1.ValidatorConsumerPubKey") proto.RegisterType((*ValidatorByConsumerAddr)(nil), "interchain_security.ccv.provider.v1.ValidatorByConsumerAddr") @@ -1254,107 +1300,110 @@ func init() { } var fileDescriptor_f22ec409a72b7b72 = []byte{ - // 1600 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x73, 0xdc, 0xc6, - 0x11, 0x26, 0xb8, 0x7c, 0xed, 0x2c, 0x1f, 0x12, 0x44, 0x59, 0x4b, 0x85, 0x59, 0xae, 0xe0, 0xc4, - 0xb5, 0x29, 0x97, 0xb1, 0x21, 0x75, 0x49, 0xa9, 0xe2, 0x72, 0x91, 0x2b, 0xcb, 0xa2, 0x19, 0x5b, - 0x6b, 0x90, 0xa1, 0x2a, 0xc9, 0x01, 0x35, 0x18, 0xb4, 0x76, 0xa7, 0x08, 0x60, 0xa0, 0x99, 0x01, - 0xa4, 0xbd, 0xe4, 0xec, 0xa3, 0x73, 0x73, 0x25, 0x17, 0xe7, 0x17, 0xe4, 0x6f, 0xf8, 0xe8, 0x63, - 0x4e, 0x76, 0x4a, 0x3a, 0xe4, 0x90, 0x3f, 0x91, 0x9a, 0xc1, 0x9b, 0xa4, 0x92, 0x55, 0x1e, 0x37, - 0x4c, 0x4f, 0xf7, 0xd7, 0xdd, 0xd3, 0xd3, 0x5f, 0x0f, 0xd0, 0x01, 0x8d, 0x24, 0x70, 0x32, 0xc5, - 0x34, 0x72, 0x05, 0x90, 0x84, 0x53, 0x39, 0x1b, 0x12, 0x92, 0x0e, 0x63, 0xce, 0x52, 0xea, 0x03, - 0x1f, 0xa6, 0xfb, 0xe5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xee, 0x35, 0x36, 0x36, 0x21, 0xa9, - 0x5d, 0xea, 0xa5, 0xfb, 0x77, 0xb7, 0x27, 0x6c, 0xc2, 0xb4, 0xfe, 0x50, 0x7d, 0x65, 0xa6, 0x77, - 0xf7, 0x26, 0x8c, 0x4d, 0x02, 0x18, 0xea, 0x95, 0x97, 0x3c, 0x1b, 0x4a, 0x1a, 0x82, 0x90, 0x38, - 0x8c, 0x73, 0x85, 0xde, 0x65, 0x05, 0x3f, 0xe1, 0x58, 0x52, 0x16, 0x15, 0x00, 0xd4, 0x23, 0x43, - 0xc2, 0x38, 0x0c, 0x49, 0x40, 0x21, 0x92, 0x2a, 0xbc, 0xec, 0x2b, 0x57, 0x18, 0x2a, 0x85, 0x80, - 0x4e, 0xa6, 0x32, 0x13, 0x8b, 0xa1, 0x84, 0xc8, 0x07, 0x1e, 0xd2, 0x4c, 0xb9, 0x5a, 0xe5, 0x06, - 0xbb, 0xb5, 0x7d, 0xc2, 0x67, 0xb1, 0x64, 0xc3, 0x0b, 0x98, 0x89, 0x7c, 0xf7, 0x3d, 0xc2, 0x44, - 0xc8, 0xc4, 0x10, 0x54, 0x62, 0x11, 0x81, 0x61, 0xba, 0xef, 0x81, 0xc4, 0xfb, 0xa5, 0xa0, 0x88, - 0x3b, 0xd7, 0xf3, 0xb0, 0xa8, 0x74, 0x08, 0xa3, 0x79, 0xdc, 0xd6, 0x0f, 0x2b, 0xa8, 0x3b, 0x62, - 0x91, 0x48, 0x42, 0xe0, 0x87, 0xbe, 0x4f, 0x55, 0x4a, 0x63, 0xce, 0x62, 0x26, 0x70, 0x60, 0x6e, - 0xa3, 0x65, 0x49, 0x65, 0x00, 0x5d, 0xa3, 0x6f, 0x0c, 0xda, 0x4e, 0xb6, 0x30, 0xfb, 0xa8, 0xe3, - 0x83, 0x20, 0x9c, 0xc6, 0x4a, 0xb9, 0xbb, 0xa8, 0xf7, 0xea, 0x22, 0x73, 0x07, 0xad, 0x65, 0x55, - 0xa0, 0x7e, 0xb7, 0xa5, 0xb7, 0x57, 0xf5, 0xfa, 0xd8, 0x37, 0x3f, 0x41, 0x9b, 0x34, 0xa2, 0x92, - 0xe2, 0xc0, 0x9d, 0x82, 0x3a, 0x8d, 0xee, 0x52, 0xdf, 0x18, 0x74, 0x0e, 0xee, 0xda, 0xd4, 0x23, - 0xb6, 0x3a, 0x40, 0x3b, 0x3f, 0xb6, 0x74, 0xdf, 0x7e, 0xac, 0x35, 0x8e, 0x96, 0xbe, 0xfd, 0x7e, - 0x6f, 0xc1, 0xd9, 0xc8, 0xed, 0x32, 0xa1, 0x79, 0x0f, 0xad, 0x4f, 0x20, 0x02, 0x41, 0x85, 0x3b, - 0xc5, 0x62, 0xda, 0x5d, 0xee, 0x1b, 0x83, 0x75, 0xa7, 0x93, 0xcb, 0x1e, 0x63, 0x31, 0x35, 0xf7, - 0x50, 0xc7, 0xa3, 0x11, 0xe6, 0xb3, 0x4c, 0x63, 0x45, 0x6b, 0xa0, 0x4c, 0xa4, 0x15, 0x46, 0x08, - 0x89, 0x18, 0xbf, 0x88, 0x5c, 0x55, 0xed, 0xee, 0x6a, 0x1e, 0x48, 0x56, 0x69, 0xbb, 0xa8, 0xb4, - 0x7d, 0x56, 0x5c, 0x85, 0xa3, 0x35, 0x15, 0xc8, 0x57, 0x3f, 0xec, 0x19, 0x4e, 0x5b, 0xdb, 0xa9, - 0x1d, 0xf3, 0x73, 0x74, 0x23, 0x89, 0x3c, 0x16, 0xf9, 0x34, 0x9a, 0xb8, 0x31, 0x70, 0xca, 0xfc, - 0xee, 0x9a, 0x86, 0xda, 0xb9, 0x02, 0xf5, 0x30, 0xbf, 0x34, 0x19, 0xd2, 0xd7, 0x0a, 0x69, 0xab, - 0x34, 0x1e, 0x6b, 0x5b, 0xf3, 0x0b, 0x64, 0x12, 0x92, 0xea, 0x90, 0x58, 0x22, 0x0b, 0xc4, 0xf6, - 0xfc, 0x88, 0x37, 0x08, 0x49, 0xcf, 0x32, 0xeb, 0x1c, 0xf2, 0x77, 0xe8, 0x8e, 0xe4, 0x38, 0x12, - 0xcf, 0x80, 0x5f, 0xc6, 0x45, 0xf3, 0xe3, 0xde, 0x2e, 0x30, 0x9a, 0xe0, 0x8f, 0x51, 0x9f, 0xe4, - 0x17, 0xc8, 0xe5, 0xe0, 0x53, 0x21, 0x39, 0xf5, 0x12, 0x65, 0xeb, 0x3e, 0xe3, 0x98, 0xe8, 0x3b, - 0xd2, 0xd1, 0x97, 0xa0, 0x57, 0xe8, 0x39, 0x0d, 0xb5, 0x47, 0xb9, 0x96, 0xf9, 0x04, 0xfd, 0xc4, - 0x0b, 0x18, 0xb9, 0x10, 0x2a, 0x38, 0xb7, 0x81, 0xa4, 0x5d, 0x87, 0x54, 0x08, 0x85, 0xb6, 0xde, - 0x37, 0x06, 0x2d, 0xe7, 0x5e, 0xa6, 0x3b, 0x06, 0xfe, 0xb0, 0xa6, 0x79, 0x56, 0x53, 0x34, 0x3f, - 0x40, 0xe6, 0x94, 0x0a, 0xc9, 0x38, 0x25, 0x38, 0x70, 0x21, 0x92, 0x9c, 0x82, 0xe8, 0x6e, 0x68, - 0xf3, 0x9b, 0xd5, 0xce, 0xc7, 0xd9, 0x86, 0xf9, 0x29, 0xba, 0xf7, 0x46, 0xa7, 0x2e, 0x99, 0xe2, - 0x28, 0x82, 0xa0, 0xbb, 0xa9, 0x53, 0xd9, 0xf3, 0xdf, 0xe0, 0x73, 0x94, 0xa9, 0x3d, 0x58, 0xfb, - 0xf2, 0x9b, 0xbd, 0x85, 0xaf, 0xbf, 0xd9, 0x5b, 0xb0, 0xfe, 0x62, 0xa0, 0x3b, 0xa3, 0x32, 0xf1, - 0x90, 0xa5, 0x38, 0xf8, 0x7f, 0x36, 0xd8, 0x21, 0x6a, 0x0b, 0xc9, 0xe2, 0xec, 0x4a, 0x2f, 0xbd, - 0xc5, 0x95, 0x5e, 0x53, 0x66, 0x6a, 0xc3, 0xfa, 0x93, 0x81, 0xb6, 0x3f, 0x7e, 0x9e, 0xd0, 0x94, - 0x11, 0xfc, 0x3f, 0xe1, 0x83, 0x13, 0xb4, 0x01, 0x35, 0x3c, 0xd1, 0x6d, 0xf5, 0x5b, 0x83, 0xce, - 0xc1, 0x4f, 0xed, 0x8c, 0x9c, 0xec, 0x92, 0xb3, 0x72, 0x82, 0xb2, 0xeb, 0xde, 0x9d, 0xa6, 0xad, - 0xf5, 0x0f, 0x03, 0xdd, 0xf8, 0x24, 0x60, 0x1e, 0x0e, 0x4e, 0x03, 0x2c, 0xa6, 0xaa, 0x78, 0x33, - 0x95, 0x35, 0x87, 0xbc, 0x6b, 0x74, 0x74, 0x73, 0x67, 0xad, 0xcc, 0x74, 0x1f, 0x7f, 0x84, 0x6e, - 0x96, 0xf7, 0xb8, 0x3c, 0x5c, 0x9d, 0xcc, 0xd1, 0xad, 0x57, 0xdf, 0xef, 0x6d, 0x15, 0x35, 0x1c, - 0xe9, 0x83, 0x7e, 0xe8, 0x6c, 0x91, 0x86, 0xc0, 0x37, 0x7b, 0xa8, 0x43, 0x3d, 0xe2, 0x0a, 0x78, - 0xee, 0x46, 0x49, 0xa8, 0xeb, 0xb2, 0xe4, 0xb4, 0xa9, 0x47, 0x4e, 0xe1, 0xf9, 0xe7, 0x49, 0x68, - 0xde, 0x47, 0xef, 0x14, 0x83, 0xc8, 0x4d, 0x71, 0xe0, 0x2a, 0x7b, 0x17, 0xfb, 0x3e, 0xd7, 0x65, - 0x5a, 0x77, 0x6e, 0x15, 0xbb, 0xe7, 0x38, 0x50, 0xce, 0x0e, 0x7d, 0x9f, 0x5b, 0x7f, 0x5f, 0x46, - 0x2b, 0x63, 0xcc, 0x71, 0x28, 0xcc, 0x33, 0xb4, 0x25, 0x21, 0x8c, 0x03, 0x2c, 0xc1, 0xcd, 0x38, - 0x32, 0xcf, 0xf4, 0x7d, 0xcd, 0x9d, 0xf5, 0xd9, 0x62, 0xd7, 0xa6, 0x49, 0xba, 0x6f, 0x8f, 0xb4, - 0xf4, 0x54, 0x62, 0x09, 0xce, 0x66, 0x81, 0x91, 0x09, 0xcd, 0x5f, 0xa0, 0xae, 0xe4, 0x89, 0x90, - 0x15, 0x7b, 0x55, 0x6d, 0x9b, 0x95, 0xf2, 0x9d, 0x62, 0x3f, 0x6b, 0xf8, 0xb2, 0x5d, 0xaf, 0x27, - 0xaa, 0xd6, 0x7f, 0x43, 0x54, 0xa7, 0xe8, 0x96, 0x62, 0xf9, 0xcb, 0x98, 0x4b, 0xf3, 0x63, 0xde, - 0x54, 0xf6, 0x4d, 0xd0, 0x2f, 0x90, 0x99, 0x0a, 0x72, 0x19, 0x73, 0xf9, 0x2d, 0xe2, 0x4c, 0x05, - 0x69, 0x42, 0xfa, 0x68, 0x57, 0xa8, 0xcb, 0xe7, 0x86, 0x20, 0x35, 0xed, 0xc5, 0x01, 0x44, 0x54, - 0x4c, 0x0b, 0xf0, 0x95, 0xf9, 0xc1, 0x77, 0x34, 0xd0, 0x67, 0x0a, 0xc7, 0x29, 0x60, 0x72, 0x2f, - 0x23, 0xd4, 0xbb, 0xde, 0x4b, 0x59, 0xa0, 0x55, 0x5d, 0xa0, 0x1f, 0x5d, 0x03, 0x51, 0x56, 0xe9, - 0x00, 0xdd, 0x0e, 0xf1, 0x4b, 0x57, 0x4e, 0x39, 0x93, 0x32, 0x00, 0xdf, 0x8d, 0x31, 0xb9, 0x00, - 0x29, 0xf4, 0x8c, 0x6a, 0x39, 0xb7, 0x42, 0xfc, 0xf2, 0xac, 0xd8, 0x1b, 0x67, 0x5b, 0xa6, 0x40, - 0xef, 0xd5, 0x28, 0xfd, 0x05, 0xe6, 0xbe, 0xeb, 0x43, 0xc4, 0x42, 0x97, 0xc3, 0x44, 0xf1, 0x1e, - 0xce, 0xd8, 0x1d, 0xa0, 0x1c, 0x4b, 0x79, 0x23, 0xab, 0x57, 0x46, 0xd9, 0xc4, 0x23, 0x46, 0xa3, - 0x7c, 0x76, 0x5b, 0x15, 0xf3, 0x2b, 0xb4, 0x87, 0x0a, 0xcc, 0xa9, 0x61, 0x3d, 0x02, 0xb0, 0x3c, - 0x74, 0xf3, 0x31, 0x8e, 0x7c, 0x31, 0xc5, 0x17, 0xf0, 0x19, 0x48, 0xec, 0x63, 0x89, 0x1b, 0x3d, - 0xf3, 0x0c, 0xc0, 0x8d, 0x19, 0x0b, 0xb2, 0x9e, 0xc9, 0x28, 0xa8, 0xec, 0x99, 0x47, 0x00, 0x63, - 0xc6, 0x02, 0xd5, 0x33, 0x66, 0x17, 0xad, 0xa6, 0xc0, 0x45, 0x75, 0x83, 0x8b, 0xa5, 0xf5, 0x33, - 0xd4, 0xd6, 0xa4, 0x71, 0x48, 0x2e, 0x84, 0xb9, 0x8b, 0xda, 0x0a, 0x09, 0x84, 0x00, 0xd1, 0x35, - 0xfa, 0xad, 0x41, 0xdb, 0xa9, 0x04, 0x96, 0x44, 0x3b, 0x6f, 0x7a, 0x17, 0x09, 0xf3, 0x29, 0x5a, - 0x8d, 0x41, 0x0f, 0x6d, 0x6d, 0xd8, 0x39, 0xf8, 0xd0, 0x9e, 0xe3, 0xed, 0x69, 0xbf, 0x09, 0xd0, - 0x29, 0xd0, 0x2c, 0x5e, 0xbd, 0xc6, 0x2e, 0xcd, 0x0a, 0x61, 0x9e, 0x5f, 0x76, 0xfa, 0xcb, 0xb7, - 0x72, 0x7a, 0x09, 0xaf, 0xf2, 0xf9, 0x3e, 0xea, 0x1c, 0x66, 0x69, 0xff, 0x8a, 0x0a, 0x79, 0xf5, - 0x58, 0xd6, 0xeb, 0xc7, 0xf2, 0x29, 0xda, 0xcc, 0x47, 0xdc, 0x19, 0xd3, 0xc4, 0x67, 0xfe, 0x18, - 0xa1, 0x7c, 0x36, 0x2a, 0xc2, 0xcc, 0xca, 0xd2, 0xce, 0x25, 0xc7, 0x7e, 0x63, 0x54, 0x2d, 0x36, - 0x46, 0x95, 0xe5, 0xa0, 0xad, 0x73, 0x41, 0x7e, 0x5d, 0xbc, 0x7f, 0x9e, 0xc4, 0xc2, 0xbc, 0x8d, - 0x56, 0x54, 0xaf, 0xe6, 0x40, 0x4b, 0xce, 0x72, 0x2a, 0xc8, 0xb1, 0x6f, 0x0e, 0xea, 0x6f, 0x2c, - 0x16, 0xbb, 0xd4, 0x17, 0xdd, 0xc5, 0x7e, 0x6b, 0xb0, 0xe4, 0x6c, 0x26, 0x95, 0xf9, 0xb1, 0x2f, - 0xac, 0xdf, 0xa0, 0x4e, 0x0d, 0xd0, 0xdc, 0x44, 0x8b, 0x25, 0xd6, 0x22, 0xf5, 0xcd, 0x07, 0x68, - 0xa7, 0x02, 0x6a, 0xd2, 0x7d, 0x86, 0xd8, 0x76, 0xee, 0x94, 0x0a, 0x0d, 0xc6, 0x17, 0xd6, 0x13, - 0xb4, 0x7d, 0x5c, 0x91, 0x4b, 0x39, 0x4c, 0x1a, 0x19, 0x1a, 0xcd, 0x61, 0xbc, 0x8b, 0xda, 0xe5, - 0x8f, 0x84, 0xce, 0x7e, 0xc9, 0xa9, 0x04, 0xd6, 0x97, 0x06, 0xba, 0x71, 0x2e, 0xc8, 0x29, 0x44, - 0xfe, 0x5c, 0x68, 0xd5, 0xe1, 0x2c, 0xd6, 0x0f, 0xe7, 0xa8, 0xee, 0xa4, 0xf5, 0x36, 0x8f, 0xd8, - 0x2a, 0x94, 0x3f, 0x18, 0xa8, 0x7b, 0x02, 0xb3, 0x43, 0x21, 0xe8, 0x24, 0x0a, 0x21, 0x92, 0x8a, - 0x48, 0x30, 0x01, 0xf5, 0x69, 0xbe, 0x8b, 0x36, 0xca, 0x26, 0x2c, 0x7b, 0x6f, 0xdd, 0x59, 0x2f, - 0x84, 0xba, 0xe9, 0x1e, 0x20, 0x14, 0x73, 0x48, 0x5d, 0xe2, 0x5e, 0xc0, 0x4c, 0x07, 0xd8, 0x39, - 0xd8, 0xad, 0xcf, 0xa1, 0xec, 0x1f, 0xc6, 0x1e, 0x27, 0x5e, 0x40, 0xc9, 0x09, 0xcc, 0x9c, 0x35, - 0xa5, 0x3f, 0x3a, 0x81, 0x99, 0x7a, 0x57, 0xc4, 0xec, 0x05, 0x70, 0x1d, 0x7d, 0xcb, 0xc9, 0x16, - 0xd6, 0x1f, 0x0d, 0x74, 0xe7, 0x1c, 0x07, 0xd4, 0xc7, 0x92, 0xf1, 0xa2, 0x16, 0xe3, 0xc4, 0x53, - 0x16, 0xff, 0xe2, 0x94, 0xae, 0x44, 0xbb, 0x78, 0x4d, 0xb4, 0x1f, 0xa1, 0xf5, 0xb2, 0xfa, 0x2a, - 0xde, 0xd6, 0x1c, 0xf1, 0x76, 0x0a, 0x8b, 0x13, 0x98, 0x59, 0xbf, 0xaf, 0xc5, 0x76, 0x34, 0xab, - 0x35, 0x36, 0xff, 0x37, 0xb1, 0x95, 0x6e, 0xeb, 0xb1, 0x91, 0xba, 0xfd, 0x95, 0x04, 0x5a, 0x57, - 0x13, 0xb0, 0xfe, 0x6c, 0xa0, 0xed, 0xba, 0x57, 0x71, 0xc6, 0xc6, 0x3c, 0x89, 0xe0, 0x3f, 0xb8, - 0x3f, 0x4f, 0xd1, 0x66, 0x23, 0x28, 0x91, 0x9f, 0xc6, 0xcf, 0xe7, 0xa2, 0x97, 0x1a, 0x75, 0x38, - 0x1b, 0xf5, 0x3c, 0xc4, 0xd1, 0xd3, 0x6f, 0x5f, 0xf5, 0x8c, 0xef, 0x5e, 0xf5, 0x8c, 0xbf, 0xbd, - 0xea, 0x19, 0x5f, 0xbd, 0xee, 0x2d, 0x7c, 0xf7, 0xba, 0xb7, 0xf0, 0xd7, 0xd7, 0xbd, 0x85, 0xdf, - 0x7e, 0x38, 0xa1, 0x72, 0x9a, 0x78, 0x36, 0x61, 0xe1, 0x30, 0xff, 0x41, 0xad, 0x7c, 0x7d, 0x50, - 0xfe, 0xef, 0xa7, 0xf7, 0x87, 0x2f, 0x9b, 0x3f, 0xfd, 0x72, 0x16, 0x83, 0xf0, 0x56, 0xf4, 0xb5, - 0xbe, 0xff, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xa3, 0x18, 0xf3, 0x25, 0x10, 0x00, 0x00, + // 1637 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x72, 0x1b, 0xc7, + 0x11, 0xe6, 0x12, 0xfc, 0xc3, 0x80, 0x3f, 0xd2, 0x8a, 0xb2, 0x40, 0x85, 0x01, 0xa1, 0x75, 0xe2, + 0x62, 0xca, 0xe5, 0x45, 0x48, 0x55, 0xaa, 0x52, 0xaa, 0xb8, 0x5c, 0x24, 0x24, 0x59, 0x34, 0x63, + 0x0b, 0x5e, 0x32, 0x54, 0x25, 0x39, 0x6c, 0xcd, 0xce, 0xb6, 0x80, 0x29, 0xee, 0xee, 0xac, 0x66, + 0x06, 0x2b, 0xe1, 0x92, 0x73, 0x8e, 0xce, 0xcd, 0x95, 0x5c, 0x94, 0x27, 0xc8, 0x6b, 0xf8, 0xe8, + 0x63, 0x4e, 0x56, 0x8a, 0x3a, 0xe4, 0x90, 0x97, 0x48, 0xcd, 0xec, 0x3f, 0x48, 0x2a, 0x50, 0x25, + 0xb9, 0xed, 0xf4, 0x74, 0x7f, 0xdd, 0x3d, 0xd3, 0xfd, 0xf5, 0x00, 0x68, 0x9f, 0x46, 0x12, 0x38, + 0x19, 0x61, 0x1a, 0xb9, 0x02, 0xc8, 0x98, 0x53, 0x39, 0xe9, 0x11, 0x92, 0xf4, 0x62, 0xce, 0x12, + 0xea, 0x03, 0xef, 0x25, 0x7b, 0xc5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xe1, 0x15, 0x36, 0x36, + 0x21, 0x89, 0x5d, 0xe8, 0x25, 0x7b, 0x77, 0x37, 0x87, 0x6c, 0xc8, 0xb4, 0x7e, 0x4f, 0x7d, 0xa5, + 0xa6, 0x77, 0x77, 0x86, 0x8c, 0x0d, 0x03, 0xe8, 0xe9, 0x95, 0x37, 0x7e, 0xde, 0x93, 0x34, 0x04, + 0x21, 0x71, 0x18, 0x67, 0x0a, 0x9d, 0x69, 0x05, 0x7f, 0xcc, 0xb1, 0xa4, 0x2c, 0xca, 0x01, 0xa8, + 0x47, 0x7a, 0x84, 0x71, 0xe8, 0x91, 0x80, 0x42, 0x24, 0x55, 0x78, 0xe9, 0x57, 0xa6, 0xd0, 0x53, + 0x0a, 0x01, 0x1d, 0x8e, 0x64, 0x2a, 0x16, 0x3d, 0x09, 0x91, 0x0f, 0x3c, 0xa4, 0xa9, 0x72, 0xb9, + 0xca, 0x0c, 0xb6, 0x2b, 0xfb, 0x84, 0x4f, 0x62, 0xc9, 0x7a, 0xe7, 0x30, 0x11, 0xd9, 0xee, 0x47, + 0x84, 0x89, 0x90, 0x89, 0x1e, 0xa8, 0xc4, 0x22, 0x02, 0xbd, 0x64, 0xcf, 0x03, 0x89, 0xf7, 0x0a, + 0x41, 0x1e, 0x77, 0xa6, 0xe7, 0x61, 0x51, 0xea, 0x10, 0x46, 0xb3, 0xb8, 0xad, 0x37, 0x4b, 0xa8, + 0xdd, 0x67, 0x91, 0x18, 0x87, 0xc0, 0x0f, 0x7c, 0x9f, 0xaa, 0x94, 0x06, 0x9c, 0xc5, 0x4c, 0xe0, + 0xc0, 0xdc, 0x44, 0x8b, 0x92, 0xca, 0x00, 0xda, 0x46, 0xd7, 0xd8, 0x6d, 0x3a, 0xe9, 0xc2, 0xec, + 0xa2, 0x96, 0x0f, 0x82, 0x70, 0x1a, 0x2b, 0xe5, 0xf6, 0xbc, 0xde, 0xab, 0x8a, 0xcc, 0x2d, 0xb4, + 0x92, 0xde, 0x02, 0xf5, 0xdb, 0x0d, 0xbd, 0xbd, 0xac, 0xd7, 0x47, 0xbe, 0xf9, 0x39, 0x5a, 0xa7, + 0x11, 0x95, 0x14, 0x07, 0xee, 0x08, 0xd4, 0x69, 0xb4, 0x17, 0xba, 0xc6, 0x6e, 0x6b, 0xff, 0xae, + 0x4d, 0x3d, 0x62, 0xab, 0x03, 0xb4, 0xb3, 0x63, 0x4b, 0xf6, 0xec, 0x27, 0x5a, 0xe3, 0x70, 0xe1, + 0xbb, 0x1f, 0x76, 0xe6, 0x9c, 0xb5, 0xcc, 0x2e, 0x15, 0x9a, 0xf7, 0xd0, 0xea, 0x10, 0x22, 0x10, + 0x54, 0xb8, 0x23, 0x2c, 0x46, 0xed, 0xc5, 0xae, 0xb1, 0xbb, 0xea, 0xb4, 0x32, 0xd9, 0x13, 0x2c, + 0x46, 0xe6, 0x0e, 0x6a, 0x79, 0x34, 0xc2, 0x7c, 0x92, 0x6a, 0x2c, 0x69, 0x0d, 0x94, 0x8a, 0xb4, + 0x42, 0x1f, 0x21, 0x11, 0xe3, 0x97, 0x91, 0xab, 0x6e, 0xbb, 0xbd, 0x9c, 0x05, 0x92, 0xde, 0xb4, + 0x9d, 0xdf, 0xb4, 0x7d, 0x9a, 0x97, 0xc2, 0xe1, 0x8a, 0x0a, 0xe4, 0x9b, 0x37, 0x3b, 0x86, 0xd3, + 0xd4, 0x76, 0x6a, 0xc7, 0xfc, 0x0a, 0xdd, 0x18, 0x47, 0x1e, 0x8b, 0x7c, 0x1a, 0x0d, 0xdd, 0x18, + 0x38, 0x65, 0x7e, 0x7b, 0x45, 0x43, 0x6d, 0x5d, 0x82, 0x7a, 0x98, 0x15, 0x4d, 0x8a, 0xf4, 0xad, + 0x42, 0xda, 0x28, 0x8c, 0x07, 0xda, 0xd6, 0xfc, 0x1a, 0x99, 0x84, 0x24, 0x3a, 0x24, 0x36, 0x96, + 0x39, 0x62, 0x73, 0x76, 0xc4, 0x1b, 0x84, 0x24, 0xa7, 0xa9, 0x75, 0x06, 0xf9, 0x7b, 0x74, 0x47, + 0x72, 0x1c, 0x89, 0xe7, 0xc0, 0xa7, 0x71, 0xd1, 0xec, 0xb8, 0xb7, 0x73, 0x8c, 0x3a, 0xf8, 0x13, + 0xd4, 0x25, 0x59, 0x01, 0xb9, 0x1c, 0x7c, 0x2a, 0x24, 0xa7, 0xde, 0x58, 0xd9, 0xba, 0xcf, 0x39, + 0x26, 0xba, 0x46, 0x5a, 0xba, 0x08, 0x3a, 0xb9, 0x9e, 0x53, 0x53, 0x7b, 0x9c, 0x69, 0x99, 0x4f, + 0xd1, 0x4f, 0xbc, 0x80, 0x91, 0x73, 0xa1, 0x82, 0x73, 0x6b, 0x48, 0xda, 0x75, 0x48, 0x85, 0x50, + 0x68, 0xab, 0x5d, 0x63, 0xb7, 0xe1, 0xdc, 0x4b, 0x75, 0x07, 0xc0, 0x1f, 0x56, 0x34, 0x4f, 0x2b, + 0x8a, 0xe6, 0x27, 0xc8, 0x1c, 0x51, 0x21, 0x19, 0xa7, 0x04, 0x07, 0x2e, 0x44, 0x92, 0x53, 0x10, + 0xed, 0x35, 0x6d, 0x7e, 0xb3, 0xdc, 0x79, 0x94, 0x6e, 0x98, 0x5f, 0xa0, 0x7b, 0xd7, 0x3a, 0x75, + 0xc9, 0x08, 0x47, 0x11, 0x04, 0xed, 0x75, 0x9d, 0xca, 0x8e, 0x7f, 0x8d, 0xcf, 0x7e, 0xaa, 0xf6, + 0x60, 0xe5, 0x8f, 0xaf, 0x77, 0xe6, 0xbe, 0x7d, 0xbd, 0x33, 0x67, 0xfd, 0xcd, 0x40, 0x77, 0xfa, + 0x45, 0xe2, 0x21, 0x4b, 0x70, 0xf0, 0xff, 0x6c, 0xb0, 0x03, 0xd4, 0x14, 0x92, 0xc5, 0x69, 0x49, + 0x2f, 0xbc, 0x47, 0x49, 0xaf, 0x28, 0x33, 0xb5, 0x61, 0xfd, 0xc5, 0x40, 0x9b, 0x8f, 0x5e, 0x8c, + 0x69, 0xc2, 0x08, 0xfe, 0x9f, 0xf0, 0xc1, 0x31, 0x5a, 0x83, 0x0a, 0x9e, 0x68, 0x37, 0xba, 0x8d, + 0xdd, 0xd6, 0xfe, 0x4f, 0xed, 0x94, 0x9c, 0xec, 0x82, 0xb3, 0x32, 0x82, 0xb2, 0xab, 0xde, 0x9d, + 0xba, 0xad, 0xf5, 0x2f, 0x03, 0xdd, 0xf8, 0x3c, 0x60, 0x1e, 0x0e, 0x4e, 0x02, 0x2c, 0x46, 0xea, + 0xf2, 0x26, 0x2a, 0x6b, 0x0e, 0x59, 0xd7, 0xe8, 0xe8, 0x66, 0xce, 0x5a, 0x99, 0xe9, 0x3e, 0xfe, + 0x0c, 0xdd, 0x2c, 0xea, 0xb8, 0x38, 0x5c, 0x9d, 0xcc, 0xe1, 0xad, 0x8b, 0x1f, 0x76, 0x36, 0xf2, + 0x3b, 0xec, 0xeb, 0x83, 0x7e, 0xe8, 0x6c, 0x90, 0x9a, 0xc0, 0x37, 0x3b, 0xa8, 0x45, 0x3d, 0xe2, + 0x0a, 0x78, 0xe1, 0x46, 0xe3, 0x50, 0xdf, 0xcb, 0x82, 0xd3, 0xa4, 0x1e, 0x39, 0x81, 0x17, 0x5f, + 0x8d, 0x43, 0xf3, 0x3e, 0xfa, 0x20, 0x1f, 0x44, 0x6e, 0x82, 0x03, 0x57, 0xd9, 0xbb, 0xd8, 0xf7, + 0xb9, 0xbe, 0xa6, 0x55, 0xe7, 0x56, 0xbe, 0x7b, 0x86, 0x03, 0xe5, 0xec, 0xc0, 0xf7, 0xb9, 0xf5, + 0xcf, 0x45, 0xb4, 0x34, 0xc0, 0x1c, 0x87, 0xc2, 0x3c, 0x45, 0x1b, 0x12, 0xc2, 0x38, 0xc0, 0x12, + 0xdc, 0x94, 0x23, 0xb3, 0x4c, 0x3f, 0xd6, 0xdc, 0x59, 0x9d, 0x2d, 0x76, 0x65, 0x9a, 0x24, 0x7b, + 0x76, 0x5f, 0x4b, 0x4f, 0x24, 0x96, 0xe0, 0xac, 0xe7, 0x18, 0xa9, 0xd0, 0xfc, 0x25, 0x6a, 0x4b, + 0x3e, 0x16, 0xb2, 0x64, 0xaf, 0xb2, 0x6d, 0xd3, 0xab, 0xfc, 0x20, 0xdf, 0x4f, 0x1b, 0xbe, 0x68, + 0xd7, 0xab, 0x89, 0xaa, 0xf1, 0xdf, 0x10, 0xd5, 0x09, 0xba, 0xa5, 0x58, 0x7e, 0x1a, 0x73, 0x61, + 0x76, 0xcc, 0x9b, 0xca, 0xbe, 0x0e, 0xfa, 0x35, 0x32, 0x13, 0x41, 0xa6, 0x31, 0x17, 0xdf, 0x23, + 0xce, 0x44, 0x90, 0x3a, 0xa4, 0x8f, 0xb6, 0x85, 0x2a, 0x3e, 0x37, 0x04, 0xa9, 0x69, 0x2f, 0x0e, + 0x20, 0xa2, 0x62, 0x94, 0x83, 0x2f, 0xcd, 0x0e, 0xbe, 0xa5, 0x81, 0xbe, 0x54, 0x38, 0x4e, 0x0e, + 0x93, 0x79, 0xe9, 0xa3, 0xce, 0xd5, 0x5e, 0x8a, 0x0b, 0x5a, 0xd6, 0x17, 0xf4, 0xa3, 0x2b, 0x20, + 0x8a, 0x5b, 0xda, 0x47, 0xb7, 0x43, 0xfc, 0xca, 0x95, 0x23, 0xce, 0xa4, 0x0c, 0xc0, 0x77, 0x63, + 0x4c, 0xce, 0x41, 0x0a, 0x3d, 0xa3, 0x1a, 0xce, 0xad, 0x10, 0xbf, 0x3a, 0xcd, 0xf7, 0x06, 0xe9, + 0x96, 0x29, 0xd0, 0x47, 0x15, 0x4a, 0x7f, 0x89, 0xb9, 0xef, 0xfa, 0x10, 0xb1, 0xd0, 0xe5, 0x30, + 0x54, 0xbc, 0x87, 0x53, 0x76, 0x07, 0x28, 0xc6, 0x52, 0xd6, 0xc8, 0xea, 0x95, 0x51, 0x34, 0x71, + 0x9f, 0xd1, 0x28, 0x9b, 0xdd, 0x56, 0xc9, 0xfc, 0x0a, 0xed, 0xa1, 0x02, 0x73, 0x2a, 0x58, 0x8f, + 0x01, 0x2c, 0x0f, 0xdd, 0x7c, 0x82, 0x23, 0x5f, 0x8c, 0xf0, 0x39, 0x7c, 0x09, 0x12, 0xfb, 0x58, + 0xe2, 0x5a, 0xcf, 0x3c, 0x07, 0x70, 0x63, 0xc6, 0x82, 0xb4, 0x67, 0x52, 0x0a, 0x2a, 0x7a, 0xe6, + 0x31, 0xc0, 0x80, 0xb1, 0x40, 0xf5, 0x8c, 0xd9, 0x46, 0xcb, 0x09, 0x70, 0x51, 0x56, 0x70, 0xbe, + 0xb4, 0x7e, 0x86, 0x9a, 0x9a, 0x34, 0x0e, 0xc8, 0xb9, 0x30, 0xb7, 0x51, 0x53, 0x21, 0x81, 0x10, + 0x20, 0xda, 0x46, 0xb7, 0xb1, 0xdb, 0x74, 0x4a, 0x81, 0x25, 0xd1, 0xd6, 0x75, 0xef, 0x22, 0x61, + 0x3e, 0x43, 0xcb, 0x31, 0xe8, 0xa1, 0xad, 0x0d, 0x5b, 0xfb, 0x9f, 0xda, 0x33, 0xbc, 0x3d, 0xed, + 0xeb, 0x00, 0x9d, 0x1c, 0xcd, 0xe2, 0xe5, 0x6b, 0x6c, 0x6a, 0x56, 0x08, 0xf3, 0x6c, 0xda, 0xe9, + 0xaf, 0xde, 0xcb, 0xe9, 0x14, 0x5e, 0xe9, 0xf3, 0x63, 0xd4, 0x3a, 0x48, 0xd3, 0xfe, 0x35, 0x15, + 0xf2, 0xf2, 0xb1, 0xac, 0x56, 0x8f, 0xe5, 0x0b, 0xb4, 0x9e, 0x8d, 0xb8, 0x53, 0xa6, 0x89, 0xcf, + 0xfc, 0x31, 0x42, 0xd9, 0x6c, 0x54, 0x84, 0x99, 0x5e, 0x4b, 0x33, 0x93, 0x1c, 0xf9, 0xb5, 0x51, + 0x35, 0x5f, 0x1b, 0x55, 0x96, 0x83, 0x36, 0xce, 0x04, 0xf9, 0x4d, 0xfe, 0xfe, 0x79, 0x1a, 0x0b, + 0xf3, 0x36, 0x5a, 0x52, 0xbd, 0x9a, 0x01, 0x2d, 0x38, 0x8b, 0x89, 0x20, 0x47, 0xbe, 0xb9, 0x5b, + 0x7d, 0x63, 0xb1, 0xd8, 0xa5, 0xbe, 0x68, 0xcf, 0x77, 0x1b, 0xbb, 0x0b, 0xce, 0xfa, 0xb8, 0x34, + 0x3f, 0xf2, 0x85, 0xf5, 0x5b, 0xd4, 0xaa, 0x00, 0x9a, 0xeb, 0x68, 0xbe, 0xc0, 0x9a, 0xa7, 0xbe, + 0xf9, 0x00, 0x6d, 0x95, 0x40, 0x75, 0xba, 0x4f, 0x11, 0x9b, 0xce, 0x9d, 0x42, 0xa1, 0xc6, 0xf8, + 0xc2, 0x7a, 0x8a, 0x36, 0x8f, 0x4a, 0x72, 0x29, 0x86, 0x49, 0x2d, 0x43, 0xa3, 0x3e, 0x8c, 0xb7, + 0x51, 0xb3, 0xf8, 0x21, 0xa1, 0xb3, 0x5f, 0x70, 0x4a, 0x81, 0x15, 0xa2, 0x1b, 0x67, 0x82, 0x9c, + 0x40, 0xe4, 0x97, 0x60, 0xd7, 0x1c, 0xc0, 0xe1, 0x34, 0xd0, 0xcc, 0x0f, 0xd5, 0xd2, 0xdd, 0x6b, + 0x03, 0xb5, 0x1f, 0xbd, 0x8a, 0x19, 0x97, 0xe0, 0x5f, 0xf2, 0xfb, 0x8e, 0x24, 0x68, 0xca, 0x9f, + 0x02, 0x22, 0xdf, 0x9d, 0x0e, 0xe2, 0x17, 0x33, 0x95, 0xe0, 0xb4, 0xb7, 0x8c, 0x15, 0x14, 0xaf, + 0xd6, 0xe4, 0xd6, 0x9f, 0x0c, 0xd4, 0x3e, 0x86, 0xc9, 0x81, 0x10, 0x74, 0x18, 0x85, 0x10, 0x49, + 0xc5, 0x67, 0x98, 0x80, 0xfa, 0x34, 0x3f, 0x44, 0x6b, 0x05, 0x17, 0x14, 0x14, 0xb0, 0xea, 0xac, + 0xe6, 0x42, 0xdd, 0xfb, 0x0f, 0x10, 0x8a, 0x39, 0x24, 0x2e, 0x71, 0xcf, 0x61, 0x92, 0x05, 0xb9, + 0x5d, 0x1d, 0x87, 0xe9, 0x4f, 0x29, 0x7b, 0x30, 0xf6, 0x02, 0x4a, 0x8e, 0x61, 0xe2, 0xac, 0x28, + 0xfd, 0xfe, 0x31, 0x4c, 0xd4, 0xf3, 0x26, 0x66, 0x2f, 0x81, 0xeb, 0x19, 0xd6, 0x70, 0xd2, 0x85, + 0xf5, 0x67, 0x03, 0xdd, 0x39, 0xc3, 0x01, 0xf5, 0xb1, 0x64, 0x3c, 0x2f, 0x89, 0xc1, 0xd8, 0x53, + 0x16, 0xef, 0x38, 0xb5, 0x4b, 0xd1, 0xce, 0x5f, 0x11, 0xed, 0x67, 0x68, 0xb5, 0x28, 0x42, 0x15, + 0x6f, 0x63, 0x86, 0x78, 0x5b, 0xb9, 0xc5, 0x31, 0x4c, 0xac, 0x3f, 0x54, 0x62, 0x3b, 0x9c, 0x54, + 0xf8, 0x85, 0xff, 0x87, 0xd8, 0x0a, 0xb7, 0xd5, 0xd8, 0x48, 0xd5, 0xfe, 0x52, 0x02, 0x8d, 0xcb, + 0x09, 0x58, 0x7f, 0x35, 0xd0, 0x66, 0xd5, 0xab, 0x38, 0x65, 0x03, 0x3e, 0x8e, 0xe0, 0x5d, 0xde, + 0xcb, 0x12, 0x9f, 0xaf, 0x96, 0xf8, 0x33, 0xb4, 0x5e, 0x0b, 0x4a, 0x64, 0xa7, 0xf1, 0xf3, 0x99, + 0x4a, 0xac, 0xc2, 0x60, 0xce, 0x5a, 0x35, 0x0f, 0x71, 0xf8, 0xec, 0xbb, 0x8b, 0x8e, 0xf1, 0xfd, + 0x45, 0xc7, 0xf8, 0xc7, 0x45, 0xc7, 0xf8, 0xe6, 0x6d, 0x67, 0xee, 0xfb, 0xb7, 0x9d, 0xb9, 0xbf, + 0xbf, 0xed, 0xcc, 0xfd, 0xee, 0xd3, 0x21, 0x95, 0xa3, 0xb1, 0x67, 0x13, 0x16, 0xf6, 0xb2, 0xdf, + 0xc9, 0xa5, 0xaf, 0x4f, 0x8a, 0xbf, 0x1d, 0x92, 0xfb, 0xbd, 0x57, 0xf5, 0xff, 0x1e, 0xe4, 0x24, + 0x06, 0xe1, 0x2d, 0xe9, 0xce, 0xbb, 0xff, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0xcb, 0xb7, + 0xa6, 0xac, 0x10, 0x00, 0x00, } func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) { @@ -2087,12 +2136,45 @@ func (m *VscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n16 i = encodeVarintProvider(dAtA, i, uint64(n16)) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 if m.VscId != 0 { i = encodeVarintProvider(dAtA, i, uint64(m.VscId)) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x8 } + return len(dAtA) - i, nil +} + +func (m *ExportedVscSendTimestamp) 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 *ExportedVscSendTimestamp) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ExportedVscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.VscSendTimestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProvider(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 if len(m.ChainId) > 0 { i -= len(m.ChainId) copy(dAtA[i:], m.ChainId) @@ -2609,10 +2691,6 @@ func (m *VscSendTimestamp) Size() (n int) { } var l int _ = l - l = len(m.ChainId) - if l > 0 { - n += 1 + l + sovProvider(uint64(l)) - } if m.VscId != 0 { n += 1 + sovProvider(uint64(m.VscId)) } @@ -2621,6 +2699,21 @@ func (m *VscSendTimestamp) Size() (n int) { return n } +func (m *ExportedVscSendTimestamp) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovProvider(uint64(l)) + } + l = m.VscSendTimestamp.Size() + n += 1 + l + sovProvider(uint64(l)) + return n +} + func (m *KeyAssignmentReplacement) Size() (n int) { if m == nil { return 0 @@ -4956,10 +5049,29 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { } 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 ErrIntOverflowProvider + } + 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 ChainId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowProvider @@ -4969,29 +5081,80 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthProvider } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthProvider } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field VscId", wireType) + default: + iNdEx = preIndex + skippy, err := skipProvider(dAtA[iNdEx:]) + if err != nil { + return err } - m.VscId = 0 + 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 (m *ExportedVscSendTimestamp) 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: ExportedVscSendTimestamp: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ExportedVscSendTimestamp: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowProvider @@ -5001,14 +5164,27 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.VscId |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 3: + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthProvider + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthProvider + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5035,7 +5211,7 @@ func (m *VscSendTimestamp) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := m.VscSendTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex From ad6bf7559882110ab32ac5decdaacc52a071a455 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Mon, 26 Jun 2023 14:08:51 +0200 Subject: [PATCH 7/9] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7cb03404c..1580a7c3d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] Add an entry to the unreleased section whenever merging a PR to main that is not targeted at a specific release. These entries will eventually be included in a release. +* `[x/ccv/provider]` (fix) [#1076](https://github.com/cosmos/interchain-security/pull/1076) Add `InitTimeoutTimestamps` and `ExportedVscSendTimestamps` to exported genesis. ## v3.0.0 From 9f80b08bf5d90ee68262b164355b18eaba2d5a1d Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Mon, 26 Jun 2023 17:50:32 +0200 Subject: [PATCH 8/9] feat: update exportedVscSendTimestamps --- .../ccv/provider/v1/provider.proto | 2 +- x/ccv/provider/keeper/genesis.go | 9 +- x/ccv/provider/keeper/genesis_test.go | 42 ++- x/ccv/provider/types/provider.pb.go | 251 +++++++++--------- 4 files changed, 155 insertions(+), 149 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/provider.proto b/proto/interchain_security/ccv/provider/v1/provider.proto index 2357443d00..3c41e01c89 100644 --- a/proto/interchain_security/ccv/provider/v1/provider.proto +++ b/proto/interchain_security/ccv/provider/v1/provider.proto @@ -224,7 +224,7 @@ message VscSendTimestamp { // ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis message ExportedVscSendTimestamp { string chain_id = 1; - VscSendTimestamp vsc_send_timestamp = 2 + repeated VscSendTimestamp vsc_send_timestamps = 2 [ (gogoproto.nullable) = false ]; } diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index 1174df8653..fdb5708db6 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -95,7 +95,10 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { } for _, item := range genState.ExportedVscSendTimestamps { - k.SetVscSendTimestamp(ctx, item.ChainId, item.VscSendTimestamp.VscId, item.VscSendTimestamp.Timestamp) + for _, vscSendTimestamp := range item.VscSendTimestamps { + k.SetVscSendTimestamp(ctx, item.ChainId, vscSendTimestamp.VscId, vscSendTimestamp.Timestamp) + + } } k.SetParams(ctx, genState.Params) @@ -139,9 +142,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { consumerStates = append(consumerStates, cs) vscSendTimestamps := k.GetAllVscSendTimestamps(ctx, chain.ChainId) - for _, vscSendTimestamp := range vscSendTimestamps { - exportedVscSendTimestamps = append(exportedVscSendTimestamps, types.ExportedVscSendTimestamp{ChainId: chain.ChainId, VscSendTimestamp: vscSendTimestamp}) - } + exportedVscSendTimestamps = append(exportedVscSendTimestamps, types.ExportedVscSendTimestamp{ChainId: chain.ChainId, VscSendTimestamps: vscSendTimestamps}) } // ConsumerAddrsToPrune are added only for registered consumer chains diff --git a/x/ccv/provider/keeper/genesis_test.go b/x/ccv/provider/keeper/genesis_test.go index 46ca68cc83..c199524939 100644 --- a/x/ccv/provider/keeper/genesis_test.go +++ b/x/ccv/provider/keeper/genesis_test.go @@ -42,16 +42,26 @@ func TestInitAndExportGenesis(t *testing.T) { } now := time.Now().UTC() - exportedVscSendTimeStampsC0 := []providertypes.ExportedVscSendTimestamp{ - {ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(time.Hour)}}, - {ChainId: "c0", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(2 * time.Hour)}}, + exportedVscSendTimeStampsC0 := providertypes.ExportedVscSendTimestamp{ + ChainId: "c0", + VscSendTimestamps: []providertypes.VscSendTimestamp{ + {VscId: 1, Timestamp: now.Add(time.Hour)}, + {VscId: 2, Timestamp: now.Add(2 * time.Hour)}, + }, } - exportedVscSendTimeStampsC1 := []providertypes.ExportedVscSendTimestamp{ - {ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 1, Timestamp: now.Add(-time.Hour)}}, - {ChainId: "c1", VscSendTimestamp: providertypes.VscSendTimestamp{VscId: 2, Timestamp: now.Add(time.Hour)}}, + exportedVscSendTimeStampsC1 := providertypes.ExportedVscSendTimestamp{ + ChainId: "c1", + VscSendTimestamps: []providertypes.VscSendTimestamp{ + {VscId: 1, Timestamp: now.Add(-time.Hour)}, + {VscId: 2, Timestamp: now.Add(time.Hour)}, + }, } - exportedVscSendTimeStampsAll := append(exportedVscSendTimeStampsC0, exportedVscSendTimeStampsC1...) + + var exportedVscSendTimeStampsAll []providertypes.ExportedVscSendTimestamp + exportedVscSendTimeStampsAll = append(exportedVscSendTimeStampsAll, exportedVscSendTimeStampsC0) + exportedVscSendTimeStampsAll = append(exportedVscSendTimeStampsAll, exportedVscSendTimeStampsC1) + // create genesis struct provGenesis := providertypes.NewGenesisState(vscID, []providertypes.ValsetUpdateIdToHeight{{ValsetUpdateId: vscID, Height: initHeight}}, @@ -193,27 +203,13 @@ func TestInitAndExportGenesis(t *testing.T) { sort.Slice(vscSendTimestampsC0InStore, func(i, j int) bool { return vscSendTimestampsC0InStore[i].VscId < vscSendTimestampsC0InStore[j].VscId }) - - require.Equal(t, vscSendTimestampsC0InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC0)) + require.Equal(t, vscSendTimestampsC0InStore, exportedVscSendTimeStampsC0.VscSendTimestamps) vscSendTimestampsC1InStore := pk.GetAllVscSendTimestamps(ctx, cChainIDs[1]) sort.Slice(vscSendTimestampsC1InStore, func(i, j int) bool { return vscSendTimestampsC1InStore[i].VscId < vscSendTimestampsC1InStore[j].VscId }) - require.Equal(t, vscSendTimestampsC1InStore, exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStampsC1)) -} - -func exportedVscSendTimeStampsToVscSendTimeStamps(exportedVscSendTimeStamps []providertypes.ExportedVscSendTimestamp) []providertypes.VscSendTimestamp { - vscSendTimeStamps := []providertypes.VscSendTimestamp{} - for _, exportedVscSendTimeStamp := range exportedVscSendTimeStamps { - vscSendTimeStamps = append(vscSendTimeStamps, exportedVscSendTimeStamp.VscSendTimestamp) - } - - sort.Slice(vscSendTimeStamps, func(i, j int) bool { - return vscSendTimeStamps[i].VscId < vscSendTimeStamps[j].VscId - }) - - return vscSendTimeStamps + require.Equal(t, vscSendTimestampsC1InStore, exportedVscSendTimeStampsC1.VscSendTimestamps) } func assertConsumerChainStates(t *testing.T, ctx sdk.Context, pk keeper.Keeper, consumerStates ...providertypes.ConsumerState) { diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go index 3acb5d01e8..30dba16cdc 100644 --- a/x/ccv/provider/types/provider.pb.go +++ b/x/ccv/provider/types/provider.pb.go @@ -973,8 +973,8 @@ func (m *VscSendTimestamp) GetTimestamp() time.Time { // ExportedVscSendTimestamps is VscSendTimestamp with chainID info for exporting to genesis type ExportedVscSendTimestamp struct { - ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - VscSendTimestamp VscSendTimestamp `protobuf:"bytes,2,opt,name=vsc_send_timestamp,json=vscSendTimestamp,proto3" json:"vsc_send_timestamp"` + ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VscSendTimestamps []VscSendTimestamp `protobuf:"bytes,2,rep,name=vsc_send_timestamps,json=vscSendTimestamps,proto3" json:"vsc_send_timestamps"` } func (m *ExportedVscSendTimestamp) Reset() { *m = ExportedVscSendTimestamp{} } @@ -1017,11 +1017,11 @@ func (m *ExportedVscSendTimestamp) GetChainId() string { return "" } -func (m *ExportedVscSendTimestamp) GetVscSendTimestamp() VscSendTimestamp { +func (m *ExportedVscSendTimestamp) GetVscSendTimestamps() []VscSendTimestamp { if m != nil { - return m.VscSendTimestamp + return m.VscSendTimestamps } - return VscSendTimestamp{} + return nil } type KeyAssignmentReplacement struct { @@ -1300,110 +1300,110 @@ func init() { } var fileDescriptor_f22ec409a72b7b72 = []byte{ - // 1637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x72, 0x1b, 0xc7, - 0x11, 0xe6, 0x12, 0xfc, 0xc3, 0x80, 0x3f, 0xd2, 0x8a, 0xb2, 0x40, 0x85, 0x01, 0xa1, 0x75, 0xe2, - 0x62, 0xca, 0xe5, 0x45, 0x48, 0x55, 0xaa, 0x52, 0xaa, 0xb8, 0x5c, 0x24, 0x24, 0x59, 0x34, 0x63, - 0x0b, 0x5e, 0x32, 0x54, 0x25, 0x39, 0x6c, 0xcd, 0xce, 0xb6, 0x80, 0x29, 0xee, 0xee, 0xac, 0x66, - 0x06, 0x2b, 0xe1, 0x92, 0x73, 0x8e, 0xce, 0xcd, 0x95, 0x5c, 0x94, 0x27, 0xc8, 0x6b, 0xf8, 0xe8, - 0x63, 0x4e, 0x56, 0x8a, 0x3a, 0xe4, 0x90, 0x97, 0x48, 0xcd, 0xec, 0x3f, 0x48, 0x2a, 0x50, 0x25, - 0xb9, 0xed, 0xf4, 0x74, 0x7f, 0xdd, 0x3d, 0xd3, 0xfd, 0xf5, 0x00, 0x68, 0x9f, 0x46, 0x12, 0x38, - 0x19, 0x61, 0x1a, 0xb9, 0x02, 0xc8, 0x98, 0x53, 0x39, 0xe9, 0x11, 0x92, 0xf4, 0x62, 0xce, 0x12, - 0xea, 0x03, 0xef, 0x25, 0x7b, 0xc5, 0xb7, 0x1d, 0x73, 0x26, 0x99, 0xf9, 0xe1, 0x15, 0x36, 0x36, - 0x21, 0x89, 0x5d, 0xe8, 0x25, 0x7b, 0x77, 0x37, 0x87, 0x6c, 0xc8, 0xb4, 0x7e, 0x4f, 0x7d, 0xa5, - 0xa6, 0x77, 0x77, 0x86, 0x8c, 0x0d, 0x03, 0xe8, 0xe9, 0x95, 0x37, 0x7e, 0xde, 0x93, 0x34, 0x04, - 0x21, 0x71, 0x18, 0x67, 0x0a, 0x9d, 0x69, 0x05, 0x7f, 0xcc, 0xb1, 0xa4, 0x2c, 0xca, 0x01, 0xa8, - 0x47, 0x7a, 0x84, 0x71, 0xe8, 0x91, 0x80, 0x42, 0x24, 0x55, 0x78, 0xe9, 0x57, 0xa6, 0xd0, 0x53, - 0x0a, 0x01, 0x1d, 0x8e, 0x64, 0x2a, 0x16, 0x3d, 0x09, 0x91, 0x0f, 0x3c, 0xa4, 0xa9, 0x72, 0xb9, - 0xca, 0x0c, 0xb6, 0x2b, 0xfb, 0x84, 0x4f, 0x62, 0xc9, 0x7a, 0xe7, 0x30, 0x11, 0xd9, 0xee, 0x47, - 0x84, 0x89, 0x90, 0x89, 0x1e, 0xa8, 0xc4, 0x22, 0x02, 0xbd, 0x64, 0xcf, 0x03, 0x89, 0xf7, 0x0a, - 0x41, 0x1e, 0x77, 0xa6, 0xe7, 0x61, 0x51, 0xea, 0x10, 0x46, 0xb3, 0xb8, 0xad, 0x37, 0x4b, 0xa8, - 0xdd, 0x67, 0x91, 0x18, 0x87, 0xc0, 0x0f, 0x7c, 0x9f, 0xaa, 0x94, 0x06, 0x9c, 0xc5, 0x4c, 0xe0, - 0xc0, 0xdc, 0x44, 0x8b, 0x92, 0xca, 0x00, 0xda, 0x46, 0xd7, 0xd8, 0x6d, 0x3a, 0xe9, 0xc2, 0xec, - 0xa2, 0x96, 0x0f, 0x82, 0x70, 0x1a, 0x2b, 0xe5, 0xf6, 0xbc, 0xde, 0xab, 0x8a, 0xcc, 0x2d, 0xb4, - 0x92, 0xde, 0x02, 0xf5, 0xdb, 0x0d, 0xbd, 0xbd, 0xac, 0xd7, 0x47, 0xbe, 0xf9, 0x39, 0x5a, 0xa7, - 0x11, 0x95, 0x14, 0x07, 0xee, 0x08, 0xd4, 0x69, 0xb4, 0x17, 0xba, 0xc6, 0x6e, 0x6b, 0xff, 0xae, - 0x4d, 0x3d, 0x62, 0xab, 0x03, 0xb4, 0xb3, 0x63, 0x4b, 0xf6, 0xec, 0x27, 0x5a, 0xe3, 0x70, 0xe1, - 0xbb, 0x1f, 0x76, 0xe6, 0x9c, 0xb5, 0xcc, 0x2e, 0x15, 0x9a, 0xf7, 0xd0, 0xea, 0x10, 0x22, 0x10, - 0x54, 0xb8, 0x23, 0x2c, 0x46, 0xed, 0xc5, 0xae, 0xb1, 0xbb, 0xea, 0xb4, 0x32, 0xd9, 0x13, 0x2c, - 0x46, 0xe6, 0x0e, 0x6a, 0x79, 0x34, 0xc2, 0x7c, 0x92, 0x6a, 0x2c, 0x69, 0x0d, 0x94, 0x8a, 0xb4, - 0x42, 0x1f, 0x21, 0x11, 0xe3, 0x97, 0x91, 0xab, 0x6e, 0xbb, 0xbd, 0x9c, 0x05, 0x92, 0xde, 0xb4, - 0x9d, 0xdf, 0xb4, 0x7d, 0x9a, 0x97, 0xc2, 0xe1, 0x8a, 0x0a, 0xe4, 0x9b, 0x37, 0x3b, 0x86, 0xd3, - 0xd4, 0x76, 0x6a, 0xc7, 0xfc, 0x0a, 0xdd, 0x18, 0x47, 0x1e, 0x8b, 0x7c, 0x1a, 0x0d, 0xdd, 0x18, - 0x38, 0x65, 0x7e, 0x7b, 0x45, 0x43, 0x6d, 0x5d, 0x82, 0x7a, 0x98, 0x15, 0x4d, 0x8a, 0xf4, 0xad, - 0x42, 0xda, 0x28, 0x8c, 0x07, 0xda, 0xd6, 0xfc, 0x1a, 0x99, 0x84, 0x24, 0x3a, 0x24, 0x36, 0x96, - 0x39, 0x62, 0x73, 0x76, 0xc4, 0x1b, 0x84, 0x24, 0xa7, 0xa9, 0x75, 0x06, 0xf9, 0x7b, 0x74, 0x47, - 0x72, 0x1c, 0x89, 0xe7, 0xc0, 0xa7, 0x71, 0xd1, 0xec, 0xb8, 0xb7, 0x73, 0x8c, 0x3a, 0xf8, 0x13, - 0xd4, 0x25, 0x59, 0x01, 0xb9, 0x1c, 0x7c, 0x2a, 0x24, 0xa7, 0xde, 0x58, 0xd9, 0xba, 0xcf, 0x39, - 0x26, 0xba, 0x46, 0x5a, 0xba, 0x08, 0x3a, 0xb9, 0x9e, 0x53, 0x53, 0x7b, 0x9c, 0x69, 0x99, 0x4f, - 0xd1, 0x4f, 0xbc, 0x80, 0x91, 0x73, 0xa1, 0x82, 0x73, 0x6b, 0x48, 0xda, 0x75, 0x48, 0x85, 0x50, - 0x68, 0xab, 0x5d, 0x63, 0xb7, 0xe1, 0xdc, 0x4b, 0x75, 0x07, 0xc0, 0x1f, 0x56, 0x34, 0x4f, 0x2b, - 0x8a, 0xe6, 0x27, 0xc8, 0x1c, 0x51, 0x21, 0x19, 0xa7, 0x04, 0x07, 0x2e, 0x44, 0x92, 0x53, 0x10, - 0xed, 0x35, 0x6d, 0x7e, 0xb3, 0xdc, 0x79, 0x94, 0x6e, 0x98, 0x5f, 0xa0, 0x7b, 0xd7, 0x3a, 0x75, - 0xc9, 0x08, 0x47, 0x11, 0x04, 0xed, 0x75, 0x9d, 0xca, 0x8e, 0x7f, 0x8d, 0xcf, 0x7e, 0xaa, 0xf6, - 0x60, 0xe5, 0x8f, 0xaf, 0x77, 0xe6, 0xbe, 0x7d, 0xbd, 0x33, 0x67, 0xfd, 0xcd, 0x40, 0x77, 0xfa, - 0x45, 0xe2, 0x21, 0x4b, 0x70, 0xf0, 0xff, 0x6c, 0xb0, 0x03, 0xd4, 0x14, 0x92, 0xc5, 0x69, 0x49, - 0x2f, 0xbc, 0x47, 0x49, 0xaf, 0x28, 0x33, 0xb5, 0x61, 0xfd, 0xc5, 0x40, 0x9b, 0x8f, 0x5e, 0x8c, - 0x69, 0xc2, 0x08, 0xfe, 0x9f, 0xf0, 0xc1, 0x31, 0x5a, 0x83, 0x0a, 0x9e, 0x68, 0x37, 0xba, 0x8d, - 0xdd, 0xd6, 0xfe, 0x4f, 0xed, 0x94, 0x9c, 0xec, 0x82, 0xb3, 0x32, 0x82, 0xb2, 0xab, 0xde, 0x9d, - 0xba, 0xad, 0xf5, 0x2f, 0x03, 0xdd, 0xf8, 0x3c, 0x60, 0x1e, 0x0e, 0x4e, 0x02, 0x2c, 0x46, 0xea, - 0xf2, 0x26, 0x2a, 0x6b, 0x0e, 0x59, 0xd7, 0xe8, 0xe8, 0x66, 0xce, 0x5a, 0x99, 0xe9, 0x3e, 0xfe, - 0x0c, 0xdd, 0x2c, 0xea, 0xb8, 0x38, 0x5c, 0x9d, 0xcc, 0xe1, 0xad, 0x8b, 0x1f, 0x76, 0x36, 0xf2, - 0x3b, 0xec, 0xeb, 0x83, 0x7e, 0xe8, 0x6c, 0x90, 0x9a, 0xc0, 0x37, 0x3b, 0xa8, 0x45, 0x3d, 0xe2, - 0x0a, 0x78, 0xe1, 0x46, 0xe3, 0x50, 0xdf, 0xcb, 0x82, 0xd3, 0xa4, 0x1e, 0x39, 0x81, 0x17, 0x5f, - 0x8d, 0x43, 0xf3, 0x3e, 0xfa, 0x20, 0x1f, 0x44, 0x6e, 0x82, 0x03, 0x57, 0xd9, 0xbb, 0xd8, 0xf7, - 0xb9, 0xbe, 0xa6, 0x55, 0xe7, 0x56, 0xbe, 0x7b, 0x86, 0x03, 0xe5, 0xec, 0xc0, 0xf7, 0xb9, 0xf5, - 0xcf, 0x45, 0xb4, 0x34, 0xc0, 0x1c, 0x87, 0xc2, 0x3c, 0x45, 0x1b, 0x12, 0xc2, 0x38, 0xc0, 0x12, - 0xdc, 0x94, 0x23, 0xb3, 0x4c, 0x3f, 0xd6, 0xdc, 0x59, 0x9d, 0x2d, 0x76, 0x65, 0x9a, 0x24, 0x7b, - 0x76, 0x5f, 0x4b, 0x4f, 0x24, 0x96, 0xe0, 0xac, 0xe7, 0x18, 0xa9, 0xd0, 0xfc, 0x25, 0x6a, 0x4b, - 0x3e, 0x16, 0xb2, 0x64, 0xaf, 0xb2, 0x6d, 0xd3, 0xab, 0xfc, 0x20, 0xdf, 0x4f, 0x1b, 0xbe, 0x68, - 0xd7, 0xab, 0x89, 0xaa, 0xf1, 0xdf, 0x10, 0xd5, 0x09, 0xba, 0xa5, 0x58, 0x7e, 0x1a, 0x73, 0x61, - 0x76, 0xcc, 0x9b, 0xca, 0xbe, 0x0e, 0xfa, 0x35, 0x32, 0x13, 0x41, 0xa6, 0x31, 0x17, 0xdf, 0x23, - 0xce, 0x44, 0x90, 0x3a, 0xa4, 0x8f, 0xb6, 0x85, 0x2a, 0x3e, 0x37, 0x04, 0xa9, 0x69, 0x2f, 0x0e, - 0x20, 0xa2, 0x62, 0x94, 0x83, 0x2f, 0xcd, 0x0e, 0xbe, 0xa5, 0x81, 0xbe, 0x54, 0x38, 0x4e, 0x0e, - 0x93, 0x79, 0xe9, 0xa3, 0xce, 0xd5, 0x5e, 0x8a, 0x0b, 0x5a, 0xd6, 0x17, 0xf4, 0xa3, 0x2b, 0x20, - 0x8a, 0x5b, 0xda, 0x47, 0xb7, 0x43, 0xfc, 0xca, 0x95, 0x23, 0xce, 0xa4, 0x0c, 0xc0, 0x77, 0x63, - 0x4c, 0xce, 0x41, 0x0a, 0x3d, 0xa3, 0x1a, 0xce, 0xad, 0x10, 0xbf, 0x3a, 0xcd, 0xf7, 0x06, 0xe9, - 0x96, 0x29, 0xd0, 0x47, 0x15, 0x4a, 0x7f, 0x89, 0xb9, 0xef, 0xfa, 0x10, 0xb1, 0xd0, 0xe5, 0x30, - 0x54, 0xbc, 0x87, 0x53, 0x76, 0x07, 0x28, 0xc6, 0x52, 0xd6, 0xc8, 0xea, 0x95, 0x51, 0x34, 0x71, - 0x9f, 0xd1, 0x28, 0x9b, 0xdd, 0x56, 0xc9, 0xfc, 0x0a, 0xed, 0xa1, 0x02, 0x73, 0x2a, 0x58, 0x8f, - 0x01, 0x2c, 0x0f, 0xdd, 0x7c, 0x82, 0x23, 0x5f, 0x8c, 0xf0, 0x39, 0x7c, 0x09, 0x12, 0xfb, 0x58, - 0xe2, 0x5a, 0xcf, 0x3c, 0x07, 0x70, 0x63, 0xc6, 0x82, 0xb4, 0x67, 0x52, 0x0a, 0x2a, 0x7a, 0xe6, - 0x31, 0xc0, 0x80, 0xb1, 0x40, 0xf5, 0x8c, 0xd9, 0x46, 0xcb, 0x09, 0x70, 0x51, 0x56, 0x70, 0xbe, - 0xb4, 0x7e, 0x86, 0x9a, 0x9a, 0x34, 0x0e, 0xc8, 0xb9, 0x30, 0xb7, 0x51, 0x53, 0x21, 0x81, 0x10, - 0x20, 0xda, 0x46, 0xb7, 0xb1, 0xdb, 0x74, 0x4a, 0x81, 0x25, 0xd1, 0xd6, 0x75, 0xef, 0x22, 0x61, - 0x3e, 0x43, 0xcb, 0x31, 0xe8, 0xa1, 0xad, 0x0d, 0x5b, 0xfb, 0x9f, 0xda, 0x33, 0xbc, 0x3d, 0xed, - 0xeb, 0x00, 0x9d, 0x1c, 0xcd, 0xe2, 0xe5, 0x6b, 0x6c, 0x6a, 0x56, 0x08, 0xf3, 0x6c, 0xda, 0xe9, - 0xaf, 0xde, 0xcb, 0xe9, 0x14, 0x5e, 0xe9, 0xf3, 0x63, 0xd4, 0x3a, 0x48, 0xd3, 0xfe, 0x35, 0x15, - 0xf2, 0xf2, 0xb1, 0xac, 0x56, 0x8f, 0xe5, 0x0b, 0xb4, 0x9e, 0x8d, 0xb8, 0x53, 0xa6, 0x89, 0xcf, - 0xfc, 0x31, 0x42, 0xd9, 0x6c, 0x54, 0x84, 0x99, 0x5e, 0x4b, 0x33, 0x93, 0x1c, 0xf9, 0xb5, 0x51, - 0x35, 0x5f, 0x1b, 0x55, 0x96, 0x83, 0x36, 0xce, 0x04, 0xf9, 0x4d, 0xfe, 0xfe, 0x79, 0x1a, 0x0b, - 0xf3, 0x36, 0x5a, 0x52, 0xbd, 0x9a, 0x01, 0x2d, 0x38, 0x8b, 0x89, 0x20, 0x47, 0xbe, 0xb9, 0x5b, - 0x7d, 0x63, 0xb1, 0xd8, 0xa5, 0xbe, 0x68, 0xcf, 0x77, 0x1b, 0xbb, 0x0b, 0xce, 0xfa, 0xb8, 0x34, - 0x3f, 0xf2, 0x85, 0xf5, 0x5b, 0xd4, 0xaa, 0x00, 0x9a, 0xeb, 0x68, 0xbe, 0xc0, 0x9a, 0xa7, 0xbe, - 0xf9, 0x00, 0x6d, 0x95, 0x40, 0x75, 0xba, 0x4f, 0x11, 0x9b, 0xce, 0x9d, 0x42, 0xa1, 0xc6, 0xf8, - 0xc2, 0x7a, 0x8a, 0x36, 0x8f, 0x4a, 0x72, 0x29, 0x86, 0x49, 0x2d, 0x43, 0xa3, 0x3e, 0x8c, 0xb7, - 0x51, 0xb3, 0xf8, 0x21, 0xa1, 0xb3, 0x5f, 0x70, 0x4a, 0x81, 0x15, 0xa2, 0x1b, 0x67, 0x82, 0x9c, - 0x40, 0xe4, 0x97, 0x60, 0xd7, 0x1c, 0xc0, 0xe1, 0x34, 0xd0, 0xcc, 0x0f, 0xd5, 0xd2, 0xdd, 0x6b, - 0x03, 0xb5, 0x1f, 0xbd, 0x8a, 0x19, 0x97, 0xe0, 0x5f, 0xf2, 0xfb, 0x8e, 0x24, 0x68, 0xca, 0x9f, - 0x02, 0x22, 0xdf, 0x9d, 0x0e, 0xe2, 0x17, 0x33, 0x95, 0xe0, 0xb4, 0xb7, 0x8c, 0x15, 0x14, 0xaf, - 0xd6, 0xe4, 0xd6, 0x9f, 0x0c, 0xd4, 0x3e, 0x86, 0xc9, 0x81, 0x10, 0x74, 0x18, 0x85, 0x10, 0x49, - 0xc5, 0x67, 0x98, 0x80, 0xfa, 0x34, 0x3f, 0x44, 0x6b, 0x05, 0x17, 0x14, 0x14, 0xb0, 0xea, 0xac, - 0xe6, 0x42, 0xdd, 0xfb, 0x0f, 0x10, 0x8a, 0x39, 0x24, 0x2e, 0x71, 0xcf, 0x61, 0x92, 0x05, 0xb9, - 0x5d, 0x1d, 0x87, 0xe9, 0x4f, 0x29, 0x7b, 0x30, 0xf6, 0x02, 0x4a, 0x8e, 0x61, 0xe2, 0xac, 0x28, - 0xfd, 0xfe, 0x31, 0x4c, 0xd4, 0xf3, 0x26, 0x66, 0x2f, 0x81, 0xeb, 0x19, 0xd6, 0x70, 0xd2, 0x85, - 0xf5, 0x67, 0x03, 0xdd, 0x39, 0xc3, 0x01, 0xf5, 0xb1, 0x64, 0x3c, 0x2f, 0x89, 0xc1, 0xd8, 0x53, - 0x16, 0xef, 0x38, 0xb5, 0x4b, 0xd1, 0xce, 0x5f, 0x11, 0xed, 0x67, 0x68, 0xb5, 0x28, 0x42, 0x15, - 0x6f, 0x63, 0x86, 0x78, 0x5b, 0xb9, 0xc5, 0x31, 0x4c, 0xac, 0x3f, 0x54, 0x62, 0x3b, 0x9c, 0x54, - 0xf8, 0x85, 0xff, 0x87, 0xd8, 0x0a, 0xb7, 0xd5, 0xd8, 0x48, 0xd5, 0xfe, 0x52, 0x02, 0x8d, 0xcb, - 0x09, 0x58, 0x7f, 0x35, 0xd0, 0x66, 0xd5, 0xab, 0x38, 0x65, 0x03, 0x3e, 0x8e, 0xe0, 0x5d, 0xde, - 0xcb, 0x12, 0x9f, 0xaf, 0x96, 0xf8, 0x33, 0xb4, 0x5e, 0x0b, 0x4a, 0x64, 0xa7, 0xf1, 0xf3, 0x99, - 0x4a, 0xac, 0xc2, 0x60, 0xce, 0x5a, 0x35, 0x0f, 0x71, 0xf8, 0xec, 0xbb, 0x8b, 0x8e, 0xf1, 0xfd, - 0x45, 0xc7, 0xf8, 0xc7, 0x45, 0xc7, 0xf8, 0xe6, 0x6d, 0x67, 0xee, 0xfb, 0xb7, 0x9d, 0xb9, 0xbf, - 0xbf, 0xed, 0xcc, 0xfd, 0xee, 0xd3, 0x21, 0x95, 0xa3, 0xb1, 0x67, 0x13, 0x16, 0xf6, 0xb2, 0xdf, - 0xc9, 0xa5, 0xaf, 0x4f, 0x8a, 0xbf, 0x1d, 0x92, 0xfb, 0xbd, 0x57, 0xf5, 0xff, 0x1e, 0xe4, 0x24, - 0x06, 0xe1, 0x2d, 0xe9, 0xce, 0xbb, 0xff, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0xcb, 0xb7, - 0xa6, 0xac, 0x10, 0x00, 0x00, + // 1645 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4d, 0x73, 0x1b, 0xc7, + 0xd1, 0xe6, 0x12, 0xfc, 0xc2, 0x80, 0x1f, 0xe2, 0x92, 0xb2, 0x96, 0x7a, 0xf9, 0x82, 0xd0, 0x3a, + 0x71, 0x31, 0xe5, 0xf2, 0x22, 0xa4, 0x2a, 0x55, 0x29, 0x55, 0x5c, 0x2e, 0x12, 0x92, 0x2c, 0x9a, + 0xb1, 0x05, 0x2f, 0x19, 0xaa, 0x92, 0x1c, 0xb6, 0x66, 0x67, 0x5b, 0xc0, 0x14, 0x77, 0x77, 0x56, + 0x33, 0x83, 0x95, 0x70, 0xc9, 0x39, 0x47, 0xe7, 0xe6, 0x4a, 0x2e, 0x4e, 0xfe, 0x40, 0xfe, 0x86, + 0x8f, 0x3e, 0xe6, 0x64, 0xa7, 0xa4, 0x43, 0x0e, 0xf9, 0x13, 0xa9, 0x99, 0xfd, 0x04, 0x48, 0x2a, + 0x50, 0x25, 0xb9, 0xed, 0xf4, 0x74, 0x3f, 0xdd, 0x3d, 0xd3, 0xfd, 0xf4, 0x00, 0xe8, 0x90, 0xc6, + 0x12, 0x38, 0x19, 0x62, 0x1a, 0x7b, 0x02, 0xc8, 0x88, 0x53, 0x39, 0xee, 0x12, 0x92, 0x76, 0x13, + 0xce, 0x52, 0x1a, 0x00, 0xef, 0xa6, 0x07, 0xe5, 0xb7, 0x93, 0x70, 0x26, 0x99, 0xf9, 0xfe, 0x35, + 0x36, 0x0e, 0x21, 0xa9, 0x53, 0xea, 0xa5, 0x07, 0x77, 0xb7, 0x07, 0x6c, 0xc0, 0xb4, 0x7e, 0x57, + 0x7d, 0x65, 0xa6, 0x77, 0xf7, 0x06, 0x8c, 0x0d, 0x42, 0xe8, 0xea, 0x95, 0x3f, 0x7a, 0xde, 0x95, + 0x34, 0x02, 0x21, 0x71, 0x94, 0xe4, 0x0a, 0xed, 0x69, 0x85, 0x60, 0xc4, 0xb1, 0xa4, 0x2c, 0x2e, + 0x00, 0xa8, 0x4f, 0xba, 0x84, 0x71, 0xe8, 0x92, 0x90, 0x42, 0x2c, 0x55, 0x78, 0xd9, 0x57, 0xae, + 0xd0, 0x55, 0x0a, 0x21, 0x1d, 0x0c, 0x65, 0x26, 0x16, 0x5d, 0x09, 0x71, 0x00, 0x3c, 0xa2, 0x99, + 0x72, 0xb5, 0xca, 0x0d, 0x76, 0x6b, 0xfb, 0x84, 0x8f, 0x13, 0xc9, 0xba, 0x97, 0x30, 0x16, 0xf9, + 0xee, 0x07, 0x84, 0x89, 0x88, 0x89, 0x2e, 0xa8, 0xc4, 0x62, 0x02, 0xdd, 0xf4, 0xc0, 0x07, 0x89, + 0x0f, 0x4a, 0x41, 0x11, 0x77, 0xae, 0xe7, 0x63, 0x51, 0xe9, 0x10, 0x46, 0xf3, 0xb8, 0xed, 0x1f, + 0x96, 0x90, 0xd5, 0x63, 0xb1, 0x18, 0x45, 0xc0, 0x8f, 0x82, 0x80, 0xaa, 0x94, 0xfa, 0x9c, 0x25, + 0x4c, 0xe0, 0xd0, 0xdc, 0x46, 0x8b, 0x92, 0xca, 0x10, 0x2c, 0xa3, 0x63, 0xec, 0x37, 0xdd, 0x6c, + 0x61, 0x76, 0x50, 0x2b, 0x00, 0x41, 0x38, 0x4d, 0x94, 0xb2, 0x35, 0xaf, 0xf7, 0xea, 0x22, 0x73, + 0x07, 0xad, 0x64, 0xb7, 0x40, 0x03, 0xab, 0xa1, 0xb7, 0x97, 0xf5, 0xfa, 0x24, 0x30, 0x3f, 0x45, + 0xeb, 0x34, 0xa6, 0x92, 0xe2, 0xd0, 0x1b, 0x82, 0x3a, 0x0d, 0x6b, 0xa1, 0x63, 0xec, 0xb7, 0x0e, + 0xef, 0x3a, 0xd4, 0x27, 0x8e, 0x3a, 0x40, 0x27, 0x3f, 0xb6, 0xf4, 0xc0, 0x79, 0xa2, 0x35, 0x8e, + 0x17, 0xbe, 0xfd, 0x7e, 0x6f, 0xce, 0x5d, 0xcb, 0xed, 0x32, 0xa1, 0x79, 0x0f, 0xad, 0x0e, 0x20, + 0x06, 0x41, 0x85, 0x37, 0xc4, 0x62, 0x68, 0x2d, 0x76, 0x8c, 0xfd, 0x55, 0xb7, 0x95, 0xcb, 0x9e, + 0x60, 0x31, 0x34, 0xf7, 0x50, 0xcb, 0xa7, 0x31, 0xe6, 0xe3, 0x4c, 0x63, 0x49, 0x6b, 0xa0, 0x4c, + 0xa4, 0x15, 0x7a, 0x08, 0x89, 0x04, 0xbf, 0x8c, 0x3d, 0x75, 0xdb, 0xd6, 0x72, 0x1e, 0x48, 0x76, + 0xd3, 0x4e, 0x71, 0xd3, 0xce, 0x79, 0x51, 0x0a, 0xc7, 0x2b, 0x2a, 0x90, 0xaf, 0x7e, 0xd8, 0x33, + 0xdc, 0xa6, 0xb6, 0x53, 0x3b, 0xe6, 0x17, 0xe8, 0xd6, 0x28, 0xf6, 0x59, 0x1c, 0xd0, 0x78, 0xe0, + 0x25, 0xc0, 0x29, 0x0b, 0xac, 0x15, 0x0d, 0xb5, 0x73, 0x05, 0xea, 0x61, 0x5e, 0x34, 0x19, 0xd2, + 0xd7, 0x0a, 0x69, 0xa3, 0x34, 0xee, 0x6b, 0x5b, 0xf3, 0x4b, 0x64, 0x12, 0x92, 0xea, 0x90, 0xd8, + 0x48, 0x16, 0x88, 0xcd, 0xd9, 0x11, 0x6f, 0x11, 0x92, 0x9e, 0x67, 0xd6, 0x39, 0xe4, 0x6f, 0xd1, + 0x1d, 0xc9, 0x71, 0x2c, 0x9e, 0x03, 0x9f, 0xc6, 0x45, 0xb3, 0xe3, 0xde, 0x2e, 0x30, 0x26, 0xc1, + 0x9f, 0xa0, 0x0e, 0xc9, 0x0b, 0xc8, 0xe3, 0x10, 0x50, 0x21, 0x39, 0xf5, 0x47, 0xca, 0xd6, 0x7b, + 0xce, 0x31, 0xd1, 0x35, 0xd2, 0xd2, 0x45, 0xd0, 0x2e, 0xf4, 0xdc, 0x09, 0xb5, 0xc7, 0xb9, 0x96, + 0xf9, 0x14, 0xfd, 0xc8, 0x0f, 0x19, 0xb9, 0x14, 0x2a, 0x38, 0x6f, 0x02, 0x49, 0xbb, 0x8e, 0xa8, + 0x10, 0x0a, 0x6d, 0xb5, 0x63, 0xec, 0x37, 0xdc, 0x7b, 0x99, 0x6e, 0x1f, 0xf8, 0xc3, 0x9a, 0xe6, + 0x79, 0x4d, 0xd1, 0xfc, 0x08, 0x99, 0x43, 0x2a, 0x24, 0xe3, 0x94, 0xe0, 0xd0, 0x83, 0x58, 0x72, + 0x0a, 0xc2, 0x5a, 0xd3, 0xe6, 0x9b, 0xd5, 0xce, 0xa3, 0x6c, 0xc3, 0xfc, 0x0c, 0xdd, 0xbb, 0xd1, + 0xa9, 0x47, 0x86, 0x38, 0x8e, 0x21, 0xb4, 0xd6, 0x75, 0x2a, 0x7b, 0xc1, 0x0d, 0x3e, 0x7b, 0x99, + 0xda, 0x83, 0x95, 0xdf, 0x7f, 0xb3, 0x37, 0xf7, 0xf5, 0x37, 0x7b, 0x73, 0xf6, 0x5f, 0x0d, 0x74, + 0xa7, 0x57, 0x26, 0x1e, 0xb1, 0x14, 0x87, 0xff, 0xcb, 0x06, 0x3b, 0x42, 0x4d, 0x21, 0x59, 0x92, + 0x95, 0xf4, 0xc2, 0x3b, 0x94, 0xf4, 0x8a, 0x32, 0x53, 0x1b, 0xf6, 0x9f, 0x0c, 0xb4, 0xfd, 0xe8, + 0xc5, 0x88, 0xa6, 0x8c, 0xe0, 0xff, 0x0a, 0x1f, 0x9c, 0xa2, 0x35, 0xa8, 0xe1, 0x09, 0xab, 0xd1, + 0x69, 0xec, 0xb7, 0x0e, 0x7f, 0xec, 0x64, 0xe4, 0xe4, 0x94, 0x9c, 0x95, 0x13, 0x94, 0x53, 0xf7, + 0xee, 0x4e, 0xda, 0xda, 0xff, 0x34, 0xd0, 0xad, 0x4f, 0x43, 0xe6, 0xe3, 0xf0, 0x2c, 0xc4, 0x62, + 0xa8, 0x2e, 0x6f, 0xac, 0xb2, 0xe6, 0x90, 0x77, 0x8d, 0x8e, 0x6e, 0xe6, 0xac, 0x95, 0x99, 0xee, + 0xe3, 0x4f, 0xd0, 0x66, 0x59, 0xc7, 0xe5, 0xe1, 0xea, 0x64, 0x8e, 0xb7, 0x5e, 0x7f, 0xbf, 0xb7, + 0x51, 0xdc, 0x61, 0x4f, 0x1f, 0xf4, 0x43, 0x77, 0x83, 0x4c, 0x08, 0x02, 0xb3, 0x8d, 0x5a, 0xd4, + 0x27, 0x9e, 0x80, 0x17, 0x5e, 0x3c, 0x8a, 0xf4, 0xbd, 0x2c, 0xb8, 0x4d, 0xea, 0x93, 0x33, 0x78, + 0xf1, 0xc5, 0x28, 0x32, 0xef, 0xa3, 0xf7, 0x8a, 0x41, 0xe4, 0xa5, 0x38, 0xf4, 0x94, 0xbd, 0x87, + 0x83, 0x80, 0xeb, 0x6b, 0x5a, 0x75, 0xb7, 0x8a, 0xdd, 0x0b, 0x1c, 0x2a, 0x67, 0x47, 0x41, 0xc0, + 0xed, 0x7f, 0x2c, 0xa2, 0xa5, 0x3e, 0xe6, 0x38, 0x12, 0xe6, 0x39, 0xda, 0x90, 0x10, 0x25, 0x21, + 0x96, 0xe0, 0x65, 0x1c, 0x99, 0x67, 0xfa, 0xa1, 0xe6, 0xce, 0xfa, 0x6c, 0x71, 0x6a, 0xd3, 0x24, + 0x3d, 0x70, 0x7a, 0x5a, 0x7a, 0x26, 0xb1, 0x04, 0x77, 0xbd, 0xc0, 0xc8, 0x84, 0xe6, 0xcf, 0x91, + 0x25, 0xf9, 0x48, 0xc8, 0x8a, 0xbd, 0xaa, 0xb6, 0xcd, 0xae, 0xf2, 0xbd, 0x62, 0x3f, 0x6b, 0xf8, + 0xb2, 0x5d, 0xaf, 0x27, 0xaa, 0xc6, 0x7f, 0x42, 0x54, 0x67, 0x68, 0x4b, 0xb1, 0xfc, 0x34, 0xe6, + 0xc2, 0xec, 0x98, 0x9b, 0xca, 0x7e, 0x12, 0xf4, 0x4b, 0x64, 0xa6, 0x82, 0x4c, 0x63, 0x2e, 0xbe, + 0x43, 0x9c, 0xa9, 0x20, 0x93, 0x90, 0x01, 0xda, 0x15, 0xaa, 0xf8, 0xbc, 0x08, 0xa4, 0xa6, 0xbd, + 0x24, 0x84, 0x98, 0x8a, 0x61, 0x01, 0xbe, 0x34, 0x3b, 0xf8, 0x8e, 0x06, 0xfa, 0x5c, 0xe1, 0xb8, + 0x05, 0x4c, 0xee, 0xa5, 0x87, 0xda, 0xd7, 0x7b, 0x29, 0x2f, 0x68, 0x59, 0x5f, 0xd0, 0xff, 0x5d, + 0x03, 0x51, 0xde, 0xd2, 0x21, 0xba, 0x1d, 0xe1, 0x57, 0x9e, 0x1c, 0x72, 0x26, 0x65, 0x08, 0x81, + 0x97, 0x60, 0x72, 0x09, 0x52, 0xe8, 0x19, 0xd5, 0x70, 0xb7, 0x22, 0xfc, 0xea, 0xbc, 0xd8, 0xeb, + 0x67, 0x5b, 0xa6, 0x40, 0x1f, 0xd4, 0x28, 0xfd, 0x25, 0xe6, 0x81, 0x17, 0x40, 0xcc, 0x22, 0x8f, + 0xc3, 0x40, 0xf1, 0x1e, 0xce, 0xd8, 0x1d, 0xa0, 0x1c, 0x4b, 0x79, 0x23, 0xab, 0x57, 0x46, 0xd9, + 0xc4, 0x3d, 0x46, 0xe3, 0x7c, 0x76, 0xdb, 0x15, 0xf3, 0x2b, 0xb4, 0x87, 0x0a, 0xcc, 0xad, 0x61, + 0x3d, 0x06, 0xb0, 0x7d, 0xb4, 0xf9, 0x04, 0xc7, 0x81, 0x18, 0xe2, 0x4b, 0xf8, 0x1c, 0x24, 0x0e, + 0xb0, 0xc4, 0x13, 0x3d, 0xf3, 0x1c, 0xc0, 0x4b, 0x18, 0x0b, 0xb3, 0x9e, 0xc9, 0x28, 0xa8, 0xec, + 0x99, 0xc7, 0x00, 0x7d, 0xc6, 0x42, 0xd5, 0x33, 0xa6, 0x85, 0x96, 0x53, 0xe0, 0xa2, 0xaa, 0xe0, + 0x62, 0x69, 0xff, 0x04, 0x35, 0x35, 0x69, 0x1c, 0x91, 0x4b, 0x61, 0xee, 0xa2, 0xa6, 0x42, 0x02, + 0x21, 0x40, 0x58, 0x46, 0xa7, 0xb1, 0xdf, 0x74, 0x2b, 0x81, 0x2d, 0xd1, 0xce, 0x4d, 0xef, 0x22, + 0x61, 0x3e, 0x43, 0xcb, 0x09, 0xe8, 0xa1, 0xad, 0x0d, 0x5b, 0x87, 0x1f, 0x3b, 0x33, 0xbc, 0x3d, + 0x9d, 0x9b, 0x00, 0xdd, 0x02, 0xcd, 0xe6, 0xd5, 0x6b, 0x6c, 0x6a, 0x56, 0x08, 0xf3, 0x62, 0xda, + 0xe9, 0x2f, 0xde, 0xc9, 0xe9, 0x14, 0x5e, 0xe5, 0xf3, 0x43, 0xd4, 0x3a, 0xca, 0xd2, 0xfe, 0x25, + 0x15, 0xf2, 0xea, 0xb1, 0xac, 0xd6, 0x8f, 0xe5, 0x33, 0xb4, 0x9e, 0x8f, 0xb8, 0x73, 0xa6, 0x89, + 0xcf, 0xfc, 0x7f, 0x84, 0xf2, 0xd9, 0xa8, 0x08, 0x33, 0xbb, 0x96, 0x66, 0x2e, 0x39, 0x09, 0x26, + 0x46, 0xd5, 0xfc, 0xc4, 0xa8, 0xb2, 0x5d, 0xb4, 0x71, 0x21, 0xc8, 0xaf, 0x8a, 0xf7, 0xcf, 0xd3, + 0x44, 0x98, 0xb7, 0xd1, 0x92, 0xea, 0xd5, 0x1c, 0x68, 0xc1, 0x5d, 0x4c, 0x05, 0x39, 0x09, 0xcc, + 0xfd, 0xfa, 0x1b, 0x8b, 0x25, 0x1e, 0x0d, 0x84, 0x35, 0xdf, 0x69, 0xec, 0x2f, 0xb8, 0xeb, 0xa3, + 0xca, 0xfc, 0x24, 0x10, 0xf6, 0xaf, 0x51, 0xab, 0x06, 0x68, 0xae, 0xa3, 0xf9, 0x12, 0x6b, 0x9e, + 0x06, 0xe6, 0x03, 0xb4, 0x53, 0x01, 0x4d, 0xd2, 0x7d, 0x86, 0xd8, 0x74, 0xef, 0x94, 0x0a, 0x13, + 0x8c, 0x2f, 0xec, 0xa7, 0x68, 0xfb, 0xa4, 0x22, 0x97, 0x72, 0x98, 0x4c, 0x64, 0x68, 0x4c, 0x0e, + 0xe3, 0x5d, 0xd4, 0x2c, 0x7f, 0x48, 0xe8, 0xec, 0x17, 0xdc, 0x4a, 0x60, 0x47, 0xe8, 0xd6, 0x85, + 0x20, 0x67, 0x10, 0x07, 0x15, 0xd8, 0x0d, 0x07, 0x70, 0x3c, 0x0d, 0x34, 0xf3, 0x43, 0xb5, 0x72, + 0xf7, 0x17, 0x03, 0x59, 0x8f, 0x5e, 0x25, 0x8c, 0x4b, 0x08, 0xae, 0xf8, 0x7d, 0x4b, 0x12, 0x97, + 0x68, 0x4b, 0x85, 0x24, 0x20, 0x0e, 0xbc, 0x12, 0x2d, 0x3b, 0xad, 0xd6, 0xe1, 0xcf, 0x66, 0xaa, + 0xc1, 0x69, 0x77, 0x39, 0x2d, 0x6c, 0xa6, 0x53, 0x72, 0x61, 0xff, 0xc1, 0x40, 0xd6, 0x29, 0x8c, + 0x8f, 0x84, 0xa0, 0x83, 0x38, 0x82, 0x58, 0x2a, 0x46, 0xc3, 0x04, 0xd4, 0xa7, 0xf9, 0x3e, 0x5a, + 0x2b, 0xd9, 0xa0, 0x24, 0x81, 0x55, 0x77, 0xb5, 0x10, 0xea, 0xee, 0x7f, 0x80, 0x50, 0xc2, 0x21, + 0xf5, 0x88, 0x77, 0x09, 0xe3, 0xfc, 0xac, 0x76, 0xeb, 0x03, 0x31, 0xfb, 0x31, 0xe5, 0xf4, 0x47, + 0x7e, 0x48, 0xc9, 0x29, 0x8c, 0xdd, 0x15, 0xa5, 0xdf, 0x3b, 0x85, 0xb1, 0x7a, 0xe0, 0x24, 0xec, + 0x25, 0x70, 0x3d, 0xc5, 0x1a, 0x6e, 0xb6, 0xb0, 0xff, 0x68, 0xa0, 0x3b, 0x17, 0x38, 0xa4, 0x01, + 0x96, 0x8c, 0x17, 0x45, 0xd1, 0x1f, 0xf9, 0xca, 0xe2, 0x2d, 0xe7, 0x76, 0x25, 0xda, 0xf9, 0x6b, + 0xa2, 0xfd, 0x04, 0xad, 0x96, 0x65, 0xa8, 0xe2, 0x6d, 0xcc, 0x10, 0x6f, 0xab, 0xb0, 0x38, 0x85, + 0xb1, 0xfd, 0xbb, 0x5a, 0x6c, 0xc7, 0xe3, 0x1a, 0xc3, 0xf0, 0x7f, 0x13, 0x5b, 0xe9, 0xb6, 0x1e, + 0x1b, 0xa9, 0xdb, 0x5f, 0x49, 0xa0, 0x71, 0x35, 0x01, 0xfb, 0xcf, 0x06, 0xda, 0xae, 0x7b, 0x15, + 0xe7, 0xac, 0xcf, 0x47, 0x31, 0xbc, 0xcd, 0x7b, 0x55, 0xe4, 0xf3, 0xf5, 0x22, 0x7f, 0x86, 0xd6, + 0x27, 0x82, 0x12, 0xf9, 0x69, 0xfc, 0x74, 0xa6, 0x1a, 0xab, 0x71, 0x98, 0xbb, 0x56, 0xcf, 0x43, + 0x1c, 0x3f, 0xfb, 0xf6, 0x75, 0xdb, 0xf8, 0xee, 0x75, 0xdb, 0xf8, 0xfb, 0xeb, 0xb6, 0xf1, 0xd5, + 0x9b, 0xf6, 0xdc, 0x77, 0x6f, 0xda, 0x73, 0x7f, 0x7b, 0xd3, 0x9e, 0xfb, 0xcd, 0xc7, 0x03, 0x2a, + 0x87, 0x23, 0xdf, 0x21, 0x2c, 0xea, 0xe6, 0xbf, 0x94, 0x2b, 0x5f, 0x1f, 0x95, 0x7f, 0x3c, 0xa4, + 0xf7, 0xbb, 0xaf, 0x26, 0xff, 0x7d, 0x90, 0xe3, 0x04, 0x84, 0xbf, 0xa4, 0x7b, 0xef, 0xfe, 0xbf, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x34, 0xfa, 0x5d, 0xae, 0x10, 0x00, 0x00, } func (m *ConsumerAdditionProposal) Marshal() (dAtA []byte, err error) { @@ -2165,16 +2165,20 @@ func (m *ExportedVscSendTimestamp) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - { - size, err := m.VscSendTimestamp.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.VscSendTimestamps) > 0 { + for iNdEx := len(m.VscSendTimestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VscSendTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProvider(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - i -= size - i = encodeVarintProvider(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0x12 if len(m.ChainId) > 0 { i -= len(m.ChainId) copy(dAtA[i:], m.ChainId) @@ -2709,8 +2713,12 @@ func (m *ExportedVscSendTimestamp) Size() (n int) { if l > 0 { n += 1 + l + sovProvider(uint64(l)) } - l = m.VscSendTimestamp.Size() - n += 1 + l + sovProvider(uint64(l)) + if len(m.VscSendTimestamps) > 0 { + for _, e := range m.VscSendTimestamps { + l = e.Size() + n += 1 + l + sovProvider(uint64(l)) + } + } return n } @@ -5184,7 +5192,7 @@ func (m *ExportedVscSendTimestamp) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamp", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamps", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5211,7 +5219,8 @@ func (m *ExportedVscSendTimestamp) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.VscSendTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.VscSendTimestamps = append(m.VscSendTimestamps, VscSendTimestamp{}) + if err := m.VscSendTimestamps[len(m.VscSendTimestamps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex From 0344988b3d53db1e320566670e16d35d973df5b4 Mon Sep 17 00:00:00 2001 From: Yaru Wang Date: Tue, 27 Jun 2023 10:59:40 +0200 Subject: [PATCH 9/9] fix: lint --- x/ccv/provider/keeper/genesis.go | 1 - 1 file changed, 1 deletion(-) diff --git a/x/ccv/provider/keeper/genesis.go b/x/ccv/provider/keeper/genesis.go index fdb5708db6..6c48124486 100644 --- a/x/ccv/provider/keeper/genesis.go +++ b/x/ccv/provider/keeper/genesis.go @@ -97,7 +97,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { for _, item := range genState.ExportedVscSendTimestamps { for _, vscSendTimestamp := range item.VscSendTimestamps { k.SetVscSendTimestamp(ctx, item.ChainId, vscSendTimestamp.VscId, vscSendTimestamp.Timestamp) - } }