diff --git a/proto/mint/v1beta1/genesis.proto b/proto/mint/v1beta1/genesis.proto index 9f1e2a77..7170107d 100644 --- a/proto/mint/v1beta1/genesis.proto +++ b/proto/mint/v1beta1/genesis.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package mint.v1beta1; import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; import "mint/v1beta1/mint.proto"; option go_package = "github.com/okp4/okp4d/x/mint/types"; @@ -11,8 +11,8 @@ option go_package = "github.com/okp4/okp4d/x/mint/types"; // GenesisState defines the mint module's genesis state. message GenesisState { // minter is a space for holding current inflation information. - Minter minter = 1 [(gogoproto.nullable) = false]; + Minter minter = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - // params defines all the paramaters of the module. - Params params = 2 [(gogoproto.nullable) = false]; + // params defines all the parameters of the module. + Params params = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } diff --git a/proto/mint/v1beta1/query.proto b/proto/mint/v1beta1/query.proto index c1d9d484..bfe4b96b 100644 --- a/proto/mint/v1beta1/query.proto +++ b/proto/mint/v1beta1/query.proto @@ -5,7 +5,7 @@ package mint.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "mint/v1beta1/mint.proto"; -import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/okp4/okp4d/x/mint/types"; @@ -33,7 +33,7 @@ message QueryParamsRequest {} // QueryParamsResponse is the response type for the Query/Params RPC method. message QueryParamsResponse { // params defines the parameters of the module. - Params params = 1 [(gogoproto.nullable) = false]; + Params params = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } // QueryInflationRequest is the request type for the Query/Inflation RPC method. @@ -45,7 +45,8 @@ message QueryInflationResponse { // inflation is the current minting inflation value. bytes inflation = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true ]; } @@ -59,6 +60,7 @@ message QueryAnnualProvisionsResponse { // annual_provisions is the current minting annual provisions value. bytes annual_provisions = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true ]; } diff --git a/proto/vesting/v1beta1/tx.proto b/proto/vesting/v1beta1/tx.proto index 8ba1f492..2a89c3b4 100644 --- a/proto/vesting/v1beta1/tx.proto +++ b/proto/vesting/v1beta1/tx.proto @@ -7,11 +7,14 @@ import "cosmos/msg/v1/msg.proto"; import "gogoproto/gogo.proto"; import "vesting/v1beta1/vesting.proto"; import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/okp4/okp4d/x/vesting/types"; // Msg defines the bank Msg service. service Msg { + option (cosmos.msg.v1.service) = true; + // CreateVestingAccount defines a method that enables creating a vesting // account. rpc CreateVestingAccount(MsgCreateVestingAccount) returns (MsgCreateVestingAccountResponse); @@ -34,13 +37,15 @@ service Msg { // account. message MsgCreateVestingAccount { option (cosmos.msg.v1.signer) = "from_address"; + option (amino.name) = "cosmos-sdk/MsgCreateVestingAccount"; option (gogoproto.equal) = true; - string from_address = 1; - string to_address = 2; + string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated cosmos.base.v1beta1.Coin amount = 3 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; @@ -56,12 +61,15 @@ message MsgCreateVestingAccountResponse {} // // Since: cosmos-sdk 0.46 message MsgCreatePermanentLockedAccount { - option (gogoproto.equal) = true; + option (cosmos.msg.v1.signer) = "from_address"; + option (amino.name) = "cosmos-sdk/MsgCreatePermLockedAccount"; + option (gogoproto.equal) = true; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; + string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; repeated cosmos.base.v1beta1.Coin amount = 3 [ - (gogoproto.nullable) = false, + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; } @@ -77,13 +85,15 @@ message MsgCreatePermanentLockedAccountResponse {} // Since: cosmos-sdk 0.46 message MsgCreatePeriodicVestingAccount { option (cosmos.msg.v1.signer) = "from_address"; + option (amino.name) = "cosmos-sdk/MsgCreatePeriodicVestingAccount"; option (gogoproto.equal) = false; - string from_address = 1; - string to_address = 2; - int64 start_time = 3; - repeated Period vesting_periods = 4 [(gogoproto.nullable) = false]; + string from_address = 1; + string to_address = 2; + // start of vesting as unix time (in seconds). + int64 start_time = 3; + repeated Period vesting_periods = 4 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } // MsgCreateVestingAccountResponse defines the Msg/CreatePeriodicVestingAccount @@ -96,13 +106,15 @@ message MsgCreatePeriodicVestingAccountResponse {} // account. message MsgCreateCliffVestingAccount { option (cosmos.msg.v1.signer) = "from_address"; + option (amino.name) = "cosmos-sdk/MsgCreateCliffVestingAccount"; option (gogoproto.equal) = true; - string from_address = 1; - string to_address = 2; + string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; repeated cosmos.base.v1beta1.Coin amount = 3 [ (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; diff --git a/proto/vesting/v1beta1/vesting.proto b/proto/vesting/v1beta1/vesting.proto index dd5835d0..b0c3b1bb 100644 --- a/proto/vesting/v1beta1/vesting.proto +++ b/proto/vesting/v1beta1/vesting.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package vesting.v1beta1; +import "amino/amino.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; @@ -12,32 +13,39 @@ option go_package = "github.com/okp4/okp4d/x/vesting/types"; // BaseVestingAccount implements the VestingAccount interface. It contains all // the necessary fields needed for any vesting account implementation. message BaseVestingAccount { + option (amino.name) = "cosmos-sdk/BaseVestingAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; repeated cosmos.base.v1beta1.Coin original_vesting = 2 [ (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; repeated cosmos.base.v1beta1.Coin delegated_free = 3 [ (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [ (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; + // Vesting end time, as unix timestamp (in seconds). int64 end_time = 5; } // ContinuousVestingAccount implements the VestingAccount interface. It // continuously vests by unlocking coins linearly with respect to time. message ContinuousVestingAccount { + option (amino.name) = "cosmos-sdk/ContinuousVestingAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; + // Vesting start time, as unix timestamp (in seconds). int64 start_time = 2; } @@ -45,6 +53,7 @@ message ContinuousVestingAccount { // coins after a specific time, but non prior. In other words, it keeps them // locked until a specified time. message DelayedVestingAccount { + option (amino.name) = "cosmos-sdk/DelayedVestingAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; @@ -58,6 +67,7 @@ message Period { int64 length = 1; repeated cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.nullable) = false, + (amino.dont_omitempty) = true, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; } @@ -65,12 +75,13 @@ message Period { // PeriodicVestingAccount implements the VestingAccount interface. It // periodically vests by unlocking coins during each specified period. message PeriodicVestingAccount { + option (amino.name) = "cosmos-sdk/PeriodicVestingAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; int64 start_time = 2; - repeated Period vesting_periods = 3 [(gogoproto.nullable) = false]; + repeated Period vesting_periods = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } // PermanentLockedAccount implements the VestingAccount interface. It does @@ -79,6 +90,7 @@ message PeriodicVestingAccount { // // Since: cosmos-sdk 0.43 message PermanentLockedAccount { + option (amino.name) = "cosmos-sdk/PermanentLockedAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; @@ -88,6 +100,7 @@ message PermanentLockedAccount { // CliffVestingAccount implements the VestingAccount interface. It // continuously vests by unlocking coins after a cliff period linearly with respect to time. message CliffVestingAccount { + option (amino.name) = "cosmos-sdk/CliffVestingAccount"; option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index cd9b8c33..936c78cf 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type GenesisState struct { // minter is a space for holding current inflation information. Minter Minter `protobuf:"bytes,1,opt,name=minter,proto3" json:"minter"` - // params defines all the paramaters of the module. + // params defines all the parameters of the module. Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } @@ -86,21 +86,21 @@ func init() { func init() { proto.RegisterFile("mint/v1beta1/genesis.proto", fileDescriptor_1dfa75836a5d5f23) } var fileDescriptor_1dfa75836a5d5f23 = []byte{ - // 219 bytes of a gzipped FileDescriptorProto + // 223 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0xc9, 0xe9, 0x41, 0xe5, 0xa4, 0x44, 0xd2, - 0xf3, 0xd3, 0xf3, 0xc1, 0x12, 0xfa, 0x20, 0x16, 0x44, 0x8d, 0x94, 0x64, 0x72, 0x7e, 0x71, 0x6e, - 0x7e, 0x71, 0x3c, 0x44, 0x02, 0xc2, 0x81, 0x4a, 0x89, 0xa3, 0x18, 0x0d, 0x36, 0x0b, 0x2c, 0xa1, - 0x54, 0xc6, 0xc5, 0xe3, 0x0e, 0xb1, 0x28, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x88, 0x8b, 0x0d, - 0x24, 0x9b, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa2, 0x87, 0x6c, 0xb1, 0x9e, - 0x2f, 0x58, 0xce, 0x89, 0xe5, 0xc4, 0x3d, 0x79, 0x86, 0x20, 0xa8, 0x4a, 0x90, 0x9e, 0x82, 0xc4, - 0xa2, 0xc4, 0xdc, 0x62, 0x09, 0x26, 0x6c, 0x7a, 0x02, 0xc0, 0x72, 0x30, 0x3d, 0x10, 0x95, 0x4e, - 0x36, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, - 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x94, 0x9e, 0x59, 0x92, - 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x9f, 0x5d, 0x60, 0x02, 0x26, 0x52, 0xf4, 0x2b, - 0xc0, 0xae, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x3b, 0xde, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0xd3, 0xb8, 0x32, 0x98, 0x32, 0x01, 0x00, 0x00, + 0xf3, 0xd3, 0xf3, 0xc1, 0x12, 0xfa, 0x20, 0x16, 0x44, 0x8d, 0x94, 0x60, 0x62, 0x6e, 0x66, 0x5e, + 0xbe, 0x3e, 0x98, 0x84, 0x0a, 0x89, 0xa3, 0x18, 0x09, 0x36, 0x03, 0x2c, 0xa1, 0xd4, 0xc0, 0xc8, + 0xc5, 0xe3, 0x0e, 0xb1, 0x21, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x9c, 0x8b, 0x0d, 0x24, 0x9d, + 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa2, 0x87, 0x6c, 0xa3, 0x9e, 0x2f, 0x58, + 0xce, 0x89, 0xf3, 0xc4, 0x3d, 0x79, 0x86, 0x15, 0xcf, 0x37, 0x68, 0x31, 0x06, 0x41, 0x95, 0x83, + 0x34, 0x16, 0x24, 0x16, 0x25, 0xe6, 0x16, 0x4b, 0x30, 0x61, 0xd3, 0x18, 0x00, 0x96, 0x43, 0xd1, + 0x08, 0x51, 0xee, 0x64, 0x73, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, + 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x4a, + 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xf9, 0xd9, 0x05, 0x26, 0x60, + 0x22, 0x45, 0xbf, 0x02, 0xec, 0x01, 0xfd, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x3f, + 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xe8, 0x88, 0xe2, 0x35, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 8a73442e..792dcbda 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -6,8 +6,8 @@ package types import ( context "context" fmt "fmt" - _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -281,36 +281,36 @@ func init() { func init() { proto.RegisterFile("mint/v1beta1/query.proto", fileDescriptor_b0718dda172d2cb4) } var fileDescriptor_b0718dda172d2cb4 = []byte{ - // 452 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4d, 0x8f, 0xd2, 0x40, - 0x00, 0x6d, 0xfd, 0x20, 0xd9, 0x71, 0x0f, 0xeb, 0x88, 0xee, 0x5a, 0x77, 0x67, 0xb1, 0x6b, 0xc8, - 0x46, 0xe3, 0x34, 0x8b, 0x1e, 0xbd, 0x48, 0xbc, 0x6c, 0xe2, 0x01, 0x39, 0xea, 0xc1, 0x0c, 0x30, - 0xd4, 0x06, 0x3a, 0x53, 0x3a, 0x53, 0x22, 0x89, 0xf1, 0xe0, 0x2f, 0x30, 0xf1, 0x64, 0xfc, 0x43, - 0x1c, 0x49, 0xbc, 0x18, 0x0f, 0xc4, 0x80, 0x3f, 0xc4, 0x74, 0x66, 0x8a, 0xb4, 0x14, 0x62, 0xbc, - 0x40, 0x3b, 0xef, 0xe5, 0xbd, 0xd7, 0xf7, 0x5a, 0x70, 0x14, 0x06, 0x4c, 0x7a, 0xe3, 0x8b, 0x0e, - 0x95, 0xe4, 0xc2, 0x1b, 0x25, 0x34, 0x9e, 0xe0, 0x28, 0xe6, 0x92, 0xc3, 0xfd, 0x14, 0xc1, 0x06, - 0x71, 0xaa, 0x3e, 0xf7, 0xb9, 0x02, 0xbc, 0xf4, 0x4a, 0x73, 0x9c, 0x63, 0x9f, 0x73, 0x7f, 0x48, - 0x3d, 0x12, 0x05, 0x1e, 0x61, 0x8c, 0x4b, 0x22, 0x03, 0xce, 0x84, 0x41, 0x0f, 0x73, 0xda, 0x4a, - 0x4e, 0x03, 0x77, 0xbb, 0x5c, 0x84, 0x5c, 0xbc, 0xd5, 0x7a, 0xfa, 0x46, 0x43, 0x6e, 0x15, 0xc0, - 0x57, 0x69, 0x88, 0x16, 0x89, 0x49, 0x28, 0xda, 0x74, 0x94, 0x50, 0x21, 0xdd, 0x4b, 0x70, 0x2b, - 0x77, 0x2a, 0x22, 0xce, 0x04, 0x85, 0x0d, 0x50, 0x89, 0xd4, 0xc9, 0x91, 0x5d, 0xb3, 0xcf, 0x6f, - 0x34, 0xaa, 0x78, 0x3d, 0x33, 0xd6, 0xec, 0xe6, 0xb5, 0xe9, 0xfc, 0xd4, 0x6a, 0x1b, 0xa6, 0x7b, - 0x08, 0x6e, 0x2b, 0xa9, 0x4b, 0xd6, 0x1f, 0xaa, 0xb4, 0x99, 0x47, 0x1f, 0xdc, 0x29, 0x02, 0xc6, - 0xe6, 0x25, 0xd8, 0x0b, 0xb2, 0x43, 0xe5, 0xb4, 0xdf, 0xc4, 0xa9, 0xe6, 0xcf, 0xf9, 0x69, 0xdd, - 0x0f, 0xe4, 0xbb, 0xa4, 0x83, 0xbb, 0x3c, 0x34, 0xcf, 0x61, 0xfe, 0x1e, 0x8b, 0xde, 0xc0, 0x93, - 0x93, 0x88, 0x0a, 0xfc, 0x82, 0x76, 0xdb, 0x7f, 0x05, 0x5c, 0x04, 0x8e, 0x95, 0xcf, 0x73, 0xc6, - 0x12, 0x32, 0x6c, 0xc5, 0x7c, 0x1c, 0x88, 0xb4, 0xb4, 0x2c, 0xc7, 0x07, 0x70, 0xb2, 0x05, 0x37, - 0x71, 0xde, 0x80, 0x9b, 0x44, 0x61, 0x69, 0x7f, 0x06, 0xfc, 0xcf, 0x58, 0x07, 0xa4, 0x60, 0xd2, - 0xf8, 0x7a, 0x15, 0x5c, 0x57, 0xf6, 0x30, 0x06, 0x15, 0x5d, 0x20, 0xac, 0xe5, 0x6b, 0xdd, 0xdc, - 0xc7, 0xb9, 0xbf, 0x83, 0xa1, 0x53, 0xbb, 0x67, 0x9f, 0xbe, 0xff, 0xfe, 0x72, 0xe5, 0x04, 0xde, - 0xcb, 0x02, 0xe5, 0x5e, 0x0e, 0x3d, 0x0e, 0xfc, 0x08, 0xf6, 0x56, 0xf5, 0xc3, 0xb3, 0x12, 0xd1, - 0xe2, 0x6a, 0xce, 0x83, 0xdd, 0x24, 0x63, 0x5e, 0x57, 0xe6, 0x35, 0x88, 0x4a, 0xcd, 0x57, 0xdb, - 0xc0, 0x6f, 0x36, 0x38, 0x28, 0xf6, 0x0e, 0x1f, 0x96, 0x58, 0x6c, 0x19, 0xcf, 0x79, 0xf4, 0x4f, - 0x5c, 0x93, 0x0a, 0xab, 0x54, 0xe7, 0xb0, 0x5e, 0x9a, 0x6a, 0x63, 0xe3, 0xe6, 0xb3, 0xe9, 0x02, - 0xd9, 0xb3, 0x05, 0xb2, 0x7f, 0x2d, 0x90, 0xfd, 0x79, 0x89, 0xac, 0xd9, 0x12, 0x59, 0x3f, 0x96, - 0xc8, 0x7a, 0xed, 0xae, 0xed, 0xcd, 0x07, 0xd1, 0x53, 0xf5, 0xd3, 0xf3, 0xde, 0x6b, 0x45, 0xb5, - 0x77, 0xa7, 0xa2, 0x3e, 0xb0, 0x27, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x45, 0x63, 0x25, - 0xf2, 0x03, 0x00, 0x00, + // 463 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc8, 0xcd, 0xcc, 0x2b, + 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0xc9, 0xe8, 0x41, 0x65, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, + 0xf3, 0xc1, 0x12, 0xfa, 0x20, 0x16, 0x44, 0x8d, 0x94, 0x4c, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, + 0x7e, 0x62, 0x41, 0xa6, 0x7e, 0x62, 0x5e, 0x5e, 0x7e, 0x49, 0x62, 0x49, 0x66, 0x7e, 0x5e, 0x31, + 0x54, 0x56, 0x1c, 0xc5, 0x6c, 0xb0, 0x71, 0x10, 0x09, 0xc1, 0xc4, 0xdc, 0xcc, 0xbc, 0x7c, 0x7d, + 0x30, 0x09, 0x11, 0x52, 0x12, 0xe1, 0x12, 0x0a, 0x04, 0x59, 0x1e, 0x90, 0x58, 0x94, 0x98, 0x5b, + 0x1c, 0x94, 0x5a, 0x58, 0x9a, 0x5a, 0x5c, 0xa2, 0xe4, 0xc7, 0x25, 0x8c, 0x22, 0x5a, 0x5c, 0x90, + 0x9f, 0x57, 0x9c, 0x2a, 0x64, 0xce, 0xc5, 0x56, 0x00, 0x16, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, + 0x36, 0x12, 0xd1, 0x43, 0x76, 0xab, 0x1e, 0x44, 0xb5, 0x13, 0xe7, 0x89, 0x7b, 0xf2, 0x0c, 0x2b, + 0x9e, 0x6f, 0xd0, 0x62, 0x0c, 0x82, 0x2a, 0x57, 0x12, 0xe7, 0x12, 0x05, 0x9b, 0xe7, 0x99, 0x97, + 0x96, 0x03, 0x76, 0x2a, 0xcc, 0xa2, 0x6c, 0x2e, 0x31, 0x74, 0x09, 0xa8, 0x5d, 0x81, 0x5c, 0x9c, + 0x99, 0x30, 0x41, 0xb0, 0x75, 0x3c, 0x4e, 0xc6, 0x20, 0x83, 0x6f, 0xdd, 0x93, 0x57, 0x4b, 0xcf, + 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x86, + 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x2e, 0xa9, 0xc9, 0x10, + 0x27, 0x20, 0x4c, 0x51, 0x92, 0xe3, 0x92, 0x01, 0x5b, 0xe6, 0x98, 0x97, 0x57, 0x9a, 0x98, 0x13, + 0x50, 0x94, 0x5f, 0x96, 0x59, 0x0c, 0x0a, 0x36, 0x98, 0x63, 0x1a, 0x19, 0xb9, 0x64, 0x71, 0x28, + 0x80, 0x3a, 0x2a, 0x81, 0x4b, 0x30, 0x11, 0x2c, 0x17, 0x5f, 0x00, 0x97, 0xa4, 0xc4, 0x71, 0x02, + 0x89, 0x68, 0x36, 0x19, 0xcd, 0x64, 0xe6, 0x62, 0x05, 0xbb, 0x41, 0xa8, 0x88, 0x8b, 0x0d, 0x12, + 0xa0, 0x42, 0x0a, 0xa8, 0xc1, 0x8c, 0x19, 0x5f, 0x52, 0x8a, 0x78, 0x54, 0x40, 0x9c, 0xae, 0xa4, + 0xdc, 0x74, 0xf9, 0xc9, 0x64, 0x26, 0x59, 0x21, 0x69, 0x98, 0xab, 0x50, 0x12, 0x09, 0x24, 0x9e, + 0x84, 0xea, 0xb8, 0x38, 0xe1, 0x31, 0x21, 0xa4, 0x8c, 0xc5, 0x50, 0xf4, 0x08, 0x94, 0x52, 0xc1, + 0xaf, 0x08, 0x6a, 0xb9, 0x1a, 0xd8, 0x72, 0x05, 0x21, 0x39, 0xac, 0x96, 0xc3, 0x63, 0x48, 0x68, + 0x36, 0x23, 0x97, 0x00, 0x7a, 0xe0, 0x0b, 0x69, 0x61, 0xb1, 0x02, 0x47, 0x14, 0x4a, 0x69, 0x13, + 0xa5, 0x16, 0xea, 0x2a, 0x3d, 0xb0, 0xab, 0x34, 0x84, 0xd4, 0xb0, 0xba, 0x0a, 0x23, 0xa2, 0x9d, + 0x6c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, + 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x09, 0x29, 0xd2, 0xf3, + 0xb3, 0x0b, 0x4c, 0xc0, 0x44, 0x8a, 0x7e, 0x05, 0xc4, 0x44, 0x70, 0xa4, 0x27, 0xb1, 0x81, 0x33, + 0x9c, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x14, 0x7d, 0x1a, 0xfa, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/vesting/types/tx.pb.go b/x/vesting/types/tx.pb.go index 7ac020d9..a9a90519 100644 --- a/x/vesting/types/tx.pb.go +++ b/x/vesting/types/tx.pb.go @@ -10,6 +10,7 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -257,8 +258,9 @@ var xxx_messageInfo_MsgCreatePermanentLockedAccountResponse proto.InternalMessag // // Since: cosmos-sdk 0.46 type MsgCreatePeriodicVestingAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` + // start of vesting as unix time (in seconds). StartTime int64 `protobuf:"varint,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` VestingPeriods []Period `protobuf:"bytes,4,rep,name=vesting_periods,json=vestingPeriods,proto3" json:"vesting_periods"` } @@ -369,8 +371,8 @@ var xxx_messageInfo_MsgCreatePeriodicVestingAccountResponse proto.InternalMessag // MsgCreateCliffVestingAccount defines a message that enables creating a cliff vesting // account. type MsgCreateCliffVestingAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` CliffTime int64 `protobuf:"varint,5,opt,name=cliff_time,json=cliffTime,proto3" json:"cliff_time,omitempty"` @@ -495,47 +497,53 @@ func init() { func init() { proto.RegisterFile("vesting/v1beta1/tx.proto", fileDescriptor_c66d8e2aee35e411) } var fileDescriptor_c66d8e2aee35e411 = []byte{ - // 635 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x55, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xce, 0x25, 0x21, 0x6d, 0xae, 0x08, 0x84, 0x69, 0x15, 0x27, 0x6a, 0xec, 0xd4, 0xe2, 0xc3, - 0x20, 0xd5, 0x6e, 0x4b, 0x91, 0x50, 0x16, 0xd4, 0x44, 0x62, 0xa2, 0x12, 0xb2, 0x10, 0x03, 0x4b, - 0xe4, 0xd8, 0x17, 0x63, 0x25, 0xf6, 0x45, 0xbe, 0x6b, 0xd5, 0x8c, 0x30, 0x22, 0x06, 0x26, 0x58, - 0x99, 0x99, 0xf8, 0x19, 0x1d, 0x3b, 0x32, 0x05, 0x48, 0x06, 0x98, 0xfb, 0x03, 0x10, 0xf2, 0x9d, - 0x1d, 0x9a, 0xc4, 0x71, 0xa9, 0x84, 0x18, 0x58, 0x62, 0xfb, 0x7d, 0xde, 0xcf, 0xe7, 0x9e, 0x37, - 0x07, 0xc5, 0x43, 0x44, 0xa8, 0xeb, 0x3b, 0xfa, 0xe1, 0x76, 0x1b, 0x51, 0x73, 0x5b, 0xa7, 0x47, - 0x5a, 0x3f, 0xc0, 0x14, 0x0b, 0x57, 0x23, 0x44, 0x8b, 0x90, 0x8a, 0x64, 0x61, 0xe2, 0x61, 0xa2, - 0xb7, 0x4d, 0x82, 0x26, 0xee, 0x16, 0x76, 0x7d, 0x1e, 0x50, 0x29, 0x45, 0xb8, 0x47, 0xc2, 0x6c, - 0xe1, 0x23, 0x02, 0x56, 0x1d, 0xec, 0x60, 0xf6, 0xaa, 0x87, 0x6f, 0x91, 0xb5, 0x3a, 0x5b, 0x39, - 0xae, 0xc7, 0xe1, 0x32, 0xcf, 0xd6, 0xe2, 0x71, 0xfc, 0x83, 0x43, 0xca, 0x9b, 0x2c, 0x2c, 0xed, - 0x13, 0xa7, 0x19, 0x20, 0x93, 0xa2, 0x67, 0x3c, 0x6a, 0xcf, 0xb2, 0xf0, 0x81, 0x4f, 0x85, 0x0d, - 0x78, 0xb9, 0x13, 0x60, 0xaf, 0x65, 0xda, 0x76, 0x80, 0x08, 0x11, 0x41, 0x0d, 0xa8, 0x45, 0x63, - 0x25, 0xb4, 0xed, 0x71, 0x93, 0x50, 0x85, 0x90, 0xe2, 0x89, 0x43, 0x96, 0x39, 0x14, 0x29, 0x8e, - 0x61, 0x0b, 0x16, 0x4c, 0x2f, 0xcc, 0x25, 0xe6, 0x6a, 0x39, 0x75, 0x65, 0xa7, 0xac, 0x45, 0xc5, - 0xc3, 0xb9, 0x63, 0x32, 0xb4, 0x26, 0x76, 0xfd, 0xc6, 0xd6, 0xf1, 0x50, 0xce, 0x7c, 0xfc, 0x22, - 0xab, 0x8e, 0x4b, 0x5f, 0x1c, 0xb4, 0x35, 0x0b, 0x7b, 0x51, 0xa7, 0xd1, 0x63, 0x93, 0xd8, 0x5d, - 0x9d, 0x0e, 0xfa, 0x88, 0xb0, 0x00, 0x62, 0x44, 0xa9, 0x85, 0x32, 0x5c, 0x46, 0xbe, 0xdd, 0xa2, - 0xae, 0x87, 0xc4, 0x7c, 0x0d, 0xa8, 0x39, 0x63, 0x09, 0xf9, 0xf6, 0x53, 0xd7, 0x43, 0x82, 0x08, - 0x97, 0x6c, 0xd4, 0x33, 0x07, 0xc8, 0x16, 0x0b, 0x35, 0xa0, 0x2e, 0x1b, 0xf1, 0x67, 0x7d, 0xed, - 0xc7, 0x07, 0x19, 0xbc, 0xfa, 0xfe, 0xe9, 0xee, 0xd4, 0x88, 0xca, 0x06, 0x94, 0x17, 0xb0, 0x61, - 0x20, 0xd2, 0xc7, 0x3e, 0x41, 0xca, 0x4f, 0x70, 0xc6, 0xe7, 0x09, 0x0a, 0x3c, 0xd3, 0x47, 0x3e, - 0x7d, 0x8c, 0xad, 0x2e, 0xb2, 0x63, 0xe6, 0xea, 0x49, 0xcc, 0x35, 0x4a, 0xa7, 0x43, 0xf9, 0xfa, - 0xc0, 0xf4, 0x7a, 0x75, 0x65, 0xaa, 0xe8, 0x34, 0xa5, 0xbb, 0xf3, 0x94, 0x36, 0xd6, 0x4e, 0x87, - 0xf2, 0x35, 0x1e, 0xf9, 0x1b, 0x53, 0xfe, 0x35, 0xd3, 0xf5, 0x7c, 0x48, 0x9a, 0x72, 0x07, 0xde, - 0x3e, 0x67, 0xfe, 0x09, 0x57, 0xdf, 0x66, 0xb8, 0x72, 0xb1, 0xed, 0x5a, 0x7f, 0x5d, 0x65, 0x55, - 0x08, 0x09, 0x35, 0x03, 0xca, 0x25, 0x90, 0x63, 0x12, 0x28, 0x32, 0x0b, 0x13, 0xc1, 0x23, 0x18, - 0xaf, 0x5f, 0xab, 0xcf, 0x5a, 0x20, 0x62, 0x9e, 0x71, 0x54, 0xd2, 0x66, 0xd6, 0x52, 0xe3, 0x2d, - 0x36, 0xf2, 0x21, 0x43, 0xc6, 0x95, 0x08, 0xe5, 0x46, 0xc2, 0x24, 0x93, 0x99, 0x97, 0xcc, 0x0c, - 0x1d, 0x09, 0x23, 0x4e, 0xe8, 0x78, 0x97, 0x85, 0xeb, 0x13, 0xdf, 0x66, 0xcf, 0xed, 0x74, 0xfe, - 0xbb, 0x8d, 0xab, 0x42, 0x68, 0x85, 0x83, 0x71, 0xf0, 0x12, 0x3f, 0x0b, 0x66, 0x09, 0xe1, 0x45, - 0x6b, 0x77, 0x0b, 0xde, 0x48, 0xe3, 0x25, 0x26, 0x70, 0xe7, 0x7d, 0x1e, 0xe6, 0xf6, 0x89, 0x23, - 0x04, 0x70, 0x35, 0xf1, 0x1f, 0x4b, 0x9d, 0x3b, 0xd1, 0x05, 0xdb, 0x5c, 0xd9, 0xfa, 0x53, 0xcf, - 0xb8, 0xb6, 0xf0, 0x1a, 0xc0, 0xf5, 0xd4, 0xa5, 0x4f, 0x49, 0x99, 0x1c, 0x51, 0x79, 0x70, 0xd1, - 0x88, 0xe4, 0x66, 0x92, 0xb6, 0x2a, 0xbd, 0x99, 0x84, 0x88, 0x73, 0x9a, 0x49, 0x91, 0xb5, 0xf0, - 0x12, 0xc0, 0xf2, 0x62, 0x4d, 0x6f, 0x2e, 0xce, 0x9b, 0xe0, 0x5e, 0xb9, 0x7f, 0x21, 0xf7, 0xb8, - 0x87, 0xc6, 0xc3, 0xe3, 0x91, 0x04, 0x4e, 0x46, 0x12, 0xf8, 0x3a, 0x92, 0xc0, 0xdb, 0xb1, 0x94, - 0x39, 0x19, 0x4b, 0x99, 0xcf, 0x63, 0x29, 0xf3, 0xfc, 0xe6, 0x19, 0x79, 0xe3, 0x6e, 0x7f, 0x97, - 0xfd, 0xd8, 0xfa, 0x51, 0x7c, 0x47, 0x72, 0x85, 0xb7, 0x0b, 0xec, 0x3e, 0xbc, 0xf7, 0x2b, 0x00, - 0x00, 0xff, 0xff, 0x04, 0xca, 0x3e, 0x7e, 0xc5, 0x07, 0x00, 0x00, + // 726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x96, 0x3d, 0x6c, 0xd3, 0x4c, + 0x18, 0xc7, 0xe3, 0xa4, 0x5f, 0xb9, 0xbe, 0x7a, 0x51, 0x4d, 0x51, 0x9c, 0xa8, 0xb1, 0x53, 0x8b, + 0xd2, 0x10, 0xa9, 0x36, 0x2d, 0xad, 0x40, 0x01, 0xa9, 0x6a, 0xca, 0x06, 0x95, 0x50, 0x40, 0x0c, + 0x2c, 0x91, 0x63, 0x5f, 0x5d, 0xab, 0xb5, 0x2f, 0xf2, 0x5d, 0xab, 0x76, 0x03, 0xc6, 0x4e, 0x2c, + 0xac, 0xa8, 0x23, 0x62, 0xea, 0xc0, 0xcc, 0xdc, 0xb1, 0x62, 0x62, 0x2a, 0xa8, 0x1d, 0xda, 0x81, + 0xa9, 0x0b, 0x2b, 0xb2, 0xef, 0x1c, 0x12, 0xf7, 0xec, 0xd2, 0x09, 0x89, 0xc5, 0x1f, 0xf7, 0x7f, + 0x9e, 0xe7, 0xce, 0xbf, 0xe7, 0x43, 0x06, 0xd2, 0x16, 0xc4, 0xc4, 0xf1, 0x6c, 0x7d, 0x6b, 0xb6, + 0x0d, 0x89, 0x31, 0xab, 0x93, 0x6d, 0xad, 0xe3, 0x23, 0x82, 0xc4, 0x6b, 0x4c, 0xd1, 0x98, 0x52, + 0x92, 0x4d, 0x84, 0x5d, 0x84, 0xf5, 0xb6, 0x81, 0x61, 0xd7, 0xdc, 0x44, 0x8e, 0x47, 0x1d, 0x4a, + 0x05, 0xa6, 0xbb, 0x38, 0x88, 0x16, 0xdc, 0x98, 0x30, 0x6e, 0x23, 0x1b, 0x85, 0x8f, 0x7a, 0xf0, + 0xc4, 0x56, 0xcb, 0xf1, 0x9d, 0xa3, 0xfd, 0xa8, 0x5c, 0xa4, 0xd1, 0x5a, 0xd4, 0x8f, 0xbe, 0x30, + 0x69, 0xcc, 0x70, 0x1d, 0x0f, 0xe9, 0xe1, 0x95, 0x2e, 0xa9, 0x3f, 0xb2, 0xa0, 0xb0, 0x82, 0xed, + 0x65, 0x1f, 0x1a, 0x04, 0xbe, 0xa0, 0x81, 0x96, 0x4c, 0x13, 0x6d, 0x7a, 0x44, 0x7c, 0x00, 0xfe, + 0x5b, 0xf5, 0x91, 0xdb, 0x32, 0x2c, 0xcb, 0x87, 0x18, 0x4b, 0x42, 0x45, 0xa8, 0xe6, 0x1b, 0xd2, + 0x97, 0x4f, 0x33, 0xe3, 0x2c, 0xec, 0x12, 0x55, 0x9e, 0x11, 0xdf, 0xf1, 0xec, 0xe6, 0x68, 0x60, + 0xcd, 0x96, 0xc4, 0x7b, 0x00, 0x10, 0xd4, 0x75, 0xcd, 0x5e, 0xe2, 0x9a, 0x27, 0x28, 0x72, 0x5c, + 0x03, 0x43, 0x86, 0x1b, 0xec, 0x2f, 0xe5, 0x2a, 0xb9, 0xea, 0xe8, 0x5c, 0x51, 0x63, 0x1e, 0x01, + 0xbe, 0x88, 0xa9, 0xb6, 0x8c, 0x1c, 0xaf, 0xb1, 0x70, 0x70, 0xa4, 0x64, 0x3e, 0x7e, 0x53, 0xaa, + 0xb6, 0x43, 0xd6, 0x36, 0xdb, 0x9a, 0x89, 0x5c, 0xf6, 0xc1, 0xec, 0x36, 0x83, 0xad, 0x75, 0x9d, + 0xec, 0x74, 0x20, 0x0e, 0x1d, 0xf0, 0x87, 0xd3, 0xfd, 0x9a, 0xd0, 0x64, 0xf1, 0xc5, 0x22, 0x18, + 0x81, 0x9e, 0xd5, 0x22, 0x8e, 0x0b, 0xa5, 0x81, 0x8a, 0x50, 0xcd, 0x35, 0x87, 0xa1, 0x67, 0x3d, + 0x77, 0x5c, 0x28, 0x4a, 0x60, 0xd8, 0x82, 0x1b, 0xc6, 0x0e, 0xb4, 0xa4, 0xa1, 0x8a, 0x50, 0x1d, + 0x69, 0x46, 0xaf, 0xf5, 0x87, 0x67, 0x7b, 0x8a, 0xf0, 0xe6, 0x74, 0xbf, 0xd6, 0xc7, 0x66, 0xf7, + 0x74, 0xbf, 0xa6, 0xf6, 0xec, 0x99, 0x80, 0x54, 0x9d, 0x04, 0x4a, 0x82, 0xd4, 0x84, 0xb8, 0x83, + 0x3c, 0x0c, 0xd5, 0xcf, 0xd9, 0x1e, 0x9b, 0xa7, 0xd0, 0x77, 0x0d, 0x0f, 0x7a, 0xe4, 0x09, 0x32, + 0xd7, 0xa1, 0x15, 0x65, 0xa6, 0xce, 0xcd, 0x4c, 0xe1, 0xfc, 0x48, 0xb9, 0xbe, 0x63, 0xb8, 0x1b, + 0x75, 0xb5, 0x57, 0x55, 0xfb, 0x13, 0x33, 0xcf, 0x49, 0xcc, 0x8d, 0xf3, 0x23, 0x65, 0x8c, 0x7a, + 0xfe, 0xd6, 0xd4, 0xbf, 0x92, 0x95, 0xfa, 0x62, 0x22, 0xe0, 0x29, 0x1e, 0xe0, 0x80, 0x50, 0x1f, + 0x1c, 0xf5, 0x36, 0x98, 0xbe, 0x84, 0x5f, 0x97, 0xf5, 0xbb, 0x18, 0x6b, 0x07, 0x59, 0x8e, 0x19, + 0xeb, 0x82, 0x49, 0x1e, 0xeb, 0x7e, 0xa4, 0xe5, 0x8b, 0x48, 0x7b, 0xd9, 0x95, 0x01, 0xc0, 0xc4, + 0xf0, 0x09, 0xad, 0xb4, 0x5c, 0x58, 0x69, 0xf9, 0x70, 0x25, 0xac, 0xb5, 0xc7, 0x20, 0x9a, 0x18, + 0xad, 0x4e, 0x78, 0x04, 0x2c, 0x0d, 0x84, 0x8c, 0x0b, 0x5a, 0x6c, 0x92, 0x68, 0xf4, 0x88, 0x8d, + 0x7c, 0x40, 0x98, 0x52, 0xfb, 0x9f, 0x99, 0x50, 0x05, 0xd7, 0x1f, 0x9d, 0xed, 0x29, 0x19, 0x2e, + 0xbd, 0x5a, 0x02, 0x3d, 0xce, 0x37, 0xc7, 0x11, 0x72, 0x4c, 0xba, 0x08, 0x7f, 0x66, 0xc1, 0x44, + 0xd7, 0x76, 0x79, 0xc3, 0x59, 0x5d, 0x8d, 0xf1, 0xfb, 0x87, 0x6b, 0x35, 0x6d, 0x82, 0x94, 0x01, + 0x30, 0x03, 0x1a, 0x54, 0x1c, 0xa4, 0x49, 0x0f, 0x57, 0x02, 0xb9, 0xbe, 0x94, 0x58, 0xe5, 0xd3, + 0xbc, 0x3c, 0x71, 0xc0, 0xaa, 0xb7, 0xc0, 0xcd, 0x34, 0x3d, 0xca, 0xd0, 0xdc, 0xfb, 0x01, 0x90, + 0x5b, 0xc1, 0xb6, 0xe8, 0x83, 0x71, 0xee, 0x98, 0xaf, 0x5e, 0x28, 0xb3, 0x84, 0x11, 0x55, 0xba, + 0xf3, 0xa7, 0x96, 0xd1, 0xde, 0xe2, 0xae, 0x00, 0x26, 0x52, 0x27, 0x59, 0x4a, 0x48, 0xbe, 0x47, + 0xe9, 0xfe, 0x55, 0x3d, 0xf8, 0x87, 0xe1, 0xb5, 0x7a, 0xfa, 0x61, 0x38, 0x1e, 0x97, 0x1c, 0x26, + 0xa5, 0x6f, 0xc4, 0xd7, 0x02, 0x28, 0x26, 0x37, 0xcd, 0x4c, 0x72, 0x5c, 0x8e, 0x79, 0x69, 0xe1, + 0x4a, 0xe6, 0xd1, 0x19, 0x4a, 0x83, 0xaf, 0x82, 0x6a, 0x6e, 0x2c, 0x1e, 0x1c, 0xcb, 0xc2, 0xe1, + 0xb1, 0x2c, 0x7c, 0x3f, 0x96, 0x85, 0xb7, 0x27, 0x72, 0xe6, 0xf0, 0x44, 0xce, 0x7c, 0x3d, 0x91, + 0x33, 0x2f, 0xa7, 0x7a, 0xda, 0x02, 0xad, 0x77, 0xe6, 0xc3, 0x8b, 0xa5, 0x6f, 0x47, 0xbf, 0x1c, + 0xb4, 0x33, 0xda, 0x43, 0xe1, 0xbf, 0xc4, 0xdd, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0xb3, + 0x8e, 0x0a, 0x14, 0x09, 0x00, 0x00, } func (this *MsgCreateVestingAccount) Equal(that interface{}) bool { diff --git a/x/vesting/types/vesting.pb.go b/x/vesting/types/vesting.pb.go index e7b78c00..eaacf35f 100644 --- a/x/vesting/types/vesting.pb.go +++ b/x/vesting/types/vesting.pb.go @@ -8,6 +8,7 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" types "github.com/cosmos/cosmos-sdk/x/auth/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -34,7 +35,8 @@ type BaseVestingAccount struct { OriginalVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=original_vesting,json=originalVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"original_vesting"` DelegatedFree github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=delegated_free,json=delegatedFree,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_free"` DelegatedVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=delegated_vesting,json=delegatedVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_vesting"` - EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` + // Vesting end time, as unix timestamp (in seconds). + EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` } func (m *BaseVestingAccount) Reset() { *m = BaseVestingAccount{} } @@ -73,7 +75,8 @@ var xxx_messageInfo_BaseVestingAccount proto.InternalMessageInfo // continuously vests by unlocking coins linearly with respect to time. type ContinuousVestingAccount struct { *BaseVestingAccount `protobuf:"bytes,1,opt,name=base_vesting_account,json=baseVestingAccount,proto3,embedded=base_vesting_account" json:"base_vesting_account,omitempty"` - StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + // Vesting start time, as unix timestamp (in seconds). + StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` } func (m *ContinuousVestingAccount) Reset() { *m = ContinuousVestingAccount{} } @@ -336,43 +339,48 @@ func init() { func init() { proto.RegisterFile("vesting/v1beta1/vesting.proto", fileDescriptor_eac461ec52018387) } var fileDescriptor_eac461ec52018387 = []byte{ - // 571 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xb6, 0xeb, 0x10, 0xca, 0x15, 0xda, 0x62, 0x4a, 0x49, 0x90, 0xe2, 0x44, 0x45, 0x48, 0x59, - 0xb0, 0x69, 0x61, 0xea, 0x82, 0x48, 0x50, 0x25, 0x24, 0x06, 0x14, 0x21, 0x06, 0x18, 0xac, 0xb3, - 0xfd, 0xe2, 0x9c, 0x12, 0xdf, 0x45, 0xbe, 0x4b, 0xd4, 0x2e, 0xb0, 0x22, 0xb1, 0x30, 0x32, 0x66, - 0xe6, 0x27, 0xf0, 0x0b, 0x3a, 0x66, 0x64, 0x2a, 0x28, 0x91, 0x18, 0xf8, 0x15, 0xc8, 0x77, 0x67, - 0x37, 0x24, 0x6b, 0xa9, 0xba, 0x24, 0xf7, 0xde, 0x97, 0xef, 0xbe, 0xef, 0xdd, 0x7b, 0x97, 0x43, - 0xb5, 0x31, 0x70, 0x41, 0x68, 0xec, 0x8d, 0xf7, 0x03, 0x10, 0x78, 0xdf, 0xd3, 0xb1, 0x3b, 0x4c, - 0x99, 0x60, 0xf6, 0x56, 0x1e, 0x6a, 0xf8, 0xbe, 0x13, 0x32, 0x9e, 0x30, 0xee, 0xe1, 0x91, 0xe8, - 0x15, 0x9c, 0x2c, 0x50, 0x84, 0x02, 0x0f, 0x30, 0x87, 0x02, 0x0f, 0x19, 0xa1, 0x1a, 0xdf, 0x89, - 0x59, 0xcc, 0xe4, 0xd2, 0xcb, 0x56, 0x3a, 0x5b, 0x55, 0x2c, 0x5f, 0x01, 0x2a, 0x50, 0xd0, 0xde, - 0x1f, 0x0b, 0xd9, 0x2d, 0xcc, 0xe1, 0xad, 0x32, 0xf2, 0x3c, 0x0c, 0xd9, 0x88, 0x0a, 0xfb, 0x25, - 0xba, 0x99, 0x49, 0xf8, 0x58, 0xc5, 0x15, 0xb3, 0x61, 0x36, 0x37, 0x0e, 0x1a, 0xae, 0xe6, 0x4a, - 0x47, 0x5a, 0xde, 0xcd, 0xe8, 0x9a, 0xd7, 0x2a, 0x4d, 0xcf, 0xea, 0x66, 0x67, 0x23, 0x38, 0x4f, - 0xd9, 0x63, 0xb4, 0xcd, 0x52, 0x12, 0x13, 0x8a, 0x07, 0xbe, 0x2e, 0xb7, 0xb2, 0xd6, 0xb0, 0x9a, - 0x1b, 0x07, 0xd5, 0x7c, 0xbb, 0xec, 0xe7, 0xc5, 0x76, 0x6d, 0x46, 0x68, 0xeb, 0xf1, 0xe9, 0x59, - 0xdd, 0xf8, 0xf6, 0xb3, 0xde, 0x8c, 0x89, 0xe8, 0x8d, 0x02, 0x37, 0x64, 0x89, 0xf6, 0xad, 0xbf, - 0x1e, 0xf1, 0xa8, 0xef, 0x89, 0x93, 0x21, 0x70, 0x49, 0xe0, 0x9d, 0xad, 0x5c, 0x44, 0x57, 0x62, - 0xa7, 0x68, 0x33, 0x82, 0x01, 0xc4, 0x58, 0x40, 0xe4, 0x77, 0x53, 0x80, 0x8a, 0x75, 0xf1, 0xaa, - 0xb7, 0x0a, 0x89, 0xa3, 0x14, 0xc0, 0x3e, 0x46, 0xb7, 0xcf, 0x35, 0xf3, 0x62, 0x4b, 0x17, 0x2f, - 0xbb, 0x5d, 0xa8, 0xe4, 0xd5, 0x56, 0xd1, 0x3a, 0xd0, 0xc8, 0x17, 0x24, 0x81, 0xca, 0xb5, 0x86, - 0xd9, 0xb4, 0x3a, 0xd7, 0x81, 0x46, 0x6f, 0x48, 0x02, 0x87, 0xeb, 0x9f, 0x26, 0x75, 0xe3, 0xeb, - 0xa4, 0x6e, 0xec, 0x4d, 0x4c, 0x54, 0x69, 0x33, 0x2a, 0x08, 0x1d, 0xb1, 0x11, 0x5f, 0x6a, 0xf9, - 0x7b, 0xb4, 0x23, 0x5b, 0xae, 0x6d, 0x2f, 0xb5, 0xfe, 0x81, 0xbb, 0x34, 0xaa, 0xee, 0xea, 0xd4, - 0xe8, 0xee, 0xdb, 0xc1, 0xea, 0x3c, 0xd5, 0x10, 0xe2, 0x02, 0xa7, 0x42, 0x19, 0x5c, 0x93, 0x06, - 0x6f, 0xc8, 0xcc, 0x92, 0xc5, 0x0f, 0xe8, 0xee, 0x0b, 0x18, 0xe0, 0x93, 0xa2, 0xb2, 0xcb, 0xb0, - 0xb7, 0xa0, 0xff, 0xd9, 0x44, 0xe5, 0xd7, 0x90, 0x12, 0x16, 0xd9, 0xbb, 0xa8, 0x3c, 0x00, 0x1a, - 0x8b, 0x9e, 0xd4, 0xb0, 0x3a, 0x3a, 0xb2, 0x43, 0x54, 0xc6, 0x89, 0xd4, 0xfe, 0x0f, 0x63, 0xac, - 0xb7, 0x3e, 0x2c, 0x49, 0x37, 0xbf, 0x4d, 0xb4, 0xab, 0xdc, 0x90, 0xf0, 0xea, 0xb4, 0xcb, 0x3e, - 0x42, 0xf9, 0x1f, 0x97, 0x3f, 0x94, 0xee, 0xb8, 0xbe, 0x5b, 0xf7, 0x56, 0x64, 0x95, 0xfb, 0x56, - 0x29, 0x3b, 0x88, 0xce, 0xa6, 0x46, 0x55, 0x92, 0x2f, 0x1c, 0xfb, 0x47, 0x59, 0x67, 0x82, 0x29, - 0x50, 0xf1, 0x8a, 0x85, 0x7d, 0x88, 0x2e, 0xb9, 0xef, 0xdf, 0x4d, 0x74, 0xa7, 0x3d, 0x20, 0xdd, - 0xee, 0x15, 0x3a, 0xe6, 0x1a, 0x42, 0x61, 0x66, 0x49, 0xc1, 0x96, 0x82, 0x65, 0xe6, 0xdf, 0x4b, - 0xd3, 0x7a, 0x76, 0x3a, 0x73, 0xcc, 0xe9, 0xcc, 0x31, 0x7f, 0xcd, 0x1c, 0xf3, 0xcb, 0xdc, 0x31, - 0xa6, 0x73, 0xc7, 0xf8, 0x31, 0x77, 0x8c, 0x77, 0x0f, 0x17, 0x06, 0x8f, 0xf5, 0x87, 0x4f, 0xe5, - 0x47, 0xe4, 0x1d, 0xe7, 0xef, 0x90, 0x9a, 0xbd, 0xa0, 0x2c, 0x1f, 0x83, 0x27, 0x7f, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x26, 0x3c, 0x56, 0xde, 0xaf, 0x06, 0x00, 0x00, + // 647 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0xf6, 0x35, 0xf9, 0xe5, 0x47, 0xaf, 0xd0, 0x3f, 0xa6, 0x94, 0xb4, 0x52, 0x9c, 0xe0, 0x0a, + 0x29, 0x2a, 0xaa, 0x4d, 0x0b, 0x2c, 0x59, 0x10, 0x29, 0x42, 0x42, 0x30, 0xa0, 0x08, 0x31, 0xc0, + 0x60, 0x9d, 0xed, 0xab, 0x73, 0x6a, 0x7c, 0x17, 0xf9, 0x2e, 0x85, 0x0a, 0xb1, 0x23, 0xa6, 0xb2, + 0x21, 0xb1, 0x54, 0x42, 0x48, 0x88, 0xa9, 0x1f, 0xa3, 0x63, 0x47, 0x16, 0x0a, 0x6a, 0x87, 0x7e, + 0x0d, 0xe4, 0xbb, 0xb3, 0x6b, 0x25, 0x85, 0xad, 0x55, 0x17, 0xc7, 0xef, 0xbd, 0xf7, 0xbe, 0xcf, + 0xf3, 0xbc, 0x7e, 0x2e, 0x07, 0x6b, 0x9b, 0x98, 0x0b, 0x42, 0x23, 0x77, 0x73, 0xc5, 0xc7, 0x02, + 0xad, 0xb8, 0x3a, 0x76, 0xfa, 0x09, 0x13, 0xcc, 0x9c, 0xca, 0x42, 0x9d, 0x5e, 0x98, 0x41, 0x31, + 0xa1, 0xcc, 0x95, 0x4f, 0xb5, 0x67, 0xc1, 0x0a, 0x18, 0x8f, 0x19, 0x77, 0xd1, 0x40, 0x74, 0xf3, + 0x36, 0x69, 0x30, 0x94, 0xf7, 0x11, 0xc7, 0x79, 0x3e, 0x60, 0x84, 0xea, 0xfc, 0x6c, 0xc4, 0x22, + 0x26, 0x5f, 0xdd, 0xf4, 0x4d, 0xaf, 0xce, 0xab, 0x2a, 0x4f, 0x25, 0x54, 0xa0, 0x52, 0xf6, 0xe7, + 0x32, 0x34, 0xdb, 0x88, 0xe3, 0x17, 0x8a, 0xdb, 0x83, 0x20, 0x60, 0x03, 0x2a, 0xcc, 0xc7, 0xf0, + 0x72, 0x0a, 0xe1, 0x21, 0x15, 0x57, 0x41, 0x03, 0x34, 0x27, 0x56, 0x1b, 0x8e, 0xae, 0x95, 0x8c, + 0x34, 0xbc, 0x93, 0x96, 0xeb, 0xba, 0x76, 0x79, 0xff, 0xa0, 0x0e, 0x3a, 0x13, 0xfe, 0xc9, 0x92, + 0xf9, 0x16, 0x4e, 0xb3, 0x84, 0x44, 0x84, 0xa2, 0x9e, 0xa7, 0x27, 0x50, 0x1d, 0x6b, 0x94, 0x9a, + 0x13, 0xab, 0xf3, 0x59, 0xbb, 0x74, 0x7b, 0xde, 0x6e, 0x8d, 0x11, 0xda, 0xbe, 0xb7, 0x77, 0x50, + 0x37, 0xbe, 0xff, 0xaa, 0x37, 0x23, 0x22, 0xba, 0x03, 0xdf, 0x09, 0x58, 0xac, 0x79, 0xeb, 0x9f, + 0x65, 0x1e, 0x6e, 0xb8, 0x62, 0xab, 0x8f, 0xb9, 0x2c, 0xe0, 0xdf, 0x8e, 0x77, 0x97, 0x40, 0x67, + 0x2a, 0x43, 0xd2, 0x72, 0xcc, 0xd7, 0x70, 0x32, 0xc4, 0x3d, 0x1c, 0x21, 0x81, 0x43, 0x6f, 0x3d, + 0xc1, 0xb8, 0x5a, 0x3a, 0x23, 0xe8, 0x2b, 0x39, 0xce, 0xa3, 0x04, 0x63, 0xf3, 0x1d, 0x9c, 0x39, + 0x01, 0xce, 0x64, 0x97, 0xcf, 0x08, 0x7b, 0x3a, 0x87, 0xca, 0x74, 0xcf, 0xc3, 0x4b, 0x98, 0x86, + 0x9e, 0x20, 0x31, 0xae, 0xfe, 0xd7, 0x00, 0xcd, 0x52, 0xe7, 0x7f, 0x4c, 0xc3, 0xe7, 0x24, 0xc6, + 0xad, 0xa5, 0xf7, 0x3b, 0x75, 0xe3, 0xd3, 0x4e, 0xdd, 0xf8, 0x70, 0xbc, 0xbb, 0x54, 0x2b, 0xb4, + 0x1d, 0xb5, 0x81, 0xbd, 0x07, 0x60, 0x75, 0x8d, 0x51, 0x41, 0xe8, 0x80, 0x0d, 0xf8, 0x90, 0x47, + 0x5e, 0xc1, 0x59, 0xe9, 0x11, 0xad, 0x6e, 0xc8, 0x2b, 0x8b, 0xce, 0x90, 0xdd, 0x9d, 0xd1, 0xfe, + 0xda, 0x2e, 0xa6, 0x3f, 0x6a, 0xc0, 0x1a, 0x84, 0x5c, 0xa0, 0x44, 0x28, 0x09, 0x63, 0x52, 0xc2, + 0xb8, 0x5c, 0x91, 0x22, 0x6e, 0x17, 0x45, 0x2c, 0x16, 0x44, 0xfc, 0x8d, 0xad, 0xfd, 0x05, 0xc0, + 0x6b, 0x0f, 0x71, 0x0f, 0x6d, 0xe5, 0x43, 0x3a, 0x0f, 0x1d, 0xad, 0xe5, 0x22, 0xd1, 0x46, 0x81, + 0xe8, 0xa9, 0x5c, 0xec, 0x6d, 0x00, 0x2b, 0xcf, 0x70, 0x42, 0x58, 0x68, 0xce, 0xc1, 0x4a, 0x0f, + 0xd3, 0x48, 0x74, 0x25, 0x91, 0x52, 0x47, 0x47, 0x66, 0x17, 0x56, 0x50, 0x2c, 0x09, 0x9e, 0xd5, + 0x29, 0xd2, 0xfd, 0x5b, 0xe5, 0x94, 0xb7, 0xfd, 0x71, 0x0c, 0xce, 0x29, 0x4a, 0x24, 0xb8, 0x38, + 0x0e, 0x30, 0x9f, 0xc0, 0xec, 0xff, 0xd4, 0xeb, 0x4b, 0x76, 0x5c, 0x1f, 0xed, 0xeb, 0x23, 0xb0, + 0x8a, 0x7d, 0x7b, 0x3c, 0x9d, 0x86, 0x52, 0x38, 0xa9, 0xb7, 0xa8, 0x0c, 0x6f, 0x39, 0xc5, 0xaf, + 0x74, 0xa3, 0x30, 0x9b, 0xd3, 0x85, 0xdb, 0x5f, 0x81, 0x9c, 0x49, 0x8c, 0x28, 0xa6, 0xe2, 0x29, + 0x0b, 0x36, 0x70, 0x78, 0x2e, 0x6e, 0xfa, 0x17, 0xcf, 0x53, 0xc8, 0xd8, 0x3f, 0x01, 0xbc, 0xba, + 0xd6, 0x23, 0xeb, 0xeb, 0x17, 0xe8, 0xc3, 0xd5, 0x20, 0x0c, 0x52, 0x4a, 0x2a, 0x5d, 0x52, 0x69, + 0xb9, 0x22, 0x4f, 0xf6, 0xad, 0xa2, 0x44, 0xab, 0x78, 0xb2, 0x47, 0x75, 0xb4, 0xef, 0xef, 0x1d, + 0x5a, 0x60, 0xff, 0xd0, 0x02, 0xbf, 0x0f, 0x2d, 0xb0, 0x7d, 0x64, 0x19, 0xfb, 0x47, 0x96, 0xf1, + 0xe3, 0xc8, 0x32, 0x5e, 0xde, 0x2c, 0x58, 0x9e, 0x6d, 0xf4, 0xef, 0xca, 0x47, 0xe8, 0xbe, 0xc9, + 0xee, 0x64, 0xe5, 0x7a, 0xbf, 0x22, 0x6f, 0xc1, 0x3b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, + 0xa4, 0x55, 0xae, 0xbb, 0x07, 0x00, 0x00, } func (m *BaseVestingAccount) Marshal() (dAtA []byte, err error) {