From ec39bb3b4274eca381cca7eefce0b45e90d84500 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Tue, 25 Feb 2020 15:22:28 -0500 Subject: [PATCH] Merge PR #5696: Fix x/auth proto json tags --- server/export.go | 10 ++--- x/auth/types/account.go | 46 ++++++++++++++++++++ x/auth/types/types.pb.go | 83 +++++++++++++++++++------------------ x/auth/types/types.proto | 4 +- x/upgrade/types/types.pb.go | 65 ++++++++++++++--------------- 5 files changed, 125 insertions(+), 83 deletions(-) diff --git a/server/export.go b/server/export.go index b4f52f639..81f43571b 100644 --- a/server/export.go +++ b/server/export.go @@ -10,7 +10,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" @@ -39,8 +38,8 @@ func ExportCmd(ctx *Context, cdc codec.JSONMarshaler, appExporter AppExporter) * return err } - if isEmptyState(db) || appExporter == nil { - if _, err := fmt.Fprintln(os.Stderr, "WARNING: State is not initialized. Returning genesis file."); err != nil { + if appExporter == nil { + if _, err := fmt.Fprintln(os.Stderr, "WARNING: App exporter not defined. Returning genesis file."); err != nil { return err } @@ -88,9 +87,6 @@ func ExportCmd(ctx *Context, cdc codec.JSONMarshaler, appExporter AppExporter) * cmd.Flags().Int64(flagHeight, -1, "Export state from a particular height (-1 means latest height)") cmd.Flags().Bool(flagForZeroHeight, false, "Export state to start at height zero (perform preproccessing)") cmd.Flags().StringSlice(flagJailWhitelist, []string{}, "List of validators to not jail state export") + return cmd } - -func isEmptyState(db dbm.DB) bool { - return db.Stats()["leveldb.sstables"] == "" -} diff --git a/x/auth/types/account.go b/x/auth/types/account.go index 08b67facc..bae7d8f3b 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -2,6 +2,7 @@ package types import ( "bytes" + "encoding/json" "errors" "github.com/tendermint/tendermint/crypto" @@ -143,3 +144,48 @@ func (acc BaseAccount) MarshalYAML() (interface{}, error) { return string(bz), err } + +// MarshalJSON returns the JSON representation of a BaseAccount. +func (acc BaseAccount) MarshalJSON() ([]byte, error) { + alias := baseAccountPretty{ + Address: acc.Address, + AccountNumber: acc.AccountNumber, + Sequence: acc.Sequence, + } + + if acc.PubKey != nil { + pks, err := sdk.Bech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, acc.GetPubKey()) + if err != nil { + return nil, err + } + + alias.PubKey = pks + } + + return json.Marshal(alias) +} + +// UnmarshalJSON unmarshals raw JSON bytes into a BaseAccount. +func (acc *BaseAccount) UnmarshalJSON(bz []byte) error { + var alias baseAccountPretty + if err := json.Unmarshal(bz, &alias); err != nil { + return err + } + + // NOTE: This will not work for multisig-based accounts as their Bech32 + // encoding is too long. + if alias.PubKey != "" { + pk, err := sdk.GetPubKeyFromBech32(sdk.Bech32PubKeyTypeAccPub, alias.PubKey) + if err != nil { + return err + } + + acc.PubKey = pk.Bytes() + } + + acc.Address = alias.Address + acc.AccountNumber = alias.AccountNumber + acc.Sequence = alias.Sequence + + return nil +} diff --git a/x/auth/types/types.pb.go b/x/auth/types/types.pb.go index d4aaf520d..f5fa313fb 100644 --- a/x/auth/types/types.pb.go +++ b/x/auth/types/types.pb.go @@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // type for additional functionality (e.g. vesting). type BaseAccount struct { Address github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=address,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"address,omitempty"` - PubKey []byte `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty" yaml:"public_key"` + PubKey []byte `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"public_key,omitempty" yaml:"public_key"` AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty" yaml:"account_number"` Sequence uint64 `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"` } @@ -207,46 +207,47 @@ func init() { func init() { proto.RegisterFile("x/auth/types/types.proto", fileDescriptor_2d526fa662daab74) } var fileDescriptor_2d526fa662daab74 = []byte{ - // 613 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xbf, 0x6f, 0xd3, 0x4e, - 0x14, 0x8f, 0xbf, 0xc9, 0x37, 0xad, 0xae, 0x05, 0x11, 0xf7, 0x97, 0x1b, 0x21, 0x5f, 0xe4, 0x01, - 0x85, 0xa1, 0x0e, 0x29, 0x2a, 0x52, 0x33, 0x20, 0xea, 0x00, 0x4b, 0xa1, 0xaa, 0x1c, 0x89, 0x01, - 0x09, 0x59, 0x67, 0xfb, 0x70, 0xac, 0xf4, 0x72, 0xae, 0xef, 0x5c, 0xd9, 0x5d, 0x58, 0x19, 0x19, - 0x19, 0x3b, 0xf3, 0x97, 0x74, 0xec, 0xc8, 0xe4, 0xa2, 0x74, 0x61, 0xf6, 0xc8, 0x84, 0xce, 0x97, - 0x96, 0xb4, 0x14, 0xc4, 0x62, 0xdf, 0x7b, 0xef, 0xf3, 0xe3, 0xee, 0xbd, 0x3b, 0xa0, 0xa5, 0x1d, - 0x94, 0xf0, 0x61, 0x87, 0x67, 0x11, 0x66, 0xf2, 0x6b, 0x46, 0x31, 0xe5, 0x54, 0x5d, 0xf6, 0x28, - 0x23, 0x94, 0x39, 0xcc, 0x1f, 0x99, 0xa9, 0x29, 0x40, 0xe6, 0x51, 0xb7, 0xf9, 0x80, 0x0f, 0xc3, - 0xd8, 0x77, 0x22, 0x14, 0xf3, 0xac, 0x53, 0x02, 0x3b, 0x01, 0x0d, 0xe8, 0xaf, 0x95, 0x64, 0x37, - 0x1b, 0xbf, 0x09, 0x1a, 0x85, 0x02, 0x16, 0x2c, 0xc4, 0xf0, 0x8e, 0xe7, 0xd1, 0x64, 0xcc, 0xd5, - 0x5d, 0x30, 0x87, 0x7c, 0x3f, 0xc6, 0x8c, 0x69, 0x4a, 0x4b, 0x69, 0x2f, 0x5a, 0xdd, 0x1f, 0x39, - 0xdc, 0x08, 0x42, 0x3e, 0x4c, 0x5c, 0xd3, 0xa3, 0xa4, 0x23, 0x37, 0x30, 0xfd, 0x6d, 0x30, 0x7f, - 0x34, 0x95, 0xdb, 0xf1, 0xbc, 0x1d, 0x49, 0xb4, 0x2f, 0x15, 0x54, 0x13, 0xcc, 0x45, 0x89, 0xeb, - 0x8c, 0x70, 0xa6, 0xfd, 0x57, 0x8a, 0xad, 0x14, 0x39, 0x6c, 0x64, 0x88, 0x1c, 0xf4, 0x8c, 0x28, - 0x71, 0x0f, 0x42, 0x4f, 0xd4, 0x0c, 0xbb, 0x1e, 0x25, 0xee, 0x2e, 0xce, 0xd4, 0x67, 0xe0, 0x2e, - 0x92, 0xfb, 0x70, 0xc6, 0x09, 0x71, 0x71, 0xac, 0x55, 0x5b, 0x4a, 0xbb, 0x66, 0xad, 0x17, 0x39, - 0x5c, 0x91, 0xb4, 0xeb, 0x75, 0xc3, 0xbe, 0x33, 0x4d, 0xec, 0x95, 0xb1, 0xda, 0x04, 0xf3, 0x0c, - 0x1f, 0x26, 0x78, 0xec, 0x61, 0xad, 0x26, 0xb8, 0xf6, 0x55, 0xdc, 0x9b, 0xff, 0x78, 0x02, 0x2b, - 0x9f, 0x4f, 0x60, 0xc5, 0xf8, 0x00, 0xea, 0x03, 0xee, 0xbf, 0xc4, 0x58, 0x7d, 0x07, 0xea, 0x88, - 0x08, 0xbe, 0xa6, 0xb4, 0xaa, 0xed, 0x85, 0xcd, 0x25, 0x73, 0xa6, 0xc1, 0x47, 0x5d, 0xb3, 0x4f, - 0xc3, 0xb1, 0xf5, 0xe8, 0x34, 0x87, 0x95, 0x2f, 0xe7, 0xb0, 0xfd, 0x0f, 0x6d, 0x10, 0x04, 0x66, - 0x4f, 0x45, 0xd5, 0x7b, 0xa0, 0x1a, 0x20, 0x56, 0x1e, 0xbe, 0x66, 0x8b, 0x65, 0xaf, 0xf6, 0xfd, - 0x04, 0x2a, 0xc6, 0x79, 0x15, 0xd4, 0xf7, 0x51, 0x8c, 0x08, 0x53, 0xf7, 0xc0, 0x12, 0x41, 0xa9, - 0x43, 0x30, 0xa1, 0x8e, 0x37, 0x44, 0x31, 0xf2, 0x38, 0x8e, 0x65, 0xf3, 0x6b, 0x96, 0x5e, 0xe4, - 0xb0, 0x29, 0x0f, 0x7e, 0x0b, 0xc8, 0xb0, 0x1b, 0x04, 0xa5, 0xaf, 0x31, 0xa1, 0xfd, 0xab, 0x9c, - 0xba, 0x0d, 0x16, 0x79, 0xea, 0xb0, 0x30, 0x70, 0x0e, 0x42, 0x12, 0x72, 0xe9, 0x6d, 0xad, 0x15, - 0x39, 0x5c, 0x92, 0x42, 0xb3, 0x55, 0xc3, 0x06, 0x3c, 0x1d, 0x84, 0xc1, 0x2b, 0x11, 0xa8, 0x36, - 0x58, 0x29, 0x8b, 0xc7, 0xd8, 0xf1, 0x28, 0xe3, 0x4e, 0x84, 0x63, 0xc7, 0xcd, 0x38, 0x9e, 0x4e, - 0xa1, 0x55, 0xe4, 0xf0, 0xfe, 0x8c, 0xc6, 0x4d, 0x98, 0x61, 0x37, 0x84, 0xd8, 0x31, 0xee, 0x53, - 0xc6, 0xf7, 0x71, 0x6c, 0x65, 0x1c, 0xab, 0x87, 0x60, 0x4d, 0xb8, 0x1d, 0xe1, 0x38, 0x7c, 0x9f, - 0x49, 0x3c, 0xf6, 0x37, 0xb7, 0xb6, 0xba, 0xdb, 0x72, 0x3e, 0x56, 0x6f, 0x92, 0xc3, 0xe5, 0x41, - 0x18, 0xbc, 0x29, 0x11, 0x82, 0xfa, 0xe2, 0x79, 0x59, 0x2f, 0x72, 0xa8, 0x4b, 0xb7, 0x3f, 0x08, - 0x18, 0xf6, 0x32, 0xbb, 0xc6, 0x93, 0x69, 0x35, 0x03, 0xeb, 0x37, 0x19, 0x0c, 0x7b, 0xd1, 0xe6, - 0xd6, 0x93, 0x51, 0x57, 0xfb, 0xbf, 0x34, 0x7d, 0x3a, 0xc9, 0xe1, 0xea, 0x35, 0xd3, 0xc1, 0x25, - 0xa2, 0xc8, 0x61, 0xeb, 0x76, 0xdb, 0x2b, 0x11, 0xc3, 0x5e, 0x65, 0xb7, 0x72, 0x7b, 0xf3, 0xe2, - 0x7a, 0x89, 0x09, 0x5b, 0xfd, 0xd3, 0x89, 0xae, 0x9c, 0x4d, 0x74, 0xe5, 0xdb, 0x44, 0x57, 0x3e, - 0x5d, 0xe8, 0x95, 0xb3, 0x0b, 0xbd, 0xf2, 0xf5, 0x42, 0xaf, 0xbc, 0x7d, 0xf8, 0xd7, 0x5b, 0x34, - 0xfb, 0xf2, 0xdd, 0x7a, 0xf9, 0x46, 0x1f, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xcb, 0x64, - 0x0b, 0x10, 0x04, 0x00, 0x00, + // 630 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xbf, 0x6f, 0xd3, 0x4e, + 0x14, 0x8f, 0x9b, 0x7c, 0xd3, 0xea, 0xda, 0x2f, 0x22, 0x6e, 0xda, 0xba, 0x11, 0xf2, 0x45, 0x1e, + 0x50, 0x90, 0xa8, 0x43, 0x8a, 0x8a, 0xd4, 0x0c, 0x88, 0x3a, 0xd0, 0xa5, 0x50, 0x55, 0x8e, 0xc4, + 0x80, 0x84, 0xac, 0xb3, 0x7d, 0x38, 0x56, 0x7a, 0x39, 0xd7, 0x77, 0xae, 0xec, 0x2e, 0xac, 0x88, + 0x89, 0x91, 0xb1, 0x33, 0x7f, 0x49, 0xc7, 0x8e, 0x4c, 0x2e, 0x4a, 0x17, 0xc4, 0xe8, 0x91, 0x09, + 0xd9, 0x97, 0xb6, 0x69, 0x29, 0x88, 0xc5, 0xbe, 0xf7, 0xde, 0xe7, 0xc7, 0xf9, 0xbd, 0xf3, 0x01, + 0x25, 0x6e, 0xa3, 0x88, 0x0f, 0xda, 0x3c, 0x09, 0x30, 0x13, 0x4f, 0x3d, 0x08, 0x29, 0xa7, 0x72, + 0xdd, 0xa1, 0x8c, 0x50, 0x66, 0x31, 0x77, 0xa8, 0xc7, 0x7a, 0x0e, 0xd2, 0x0f, 0x3b, 0x8d, 0xfb, + 0x7c, 0xe0, 0x87, 0xae, 0x15, 0xa0, 0x90, 0x27, 0xed, 0x02, 0xd8, 0xf6, 0xa8, 0x47, 0xaf, 0x56, + 0x82, 0xdd, 0xa8, 0xfd, 0x26, 0xa8, 0x7d, 0x9c, 0x01, 0xf3, 0x06, 0x62, 0x78, 0xcb, 0x71, 0x68, + 0x34, 0xe2, 0xf2, 0x0e, 0x98, 0x45, 0xae, 0x1b, 0x62, 0xc6, 0x14, 0xa9, 0x29, 0xb5, 0x16, 0x8c, + 0xce, 0xcf, 0x14, 0xae, 0x79, 0x3e, 0x1f, 0x44, 0xb6, 0xee, 0x50, 0xd2, 0x16, 0x1b, 0x98, 0xbc, + 0xd6, 0x98, 0x3b, 0x9c, 0xc8, 0x6d, 0x39, 0xce, 0x96, 0x20, 0x9a, 0x17, 0x0a, 0xf2, 0x36, 0x98, + 0x0d, 0x22, 0xdb, 0x1a, 0xe2, 0x44, 0x99, 0x29, 0xc4, 0xd6, 0x7e, 0xa4, 0xb0, 0x1e, 0x44, 0xf6, + 0xbe, 0xef, 0xe4, 0xd9, 0x87, 0x94, 0xf8, 0x1c, 0x93, 0x80, 0x27, 0x59, 0x0a, 0x6b, 0x09, 0x22, + 0xfb, 0x5d, 0xed, 0xaa, 0xaa, 0x99, 0xd5, 0x20, 0xb2, 0x77, 0x70, 0x22, 0x3f, 0x03, 0x77, 0x90, + 0xd8, 0x9f, 0x35, 0x8a, 0x88, 0x8d, 0x43, 0xa5, 0xdc, 0x94, 0x5a, 0x15, 0x63, 0x35, 0x4b, 0xe1, + 0x92, 0xa0, 0x5d, 0xaf, 0x6b, 0xe6, 0xff, 0x93, 0xc4, 0x6e, 0x11, 0xcb, 0x0d, 0x30, 0xc7, 0xf0, + 0x41, 0x84, 0x47, 0x0e, 0x56, 0x2a, 0x39, 0xd7, 0xbc, 0x8c, 0xbb, 0x73, 0x1f, 0x8e, 0x61, 0xe9, + 0xf3, 0x31, 0x2c, 0x69, 0xef, 0x41, 0xb5, 0xcf, 0xdd, 0x6d, 0x8c, 0xe5, 0xb7, 0xa0, 0x8a, 0x48, + 0xce, 0x57, 0xa4, 0x66, 0xb9, 0x35, 0xbf, 0xbe, 0xa8, 0x4f, 0x35, 0xfe, 0xb0, 0xa3, 0xf7, 0xa8, + 0x3f, 0x32, 0x1e, 0x9d, 0xa4, 0xb0, 0xf4, 0xe5, 0x0c, 0xb6, 0xfe, 0xa1, 0x3d, 0x39, 0x81, 0x99, + 0x13, 0x51, 0xf9, 0x2e, 0x28, 0x7b, 0x88, 0x15, 0x4d, 0xa9, 0x98, 0xf9, 0xb2, 0x5b, 0xf9, 0x7e, + 0x0c, 0x25, 0xed, 0xac, 0x0c, 0xaa, 0x7b, 0x28, 0x44, 0x84, 0xc9, 0xbb, 0x60, 0x91, 0xa0, 0xd8, + 0x22, 0x98, 0x50, 0xcb, 0x19, 0xa0, 0x10, 0x39, 0x1c, 0x87, 0x62, 0x28, 0x15, 0x43, 0xcd, 0x52, + 0xd8, 0x10, 0x1f, 0x7e, 0x0b, 0x48, 0x33, 0x6b, 0x04, 0xc5, 0xaf, 0x30, 0xa1, 0xbd, 0xcb, 0x9c, + 0xbc, 0x09, 0x16, 0x78, 0x6c, 0x31, 0xdf, 0xb3, 0xf6, 0x7d, 0xe2, 0x73, 0xe1, 0x6d, 0xac, 0x64, + 0x29, 0x5c, 0x14, 0x42, 0xd3, 0x55, 0xcd, 0x04, 0x3c, 0xee, 0xfb, 0xde, 0xcb, 0x3c, 0x90, 0x4d, + 0xb0, 0x54, 0x14, 0x8f, 0xb0, 0xe5, 0x50, 0xc6, 0xad, 0x00, 0x87, 0x96, 0x9d, 0x70, 0x3c, 0x99, + 0x42, 0x33, 0x4b, 0xe1, 0xbd, 0x29, 0x8d, 0x9b, 0x30, 0xcd, 0xac, 0xe5, 0x62, 0x47, 0xb8, 0x47, + 0x19, 0xdf, 0xc3, 0xa1, 0x91, 0x70, 0x2c, 0x1f, 0x80, 0x95, 0xdc, 0xed, 0x10, 0x87, 0xfe, 0xbb, + 0x44, 0xe0, 0xb1, 0xbb, 0xbe, 0xb1, 0xd1, 0xd9, 0x14, 0xf3, 0x31, 0xba, 0xe3, 0x14, 0xd6, 0xfb, + 0xbe, 0xf7, 0xba, 0x40, 0xe4, 0xd4, 0x17, 0xcf, 0x8b, 0x7a, 0x96, 0x42, 0x55, 0xb8, 0xfd, 0x41, + 0x40, 0x33, 0xeb, 0xec, 0x1a, 0x4f, 0xa4, 0xe5, 0x04, 0xac, 0xde, 0x64, 0x30, 0xec, 0x04, 0xeb, + 0x1b, 0x4f, 0x86, 0x1d, 0xe5, 0xbf, 0xc2, 0xf4, 0xe9, 0x38, 0x85, 0xcb, 0xd7, 0x4c, 0xfb, 0x17, + 0x88, 0x2c, 0x85, 0xcd, 0xdb, 0x6d, 0x2f, 0x45, 0x34, 0x73, 0x99, 0xdd, 0xca, 0xed, 0xce, 0xe5, + 0xc7, 0x2b, 0x9f, 0xb0, 0xd1, 0x3b, 0x19, 0xab, 0xd2, 0xe9, 0x58, 0x95, 0xbe, 0x8d, 0x55, 0xe9, + 0xd3, 0xb9, 0x5a, 0x3a, 0x3d, 0x57, 0x4b, 0x5f, 0xcf, 0xd5, 0xd2, 0x9b, 0x07, 0x7f, 0x3d, 0x45, + 0xd3, 0x37, 0x82, 0x5d, 0x2d, 0xfe, 0xdd, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xce, 0x6d, + 0xf3, 0x2e, 0x28, 0x04, 0x00, 0x00, } func (this *StdFee) Equal(that interface{}) bool { diff --git a/x/auth/types/types.proto b/x/auth/types/types.proto index 99bf50bc8..60e7a8d8b 100644 --- a/x/auth/types/types.proto +++ b/x/auth/types/types.proto @@ -13,8 +13,8 @@ message BaseAccount { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - bytes address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - bytes pub_key = 2 [(gogoproto.moretags) = "yaml:\"public_key\""]; + bytes address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; + bytes pub_key = 2 [(gogoproto.jsontag) = "public_key,omitempty", (gogoproto.moretags) = "yaml:\"public_key\""]; uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""]; uint64 sequence = 4; } diff --git a/x/upgrade/types/types.pb.go b/x/upgrade/types/types.pb.go index 4e8f7cbb9..8cc9e383b 100644 --- a/x/upgrade/types/types.pb.go +++ b/x/upgrade/types/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: x/upgrade/internal/types/types.proto +// source: x/upgrade/types/types.proto package types @@ -49,7 +49,7 @@ type Plan struct { func (m *Plan) Reset() { *m = Plan{} } func (*Plan) ProtoMessage() {} func (*Plan) Descriptor() ([]byte, []int) { - return fileDescriptor_6199ecc2c05edfcb, []int{0} + return fileDescriptor_2a308fd9dd71aff8, []int{0} } func (m *Plan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -78,6 +78,7 @@ func (m *Plan) XXX_DiscardUnknown() { var xxx_messageInfo_Plan proto.InternalMessageInfo +// SoftwareUpgradeProposal is a gov Content type for initiating a software upgrade type SoftwareUpgradeProposal struct { Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` @@ -87,7 +88,7 @@ type SoftwareUpgradeProposal struct { func (m *SoftwareUpgradeProposal) Reset() { *m = SoftwareUpgradeProposal{} } func (*SoftwareUpgradeProposal) ProtoMessage() {} func (*SoftwareUpgradeProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_6199ecc2c05edfcb, []int{1} + return fileDescriptor_2a308fd9dd71aff8, []int{1} } func (m *SoftwareUpgradeProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -116,6 +117,7 @@ func (m *SoftwareUpgradeProposal) XXX_DiscardUnknown() { var xxx_messageInfo_SoftwareUpgradeProposal proto.InternalMessageInfo +// SoftwareUpgradeProposal is a gov Content type for cancelling a software upgrade type CancelSoftwareUpgradeProposal struct { Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` @@ -124,7 +126,7 @@ type CancelSoftwareUpgradeProposal struct { func (m *CancelSoftwareUpgradeProposal) Reset() { *m = CancelSoftwareUpgradeProposal{} } func (*CancelSoftwareUpgradeProposal) ProtoMessage() {} func (*CancelSoftwareUpgradeProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_6199ecc2c05edfcb, []int{2} + return fileDescriptor_2a308fd9dd71aff8, []int{2} } func (m *CancelSoftwareUpgradeProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,36 +161,33 @@ func init() { proto.RegisterType((*CancelSoftwareUpgradeProposal)(nil), "cosmos_sdk.x.upgrade.v1.CancelSoftwareUpgradeProposal") } -func init() { - proto.RegisterFile("x/upgrade/internal/types/types.proto", fileDescriptor_6199ecc2c05edfcb) -} +func init() { proto.RegisterFile("x/upgrade/types/types.proto", fileDescriptor_2a308fd9dd71aff8) } -var fileDescriptor_6199ecc2c05edfcb = []byte{ - // 371 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x3f, 0x0f, 0x12, 0x31, - 0x14, 0xbf, 0xca, 0x49, 0xa4, 0x6c, 0x8d, 0x91, 0x0b, 0x09, 0xe5, 0x42, 0x8c, 0x21, 0x31, 0xb6, - 0x11, 0x07, 0x9d, 0x71, 0x36, 0x21, 0xa7, 0xc6, 0xc4, 0x85, 0x94, 0xbb, 0x72, 0xd7, 0x70, 0xd7, - 0x36, 0x6d, 0x51, 0xd8, 0x9c, 0x9d, 0xf8, 0x58, 0x8c, 0x8c, 0x4c, 0x2a, 0xf0, 0x45, 0xcc, 0x5d, - 0x8f, 0xe8, 0xe2, 0xe6, 0xd2, 0xbe, 0xd7, 0xfc, 0xfe, 0xbd, 0xb6, 0xf0, 0xe9, 0x8e, 0x6e, 0x75, - 0x6e, 0x58, 0xc6, 0xa9, 0x90, 0x8e, 0x1b, 0xc9, 0x4a, 0xea, 0xf6, 0x9a, 0x5b, 0xbf, 0x12, 0x6d, - 0x94, 0x53, 0x68, 0x90, 0x2a, 0x5b, 0x29, 0xbb, 0xb4, 0xd9, 0x86, 0xec, 0x48, 0x4b, 0x20, 0x5f, - 0x5e, 0x0e, 0x9f, 0xb9, 0x42, 0x98, 0x6c, 0xa9, 0x99, 0x71, 0x7b, 0xda, 0x60, 0x69, 0xae, 0x72, - 0xf5, 0xa7, 0xf2, 0x02, 0xc3, 0x71, 0xae, 0x54, 0x5e, 0x72, 0x0f, 0x59, 0x6d, 0xd7, 0xd4, 0x89, - 0x8a, 0x5b, 0xc7, 0x2a, 0xed, 0x01, 0x93, 0x6f, 0x00, 0x86, 0x8b, 0x92, 0x49, 0x84, 0x60, 0x28, - 0x59, 0xc5, 0x23, 0x10, 0x83, 0x69, 0x2f, 0x69, 0x6a, 0xf4, 0x06, 0x86, 0x35, 0x3e, 0x7a, 0x10, - 0x83, 0x69, 0x7f, 0x36, 0x24, 0x5e, 0x8c, 0xdc, 0xc5, 0xc8, 0x87, 0xbb, 0xd8, 0xfc, 0xd1, 0xf1, - 0xc7, 0x38, 0x38, 0xfc, 0x1c, 0x83, 0xa4, 0x61, 0xa0, 0x27, 0xb0, 0x5b, 0x70, 0x91, 0x17, 0x2e, - 0xea, 0xc4, 0x60, 0xda, 0x49, 0xda, 0xae, 0x76, 0x11, 0x72, 0xad, 0xa2, 0xd0, 0xbb, 0xd4, 0xf5, - 0xe4, 0x3b, 0x80, 0x83, 0xf7, 0x6a, 0xed, 0xbe, 0x32, 0xc3, 0x3f, 0xfa, 0x11, 0x17, 0x46, 0x69, - 0x65, 0x59, 0x89, 0x1e, 0xc3, 0x87, 0x4e, 0xb8, 0xf2, 0x1e, 0xcb, 0x37, 0x28, 0x86, 0xfd, 0x8c, - 0xdb, 0xd4, 0x08, 0xed, 0x84, 0x92, 0x4d, 0xbc, 0x5e, 0xf2, 0xf7, 0x11, 0x7a, 0x0d, 0x43, 0x5d, - 0x32, 0xd9, 0xb8, 0xf7, 0x67, 0x23, 0xf2, 0x8f, 0x7b, 0x24, 0xf5, 0xe8, 0xf3, 0xb0, 0x0e, 0x9f, - 0x34, 0x84, 0xc9, 0x27, 0x38, 0x7a, 0xcb, 0x64, 0xca, 0xcb, 0xff, 0x9c, 0x68, 0xfe, 0xee, 0x78, - 0xc1, 0xc1, 0xf9, 0x82, 0x83, 0xe3, 0x15, 0x83, 0xd3, 0x15, 0x83, 0x5f, 0x57, 0x0c, 0x0e, 0x37, - 0x1c, 0x9c, 0x6e, 0x38, 0x38, 0xdf, 0x70, 0xf0, 0xf9, 0x79, 0x2e, 0x5c, 0xb1, 0x5d, 0x91, 0x54, - 0x55, 0xd4, 0xe7, 0x6d, 0xb7, 0x17, 0x36, 0xdb, 0xd0, 0x1d, 0xd5, 0xcc, 0xb0, 0xaa, 0xfd, 0x1f, - 0xab, 0x6e, 0xf3, 0x08, 0xaf, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xad, 0x67, 0xed, 0x35, 0x48, - 0x02, 0x00, 0x00, +var fileDescriptor_2a308fd9dd71aff8 = []byte{ + // 364 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x31, 0x6f, 0xe2, 0x30, + 0x18, 0x8d, 0x8f, 0x1c, 0x3a, 0xcc, 0x66, 0x9d, 0x8e, 0x88, 0x13, 0x26, 0x62, 0xa8, 0x18, 0x5a, + 0x47, 0xa5, 0x43, 0x3b, 0xd3, 0xbd, 0x42, 0x69, 0xab, 0x4a, 0x5d, 0x90, 0x49, 0x4c, 0x62, 0x91, + 0xc4, 0x56, 0x6c, 0x5a, 0xd8, 0x3a, 0x77, 0xe2, 0x67, 0x31, 0x32, 0x32, 0xb5, 0x05, 0xfe, 0x48, + 0x95, 0x18, 0xd4, 0xaa, 0x52, 0xb7, 0x2e, 0xf6, 0xfb, 0xac, 0xf7, 0xbd, 0xf7, 0x3e, 0xdb, 0xf0, + 0xff, 0xcc, 0x9b, 0xca, 0x28, 0xa7, 0x21, 0xf3, 0xf4, 0x5c, 0x32, 0x65, 0x56, 0x22, 0x73, 0xa1, + 0x05, 0x6a, 0x04, 0x42, 0xa5, 0x42, 0x0d, 0x55, 0x38, 0x21, 0x33, 0xb2, 0xe7, 0x91, 0x87, 0xd3, + 0xe6, 0x91, 0x8e, 0x79, 0x1e, 0x0e, 0x25, 0xcd, 0xf5, 0xdc, 0x2b, 0xb9, 0x5e, 0x24, 0x22, 0xf1, + 0x81, 0x8c, 0x40, 0xb3, 0x1d, 0x09, 0x11, 0x25, 0xcc, 0x50, 0x46, 0xd3, 0xb1, 0xa7, 0x79, 0xca, + 0x94, 0xa6, 0xa9, 0x34, 0x84, 0xce, 0x13, 0x80, 0xf6, 0x20, 0xa1, 0x19, 0x42, 0xd0, 0xce, 0x68, + 0xca, 0x1c, 0xe0, 0x82, 0x6e, 0xcd, 0x2f, 0x31, 0xba, 0x80, 0x76, 0xc1, 0x77, 0x7e, 0xb9, 0xa0, + 0x5b, 0xef, 0x35, 0x89, 0x11, 0x23, 0x07, 0x31, 0x72, 0x73, 0x10, 0xeb, 0xff, 0x59, 0xbe, 0xb4, + 0xad, 0xc5, 0x6b, 0x1b, 0xf8, 0x65, 0x07, 0xfa, 0x07, 0xab, 0x31, 0xe3, 0x51, 0xac, 0x9d, 0x8a, + 0x0b, 0xba, 0x15, 0x7f, 0x5f, 0x15, 0x2e, 0x3c, 0x1b, 0x0b, 0xc7, 0x36, 0x2e, 0x05, 0xee, 0x3c, + 0x03, 0xd8, 0xb8, 0x16, 0x63, 0xfd, 0x48, 0x73, 0x76, 0x6b, 0x46, 0x1c, 0xe4, 0x42, 0x0a, 0x45, + 0x13, 0xf4, 0x17, 0xfe, 0xd6, 0x5c, 0x27, 0x87, 0x58, 0xa6, 0x40, 0x2e, 0xac, 0x87, 0x4c, 0x05, + 0x39, 0x97, 0x9a, 0x8b, 0xac, 0x8c, 0x57, 0xf3, 0x3f, 0x1f, 0xa1, 0x73, 0x68, 0xcb, 0x84, 0x66, + 0xa5, 0x7b, 0xbd, 0xd7, 0x22, 0xdf, 0xdc, 0x23, 0x29, 0x46, 0xef, 0xdb, 0x45, 0x78, 0xbf, 0x6c, + 0xe8, 0xdc, 0xc1, 0xd6, 0x25, 0xcd, 0x02, 0x96, 0xfc, 0x70, 0xa2, 0xfe, 0xd5, 0x72, 0x83, 0xad, + 0xf5, 0x06, 0x5b, 0xcb, 0x2d, 0x06, 0xab, 0x2d, 0x06, 0x6f, 0x5b, 0x0c, 0x16, 0x3b, 0x6c, 0xad, + 0x76, 0xd8, 0x5a, 0xef, 0xb0, 0x75, 0x7f, 0x1c, 0x71, 0x1d, 0x4f, 0x47, 0x24, 0x10, 0xa9, 0x67, + 0xf2, 0xee, 0xb7, 0x13, 0x15, 0x4e, 0xbc, 0x2f, 0xdf, 0x64, 0x54, 0x2d, 0x5f, 0xe1, 0xec, 0x3d, + 0x00, 0x00, 0xff, 0xff, 0x0f, 0x77, 0x53, 0x0a, 0x40, 0x02, 0x00, 0x00, } func (m *Plan) Marshal() (dAtA []byte, err error) {