From 5cc08df7eca745bf70e1bebb7dd715bec0656b10 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 19 Nov 2024 16:21:11 +0100 Subject: [PATCH 1/7] fix(x/staking): make metadata nullable --- api/cosmos/staking/v1beta1/staking.pulsar.go | 2 +- x/staking/client/cli/tx.go | 4 +- x/staking/client/cli/utils.go | 16 +- .../cosmos/staking/v1beta1/staking.proto | 2 +- x/staking/simulation/msg_factory.go | 4 +- x/staking/types/staking.pb.go | 405 +++++++++--------- x/staking/types/validator.go | 2 +- 7 files changed, 223 insertions(+), 212 deletions(-) diff --git a/api/cosmos/staking/v1beta1/staking.pulsar.go b/api/cosmos/staking/v1beta1/staking.pulsar.go index c2f9457ca822..6c301f72e05d 100644 --- a/api/cosmos/staking/v1beta1/staking.pulsar.go +++ b/api/cosmos/staking/v1beta1/staking.pulsar.go @@ -16175,7 +16175,7 @@ var file_cosmos_staking_v1beta1_staking_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x09, 0xc8, 0xde, - 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x1f, 0x01, 0xa8, 0xe7, 0xb0, 0x2a, 0x00, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3a, 0x04, 0xe8, 0xa0, 0x1f, 0x01, 0x22, 0x66, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x26, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x69, 0x63, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, diff --git a/x/staking/client/cli/tx.go b/x/staking/client/cli/tx.go index 0e1ba1c396dd..8976484241f8 100644 --- a/x/staking/client/cli/tx.go +++ b/x/staking/client/cli/tx.go @@ -133,7 +133,7 @@ func NewEditValidatorCmd() *cobra.Command { profilePicUri, _ := cmd.Flags().GetString(FlagMetadataProfilePicUri) socialHandlesUris, _ := cmd.Flags().GetStringArray(FlagMetadataSocialHandleUris) - metadata := types.Metadata{ + metadata := &types.Metadata{ ProfilePicUri: profilePicUri, SocialHandleUris: socialHandlesUris, } @@ -401,7 +401,7 @@ func BuildCreateValidatorMsg(clientCtx client.Context, config TxCreateValidatorC config.Website, config.SecurityContact, config.Details, - config.Metadata, + &config.Metadata, ) // get the initial validator commission parameters diff --git a/x/staking/client/cli/utils.go b/x/staking/client/cli/utils.go index fc4ed032efc4..00baf3504fd5 100644 --- a/x/staking/client/cli/utils.go +++ b/x/staking/client/cli/utils.go @@ -24,7 +24,7 @@ type validator struct { Website string Security string Details string - Metadata types.Metadata + Metadata *types.Metadata CommissionRates types.CommissionRates MinSelfDelegation math.Int } @@ -134,11 +134,15 @@ func buildCommissionRates(rateStr, maxRateStr, maxChangeRateStr string) (commiss return commission, nil } -func buildMetadata(profilePicUri string, socialHandlesUris []string) (metadata types.Metadata, err error) { - metadata.ProfilePicUri = profilePicUri - metadata.SocialHandleUris = socialHandlesUris +func buildMetadata(profilePicUri string, socialHandlesUris []string) (*types.Metadata, error) { + metadata := types.Metadata{ + ProfilePicUri: profilePicUri, + SocialHandleUris: socialHandlesUris, + } + if err := metadata.Validate(); err != nil { - return metadata, err + return nil, err } - return metadata, nil + + return &metadata, nil } diff --git a/x/staking/proto/cosmos/staking/v1beta1/staking.proto b/x/staking/proto/cosmos/staking/v1beta1/staking.proto index b6dd5fcbff78..495fa0020cfd 100644 --- a/x/staking/proto/cosmos/staking/v1beta1/staking.proto +++ b/x/staking/proto/cosmos/staking/v1beta1/staking.proto @@ -79,7 +79,7 @@ message Description { // details define other optional details. string details = 5; // metadata defines extra information about the validator. - Metadata metadata = 6 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + Metadata metadata = 6 [(gogoproto.nullable) = true, (amino.dont_omitempty) = false]; } // Metadata defines extra information about the validator. diff --git a/x/staking/simulation/msg_factory.go b/x/staking/simulation/msg_factory.go index 49aff2505298..a0a8c4a9df24 100644 --- a/x/staking/simulation/msg_factory.go +++ b/x/staking/simulation/msg_factory.go @@ -46,7 +46,7 @@ func MsgCreateValidatorFactory(k *keeper.Keeper) simsx.SimMsgFactoryFn[*types.Ms r.StringN(10), r.StringN(10), r.StringN(10), - types.Metadata{ + &types.Metadata{ ProfilePicUri: RandURIOfHostLength(r.Rand, 10), SocialHandleUris: RandSocialHandleURIs(r.Rand, 2, 10), }, @@ -143,7 +143,7 @@ func MsgEditValidatorFactory(k *keeper.Keeper) simsx.SimMsgFactoryFn[*types.MsgE } valOpAddrBz := must(k.ValidatorAddressCodec().StringToBytes(val.GetOperator())) valOper := testData.GetAccountbyAccAddr(reporter, valOpAddrBz) - d := types.NewDescription(r.StringN(10), r.StringN(10), r.StringN(10), r.StringN(10), r.StringN(10), types.Metadata{ + d := types.NewDescription(r.StringN(10), r.StringN(10), r.StringN(10), r.StringN(10), r.StringN(10), &types.Metadata{ ProfilePicUri: RandURIOfHostLength(r.Rand, 10), SocialHandleUris: RandSocialHandleURIs(r.Rand, 2, 10), }) diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 197e937a35d4..1a6ae219a100 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -271,7 +271,7 @@ type Description struct { // details define other optional details. Details string `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` // metadata defines extra information about the validator. - Metadata Metadata `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata"` + Metadata *Metadata `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (m *Description) Reset() { *m = Description{} } @@ -342,11 +342,11 @@ func (m *Description) GetDetails() string { return "" } -func (m *Description) GetMetadata() Metadata { +func (m *Description) GetMetadata() *Metadata { if m != nil { return m.Metadata } - return Metadata{} + return nil } // Metadata defines extra information about the validator. @@ -1449,7 +1449,7 @@ func init() { } var fileDescriptor_64c30c6cf92913c9 = []byte{ - // 2146 bytes of a gzipped FileDescriptorProto + // 2150 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4b, 0x6c, 0x1b, 0xc7, 0x19, 0xd6, 0x92, 0x34, 0x25, 0xfe, 0x14, 0x45, 0x6a, 0xfc, 0xa2, 0xe8, 0x58, 0x92, 0x19, 0x37, 0x91, 0xdd, 0x98, 0x8c, 0xdc, 0xc2, 0x05, 0x84, 0x20, 0x85, 0x29, 0xca, 0x36, 0x93, 0x58, 0x52, @@ -1489,102 +1489,102 @@ var fileDescriptor_64c30c6cf92913c9 = []byte{ 0xfb, 0x9e, 0xcd, 0x06, 0x86, 0xe9, 0x3a, 0x0c, 0x9b, 0x2c, 0x9f, 0x10, 0x24, 0x59, 0x7f, 0x7e, 0x55, 0x4e, 0x73, 0x10, 0x8b, 0x30, 0x6c, 0x77, 0x68, 0xfe, 0x84, 0x04, 0x51, 0x43, 0x74, 0x13, 0xa6, 0xba, 0x84, 0x61, 0x0b, 0x33, 0x9c, 0x4f, 0x0a, 0x99, 0x17, 0xc7, 0x69, 0xf4, 0xb6, 0xa2, - 0x8b, 0x3a, 0x73, 0xc0, 0xac, 0x64, 0x6e, 0xc1, 0x94, 0x4f, 0x86, 0x5e, 0x83, 0x6c, 0xcf, 0x73, - 0x5b, 0x76, 0x87, 0x18, 0x3d, 0xdb, 0x34, 0xfa, 0x9e, 0xad, 0xe4, 0xce, 0xa8, 0xe9, 0x4d, 0xdb, - 0x6c, 0x78, 0x36, 0x7a, 0x03, 0x10, 0x75, 0x4d, 0x1b, 0x77, 0x8c, 0x1d, 0xec, 0x58, 0x1d, 0xc2, - 0x29, 0xa9, 0x08, 0xad, 0x94, 0x9e, 0x93, 0x2b, 0xb7, 0xc4, 0x42, 0xc3, 0xb3, 0xa9, 0xda, 0xe7, - 0xfe, 0x24, 0xa4, 0x82, 0xe8, 0x42, 0xab, 0x90, 0x73, 0x7b, 0xc4, 0xe3, 0xdf, 0x06, 0xb6, 0x2c, - 0x8f, 0x50, 0xaa, 0xc2, 0x27, 0xff, 0xf8, 0xe1, 0x95, 0x53, 0x4a, 0x9e, 0xeb, 0x72, 0xa5, 0xce, - 0x3c, 0xdb, 0x69, 0xeb, 0x59, 0x9f, 0x43, 0x4d, 0xa3, 0xef, 0x73, 0x1f, 0x73, 0x28, 0x71, 0x68, - 0x9f, 0x1a, 0xbd, 0x7e, 0x73, 0x97, 0x0c, 0x94, 0x17, 0x9c, 0x1a, 0xf1, 0x82, 0xeb, 0xce, 0xa0, - 0x92, 0xff, 0x63, 0x08, 0x6d, 0x7a, 0x83, 0x1e, 0x73, 0x4b, 0x9b, 0xfd, 0xe6, 0xbb, 0x64, 0xc0, - 0x7d, 0x4b, 0xe1, 0x6c, 0x0a, 0x18, 0x74, 0x06, 0x92, 0x3f, 0xc6, 0x76, 0x87, 0x58, 0xc2, 0x84, - 0x53, 0xba, 0x1a, 0xa1, 0x15, 0x48, 0x52, 0x86, 0x59, 0x9f, 0x0a, 0xbb, 0xcd, 0x5c, 0x2d, 0x8e, - 0x53, 0x7d, 0xc5, 0x75, 0xac, 0xba, 0xa0, 0xd4, 0x15, 0x07, 0x5a, 0x85, 0x24, 0x73, 0x77, 0x89, - 0xa3, 0x2c, 0x5a, 0xf9, 0xba, 0x0a, 0xbf, 0xd3, 0xa3, 0xe1, 0x57, 0x73, 0x58, 0x24, 0xf0, 0x6a, - 0x0e, 0xd3, 0x15, 0x2b, 0xfa, 0x21, 0xe4, 0x2c, 0xd2, 0x21, 0x6d, 0xa1, 0x39, 0xba, 0x83, 0x3d, - 0x42, 0x85, 0x17, 0xa4, 0x2a, 0xcb, 0x47, 0x8e, 0x66, 0x3d, 0x1b, 0x40, 0xd5, 0x05, 0x12, 0xda, - 0x84, 0xb4, 0x15, 0xfa, 0x7f, 0x7e, 0x52, 0x28, 0xf3, 0xd5, 0x71, 0x32, 0x46, 0x42, 0x25, 0xea, - 0x61, 0x51, 0x08, 0xee, 0xf2, 0x7d, 0xa7, 0xe9, 0x3a, 0x96, 0xed, 0xb4, 0x8d, 0x1d, 0x62, 0xb7, - 0x77, 0x58, 0x7e, 0x6a, 0x51, 0x5b, 0x8a, 0xeb, 0xd9, 0x60, 0xfe, 0x96, 0x98, 0x46, 0x9b, 0x30, - 0x13, 0x92, 0x8a, 0x90, 0x4e, 0x1d, 0x35, 0xa4, 0x33, 0x01, 0x00, 0x27, 0x41, 0xb7, 0x01, 0xc2, - 0xa4, 0x91, 0x07, 0x81, 0x56, 0x3c, 0x3c, 0xfd, 0x44, 0x85, 0x89, 0x00, 0x20, 0x07, 0x4e, 0x76, - 0x6d, 0xc7, 0xa0, 0xa4, 0xd3, 0x32, 0x94, 0xe6, 0x38, 0x6e, 0x5a, 0xa8, 0xff, 0xed, 0x23, 0x58, - 0xf3, 0xd3, 0x87, 0x57, 0xb2, 0x72, 0x74, 0x85, 0x5a, 0xbb, 0x8b, 0x6f, 0x96, 0xbe, 0xf9, 0x2d, - 0x7d, 0xb6, 0x6b, 0x3b, 0x75, 0xd2, 0x69, 0x55, 0x03, 0x60, 0xf4, 0x16, 0x9c, 0x0b, 0x15, 0xe2, - 0x3a, 0xc6, 0x8e, 0xdb, 0xb1, 0x0c, 0x8f, 0xb4, 0x0c, 0xd3, 0xed, 0x3b, 0x2c, 0x3f, 0x2d, 0xd4, - 0x78, 0x36, 0x20, 0xd9, 0x70, 0x6e, 0xb9, 0x1d, 0x4b, 0x27, 0xad, 0x55, 0xbe, 0x8c, 0x5e, 0x85, - 0x50, 0x1b, 0x86, 0x6d, 0xd1, 0x7c, 0x66, 0x31, 0xbe, 0x94, 0xd0, 0xa7, 0x83, 0xc9, 0x9a, 0x45, - 0x57, 0xa6, 0x3e, 0x78, 0xb0, 0x30, 0xf1, 0xf9, 0x83, 0x85, 0x89, 0xe2, 0x0d, 0x98, 0xde, 0xc6, - 0x1d, 0x15, 0x5a, 0x84, 0xa2, 0x6b, 0x90, 0xc2, 0xfe, 0x20, 0xaf, 0xf1, 0xd0, 0x7e, 0x4e, 0x68, - 0x86, 0xa4, 0xc5, 0xdf, 0x6a, 0x90, 0xac, 0x6e, 0x6f, 0x62, 0xdb, 0x43, 0x6b, 0x30, 0x1b, 0xfa, - 0xea, 0x8b, 0x46, 0x79, 0xe8, 0xde, 0x7e, 0x98, 0xaf, 0xc3, 0xec, 0x9e, 0x9f, 0x38, 0x02, 0x18, - 0x59, 0x1b, 0x2f, 0x3c, 0x7e, 0x78, 0xe5, 0xbc, 0x82, 0x09, 0x92, 0xcb, 0x3e, 0xbc, 0xbd, 0x7d, - 0xf3, 0x11, 0x99, 0xdf, 0x81, 0x49, 0x79, 0x54, 0x8a, 0xbe, 0x0d, 0x27, 0x7a, 0xfc, 0x43, 0x88, - 0x9a, 0xbe, 0x3a, 0x3f, 0xd6, 0xe7, 0x05, 0x7d, 0xd4, 0x43, 0x24, 0x5f, 0xf1, 0x67, 0x31, 0x80, - 0xea, 0xf6, 0xf6, 0x96, 0x67, 0xf7, 0x3a, 0x84, 0x7d, 0x59, 0xb2, 0x37, 0xe0, 0x74, 0x28, 0x3b, - 0xf5, 0xcc, 0xa3, 0xcb, 0x7f, 0x32, 0xe0, 0xaf, 0x7b, 0xe6, 0x81, 0xb0, 0x16, 0x65, 0x01, 0x6c, - 0xfc, 0xe8, 0xb0, 0x55, 0xca, 0x46, 0x35, 0xfb, 0x3d, 0x48, 0x87, 0xca, 0xa0, 0xa8, 0x06, 0x53, - 0x4c, 0x7d, 0x2b, 0x05, 0x17, 0xc7, 0x2b, 0xd8, 0x67, 0x1b, 0xaa, 0x5a, 0x3e, 0x7b, 0xf1, 0xdf, - 0x1a, 0x40, 0x24, 0x46, 0xbe, 0x9a, 0x3e, 0x86, 0x6a, 0x90, 0x54, 0xc9, 0x39, 0x7e, 0xdc, 0xe4, - 0xac, 0x00, 0x22, 0x4a, 0xfd, 0x79, 0x0c, 0x4e, 0x36, 0xfc, 0xe8, 0xfd, 0xea, 0xeb, 0xa0, 0x01, - 0x93, 0xc4, 0x61, 0x9e, 0x2d, 0x94, 0xc0, 0x6d, 0xfe, 0xe6, 0x38, 0x9b, 0x1f, 0x20, 0xd4, 0x9a, - 0xc3, 0xbc, 0x41, 0xd4, 0x03, 0x7c, 0xac, 0x88, 0x3e, 0x7e, 0x19, 0x87, 0xfc, 0x38, 0x56, 0xf4, - 0x3a, 0x64, 0x4d, 0x8f, 0x88, 0x09, 0xbf, 0xee, 0x68, 0x22, 0x61, 0xce, 0xf8, 0xd3, 0xaa, 0xec, - 0xe8, 0xc0, 0x6f, 0x96, 0xdc, 0xb9, 0x38, 0xe9, 0xf1, 0xae, 0x92, 0x33, 0x21, 0x82, 0x28, 0x3c, - 0x5b, 0x90, 0xb5, 0x1d, 0x9b, 0xf1, 0x1b, 0x52, 0x13, 0x77, 0xb0, 0x63, 0xfa, 0x57, 0xee, 0x23, - 0xd5, 0xfc, 0x19, 0x85, 0x51, 0x91, 0x10, 0x68, 0x0d, 0x26, 0x7d, 0xb4, 0xc4, 0xd1, 0xd1, 0x7c, - 0x5e, 0x74, 0x01, 0xa6, 0xa3, 0x85, 0x41, 0xdc, 0x46, 0x12, 0x7a, 0x3a, 0x52, 0x17, 0x0e, 0xab, - 0x3c, 0xc9, 0xe7, 0x56, 0x1e, 0x75, 0xe1, 0xfb, 0x55, 0x1c, 0x66, 0x75, 0x62, 0xfd, 0xef, 0x9b, - 0x65, 0x13, 0x40, 0x86, 0x2a, 0xcf, 0xa4, 0xca, 0x32, 0xc7, 0x88, 0xf7, 0x94, 0x04, 0xa9, 0x52, - 0xf6, 0xdf, 0xb2, 0xd0, 0x5f, 0x62, 0x30, 0x1d, 0xb5, 0xd0, 0xff, 0x65, 0xd1, 0x42, 0xeb, 0x61, - 0x9a, 0x4a, 0x88, 0x34, 0x75, 0x69, 0x5c, 0x9a, 0x1a, 0xf1, 0xe6, 0x43, 0xf2, 0xd3, 0x17, 0x71, - 0x48, 0x6e, 0x62, 0x0f, 0x77, 0x29, 0xda, 0x18, 0xb9, 0xdb, 0xfa, 0x6d, 0x8c, 0xfd, 0xce, 0x5c, - 0x55, 0xbd, 0x12, 0xe9, 0xcb, 0x1f, 0x8d, 0xbb, 0xda, 0x7e, 0x0d, 0x66, 0xf8, 0xa3, 0x3e, 0x10, - 0x48, 0x2a, 0x37, 0x23, 0xde, 0xe6, 0x81, 0xf4, 0x14, 0x2d, 0x40, 0x9a, 0x93, 0x85, 0x79, 0x98, - 0xd3, 0x40, 0x17, 0xdf, 0x5d, 0x93, 0x33, 0x68, 0x19, 0xd0, 0x4e, 0xd0, 0x69, 0x31, 0x42, 0x45, - 0x68, 0x4b, 0x99, 0x4a, 0x2c, 0xaf, 0xe9, 0xb3, 0xe1, 0xaa, 0xcf, 0x72, 0x1e, 0x80, 0x9f, 0xc4, - 0xb0, 0x88, 0xe3, 0x76, 0xd5, 0xeb, 0x34, 0xc5, 0x67, 0xaa, 0x7c, 0x02, 0xfd, 0x54, 0x93, 0xd7, - 0xe4, 0x7d, 0xcf, 0x7f, 0xf5, 0x4a, 0xd9, 0x7a, 0x81, 0xc0, 0xf8, 0xd7, 0x93, 0x85, 0xc2, 0x00, - 0x77, 0x3b, 0x2b, 0xc5, 0x03, 0x70, 0x8a, 0x07, 0x75, 0x24, 0xf8, 0xe5, 0x79, 0xb8, 0x7d, 0x80, - 0x6a, 0x90, 0xdb, 0x25, 0x03, 0xc3, 0x73, 0x99, 0x4c, 0x36, 0x2d, 0x42, 0xd4, 0x7b, 0x66, 0xce, - 0xb7, 0x6f, 0x13, 0x53, 0x12, 0xb9, 0xfe, 0xdb, 0x4e, 0x25, 0xc1, 0x4f, 0xa7, 0xcf, 0xec, 0x92, - 0x81, 0xae, 0xf8, 0x6e, 0x10, 0xb2, 0x72, 0x91, 0x47, 0xcb, 0xbd, 0xcf, 0x3e, 0xbe, 0x7c, 0x2e, - 0xbc, 0xb4, 0x97, 0xef, 0x06, 0x8d, 0x3d, 0x69, 0x62, 0x7e, 0xf1, 0x45, 0x61, 0x11, 0xd2, 0x09, - 0xed, 0xf1, 0x37, 0x25, 0x7f, 0x83, 0x44, 0xde, 0x0a, 0xda, 0xf3, 0xdf, 0x20, 0x21, 0xff, 0xd0, - 0x1b, 0x24, 0x12, 0xa2, 0x6f, 0x87, 0x35, 0x20, 0x76, 0x98, 0x34, 0x51, 0xef, 0x54, 0x4c, 0x22, - 0xf2, 0x27, 0x8a, 0x7f, 0xd2, 0x60, 0x6e, 0xc4, 0x9b, 0x83, 0x23, 0x9b, 0x80, 0xbc, 0xc8, 0xa2, - 0xf0, 0x8a, 0x81, 0x3a, 0xfa, 0xf1, 0x82, 0x63, 0xd6, 0x1b, 0x29, 0x04, 0x5f, 0x4e, 0x31, 0x53, - 0x99, 0xec, 0x0f, 0x1a, 0x9c, 0x8a, 0x1e, 0x20, 0x10, 0xa5, 0x0e, 0xd3, 0xd1, 0xad, 0x95, 0x10, - 0x17, 0x5f, 0x44, 0x88, 0xe8, 0xf9, 0x87, 0x40, 0xd0, 0x76, 0x98, 0x31, 0x64, 0x3b, 0x71, 0xf9, - 0x85, 0x95, 0xe2, 0x1f, 0xec, 0xc0, 0xcc, 0x21, 0x6d, 0xf3, 0x85, 0x06, 0x89, 0x4d, 0xd7, 0xed, - 0xa0, 0x9f, 0xc0, 0xac, 0xe3, 0x32, 0x83, 0x47, 0x16, 0xb1, 0x0c, 0xd5, 0x3a, 0x90, 0xd9, 0x78, - 0xed, 0xb9, 0xba, 0xfa, 0xfb, 0x93, 0x85, 0x51, 0xce, 0x61, 0x05, 0xaa, 0x96, 0x9a, 0xe3, 0xb2, - 0x8a, 0x20, 0xda, 0x92, 0xdd, 0x85, 0x16, 0x64, 0x86, 0xb7, 0x93, 0x19, 0xfb, 0xfa, 0x61, 0xdb, - 0x65, 0x0e, 0xdd, 0x6a, 0xba, 0x19, 0xd9, 0x67, 0x65, 0x8a, 0x5b, 0xed, 0x1f, 0xdc, 0x72, 0xef, - 0x43, 0x2e, 0x48, 0x57, 0x0d, 0xd1, 0x8f, 0xa3, 0xe8, 0x06, 0x4c, 0xca, 0xd6, 0x9c, 0xff, 0x58, - 0xb8, 0x10, 0x36, 0x7b, 0x71, 0xd3, 0xb4, 0x4b, 0x7b, 0x91, 0x46, 0xad, 0x64, 0x1a, 0xd2, 0xa7, - 0x62, 0x16, 0xfd, 0xda, 0x47, 0x31, 0x98, 0x5b, 0x75, 0x1d, 0xaa, 0x1a, 0x3d, 0x2a, 0xaa, 0x65, - 0x73, 0x79, 0x80, 0x2e, 0x8d, 0x69, 0x43, 0x4d, 0x8f, 0x36, 0x9b, 0xb6, 0x21, 0xcb, 0x4b, 0xac, - 0xe9, 0x3a, 0x2f, 0xd9, 0x6b, 0xca, 0xb8, 0x1d, 0x4b, 0x9d, 0x68, 0x97, 0x0c, 0x38, 0xae, 0x43, - 0xee, 0x0c, 0xe1, 0xc6, 0x8f, 0x87, 0xeb, 0x90, 0x3b, 0x11, 0xdc, 0x33, 0x90, 0x54, 0xf7, 0xab, - 0x84, 0xb8, 0x3d, 0xa8, 0x11, 0xba, 0x06, 0x71, 0x9e, 0x0a, 0x4f, 0x1c, 0x21, 0x79, 0x70, 0x86, - 0x48, 0x59, 0xab, 0xc3, 0x9c, 0xea, 0x14, 0xd0, 0x8d, 0x96, 0xd0, 0x28, 0x11, 0x02, 0xbd, 0x4b, - 0x06, 0x07, 0xb4, 0x0d, 0xa6, 0x5f, 0xa8, 0x6d, 0x70, 0xf9, 0x77, 0x1a, 0x40, 0xd8, 0x33, 0x43, - 0x6f, 0xc0, 0xd9, 0xca, 0xc6, 0x7a, 0xd5, 0xa8, 0x6f, 0x5d, 0xdf, 0x6a, 0xd4, 0x8d, 0xc6, 0x7a, - 0x7d, 0x73, 0x6d, 0xb5, 0x76, 0xa3, 0xb6, 0x56, 0xcd, 0x4d, 0x14, 0xb2, 0xf7, 0xee, 0x2f, 0xa6, - 0x1b, 0x0e, 0xed, 0x11, 0xd3, 0x6e, 0xd9, 0xc4, 0x42, 0xaf, 0xc1, 0xa9, 0x61, 0x6a, 0x3e, 0x5a, - 0xab, 0xe6, 0xb4, 0xc2, 0xf4, 0xbd, 0xfb, 0x8b, 0x53, 0xf2, 0x8d, 0x40, 0x2c, 0xb4, 0x04, 0xa7, - 0x47, 0xe9, 0x6a, 0xeb, 0x37, 0x73, 0xb1, 0x42, 0xe6, 0xde, 0xfd, 0xc5, 0x54, 0xf0, 0x98, 0x40, - 0x45, 0x40, 0x51, 0x4a, 0x85, 0x17, 0x2f, 0xc0, 0xbd, 0xfb, 0x8b, 0x49, 0x19, 0x32, 0x85, 0xc4, - 0x07, 0xbf, 0x9e, 0x9f, 0xb8, 0xfc, 0x23, 0x80, 0x9a, 0xd3, 0xf2, 0xb0, 0x29, 0x52, 0x43, 0x01, - 0xce, 0xd4, 0xd6, 0x6f, 0xe8, 0xd7, 0x57, 0xb7, 0x6a, 0x1b, 0xeb, 0xc3, 0xc7, 0xde, 0xb7, 0x56, - 0xdd, 0x68, 0x54, 0xde, 0x5b, 0x33, 0xea, 0xb5, 0x9b, 0xeb, 0x39, 0x0d, 0x9d, 0x85, 0x93, 0x43, - 0x6b, 0xdf, 0x5d, 0xdf, 0xaa, 0xdd, 0x5e, 0xcb, 0xc5, 0x2a, 0xd7, 0x3e, 0x79, 0x3a, 0xaf, 0x3d, - 0x7a, 0x3a, 0xaf, 0xfd, 0xed, 0xe9, 0xbc, 0xf6, 0xe1, 0xb3, 0xf9, 0x89, 0x47, 0xcf, 0xe6, 0x27, - 0xfe, 0xfc, 0x6c, 0x7e, 0xe2, 0x07, 0xaf, 0x0c, 0x05, 0x63, 0x58, 0x8e, 0xc4, 0xdf, 0x21, 0xcd, - 0xa4, 0xf0, 0x9a, 0x6f, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x85, 0x67, 0xcc, 0xc5, 0x86, 0x1a, - 0x00, 0x00, + 0x13, 0xce, 0x2c, 0xa4, 0x9e, 0xd0, 0x03, 0x66, 0x25, 0x73, 0x0b, 0xa6, 0x7c, 0x32, 0xf4, 0x1a, + 0x64, 0x7b, 0x9e, 0xdb, 0xb2, 0x3b, 0xc4, 0xe8, 0xd9, 0xa6, 0xd1, 0xf7, 0x6c, 0x25, 0x77, 0x46, + 0x4d, 0x6f, 0xda, 0x66, 0xc3, 0xb3, 0xd1, 0x1b, 0x80, 0xa8, 0x6b, 0xda, 0xb8, 0x63, 0xec, 0x60, + 0xc7, 0xea, 0x10, 0x4e, 0x49, 0x45, 0x68, 0xa5, 0xf4, 0x9c, 0x5c, 0xb9, 0x25, 0x16, 0x1a, 0x9e, + 0x4d, 0xd5, 0x3e, 0xf7, 0x27, 0x21, 0x15, 0x44, 0x17, 0x5a, 0x85, 0x9c, 0xdb, 0x23, 0x1e, 0xff, + 0x36, 0xb0, 0x65, 0x79, 0x84, 0x52, 0x15, 0x3e, 0xf9, 0xc7, 0x0f, 0xaf, 0x9c, 0x52, 0xf2, 0x5c, + 0x97, 0x2b, 0x75, 0xe6, 0xd9, 0x4e, 0x5b, 0xcf, 0xfa, 0x1c, 0x6a, 0x1a, 0x7d, 0x9f, 0xfb, 0x98, + 0x43, 0x89, 0x43, 0xfb, 0xd4, 0xe8, 0xf5, 0x9b, 0xbb, 0x64, 0xa0, 0xbc, 0xe0, 0xd4, 0x88, 0x17, + 0x5c, 0x77, 0x06, 0x95, 0xfc, 0x1f, 0x43, 0x68, 0xd3, 0x1b, 0xf4, 0x98, 0x5b, 0xda, 0xec, 0x37, + 0xdf, 0x25, 0x03, 0xee, 0x5b, 0x0a, 0x67, 0x53, 0xc0, 0xa0, 0x33, 0x90, 0xfc, 0x31, 0xb6, 0x3b, + 0xc4, 0x12, 0x26, 0x9c, 0xd2, 0xd5, 0x08, 0xad, 0x40, 0x92, 0x32, 0xcc, 0xfa, 0x54, 0xd8, 0x6d, + 0xe6, 0x6a, 0x71, 0x9c, 0xea, 0x2b, 0xae, 0x63, 0xd5, 0x05, 0xa5, 0xae, 0x38, 0xd0, 0x2a, 0x24, + 0x99, 0xbb, 0x4b, 0x1c, 0x65, 0xd1, 0xca, 0xd7, 0x55, 0xf8, 0x9d, 0x1e, 0x0d, 0xbf, 0x9a, 0xc3, + 0x22, 0x81, 0x57, 0x73, 0x98, 0xae, 0x58, 0xd1, 0x0f, 0x21, 0x67, 0x91, 0x0e, 0x69, 0x0b, 0xcd, + 0xd1, 0x1d, 0xec, 0x11, 0x2a, 0xbc, 0x20, 0x55, 0x59, 0x3e, 0x72, 0x34, 0xeb, 0xd9, 0x00, 0xaa, + 0x2e, 0x90, 0xd0, 0x26, 0xa4, 0xad, 0xd0, 0xff, 0xf3, 0x93, 0x42, 0x99, 0xaf, 0x8e, 0x93, 0x31, + 0x12, 0x2a, 0xd1, 0x74, 0x19, 0x85, 0xe0, 0x2e, 0xdf, 0x77, 0x9a, 0xae, 0x63, 0xd9, 0x4e, 0xdb, + 0xd8, 0x21, 0x76, 0x7b, 0x87, 0xe5, 0xa7, 0x16, 0xb5, 0xa5, 0xb8, 0x9e, 0x0d, 0xe6, 0x6f, 0x89, + 0x69, 0xb4, 0x09, 0x33, 0x21, 0xa9, 0x08, 0xe9, 0xd4, 0x51, 0x43, 0x3a, 0x13, 0x00, 0x70, 0x12, + 0x74, 0x1b, 0x20, 0x4c, 0x1a, 0x79, 0x10, 0x68, 0xc5, 0xc3, 0xd3, 0x4f, 0x54, 0x98, 0x08, 0x00, + 0x72, 0xe0, 0x64, 0xd7, 0x76, 0x0c, 0x4a, 0x3a, 0x2d, 0x43, 0x69, 0x8e, 0xe3, 0xa6, 0x85, 0xfa, + 0xdf, 0x3e, 0x82, 0x35, 0x3f, 0x7d, 0x78, 0x25, 0x2b, 0x47, 0x57, 0xa8, 0xb5, 0xbb, 0xf8, 0x66, + 0xe9, 0x9b, 0xdf, 0xd2, 0x67, 0xbb, 0xb6, 0x53, 0x27, 0x9d, 0x56, 0x35, 0x00, 0x46, 0x6f, 0xc1, + 0xb9, 0x50, 0x21, 0xae, 0x63, 0xec, 0xb8, 0x1d, 0xcb, 0xf0, 0x48, 0xcb, 0x30, 0xdd, 0xbe, 0xc3, + 0xf2, 0xd3, 0x42, 0x8d, 0x67, 0x03, 0x92, 0x0d, 0xe7, 0x96, 0xdb, 0xb1, 0x74, 0xd2, 0x5a, 0xe5, + 0xcb, 0xe8, 0x55, 0x08, 0xb5, 0x61, 0xd8, 0x16, 0xcd, 0x67, 0x16, 0xe3, 0x4b, 0x09, 0x7d, 0x3a, + 0x98, 0xac, 0x59, 0x74, 0x65, 0xea, 0x83, 0x07, 0x0b, 0x13, 0x9f, 0x3f, 0x58, 0x98, 0x28, 0xde, + 0x80, 0xe9, 0x6d, 0xdc, 0x51, 0xa1, 0x45, 0x28, 0xba, 0x06, 0x29, 0xec, 0x0f, 0xf2, 0x1a, 0x0f, + 0xed, 0xe7, 0x84, 0x66, 0x48, 0x5a, 0xfc, 0xad, 0x06, 0xc9, 0xea, 0xf6, 0x26, 0xb6, 0x3d, 0xb4, + 0x06, 0xb3, 0xa1, 0xaf, 0xbe, 0x68, 0x94, 0x87, 0xee, 0xed, 0x87, 0xf9, 0x3a, 0xcc, 0xee, 0xf9, + 0x89, 0x23, 0x80, 0x91, 0xb5, 0xf1, 0xc2, 0xe3, 0x87, 0x57, 0xce, 0x2b, 0x98, 0x20, 0xb9, 0xec, + 0xc3, 0xdb, 0xdb, 0x37, 0x1f, 0x91, 0xf9, 0x1d, 0x98, 0x94, 0x47, 0xa5, 0xe8, 0xdb, 0x70, 0xa2, + 0xc7, 0x3f, 0x84, 0xa8, 0xe9, 0xab, 0xf3, 0x63, 0x7d, 0x5e, 0xd0, 0x47, 0x3d, 0x44, 0xf2, 0x15, + 0x7f, 0x16, 0x03, 0xa8, 0x6e, 0x6f, 0x6f, 0x79, 0x76, 0xaf, 0x43, 0xd8, 0x97, 0x25, 0x7b, 0x03, + 0x4e, 0x87, 0xb2, 0x53, 0xcf, 0x3c, 0xba, 0xfc, 0x27, 0x03, 0xfe, 0xba, 0x67, 0x1e, 0x08, 0x6b, + 0x51, 0x16, 0xc0, 0xc6, 0x8f, 0x0e, 0x5b, 0xa5, 0x6c, 0x54, 0xb3, 0xdf, 0x83, 0x74, 0xa8, 0x0c, + 0x8a, 0x6a, 0x30, 0xc5, 0xd4, 0xb7, 0x52, 0x70, 0x71, 0xbc, 0x82, 0x7d, 0xb6, 0xa8, 0x92, 0x03, + 0xf6, 0xe2, 0xbf, 0x35, 0x80, 0x48, 0x8c, 0x7c, 0x35, 0x7d, 0x0c, 0xd5, 0x20, 0xa9, 0x92, 0x73, + 0xfc, 0xb8, 0xc9, 0x59, 0x01, 0x44, 0x94, 0xfa, 0xf3, 0x18, 0x9c, 0x6c, 0xf8, 0xd1, 0xfb, 0xd5, + 0xd7, 0x41, 0x03, 0x26, 0x89, 0xc3, 0x3c, 0x5b, 0x28, 0x81, 0xdb, 0xfc, 0xcd, 0x71, 0x36, 0x3f, + 0x40, 0xa8, 0x35, 0x87, 0x79, 0x83, 0xa8, 0x07, 0xf8, 0x58, 0x11, 0x7d, 0xfc, 0x32, 0x0e, 0xf9, + 0x71, 0xac, 0xe8, 0x75, 0xc8, 0x9a, 0x1e, 0x11, 0x13, 0x7e, 0xdd, 0xd1, 0x44, 0xc2, 0x9c, 0xf1, + 0xa7, 0x55, 0xd9, 0xd1, 0x81, 0xdf, 0x2c, 0xb9, 0x73, 0x71, 0xd2, 0xe3, 0x5d, 0x25, 0x67, 0x42, + 0x04, 0x51, 0x78, 0xb6, 0x20, 0x6b, 0x3b, 0x36, 0xe3, 0x37, 0xa4, 0x26, 0xee, 0x60, 0xc7, 0xf4, + 0xaf, 0xdc, 0x47, 0xaa, 0xf9, 0x33, 0x0a, 0xa3, 0x22, 0x21, 0xd0, 0x1a, 0x4c, 0xfa, 0x68, 0x89, + 0xa3, 0xa3, 0xf9, 0xbc, 0xe8, 0x02, 0x4c, 0x47, 0x0b, 0x83, 0xb8, 0x8d, 0x24, 0xf4, 0x74, 0xa4, + 0x2e, 0x1c, 0x56, 0x79, 0x92, 0xcf, 0xad, 0x3c, 0xea, 0xc2, 0xf7, 0xab, 0x38, 0xcc, 0xea, 0xc4, + 0xfa, 0xdf, 0x37, 0xcb, 0x26, 0x80, 0x0c, 0x55, 0x9e, 0x49, 0x95, 0x65, 0x8e, 0x11, 0xef, 0x29, + 0x09, 0x52, 0xa5, 0xec, 0xbf, 0x65, 0xa1, 0xbf, 0xc4, 0x60, 0x3a, 0x6a, 0xa1, 0xff, 0xcb, 0xa2, + 0x85, 0xd6, 0xc3, 0x34, 0x95, 0x10, 0x69, 0xea, 0xd2, 0xb8, 0x34, 0x35, 0xe2, 0xcd, 0x87, 0xe4, + 0xa7, 0x2f, 0xe2, 0x90, 0xdc, 0xc4, 0x1e, 0xee, 0x52, 0xb4, 0x31, 0x72, 0xb7, 0xf5, 0xdb, 0x18, + 0xfb, 0x9d, 0xb9, 0xaa, 0x7a, 0x25, 0xd2, 0x97, 0x3f, 0x1a, 0x77, 0xb5, 0xfd, 0x1a, 0xcc, 0xf0, + 0x47, 0x7d, 0x20, 0x90, 0x54, 0x6e, 0x46, 0xbc, 0xcd, 0x03, 0xe9, 0x29, 0x5a, 0x80, 0x34, 0x27, + 0x0b, 0xf3, 0x30, 0xa7, 0x81, 0x2e, 0xbe, 0xbb, 0x26, 0x67, 0xd0, 0x32, 0xa0, 0x9d, 0xa0, 0xd3, + 0x62, 0x84, 0x8a, 0xd0, 0x96, 0x32, 0x95, 0x58, 0x5e, 0xd3, 0x67, 0xc3, 0x55, 0x9f, 0xe5, 0x3c, + 0x00, 0x3f, 0x89, 0x61, 0x11, 0xc7, 0xed, 0xaa, 0xd7, 0x69, 0x8a, 0xcf, 0x54, 0xf9, 0x04, 0xfa, + 0xa9, 0x26, 0xaf, 0xc9, 0xfb, 0x9e, 0xff, 0xea, 0x95, 0xb2, 0xf5, 0x02, 0x81, 0xf1, 0xaf, 0x27, + 0x0b, 0x85, 0x01, 0xee, 0x76, 0x56, 0x8a, 0x07, 0xe0, 0x14, 0x0f, 0xea, 0x48, 0xf0, 0xcb, 0xf3, + 0x70, 0xfb, 0x00, 0xd5, 0x20, 0xb7, 0x4b, 0x06, 0x86, 0xe7, 0x32, 0x99, 0x6c, 0x5a, 0x84, 0xa8, + 0xf7, 0xcc, 0x9c, 0x6f, 0xdf, 0x26, 0xa6, 0x24, 0x72, 0xfd, 0xb7, 0x9d, 0x4a, 0x82, 0x9f, 0x4e, + 0x9f, 0xd9, 0x25, 0x03, 0x5d, 0xf1, 0xdd, 0x20, 0x64, 0xe5, 0x22, 0x8f, 0x96, 0x7b, 0x9f, 0x7d, + 0x7c, 0xf9, 0x5c, 0x78, 0x69, 0x2f, 0xdf, 0x0d, 0x1a, 0x7b, 0xd2, 0xc4, 0xfc, 0xe2, 0x8b, 0xc2, + 0x22, 0xa4, 0x13, 0xda, 0xe3, 0x6f, 0x4a, 0xfe, 0x06, 0x89, 0xbc, 0x15, 0xb4, 0xe7, 0xbf, 0x41, + 0x42, 0xfe, 0xa1, 0x37, 0x48, 0x24, 0x44, 0xdf, 0x0e, 0x6b, 0x40, 0xec, 0x30, 0x69, 0xa2, 0xde, + 0xa9, 0x98, 0x44, 0xe4, 0x4f, 0x14, 0xff, 0xa4, 0xc1, 0xdc, 0x88, 0x37, 0x07, 0x47, 0x36, 0x01, + 0x79, 0x91, 0x45, 0xe1, 0x15, 0x03, 0x75, 0xf4, 0xe3, 0x05, 0xc7, 0xac, 0x37, 0x52, 0x08, 0xbe, + 0x9c, 0x62, 0xa6, 0x32, 0xd9, 0x1f, 0x34, 0x38, 0x15, 0x3d, 0x40, 0x20, 0x4a, 0x1d, 0xa6, 0xa3, + 0x5b, 0x2b, 0x21, 0x2e, 0xbe, 0x88, 0x10, 0xd1, 0xf3, 0x0f, 0x81, 0xa0, 0xed, 0x30, 0x63, 0xc8, + 0x76, 0xe2, 0xf2, 0x0b, 0x2b, 0xc5, 0x3f, 0xd8, 0x81, 0x99, 0x43, 0xda, 0xe6, 0x0b, 0x0d, 0x12, + 0x9b, 0xae, 0xdb, 0x41, 0x3f, 0x81, 0x59, 0xc7, 0x65, 0x06, 0x8f, 0x2c, 0x62, 0x19, 0xaa, 0x75, + 0x20, 0xb3, 0xf1, 0xda, 0x73, 0x75, 0xf5, 0xf7, 0x27, 0x0b, 0xa3, 0x9c, 0xc3, 0x0a, 0x54, 0x2d, + 0x35, 0xc7, 0x65, 0x15, 0x41, 0xb4, 0x25, 0xbb, 0x0b, 0x2d, 0xc8, 0x0c, 0x6f, 0x27, 0x33, 0xf6, + 0xf5, 0xc3, 0xb6, 0xcb, 0x1c, 0xba, 0xd5, 0x74, 0x33, 0xb2, 0xcf, 0xca, 0x14, 0xb7, 0xda, 0x3f, + 0xb8, 0xe5, 0xde, 0x87, 0x5c, 0x90, 0xae, 0x1a, 0xa2, 0x1f, 0x47, 0xd1, 0x0d, 0x98, 0x94, 0xad, + 0x39, 0xff, 0xb1, 0x70, 0x21, 0x6c, 0xf6, 0xe2, 0xa6, 0x69, 0x97, 0xf6, 0x22, 0x8d, 0x5a, 0xc9, + 0x34, 0xa4, 0x4f, 0xc5, 0x2c, 0xfa, 0xb5, 0x8f, 0x62, 0x30, 0xb7, 0xea, 0x3a, 0x54, 0x35, 0x7a, + 0x54, 0x54, 0xcb, 0xe6, 0xf2, 0x00, 0x5d, 0x1a, 0xd3, 0x86, 0x9a, 0x1e, 0x6d, 0x36, 0x6d, 0x43, + 0x96, 0x97, 0x58, 0xd3, 0x75, 0x5e, 0xb2, 0xd7, 0x94, 0x71, 0x3b, 0x96, 0x3a, 0xd1, 0x2e, 0x19, + 0x70, 0x5c, 0x87, 0xdc, 0x19, 0xc2, 0x8d, 0x1f, 0x0f, 0xd7, 0x21, 0x77, 0x22, 0xb8, 0x67, 0x20, + 0xa9, 0xee, 0x57, 0x09, 0x71, 0x7b, 0x50, 0x23, 0x74, 0x0d, 0xe2, 0x3c, 0x15, 0x9e, 0x38, 0x42, + 0xf2, 0xe0, 0x0c, 0x91, 0xb2, 0x56, 0x87, 0x39, 0xd5, 0x29, 0xa0, 0x1b, 0x2d, 0xa1, 0x51, 0x22, + 0x04, 0x7a, 0x97, 0x0c, 0x0e, 0x68, 0x1b, 0x4c, 0xbf, 0x50, 0xdb, 0xe0, 0xf2, 0xef, 0x34, 0x80, + 0xb0, 0x67, 0x86, 0xde, 0x80, 0xb3, 0x95, 0x8d, 0xf5, 0xaa, 0x51, 0xdf, 0xba, 0xbe, 0xd5, 0xa8, + 0x1b, 0x8d, 0xf5, 0xfa, 0xe6, 0xda, 0x6a, 0xed, 0x46, 0x6d, 0xad, 0x9a, 0x9b, 0x28, 0x64, 0xef, + 0xdd, 0x5f, 0x4c, 0x37, 0x1c, 0xda, 0x23, 0xa6, 0xdd, 0xb2, 0x89, 0x85, 0x5e, 0x83, 0x53, 0xc3, + 0xd4, 0x7c, 0xb4, 0x56, 0xcd, 0x69, 0x85, 0xe9, 0x7b, 0xf7, 0x17, 0xa7, 0xe4, 0x1b, 0x81, 0x58, + 0x68, 0x09, 0x4e, 0x8f, 0xd2, 0xd5, 0xd6, 0x6f, 0xe6, 0x62, 0x85, 0xcc, 0xbd, 0xfb, 0x8b, 0xa9, + 0xe0, 0x31, 0x81, 0x8a, 0x80, 0xa2, 0x94, 0x0a, 0x2f, 0x5e, 0x80, 0x7b, 0xf7, 0x17, 0x93, 0x32, + 0x64, 0x0a, 0x89, 0x0f, 0x7e, 0x3d, 0x3f, 0x71, 0xf9, 0x47, 0x00, 0x35, 0xa7, 0xe5, 0x61, 0x53, + 0xa4, 0x86, 0x02, 0x9c, 0xa9, 0xad, 0xdf, 0xd0, 0xaf, 0xaf, 0x6e, 0xd5, 0x36, 0xd6, 0x87, 0x8f, + 0xbd, 0x6f, 0xad, 0xba, 0xd1, 0xa8, 0xbc, 0xb7, 0x66, 0xd4, 0x6b, 0x37, 0xd7, 0x73, 0x1a, 0x3a, + 0x0b, 0x27, 0x87, 0xd6, 0xbe, 0xbb, 0xbe, 0x55, 0xbb, 0xbd, 0x96, 0x8b, 0x55, 0xae, 0x7d, 0xf2, + 0x74, 0x5e, 0x7b, 0xf4, 0x74, 0x5e, 0xfb, 0xdb, 0xd3, 0x79, 0xed, 0xc3, 0x67, 0xf3, 0x13, 0x8f, + 0x9e, 0xcd, 0x4f, 0xfc, 0xf9, 0xd9, 0xfc, 0xc4, 0x0f, 0x5e, 0x19, 0x0a, 0xc6, 0xb0, 0x1c, 0x89, + 0xbf, 0x43, 0x9a, 0x49, 0xe1, 0x35, 0xdf, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x97, + 0xa2, 0x84, 0x86, 0x1a, 0x00, 0x00, } func (this *Pool) Description() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet) { @@ -1593,7 +1593,7 @@ func (this *Pool) Description() (desc *github_com_cosmos_gogoproto_protoc_gen_go func StakingDescription() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 11876 bytes of a gzipped FileDescriptorSet + // 11880 bytes of a gzipped FileDescriptorSet 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6b, 0x94, 0x24, 0xd7, 0x59, 0xd8, 0x56, 0x77, 0x4f, 0x4f, 0xf7, 0xd7, 0xaf, 0x9a, 0x3b, 0xb3, 0xbb, 0xb3, 0xb3, 0xd2, 0xce, 0x6c, 0xad, 0xa4, 0x5d, 0xad, 0xa4, 0x59, 0xed, 0x4a, 0xbb, 0x92, 0x5a, 0x96, 0x44, 0xf7, @@ -2250,93 +2250,93 @@ func StakingDescription() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_des 0xa2, 0x87, 0x41, 0x76, 0xb1, 0xd1, 0x73, 0x4c, 0x6f, 0x5f, 0x33, 0x6c, 0xcb, 0xd3, 0x0d, 0x8f, 0x1f, 0x56, 0x2a, 0x89, 0xf2, 0x25, 0x56, 0x4c, 0x88, 0xb4, 0xb0, 0xa7, 0x9b, 0x6d, 0x76, 0x19, 0x3b, 0xab, 0x8a, 0x4f, 0xb4, 0x12, 0xda, 0xfe, 0x4f, 0xfb, 0xbb, 0x13, 0xb1, 0x1c, 0x15, 0xbf, - 0x37, 0x1f, 0x16, 0x66, 0x1f, 0x99, 0x8f, 0x79, 0x07, 0x32, 0x02, 0x0c, 0x3d, 0x04, 0xa5, 0xae, - 0x63, 0x53, 0xab, 0xdf, 0x35, 0x0d, 0xad, 0xe7, 0x98, 0x7c, 0xdc, 0x05, 0x5e, 0xbc, 0x69, 0x1a, - 0x5b, 0x8e, 0x89, 0x1e, 0x05, 0xe4, 0xda, 0x06, 0xbd, 0x08, 0xae, 0x5b, 0xad, 0x36, 0x51, 0xd8, - 0x26, 0x3b, 0x6b, 0x96, 0x55, 0x65, 0x56, 0x73, 0x8d, 0x56, 0x6c, 0x39, 0xa6, 0xcb, 0xdb, 0xb9, - 0x3b, 0x19, 0x3e, 0x5b, 0xb4, 0x04, 0xb2, 0xdd, 0xc5, 0x4e, 0x24, 0xe3, 0xc3, 0x96, 0xcf, 0xec, - 0x6f, 0x7c, 0xe6, 0xb1, 0x19, 0x3e, 0x1e, 0x9e, 0xf3, 0x61, 0xaf, 0x38, 0xaa, 0x25, 0x81, 0x21, - 0x52, 0x41, 0x2f, 0x47, 0x0e, 0xc6, 0xf7, 0xb6, 0x83, 0x37, 0x99, 0x66, 0x06, 0xa4, 0xa0, 0x62, - 0xed, 0x57, 0x67, 0x7f, 0x2d, 0x20, 0xcd, 0xe3, 0xc5, 0x4d, 0x7a, 0xd2, 0x28, 0x7c, 0x48, 0x9e, - 0x92, 0x41, 0xc7, 0x20, 0xfd, 0xaa, 0x6e, 0xb6, 0xc5, 0xaf, 0xfb, 0xaa, 0xfc, 0x0b, 0x95, 0xfd, - 0x83, 0x9f, 0x29, 0x9a, 0xc1, 0x51, 0x86, 0xb1, 0xbe, 0x6a, 0x5b, 0xad, 0xe8, 0x79, 0x4f, 0xb4, - 0x04, 0x69, 0xcf, 0xbe, 0x89, 0x2d, 0x3e, 0xa3, 0xd5, 0x47, 0x0e, 0xe1, 0x23, 0xa8, 0x1c, 0x15, - 0x7d, 0x03, 0xc8, 0x2d, 0xdc, 0xc6, 0xbb, 0x2c, 0x95, 0xb0, 0xa7, 0x3b, 0x98, 0xe5, 0xb4, 0xef, - 0xc9, 0x03, 0x28, 0xf9, 0xa4, 0x1a, 0x94, 0x12, 0xda, 0x8c, 0x86, 0x4e, 0x93, 0xfe, 0x9d, 0xae, - 0xd8, 0x31, 0x86, 0x96, 0x4a, 0x58, 0xc2, 0x22, 0xa1, 0xd6, 0xc3, 0x20, 0xf7, 0xac, 0x6d, 0xdb, - 0xa2, 0x3f, 0x8a, 0xc9, 0x93, 0x58, 0x19, 0x76, 0x59, 0xc2, 0x2f, 0xe7, 0x97, 0x25, 0x36, 0xa1, - 0x18, 0x80, 0xd2, 0x25, 0x9d, 0x3d, 0xec, 0x92, 0x2e, 0xf8, 0x04, 0x08, 0x08, 0x5a, 0x03, 0x08, - 0x94, 0x06, 0x4d, 0xb3, 0xe7, 0x86, 0xcf, 0x58, 0xa0, 0x7e, 0xc2, 0x83, 0x09, 0x11, 0x40, 0x16, - 0x4c, 0x77, 0x4c, 0x4b, 0x73, 0x71, 0x7b, 0x47, 0xe3, 0x9c, 0x23, 0x74, 0x73, 0x94, 0xfd, 0xcf, - 0x1f, 0x62, 0x36, 0x7f, 0xfb, 0x33, 0x8f, 0x95, 0x02, 0xd7, 0x69, 0xe1, 0xf1, 0xc5, 0x27, 0x9f, - 0x52, 0xa7, 0x3a, 0xa6, 0xd5, 0xc0, 0xed, 0x9d, 0x65, 0x9f, 0x30, 0x7a, 0x17, 0x9c, 0x0c, 0x18, - 0x62, 0x5b, 0xda, 0x9e, 0xdd, 0x6e, 0x69, 0x0e, 0xde, 0xd1, 0x0c, 0xea, 0xf8, 0xe5, 0x29, 0x1b, - 0x8f, 0xfb, 0x20, 0x1b, 0xd6, 0x35, 0xbb, 0xdd, 0x52, 0xf1, 0xce, 0x12, 0xa9, 0x46, 0x67, 0x20, - 0xe0, 0x86, 0x66, 0xb6, 0xdc, 0xd9, 0xc2, 0x42, 0xf2, 0x5c, 0x4a, 0xcd, 0xfb, 0x85, 0xf5, 0x96, - 0x5b, 0xce, 0x7c, 0xf0, 0x8d, 0xf9, 0x23, 0x5f, 0x7c, 0x63, 0xfe, 0x88, 0x72, 0x95, 0xbe, 0xda, - 0xc6, 0x97, 0x16, 0x76, 0xd1, 0x15, 0xc8, 0xea, 0xe2, 0x83, 0x3d, 0x7c, 0x78, 0xc0, 0xd2, 0x0c, - 0x40, 0x95, 0x4f, 0x49, 0x90, 0x5e, 0xbe, 0xb1, 0xa9, 0x9b, 0x0e, 0xaa, 0x91, 0xc0, 0x48, 0xc8, - 0xea, 0xb8, 0xab, 0x3c, 0x10, 0x6f, 0xb1, 0xcc, 0xd7, 0x87, 0xa5, 0x87, 0xb3, 0xd5, 0xd3, 0xbf, - 0xf1, 0x99, 0xc7, 0xee, 0xe7, 0x64, 0x6e, 0xf4, 0x65, 0x8a, 0x05, 0xbd, 0xfe, 0x0c, 0x72, 0x68, - 0xcc, 0xd7, 0x61, 0x92, 0x75, 0xd5, 0x45, 0x2f, 0xc0, 0x44, 0x97, 0xfc, 0xc1, 0x4f, 0x5c, 0x9f, - 0x1a, 0x2a, 0xf3, 0x14, 0x3e, 0x2c, 0x21, 0x0c, 0x4f, 0xf9, 0x8e, 0x04, 0xc0, 0xf2, 0x8d, 0x1b, - 0x4d, 0xc7, 0xec, 0xb6, 0xb1, 0xf7, 0x76, 0x8d, 0x7d, 0x0b, 0x8e, 0x86, 0x32, 0x87, 0x8e, 0x71, - 0xf8, 0xf1, 0x4f, 0x07, 0x39, 0x44, 0xc7, 0x88, 0x25, 0xdb, 0x72, 0x3d, 0x9f, 0x6c, 0xf2, 0xf0, - 0x64, 0x97, 0x5d, 0x6f, 0x90, 0xb3, 0x2f, 0x41, 0x2e, 0x60, 0x86, 0x8b, 0xea, 0x90, 0xf1, 0xf8, - 0xdf, 0x9c, 0xc1, 0xca, 0x70, 0x06, 0x0b, 0xb4, 0x88, 0xd5, 0x12, 0xe8, 0xca, 0x5f, 0x4a, 0x00, - 0xa1, 0x35, 0xf2, 0xd7, 0x53, 0xc6, 0x48, 0x78, 0xc6, 0x95, 0x73, 0xf2, 0x9e, 0xc3, 0x33, 0x46, - 0x20, 0xc4, 0xd4, 0xef, 0x4a, 0xc0, 0xf4, 0x96, 0x58, 0xbd, 0x7f, 0xfd, 0x79, 0xb0, 0x05, 0x93, - 0xd8, 0xf2, 0x1c, 0xd3, 0xbf, 0x31, 0xf0, 0xf8, 0xb0, 0x39, 0x8f, 0x19, 0x54, 0xcd, 0xf2, 0x9c, - 0xfd, 0xb0, 0x04, 0x08, 0x5a, 0x21, 0x7e, 0x7c, 0x34, 0x09, 0xb3, 0xc3, 0x50, 0xd1, 0x59, 0x28, - 0x19, 0x0e, 0xa6, 0x05, 0xd1, 0x77, 0x38, 0x8b, 0xa2, 0x98, 0x9b, 0x1d, 0x15, 0x88, 0x67, 0x49, - 0x84, 0x8b, 0x80, 0xde, 0x9b, 0x2b, 0x59, 0x0c, 0x28, 0x50, 0xc3, 0xd3, 0x84, 0x92, 0x78, 0x2a, - 0x67, 0x5b, 0x6f, 0xeb, 0x96, 0x21, 0x5c, 0xee, 0x43, 0xd9, 0x7c, 0xf1, 0xdc, 0x4e, 0x95, 0x91, - 0x40, 0x35, 0x98, 0x14, 0xd4, 0x52, 0x87, 0xa7, 0x26, 0x70, 0xd1, 0x69, 0xc8, 0x87, 0x0d, 0x03, - 0xf5, 0x46, 0x52, 0x6a, 0x2e, 0x64, 0x17, 0x46, 0x59, 0x9e, 0xf4, 0x81, 0x96, 0x87, 0x3b, 0x7c, - 0x3f, 0x94, 0x84, 0x29, 0x15, 0xb7, 0xfe, 0xe6, 0x4f, 0xcb, 0x26, 0x00, 0x5b, 0xaa, 0x44, 0x93, - 0xf2, 0x99, 0xb9, 0x87, 0xf5, 0x9e, 0x65, 0x44, 0x96, 0x5d, 0xef, 0x6b, 0x35, 0x43, 0xbf, 0x93, - 0x80, 0x7c, 0x78, 0x86, 0xfe, 0x56, 0x1a, 0x2d, 0xb4, 0x1e, 0xa8, 0x29, 0xb6, 0x51, 0xfe, 0xf0, - 0x30, 0x35, 0x35, 0x20, 0xcd, 0x23, 0xf4, 0xd3, 0x97, 0x92, 0x90, 0xe6, 0x97, 0x6e, 0x37, 0x06, - 0x7c, 0xdb, 0x91, 0x8f, 0x30, 0x17, 0xc4, 0x3b, 0xd6, 0xb1, 0xae, 0xed, 0x83, 0x50, 0x24, 0x41, - 0x7d, 0xe4, 0x26, 0xaf, 0x74, 0xae, 0x40, 0x63, 0xf3, 0xe0, 0x60, 0x13, 0x9a, 0x87, 0x1c, 0x01, - 0x0b, 0xf4, 0x30, 0x81, 0x81, 0x8e, 0x7e, 0xa7, 0xc6, 0x4a, 0xd0, 0x45, 0x40, 0x7b, 0x7e, 0xa6, - 0x45, 0x0b, 0x18, 0x21, 0x9d, 0x2b, 0xd0, 0x17, 0xc9, 0xa7, 0x82, 0x5a, 0x81, 0x72, 0x3f, 0x00, - 0xe9, 0x89, 0xc6, 0xb2, 0x92, 0xfc, 0x67, 0xb2, 0x49, 0xc9, 0x32, 0xcd, 0x4c, 0x7e, 0x9b, 0xc4, - 0xdc, 0xe4, 0xbe, 0xf0, 0x9f, 0x47, 0x29, 0xcd, 0x31, 0x16, 0xc6, 0x9f, 0xbd, 0x39, 0x3f, 0xb7, - 0xaf, 0x77, 0xda, 0x65, 0x25, 0x86, 0x8e, 0x12, 0x97, 0x91, 0x20, 0xce, 0x73, 0x34, 0x7d, 0x80, - 0xea, 0x20, 0xdf, 0xc4, 0xfb, 0x9a, 0xc3, 0x7f, 0x49, 0x5e, 0xdb, 0xc1, 0xe2, 0x2d, 0xf4, 0x13, - 0x8b, 0x31, 0x39, 0xe2, 0xc5, 0x25, 0xdb, 0xb4, 0xf8, 0x16, 0x66, 0xf1, 0x26, 0xde, 0x57, 0x39, - 0xde, 0x55, 0x8c, 0xcb, 0x0f, 0x90, 0xd5, 0xf2, 0xfa, 0x1f, 0xfc, 0xcc, 0xf9, 0x93, 0xa1, 0x7c, - 0xe7, 0x1d, 0x3f, 0xb1, 0xc7, 0xa6, 0x98, 0x38, 0xbe, 0x28, 0x30, 0x42, 0xa1, 0xdb, 0xdb, 0x10, - 0x8a, 0x15, 0xa4, 0x83, 0x63, 0x90, 0x00, 0x3f, 0x12, 0x83, 0x84, 0x96, 0xe8, 0xf3, 0x81, 0x0d, - 0x48, 0x8c, 0x1a, 0x4d, 0x58, 0x3a, 0x39, 0x12, 0x5d, 0xf9, 0x47, 0x94, 0xff, 0x24, 0xc1, 0x89, - 0x01, 0x69, 0xf6, 0xbb, 0x6c, 0x00, 0x72, 0x42, 0x95, 0x54, 0x2a, 0xc4, 0x05, 0x9e, 0x7b, 0x5b, - 0x1c, 0x53, 0xce, 0x80, 0x21, 0x78, 0x7b, 0x8c, 0x19, 0xd7, 0x64, 0xbf, 0x2a, 0xc1, 0x4c, 0xb8, - 0x03, 0xfe, 0x50, 0x1a, 0x90, 0x0f, 0x37, 0xcd, 0x07, 0xf1, 0xc0, 0x38, 0x83, 0x08, 0xf7, 0x3f, - 0x42, 0x04, 0xdd, 0x08, 0x34, 0x06, 0x4b, 0x27, 0x5e, 0x1c, 0x9b, 0x29, 0xa2, 0x63, 0xb1, 0x9a, - 0x83, 0xcd, 0xcd, 0x97, 0x24, 0x48, 0x6d, 0xda, 0x76, 0x1b, 0xbd, 0x17, 0xa6, 0x2c, 0xdb, 0xd3, - 0xc8, 0xca, 0xc2, 0x2d, 0x8d, 0xa7, 0x0e, 0x98, 0x36, 0xae, 0x1d, 0xc8, 0xab, 0x3f, 0x7c, 0x73, - 0x7e, 0x10, 0x33, 0x6e, 0xcf, 0xa1, 0x64, 0xd9, 0x5e, 0x95, 0x02, 0x35, 0x59, 0x76, 0x61, 0x07, - 0x0a, 0xd1, 0xe6, 0x98, 0xc6, 0xae, 0x8c, 0x6a, 0xae, 0x30, 0xb2, 0xa9, 0xfc, 0x76, 0xa8, 0x1d, - 0xf6, 0xb3, 0x43, 0x7f, 0x42, 0x66, 0xee, 0x9b, 0x40, 0xbe, 0xd1, 0x7f, 0x3d, 0xf4, 0x2a, 0x4c, - 0x8a, 0xeb, 0xa0, 0xd2, 0xb8, 0x57, 0x4d, 0xc3, 0xfc, 0xe4, 0xc8, 0x34, 0x5f, 0xfb, 0xb9, 0x04, - 0x9c, 0x58, 0xb2, 0x2d, 0x97, 0x27, 0x7a, 0xf8, 0xaa, 0x66, 0xc9, 0xe5, 0x7d, 0xf4, 0xf0, 0x90, - 0x34, 0x54, 0x7e, 0x30, 0xd9, 0x74, 0x03, 0x4a, 0xc4, 0xc4, 0x1a, 0xb6, 0xf5, 0x16, 0x73, 0x4d, - 0x05, 0xbb, 0xdd, 0xe2, 0x3d, 0xba, 0x89, 0xf7, 0x09, 0x5d, 0x0b, 0xdf, 0x8e, 0xd0, 0x4d, 0xde, - 0x1b, 0x5d, 0x0b, 0xdf, 0x0e, 0xd1, 0x0d, 0xce, 0x0c, 0xa5, 0x22, 0x37, 0x90, 0xae, 0x40, 0x92, - 0xa8, 0xc2, 0x89, 0x43, 0x28, 0x0f, 0x82, 0x10, 0x32, 0x6b, 0x0d, 0x38, 0xc1, 0x33, 0x05, 0xee, - 0xc6, 0x0e, 0xe5, 0x28, 0xa6, 0x03, 0x7a, 0x11, 0xef, 0xc7, 0xa4, 0x0d, 0xf2, 0x63, 0xa5, 0x0d, - 0xce, 0xff, 0xbc, 0x04, 0x10, 0xe4, 0xcc, 0xd0, 0xa3, 0x70, 0xbc, 0xba, 0xb1, 0xbe, 0x1c, 0x5c, - 0xc6, 0x08, 0x6d, 0xad, 0x8b, 0x53, 0x1a, 0x6e, 0x17, 0x1b, 0xe6, 0x8e, 0x89, 0x5b, 0xe8, 0x21, - 0x98, 0x89, 0x42, 0x93, 0xaf, 0xda, 0xb2, 0x2c, 0xcd, 0xe5, 0x5f, 0xbf, 0xbb, 0x90, 0x61, 0x31, - 0x02, 0x6e, 0xa1, 0x73, 0x70, 0x74, 0x10, 0xae, 0xbe, 0xbe, 0x22, 0x27, 0xe6, 0x0a, 0xaf, 0xdf, - 0x5d, 0xc8, 0xfa, 0xc1, 0x04, 0x52, 0x00, 0x85, 0x21, 0x39, 0xbd, 0xe4, 0x1c, 0xbc, 0x7e, 0x77, - 0x21, 0xcd, 0x96, 0x0c, 0xbf, 0xc5, 0xf1, 0x8d, 0x00, 0x75, 0x6b, 0xc7, 0xd1, 0x0d, 0xaa, 0x1a, - 0xe6, 0xe0, 0x58, 0x7d, 0xfd, 0xaa, 0x5a, 0x59, 0x6a, 0xd6, 0x37, 0xd6, 0xfb, 0x4e, 0x04, 0x44, - 0xeb, 0x96, 0x37, 0xb6, 0xaa, 0xab, 0x35, 0xad, 0x51, 0x5f, 0x59, 0x67, 0x57, 0xae, 0x22, 0x75, - 0xef, 0x59, 0x6f, 0xd6, 0xd7, 0x6a, 0x72, 0xa2, 0x7a, 0x65, 0xe8, 0x76, 0xdc, 0x7d, 0x91, 0xc5, - 0x18, 0x98, 0xa3, 0xc8, 0x46, 0xdc, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x2e, 0x6f, 0x47, - 0xe8, 0xa7, 0x00, 0x00, + 0x37, 0x4f, 0x85, 0x99, 0x8e, 0xfa, 0x48, 0x70, 0x56, 0x80, 0x8f, 0x79, 0x07, 0x32, 0x02, 0x0c, + 0x3d, 0x04, 0xa5, 0xae, 0x63, 0x53, 0xab, 0xdf, 0x35, 0x0d, 0xad, 0xe7, 0x98, 0x7c, 0xdc, 0x05, + 0x5e, 0xbc, 0x69, 0x1a, 0x5b, 0x8e, 0x89, 0x1e, 0x05, 0xe4, 0xda, 0x06, 0xbd, 0x08, 0xae, 0x5b, + 0xad, 0x36, 0x51, 0xd8, 0x26, 0x3b, 0x6b, 0x96, 0x55, 0x65, 0x56, 0x73, 0x8d, 0x56, 0x6c, 0x39, + 0xa6, 0xcb, 0xdb, 0xb9, 0x3b, 0x19, 0x3e, 0x5b, 0xb4, 0x04, 0xb2, 0xdd, 0xc5, 0x4e, 0x24, 0xe3, + 0xc3, 0x96, 0xcf, 0xec, 0x6f, 0x7c, 0xe6, 0xb1, 0x19, 0x3e, 0x1e, 0x9e, 0xf3, 0x61, 0xaf, 0x38, + 0xaa, 0x25, 0x81, 0x21, 0x52, 0x41, 0x2f, 0x47, 0x0e, 0xc6, 0xf7, 0xb6, 0x83, 0x37, 0x99, 0x66, + 0x06, 0xa4, 0xa0, 0x62, 0xed, 0x57, 0x67, 0x7f, 0x2d, 0x20, 0xcd, 0xe3, 0xc5, 0x4d, 0x7a, 0xd2, + 0x28, 0x7c, 0x48, 0x9e, 0x92, 0x41, 0xc7, 0x20, 0xfd, 0xaa, 0x6e, 0xb6, 0xc5, 0xaf, 0xfb, 0xaa, + 0xfc, 0x0b, 0x95, 0xfd, 0x83, 0x9f, 0x29, 0x9a, 0xc1, 0x51, 0x86, 0xb1, 0xbe, 0x6a, 0x5b, 0xad, + 0xe8, 0x79, 0x4f, 0xb4, 0x04, 0x69, 0xcf, 0xbe, 0x89, 0x2d, 0x3e, 0xa3, 0xd5, 0x47, 0x0e, 0xe1, + 0x23, 0xa8, 0x1c, 0x15, 0x7d, 0x03, 0xc8, 0x2d, 0xdc, 0xc6, 0xbb, 0x2c, 0x95, 0xb0, 0xa7, 0x3b, + 0x98, 0xe5, 0xb4, 0xef, 0xc9, 0x03, 0x28, 0xf9, 0xa4, 0x1a, 0x94, 0x12, 0xda, 0x8c, 0x86, 0x4e, + 0x93, 0xfe, 0x9d, 0xae, 0xd8, 0x31, 0x86, 0x96, 0x4a, 0x58, 0x5d, 0x46, 0x42, 0xad, 0x87, 0x41, + 0xee, 0x59, 0xdb, 0xb6, 0x45, 0x7f, 0x14, 0x93, 0x27, 0xb1, 0x32, 0xec, 0xb2, 0x84, 0x5f, 0xce, + 0x2f, 0x4b, 0x6c, 0x42, 0x31, 0x00, 0xa5, 0x4b, 0x3a, 0x7b, 0xd8, 0x25, 0x5d, 0xf0, 0x09, 0x10, + 0x10, 0xb4, 0x06, 0x10, 0x28, 0x0d, 0x9a, 0x66, 0xcf, 0x0d, 0x9f, 0xb1, 0x40, 0xfd, 0x84, 0x07, + 0x13, 0x22, 0x80, 0x2c, 0x98, 0xee, 0x98, 0x96, 0xe6, 0xe2, 0xf6, 0x8e, 0xc6, 0x39, 0x47, 0xe8, + 0xe6, 0x28, 0xfb, 0x9f, 0x3f, 0xc4, 0x6c, 0xfe, 0xf6, 0x67, 0x1e, 0x2b, 0x05, 0xae, 0xd3, 0xc2, + 0xe3, 0x8b, 0x4f, 0x3e, 0xa5, 0x4e, 0x75, 0x4c, 0xab, 0x81, 0xdb, 0x3b, 0xcb, 0x3e, 0x61, 0xf4, + 0x2e, 0x38, 0x19, 0x30, 0xc4, 0xb6, 0xb4, 0x3d, 0xbb, 0xdd, 0xd2, 0x1c, 0xbc, 0xa3, 0x19, 0xd4, + 0xf1, 0xcb, 0x53, 0x36, 0x1e, 0xf7, 0x41, 0x36, 0xac, 0x6b, 0x76, 0xbb, 0xa5, 0xe2, 0x9d, 0x25, + 0x52, 0x8d, 0xce, 0x40, 0xc0, 0x0d, 0xcd, 0x6c, 0xb9, 0xb3, 0x85, 0x85, 0xe4, 0xb9, 0x94, 0x9a, + 0xf7, 0x0b, 0xeb, 0x2d, 0xb7, 0x9c, 0xf9, 0xe0, 0x1b, 0xf3, 0x47, 0xbe, 0xf8, 0xc6, 0xfc, 0x11, + 0xe5, 0x2a, 0x7d, 0xb5, 0x8d, 0x2f, 0x2d, 0xec, 0xa2, 0x2b, 0x90, 0xd5, 0xc5, 0x07, 0x7b, 0xf8, + 0xf0, 0x80, 0xa5, 0x19, 0x80, 0x2a, 0x9f, 0x92, 0x20, 0xbd, 0x7c, 0x63, 0x53, 0x37, 0x1d, 0x54, + 0x23, 0x81, 0x91, 0x90, 0xd5, 0x71, 0x57, 0x79, 0x20, 0xde, 0x62, 0x99, 0xaf, 0x0f, 0x4b, 0x0f, + 0x67, 0xab, 0xa7, 0x7f, 0xe3, 0x33, 0x8f, 0xdd, 0xcf, 0xc9, 0xdc, 0xe8, 0xcb, 0x14, 0x0b, 0x7a, + 0xfd, 0x19, 0xe4, 0xd0, 0x98, 0xaf, 0xc3, 0x24, 0xeb, 0xaa, 0x8b, 0x5e, 0x80, 0x89, 0x2e, 0xf9, + 0x83, 0x9f, 0xb8, 0x3e, 0x35, 0x54, 0xe6, 0x29, 0x7c, 0x58, 0x42, 0x18, 0x9e, 0xf2, 0x1d, 0x09, + 0x80, 0xe5, 0x1b, 0x37, 0x9a, 0x8e, 0xd9, 0x6d, 0x63, 0xef, 0xed, 0x1a, 0xfb, 0x16, 0x1c, 0x0d, + 0x65, 0x0e, 0x1d, 0xe3, 0xf0, 0xe3, 0x9f, 0x0e, 0x72, 0x88, 0x8e, 0x11, 0x4b, 0xb6, 0xe5, 0x7a, + 0x3e, 0xd9, 0xe4, 0xe1, 0xc9, 0x2e, 0xbb, 0xde, 0x20, 0x67, 0x5f, 0x82, 0x5c, 0xc0, 0x0c, 0x17, + 0xd5, 0x21, 0xe3, 0xf1, 0xbf, 0x39, 0x83, 0x95, 0xe1, 0x0c, 0x16, 0x68, 0x61, 0x26, 0xfb, 0xe8, + 0xca, 0x5f, 0x4a, 0x00, 0xa1, 0x35, 0xf2, 0xd7, 0x53, 0xc6, 0x48, 0x78, 0xc6, 0x95, 0x73, 0xf2, + 0x9e, 0xc3, 0x33, 0x46, 0x20, 0xc4, 0xd4, 0xef, 0x4a, 0xc0, 0xf4, 0x96, 0x58, 0xbd, 0x7f, 0xfd, + 0x79, 0xb0, 0x05, 0x93, 0xd8, 0xf2, 0x1c, 0xd3, 0xbf, 0x31, 0xf0, 0xf8, 0xb0, 0x39, 0x8f, 0x19, + 0x54, 0xcd, 0xf2, 0x9c, 0xfd, 0xb0, 0x04, 0x08, 0x5a, 0x21, 0x7e, 0x7c, 0x34, 0x09, 0xb3, 0xc3, + 0x50, 0xd1, 0x59, 0x28, 0x19, 0x0e, 0xa6, 0x05, 0xd1, 0x77, 0x38, 0x8b, 0xa2, 0x98, 0x9b, 0x1d, + 0x15, 0x88, 0x67, 0x49, 0x84, 0x8b, 0x80, 0xde, 0x9b, 0x2b, 0x59, 0x0c, 0x28, 0x50, 0xc3, 0xd3, + 0x84, 0x92, 0x78, 0x2a, 0x67, 0x5b, 0x6f, 0xeb, 0x96, 0x21, 0x5c, 0xee, 0x43, 0xd9, 0x7c, 0xf1, + 0xdc, 0x4e, 0x95, 0x91, 0x40, 0x35, 0x98, 0x14, 0xd4, 0x52, 0x87, 0xa7, 0x26, 0x70, 0xd1, 0x69, + 0xc8, 0x87, 0x0d, 0x03, 0xf5, 0x46, 0x52, 0x6a, 0x2e, 0x64, 0x17, 0x46, 0x59, 0x9e, 0xf4, 0x81, + 0x96, 0x87, 0x3b, 0x7c, 0x3f, 0x94, 0x84, 0x29, 0x15, 0xb7, 0xfe, 0xe6, 0x4f, 0xcb, 0x26, 0x00, + 0x5b, 0xaa, 0x44, 0x93, 0xf2, 0x99, 0xb9, 0x87, 0xf5, 0x9e, 0x65, 0x44, 0x96, 0x5d, 0xef, 0x6b, + 0x35, 0x43, 0xbf, 0x93, 0x80, 0x7c, 0x78, 0x86, 0xfe, 0x56, 0x1a, 0x2d, 0xb4, 0x1e, 0xa8, 0x29, + 0xb6, 0x51, 0xfe, 0xf0, 0x30, 0x35, 0x35, 0x20, 0xcd, 0x23, 0xf4, 0xd3, 0x97, 0x92, 0x90, 0xe6, + 0x97, 0x6e, 0x37, 0x06, 0x7c, 0xdb, 0x91, 0x8f, 0x30, 0x17, 0xc4, 0x3b, 0xd6, 0xb1, 0xae, 0xed, + 0x83, 0x50, 0x24, 0x41, 0x7d, 0xe4, 0x26, 0xaf, 0x74, 0xae, 0x40, 0x63, 0xf3, 0xe0, 0x60, 0x13, + 0x9a, 0x87, 0x1c, 0x01, 0x0b, 0xf4, 0x30, 0x81, 0x81, 0x8e, 0x7e, 0xa7, 0xc6, 0x4a, 0xd0, 0x45, + 0x40, 0x7b, 0x7e, 0xa6, 0x45, 0x0b, 0x18, 0x21, 0x9d, 0x2b, 0xd0, 0x17, 0xc9, 0xa7, 0x82, 0x5a, + 0x81, 0x72, 0x3f, 0x00, 0xe9, 0x89, 0xc6, 0xb2, 0x92, 0xfc, 0x67, 0xb2, 0x49, 0xc9, 0x32, 0xcd, + 0x4c, 0x7e, 0x9b, 0xc4, 0xdc, 0xe4, 0xbe, 0xf0, 0x9f, 0x47, 0x29, 0xcd, 0x31, 0x16, 0xc6, 0x9f, + 0xbd, 0x39, 0x3f, 0xb7, 0xaf, 0x77, 0xda, 0x65, 0x25, 0x86, 0x8e, 0x12, 0x97, 0x91, 0x20, 0xce, + 0x73, 0x34, 0x7d, 0x80, 0xea, 0x20, 0xdf, 0xc4, 0xfb, 0x9a, 0xc3, 0x7f, 0x49, 0x5e, 0xdb, 0xc1, + 0xe2, 0x2d, 0xf4, 0x13, 0x8b, 0x31, 0x39, 0xe2, 0xc5, 0x25, 0xdb, 0xb4, 0xf8, 0x16, 0x66, 0xf1, + 0x26, 0xde, 0x57, 0x39, 0xde, 0x55, 0x8c, 0xcb, 0x0f, 0x90, 0xd5, 0xf2, 0xfa, 0x1f, 0xfc, 0xcc, + 0xf9, 0x93, 0xa1, 0x7c, 0xe7, 0x1d, 0x3f, 0xb1, 0xc7, 0xa6, 0x98, 0x38, 0xbe, 0x28, 0x30, 0x42, + 0xa1, 0xdb, 0xdb, 0x10, 0x8a, 0x15, 0xa4, 0x83, 0x63, 0x90, 0x00, 0x3f, 0x12, 0x83, 0x84, 0x96, + 0xe8, 0xf3, 0x81, 0x0d, 0x48, 0x8c, 0x1a, 0x4d, 0x58, 0x3a, 0x39, 0x12, 0x5d, 0xf9, 0x47, 0x94, + 0xff, 0x24, 0xc1, 0x89, 0x01, 0x69, 0xf6, 0xbb, 0x6c, 0x00, 0x72, 0x42, 0x95, 0x54, 0x2a, 0xc4, + 0x05, 0x9e, 0x7b, 0x5b, 0x1c, 0x53, 0xce, 0x80, 0x21, 0x78, 0x7b, 0x8c, 0x19, 0xd7, 0x64, 0xbf, + 0x2a, 0xc1, 0x4c, 0xb8, 0x03, 0xfe, 0x50, 0x1a, 0x90, 0x0f, 0x37, 0xcd, 0x07, 0xf1, 0xc0, 0x38, + 0x83, 0x08, 0xf7, 0x3f, 0x42, 0x04, 0xdd, 0x08, 0x34, 0x06, 0x4b, 0x27, 0x5e, 0x1c, 0x9b, 0x29, + 0xa2, 0x63, 0xb1, 0x9a, 0x83, 0xcd, 0xcd, 0x97, 0x24, 0x48, 0x6d, 0xda, 0x76, 0x1b, 0xbd, 0x17, + 0xa6, 0x2c, 0xdb, 0xd3, 0xc8, 0xca, 0xc2, 0x2d, 0x8d, 0xa7, 0x0e, 0x98, 0x36, 0xae, 0x1d, 0xc8, + 0xab, 0x3f, 0x7c, 0x73, 0x7e, 0x10, 0x33, 0x6e, 0xcf, 0xa1, 0x64, 0xd9, 0x5e, 0x95, 0x02, 0x35, + 0x59, 0x76, 0x61, 0x07, 0x0a, 0xd1, 0xe6, 0x98, 0xc6, 0xae, 0x8c, 0x6a, 0xae, 0x30, 0xb2, 0xa9, + 0xfc, 0x76, 0xa8, 0x1d, 0xf6, 0xb3, 0x43, 0x7f, 0x42, 0x66, 0xee, 0x9b, 0x40, 0xbe, 0xd1, 0x7f, + 0x3d, 0xf4, 0x2a, 0x4c, 0x8a, 0xeb, 0xa0, 0xd2, 0xb8, 0x57, 0x4d, 0xc3, 0xfc, 0xe4, 0xc8, 0x34, + 0x5f, 0xfb, 0xb9, 0x04, 0x9c, 0x58, 0xb2, 0x2d, 0x97, 0x27, 0x7a, 0xf8, 0xaa, 0x66, 0xc9, 0xe5, + 0x7d, 0xf4, 0xf0, 0x90, 0x34, 0x54, 0x7e, 0x30, 0xd9, 0x74, 0x03, 0x4a, 0xc4, 0xc4, 0x1a, 0xb6, + 0xf5, 0x16, 0x73, 0x4d, 0x05, 0xbb, 0xdd, 0xe2, 0x3d, 0xba, 0x89, 0xf7, 0x09, 0x5d, 0x0b, 0xdf, + 0x8e, 0xd0, 0x4d, 0xde, 0x1b, 0x5d, 0x0b, 0xdf, 0x0e, 0xd1, 0x0d, 0xce, 0x0c, 0xa5, 0x22, 0x37, + 0x90, 0xae, 0x40, 0x92, 0xa8, 0xc2, 0x89, 0x43, 0x28, 0x0f, 0x82, 0x10, 0x32, 0x6b, 0x0d, 0x38, + 0xc1, 0x33, 0x05, 0xee, 0xc6, 0x0e, 0xe5, 0x28, 0xa6, 0x03, 0x7a, 0x11, 0xef, 0xc7, 0xa4, 0x0d, + 0xf2, 0x63, 0xa5, 0x0d, 0xce, 0xff, 0xbc, 0x04, 0x10, 0xe4, 0xcc, 0xd0, 0xa3, 0x70, 0xbc, 0xba, + 0xb1, 0xbe, 0x1c, 0x5c, 0xc6, 0x08, 0x6d, 0xad, 0x8b, 0x53, 0x1a, 0x6e, 0x17, 0x1b, 0xe6, 0x8e, + 0x89, 0x5b, 0xe8, 0x21, 0x98, 0x89, 0x42, 0x93, 0xaf, 0xda, 0xb2, 0x2c, 0xcd, 0xe5, 0x5f, 0xbf, + 0xbb, 0x90, 0x61, 0x31, 0x02, 0x6e, 0xa1, 0x73, 0x70, 0x74, 0x10, 0xae, 0xbe, 0xbe, 0x22, 0x27, + 0xe6, 0x0a, 0xaf, 0xdf, 0x5d, 0xc8, 0xfa, 0xc1, 0x04, 0x52, 0x00, 0x85, 0x21, 0x39, 0xbd, 0xe4, + 0x1c, 0xbc, 0x7e, 0x77, 0x21, 0xcd, 0x96, 0x0c, 0xbf, 0xc5, 0xf1, 0x8d, 0x00, 0x75, 0x6b, 0xc7, + 0xd1, 0x0d, 0xaa, 0x1a, 0xe6, 0xe0, 0x58, 0x7d, 0xfd, 0xaa, 0x5a, 0x59, 0x6a, 0xd6, 0x37, 0xd6, + 0xfb, 0x4e, 0x04, 0x44, 0xeb, 0x96, 0x37, 0xb6, 0xaa, 0xab, 0x35, 0xad, 0x51, 0x5f, 0x59, 0x67, + 0x57, 0xae, 0x22, 0x75, 0xef, 0x59, 0x6f, 0xd6, 0xd7, 0x6a, 0x72, 0xa2, 0x7a, 0x65, 0xe8, 0x76, + 0xdc, 0x7d, 0x91, 0xc5, 0x18, 0x98, 0xa3, 0xc8, 0x46, 0xdc, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, + 0xf0, 0xde, 0x01, 0x06, 0xe8, 0xa7, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -2443,7 +2443,7 @@ func (this *Description) Equal(that interface{}) bool { if this.Details != that1.Details { return false } - if !this.Metadata.Equal(&that1.Metadata) { + if !this.Metadata.Equal(that1.Metadata) { return false } return true @@ -2815,16 +2815,18 @@ func (m *Description) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { - size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Metadata != nil { + { + size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStaking(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintStaking(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x32 } - i-- - dAtA[i] = 0x32 if len(m.Details) > 0 { i -= len(m.Details) copy(dAtA[i:], m.Details) @@ -3989,8 +3991,10 @@ func (m *Description) Size() (n int) { if l > 0 { n += 1 + l + sovStaking(uint64(l)) } - l = m.Metadata.Size() - n += 1 + l + sovStaking(uint64(l)) + if m.Metadata != nil { + l = m.Metadata.Size() + n += 1 + l + sovStaking(uint64(l)) + } return n } @@ -5010,6 +5014,9 @@ func (m *Description) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Metadata == nil { + m.Metadata = &Metadata{} + } if err := m.Metadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 6665c037b793..66483bb9b70e 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -189,7 +189,7 @@ func (v Validator) IsUnbonding() bool { // constant used in flags to indicate that description field should not be updated const DoNotModifyDesc = "[do-not-modify]" -func NewDescription(moniker, identity, website, securityContact, details string, metadata Metadata) Description { +func NewDescription(moniker, identity, website, securityContact, details string, metadata *Metadata) Description { return Description{ Moniker: moniker, Identity: identity, From a4a5a6b1a2a4588a94e2c7b54034b95dfa6a500a Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 19 Nov 2024 16:22:03 +0100 Subject: [PATCH 2/7] cl --- x/staking/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/staking/CHANGELOG.md b/x/staking/CHANGELOG.md index 24843a45f121..49cd67798b9f 100644 --- a/x/staking/CHANGELOG.md +++ b/x/staking/CHANGELOG.md @@ -34,7 +34,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [#19537](https://github.com/cosmos/cosmos-sdk/pull/19537) Changing `MinCommissionRate` in `MsgUpdateParams` now updates the minimum commission rate for all validators. * [#20434](https://github.com/cosmos/cosmos-sdk/pull/20434) Add consensus address to validator query response -* [#21315](https://github.com/cosmos/cosmos-sdk/pull/21315) Create metadata type and add metadata field in validator details proto +* [#21315](https://github.com/cosmos/cosmos-sdk/pull/21315), [#22556](https://github.com/cosmos/cosmos-sdk/pull/22556) Create metadata type and add metadata field in validator details proto * Add parsing of `metadata-profile-pic-uri` in `create-validator` JSON. * Add cli flag: `metadata-profile-pic-uri` to `edit-validator` cmd. From f4d6a37e6b7bfe8e4a58cbfd2beaf6cb07a20813 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 20 Nov 2024 09:32:51 +0100 Subject: [PATCH 3/7] fix --- testutil/network/network.go | 2 +- x/genutil/gentx_test.go | 2 +- x/genutil/types/genesis_state_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testutil/network/network.go b/testutil/network/network.go index 2bc85a10bd52..994e7d5ef366 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -493,7 +493,7 @@ func New(l Logger, baseDir string, cfg Config) (NetworkI, error) { sdk.ValAddress(addr).String(), valPubKeys[i], sdk.NewCoin(cfg.BondDenom, cfg.BondedTokens), - stakingtypes.NewDescription(nodeDirName, "", "", "", "", stakingtypes.Metadata{}), + stakingtypes.NewDescription(nodeDirName, "", "", "", "", &stakingtypes.Metadata{}), stakingtypes.NewCommissionRates(commission, sdkmath.LegacyOneDec(), sdkmath.LegacyOneDec()), sdkmath.OneInt(), ) diff --git a/x/genutil/gentx_test.go b/x/genutil/gentx_test.go index 3a79c9bcceb1..ffe19d1980c9 100644 --- a/x/genutil/gentx_test.go +++ b/x/genutil/gentx_test.go @@ -36,7 +36,7 @@ var ( pk2 = priv2.PubKey() addr1 = sdk.AccAddress(pk1.Address()) addr2 = sdk.AccAddress(pk2.Address()) - desc = stakingtypes.NewDescription("testname", "", "", "", "", stakingtypes.Metadata{}) + desc = stakingtypes.NewDescription("testname", "", "", "", "", &stakingtypes.Metadata{}) comm = stakingtypes.CommissionRates{} ) diff --git a/x/genutil/types/genesis_state_test.go b/x/genutil/types/genesis_state_test.go index 9e04d9a5f571..ec5ec7047038 100644 --- a/x/genutil/types/genesis_state_test.go +++ b/x/genutil/types/genesis_state_test.go @@ -39,7 +39,7 @@ func TestNetGenesisState(t *testing.T) { } func TestValidateGenesisMultipleMessages(t *testing.T) { - desc := stakingtypes.NewDescription("testname", "", "", "", "", stakingtypes.Metadata{}) + desc := stakingtypes.NewDescription("testname", "", "", "", "", &stakingtypes.Metadata{}) comm := stakingtypes.CommissionRates{} valAc := codectestutil.CodecOptions{}.GetValidatorCodec() @@ -66,7 +66,7 @@ func TestValidateGenesisMultipleMessages(t *testing.T) { } func TestValidateGenesisBadMessage(t *testing.T) { - desc := stakingtypes.NewDescription("testname", "", "", "", "", stakingtypes.Metadata{}) + desc := stakingtypes.NewDescription("testname", "", "", "", "", &stakingtypes.Metadata{}) pk1Addr, err := codectestutil.CodecOptions{}.GetValidatorCodec().BytesToString(pk1.Address()) require.NoError(t, err) msg1 := stakingtypes.NewMsgEditValidator(pk1Addr, desc, nil, nil) From accb7ecded235a070b9376c5621070efe8f9d6df Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 26 Nov 2024 17:52:28 +0100 Subject: [PATCH 4/7] build --- simapp/simd/cmd/testnet.go | 2 +- simapp/v2/simdv2/cmd/testnet.go | 2 +- tests/integration/gov/common_test.go | 2 +- tests/integration/slashing/slashing_test.go | 2 +- tests/integration/staking/keeper/deterministic_test.go | 10 +++++----- tests/integration/staking/keeper/genesis_test.go | 10 +++++----- tests/integration/staking/keeper/msg_server_test.go | 2 +- x/staking/types/validator.go | 6 ++++-- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index b7199b4cbafa..e060976d1376 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -353,7 +353,7 @@ func initTestnetFiles( valStr, valPubKeys[i], sdk.NewCoin(args.bondTokenDenom, valTokens), - stakingtypes.NewDescription(nodeDirName, "", "", "", "", stakingtypes.Metadata{}), + stakingtypes.NewDescription(nodeDirName, "", "", "", "", &stakingtypes.Metadata{}), stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()), math.OneInt(), ) diff --git a/simapp/v2/simdv2/cmd/testnet.go b/simapp/v2/simdv2/cmd/testnet.go index 46a19c039c86..ed5786fb668c 100644 --- a/simapp/v2/simdv2/cmd/testnet.go +++ b/simapp/v2/simdv2/cmd/testnet.go @@ -295,7 +295,7 @@ func initTestnetFiles[T transaction.Tx]( valStr, valPubKeys[i], sdk.NewCoin(args.bondTokenDenom, valTokens), - stakingtypes.NewDescription(nodeDirName, "", "", "", "", stakingtypes.Metadata{}), + stakingtypes.NewDescription(nodeDirName, "", "", "", "", &stakingtypes.Metadata{}), stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()), math.OneInt(), ) diff --git a/tests/integration/gov/common_test.go b/tests/integration/gov/common_test.go index f84bbc81a857..b2fe831877ee 100644 --- a/tests/integration/gov/common_test.go +++ b/tests/integration/gov/common_test.go @@ -34,7 +34,7 @@ import ( var ( valTokens = sdk.TokensFromConsensusPower(42, sdk.DefaultPowerReduction) TestProposal = v1beta1.NewTextProposal("Test", "description") - TestDescription = stakingtypes.NewDescription("T", "E", "S", "T", "Z", stakingtypes.Metadata{}) + TestDescription = stakingtypes.NewDescription("T", "E", "S", "T", "Z", &stakingtypes.Metadata{}) TestCommissionRates = stakingtypes.NewCommissionRates(math.LegacyZeroDec(), math.LegacyZeroDec(), math.LegacyZeroDec()) ) diff --git a/tests/integration/slashing/slashing_test.go b/tests/integration/slashing/slashing_test.go index 6c60ce295b5d..be116892c240 100644 --- a/tests/integration/slashing/slashing_test.go +++ b/tests/integration/slashing/slashing_test.go @@ -83,7 +83,7 @@ func TestSlashingMsgs(t *testing.T) { require.NoError(t, err) - description := stakingtypes.NewDescription("foo_moniker", "", "", "", "", stakingtypes.Metadata{}) + description := stakingtypes.NewDescription("foo_moniker", "", "", "", "", &stakingtypes.Metadata{}) commission := stakingtypes.NewCommissionRates(math.LegacyZeroDec(), math.LegacyZeroDec(), math.LegacyZeroDec()) addrStrVal, err := valaddrCodec.BytesToString(addr1) diff --git a/tests/integration/staking/keeper/deterministic_test.go b/tests/integration/staking/keeper/deterministic_test.go index 4a47dc2fa6f5..d7e0e227a80b 100644 --- a/tests/integration/staking/keeper/deterministic_test.go +++ b/tests/integration/staking/keeper/deterministic_test.go @@ -216,9 +216,9 @@ func bondTypeGenerator() *rapid.Generator[stakingtypes.BondStatus] { }) } -func metadataGenerator() *rapid.Generator[stakingtypes.Metadata] { - return rapid.Custom(func(t *rapid.T) stakingtypes.Metadata { - return stakingtypes.Metadata{ +func metadataGenerator() *rapid.Generator[*stakingtypes.Metadata] { + return rapid.Custom(func(t *rapid.T) *stakingtypes.Metadata { + return &stakingtypes.Metadata{ ProfilePicUri: generateUri(t), SocialHandleUris: []string{generateUri(t), generateUri(t)}, } @@ -331,7 +331,7 @@ func getStaticValidator(t *testing.T, f *deterministicFixture) stakingtypes.Vali "website", "securityContact", "details", - stakingtypes.Metadata{}, + &stakingtypes.Metadata{}, ), UnbondingHeight: 10, UnbondingTime: time.Date(2022, 10, 1, 0, 0, 0, 0, time.UTC), @@ -367,7 +367,7 @@ func getStaticValidator2(t *testing.T, f *deterministicFixture) stakingtypes.Val "website", "securityContact", "details", - stakingtypes.Metadata{}, + &stakingtypes.Metadata{}, ), UnbondingHeight: 100132, UnbondingTime: time.Date(2025, 10, 1, 0, 0, 0, 0, time.UTC), diff --git a/tests/integration/staking/keeper/genesis_test.go b/tests/integration/staking/keeper/genesis_test.go index da9fd6c5d660..82bc85562ce1 100644 --- a/tests/integration/staking/keeper/genesis_test.go +++ b/tests/integration/staking/keeper/genesis_test.go @@ -41,7 +41,7 @@ func TestInitGenesis(t *testing.T) { Status: types.Bonded, Tokens: valTokens, DelegatorShares: math.LegacyNewDecFromInt(valTokens), - Description: types.NewDescription("hoop", "", "", "", "", types.Metadata{}), + Description: types.NewDescription("hoop", "", "", "", "", &types.Metadata{}), } assert.NilError(t, f.stakingKeeper.SetValidator(f.sdkCtx, bondedVal)) @@ -67,7 +67,7 @@ func TestInitGenesis(t *testing.T) { Status: types.Bonded, Tokens: valTokens, DelegatorShares: math.LegacyNewDecFromInt(valTokens), - Description: types.NewDescription("hoop", "", "", "", "", types.Metadata{}), + Description: types.NewDescription("hoop", "", "", "", "", &types.Metadata{}), } bondedVal2 := types.Validator{ OperatorAddress: sdk.ValAddress(addrs[2]).String(), @@ -75,7 +75,7 @@ func TestInitGenesis(t *testing.T) { Status: types.Bonded, Tokens: valTokens, DelegatorShares: math.LegacyNewDecFromInt(valTokens), - Description: types.NewDescription("bloop", "", "", "", "", types.Metadata{}), + Description: types.NewDescription("bloop", "", "", "", "", &types.Metadata{}), } // append new bonded validators to the list @@ -148,7 +148,7 @@ func TestInitGenesis_PoolsBalanceMismatch(t *testing.T) { Jailed: false, Tokens: math.NewInt(10), DelegatorShares: math.LegacyNewDecFromInt(math.NewInt(10)), - Description: types.NewDescription("bloop", "", "", "", "", types.Metadata{}), + Description: types.NewDescription("bloop", "", "", "", "", &types.Metadata{}), } params := types.Params{ @@ -195,7 +195,7 @@ func TestInitGenesisLargeValidatorSet(t *testing.T) { validators[i], err = types.NewValidator( sdk.ValAddress(addrs[i]).String(), PKs[i], - types.NewDescription(fmt.Sprintf("#%d", i), "", "", "", "", types.Metadata{}), + types.NewDescription(fmt.Sprintf("#%d", i), "", "", "", "", &types.Metadata{}), ) assert.NilError(t, err) validators[i].Status = types.Bonded diff --git a/tests/integration/staking/keeper/msg_server_test.go b/tests/integration/staking/keeper/msg_server_test.go index f07308591a84..cea78ae9f1f7 100644 --- a/tests/integration/staking/keeper/msg_server_test.go +++ b/tests/integration/staking/keeper/msg_server_test.go @@ -44,7 +44,7 @@ func TestCancelUnbondingDelegation(t *testing.T) { delegatorAddr := addrs[1] // setup a new validator with bonded status - validator, err := types.NewValidator(valAddr.String(), PKs[0], types.NewDescription("Validator", "", "", "", "", types.Metadata{})) + validator, err := types.NewValidator(valAddr.String(), PKs[0], types.NewDescription("Validator", "", "", "", "", &types.Metadata{})) validator.Status = types.Bonded assert.NilError(t, err) assert.NilError(t, f.stakingKeeper.SetValidator(ctx, validator)) diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 66483bb9b70e..3520137423a0 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -269,8 +269,10 @@ func (d Description) IsEmpty() bool { // Validate calls metadata.Validate() description.EnsureLength() func (d Description) Validate() (Description, error) { - if err := d.Metadata.Validate(); err != nil { - return d, err + if d.Metadata != nil { + if err := d.Metadata.Validate(); err != nil { + return d, err + } } return d.EnsureLength() From 09e8221caf445cff20e6ebfe6d722e62a8d6cf88 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 26 Nov 2024 18:09:01 +0100 Subject: [PATCH 5/7] fix isEmpty --- x/staking/types/validator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 3520137423a0..9a0785e1942e 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -264,7 +264,7 @@ func (d Description) EnsureLength() (Description, error) { func (d Description) IsEmpty() bool { return d.Moniker == "" && d.Details == "" && d.Identity == "" && d.Website == "" && d.SecurityContact == "" && - d.Metadata.ProfilePicUri == "" && len(d.Metadata.SocialHandleUris) == 0 + d.Metadata == nil } // Validate calls metadata.Validate() description.EnsureLength() From 826779dc75b8816b09ba14badd1233fc796034d0 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 26 Nov 2024 21:45:42 +0100 Subject: [PATCH 6/7] updates --- x/staking/types/validator.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 9a0785e1942e..b626d2e2ea0b 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -223,8 +223,10 @@ func (d Description) UpdateDescription(d2 Description) (Description, error) { d2.Details = d.Details } - if d2.Metadata.ProfilePicUri == DoNotModifyDesc { - d2.Metadata.ProfilePicUri = d.Metadata.ProfilePicUri + if d2.Metadata != nil { + if d2.Metadata.ProfilePicUri == DoNotModifyDesc { + d2.Metadata.ProfilePicUri = d.Metadata.ProfilePicUri + } } return NewDescription( @@ -264,7 +266,7 @@ func (d Description) EnsureLength() (Description, error) { func (d Description) IsEmpty() bool { return d.Moniker == "" && d.Details == "" && d.Identity == "" && d.Website == "" && d.SecurityContact == "" && - d.Metadata == nil + (d.Metadata == nil || d.Metadata.ProfilePicUri == "" && len(d.Metadata.SocialHandleUris) == 0) } // Validate calls metadata.Validate() description.EnsureLength() From 6edb300a1af468068374ba1b387b686f11143978 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 27 Nov 2024 00:33:07 +0100 Subject: [PATCH 7/7] updates --- x/staking/keeper/keeper_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/staking/keeper/keeper_test.go b/x/staking/keeper/keeper_test.go index 9043e261d25d..ebc252551aea 100644 --- a/x/staking/keeper/keeper_test.go +++ b/x/staking/keeper/keeper_test.go @@ -481,7 +481,7 @@ func (s *KeeperTestSuite) TestValidatorsMigrationToColls() { // legacy Set method s.ctx.KVStore(s.key).Set(getValidatorKey(valAddrs[i]), valBz) }, - "55565aebbb67e1de08d0f17634ad168c68eae74f5cc9074e3a1ec4d1fbff16e5", + "d8acdcf8b7c8e17f3e83f0a4c293f89ad619a5dcb14d232911ccc5da15653177", ) s.Require().NoError(err) @@ -507,7 +507,7 @@ func (s *KeeperTestSuite) TestValidatorsMigrationToColls() { err := s.stakingKeeper.SetValidator(s.ctx, val) s.Require().NoError(err) }, - "55565aebbb67e1de08d0f17634ad168c68eae74f5cc9074e3a1ec4d1fbff16e5", + "d8acdcf8b7c8e17f3e83f0a4c293f89ad619a5dcb14d232911ccc5da15653177", ) s.Require().NoError(err) }