diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 752902d2..be27df23 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -19,8 +19,8 @@ - [Query](#xpla.reward.v1beta1.Query) - [xpla/reward/v1beta1/tx.proto](#xpla/reward/v1beta1/tx.proto) - - [MsgFundFeeCollector](#xpla.reward.v1beta1.MsgFundFeeCollector) - - [MsgFundFeeCollectorResponse](#xpla.reward.v1beta1.MsgFundFeeCollectorResponse) + - [MsgFundRewardPool](#xpla.reward.v1beta1.MsgFundRewardPool) + - [MsgFundRewardPoolResponse](#xpla.reward.v1beta1.MsgFundRewardPoolResponse) - [MsgUpdateParams](#xpla.reward.v1beta1.MsgUpdateParams) - [MsgUpdateParamsResponse](#xpla.reward.v1beta1.MsgUpdateParamsResponse) @@ -200,11 +200,11 @@ Query defines the gRPC querier service for reward module. - + -### MsgFundFeeCollector -MsgFundFeeCollector allows an account to directly -fund the fee collector. +### MsgFundRewardPool +MsgFundRewardPool allows an account to directly +fund the reward pool. | Field | Type | Label | Description | @@ -217,10 +217,10 @@ fund the fee collector. - + -### MsgFundFeeCollectorResponse -MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type. +### MsgFundRewardPoolResponse +MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type. @@ -269,7 +269,7 @@ Msg defines the reawrd Msg service. | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | | ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `FundFeeCollector` | [MsgFundFeeCollector](#xpla.reward.v1beta1.MsgFundFeeCollector) | [MsgFundFeeCollectorResponse](#xpla.reward.v1beta1.MsgFundFeeCollectorResponse) | FundFeeCollector defines a method to allow an account to directly fund the fee collector. | | +| `FundRewardPool` | [MsgFundRewardPool](#xpla.reward.v1beta1.MsgFundRewardPool) | [MsgFundRewardPoolResponse](#xpla.reward.v1beta1.MsgFundRewardPoolResponse) | MsgFundRewardPool defines a method to allow an account to directly fund the reward pool. | | | `UpdateParams` | [MsgUpdateParams](#xpla.reward.v1beta1.MsgUpdateParams) | [MsgUpdateParamsResponse](#xpla.reward.v1beta1.MsgUpdateParamsResponse) | UpdateParams defined a governance operation for updating the x/reward module parameters. The authority is hard-coded to the Cosmos SDK x/gov module account | | diff --git a/proto/xpla/reward/v1beta1/tx.proto b/proto/xpla/reward/v1beta1/tx.proto index 5cd7c9a7..fe0b1440 100644 --- a/proto/xpla/reward/v1beta1/tx.proto +++ b/proto/xpla/reward/v1beta1/tx.proto @@ -12,10 +12,9 @@ import "amino/amino.proto"; // Msg defines the reawrd Msg service. service Msg { - // FundFeeCollector defines a method to allow an account to directly - // fund the fee collector. - rpc FundFeeCollector(MsgFundFeeCollector) - returns (MsgFundFeeCollectorResponse); + // MsgFundRewardPool defines a method to allow an account to directly + // fund the reward pool. + rpc FundRewardPool(MsgFundRewardPool) returns (MsgFundRewardPoolResponse); // UpdateParams defined a governance operation for updating the x/reward // module parameters. The authority is hard-coded to the Cosmos SDK x/gov @@ -23,10 +22,10 @@ service Msg { rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } -// MsgFundFeeCollector allows an account to directly -// fund the fee collector. -message MsgFundFeeCollector { - option (amino.name) = "xpladev/MsgFundFeeCollector"; +// MsgFundRewardPool allows an account to directly +// fund the reward pool. +message MsgFundRewardPool { + option (amino.name) = "xpladev/MsgFundRewardPool"; option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; @@ -37,8 +36,8 @@ message MsgFundFeeCollector { string depositor = 2; } -// MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type. -message MsgFundFeeCollectorResponse {} +// MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type. +message MsgFundRewardPoolResponse {} // MsgUpdateParams is the Msg/UpdateParams request type for reward parameters. // Since: cosmos-sdk 0.47 diff --git a/x/reward/client/cli/tx.go b/x/reward/client/cli/tx.go index e67eaadf..609aed17 100644 --- a/x/reward/client/cli/tx.go +++ b/x/reward/client/cli/tx.go @@ -30,7 +30,7 @@ func NewTxCmd() *cobra.Command { } distTxCmd.AddCommand( - NewFundFeeCollectorCmd(), + NewFundRewardPoolCmd(), ) return distTxCmd @@ -38,16 +38,16 @@ func NewTxCmd() *cobra.Command { type newGenerateOrBroadcastFunc func(client.Context, *pflag.FlagSet, ...sdk.Msg) error -func NewFundFeeCollectorCmd() *cobra.Command { +func NewFundRewardPoolCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "fund-fee-collector [amount]", + Use: "fund-reward-pool [amount]", Args: cobra.ExactArgs(1), - Short: "Funds the fee collector with the specified amount", + Short: "Funds the reward pool with the specified amount", Long: strings.TrimSpace( - fmt.Sprintf(`Funds the fee collector with the specified amount + fmt.Sprintf(`Funds the reward pool with the specified amount Example: -$ %s tx reward fund-fee-collector 100axpla --from mykey +$ %s tx reward fund-reward-pool 100axpla --from mykey `, version.AppName, ), @@ -63,7 +63,7 @@ $ %s tx reward fund-fee-collector 100axpla --from mykey return err } - msg := types.NewMsgFundFeeCollector(amount, depositorAddr) + msg := types.NewMsgFundRewardPool(amount, depositorAddr) return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) }, diff --git a/x/reward/keeper/keeper.go b/x/reward/keeper/keeper.go index c01095f8..699e4f9d 100644 --- a/x/reward/keeper/keeper.go +++ b/x/reward/keeper/keeper.go @@ -8,7 +8,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/xpladev/xpla/x/reward/types" ) @@ -59,11 +58,11 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", "x/"+types.ModuleName) } -// FundFeeCollector allows an account to directly fund the fee collector fund. -// The amount is added to the fee collector account +// FundRewardPool allows an account to directly fund the reward pool fund. +// The amount is added to the reward pool account // An error is returned if the amount cannot be sent to the module account. -func (k Keeper) FundFeeCollector(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error { - if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, authtypes.FeeCollectorName, amount); err != nil { +func (k Keeper) FundRewardPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error { + if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, amount); err != nil { return err } diff --git a/x/reward/keeper/msg_server.go b/x/reward/keeper/msg_server.go index 11079557..d996fd77 100644 --- a/x/reward/keeper/msg_server.go +++ b/x/reward/keeper/msg_server.go @@ -21,7 +21,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer { var _ types.MsgServer = msgServer{} -func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFeeCollector) (*types.MsgFundFeeCollectorResponse, error) { +func (k msgServer) FundRewardPool(goCtx context.Context, msg *types.MsgFundRewardPool) (*types.MsgFundRewardPoolResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) depositer, err := sdk.AccAddressFromBech32(msg.Depositor) @@ -29,7 +29,7 @@ func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFee return nil, err } - err = k.Keeper.FundFeeCollector(ctx, msg.Amount, depositer) + err = k.Keeper.FundRewardPool(ctx, msg.Amount, depositer) if err != nil { return nil, err } @@ -42,7 +42,7 @@ func (k msgServer) FundFeeCollector(goCtx context.Context, msg *types.MsgFundFee ), ) - return &types.MsgFundFeeCollectorResponse{}, nil + return &types.MsgFundRewardPoolResponse{}, nil } // UpdateParams implements the gRPC MsgServer interface. After a successful governance vote diff --git a/x/reward/types/codec.go b/x/reward/types/codec.go index dcefda26..78959420 100644 --- a/x/reward/types/codec.go +++ b/x/reward/types/codec.go @@ -9,14 +9,14 @@ import ( ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgFundFeeCollector{}, "xpladev/MsgFundFeeCollector", nil) + cdc.RegisterConcrete(&MsgFundRewardPool{}, "xpladev/MsgFundRewardPool", nil) cdc.RegisterConcrete(&MsgUpdateParams{}, "xpladev/reward/MsgUpdateParams", nil) } func RegisterInterfaces(registry types.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), - &MsgFundFeeCollector{}, + &MsgFundRewardPool{}, &MsgUpdateParams{}, ) diff --git a/x/reward/types/msg.go b/x/reward/types/msg.go index 631adcaf..80f77dcc 100644 --- a/x/reward/types/msg.go +++ b/x/reward/types/msg.go @@ -6,28 +6,28 @@ import ( ) const ( - TypeMsgFundFeeCollector = "fund_fee_collector" - TypeMsgUpdateParams = "update_params" + TypeMsgFundRewardPool = "fund_reward_pool" + TypeMsgUpdateParams = "update_params" ) -// NewMsgFundFeeCollector returns a new MsgFundFeeCollector with a sender and +// NewMsgFundRewardPool returns a new MsgFundRewardPool with a sender and // a funding amount. -func NewMsgFundFeeCollector(amount sdk.Coins, depositor sdk.AccAddress) *MsgFundFeeCollector { - return &MsgFundFeeCollector{ +func NewMsgFundRewardPool(amount sdk.Coins, depositor sdk.AccAddress) *MsgFundRewardPool { + return &MsgFundRewardPool{ Amount: amount, Depositor: depositor.String(), } } -// Route returns the MsgFundFeeCollector message route. -func (msg MsgFundFeeCollector) Route() string { return ModuleName } +// Route returns the MsgFundRewardPool message route. +func (msg MsgFundRewardPool) Route() string { return ModuleName } -// Type returns the MsgFundFeeCollector message type. -func (msg MsgFundFeeCollector) Type() string { return TypeMsgFundFeeCollector } +// Type returns the MsgFundRewardPool message type. +func (msg MsgFundRewardPool) Type() string { return TypeMsgFundRewardPool } // GetSigners returns the signer addresses that are expected to sign the result // of GetSignBytes. -func (msg MsgFundFeeCollector) GetSigners() []sdk.AccAddress { +func (msg MsgFundRewardPool) GetSigners() []sdk.AccAddress { depoAddr, err := sdk.AccAddressFromBech32(msg.Depositor) if err != nil { panic(err) @@ -35,15 +35,15 @@ func (msg MsgFundFeeCollector) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{depoAddr} } -// GetSignBytes returns the raw bytes for a MsgFundFeeCollector message that +// GetSignBytes returns the raw bytes for a MsgFundRewardPool message that // the expected signer needs to sign. -func (msg MsgFundFeeCollector) GetSignBytes() []byte { +func (msg MsgFundRewardPool) GetSignBytes() []byte { bz := ModuleCdc.MustMarshalJSON(&msg) return sdk.MustSortJSON(bz) } -// ValidateBasic performs basic MsgFundFeeCollector message validation. -func (msg MsgFundFeeCollector) ValidateBasic() error { +// ValidateBasic performs basic MsgFundRewardPool message validation. +func (msg MsgFundRewardPool) ValidateBasic() error { if !msg.Amount.IsValid() { return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) } diff --git a/x/reward/types/msg_test.go b/x/reward/types/msg_test.go index fcc4d9e8..92fdb9c3 100644 --- a/x/reward/types/msg_test.go +++ b/x/reward/types/msg_test.go @@ -10,7 +10,7 @@ import ( "github.com/xpladev/xpla/x/reward/types" ) -func TestMsgFundFeeCollector(t *testing.T) { +func TestMsgFundRewardPool(t *testing.T) { tests := []struct { amount sdk.Coins depositorAddr sdk.AccAddress @@ -22,7 +22,7 @@ func TestMsgFundFeeCollector(t *testing.T) { } for i, tc := range tests { - msg := types.NewMsgFundFeeCollector(tc.amount, tc.depositorAddr) + msg := types.NewMsgFundRewardPool(tc.amount, tc.depositorAddr) if tc.expectPass { require.Nil(t, msg.ValidateBasic(), "test index: %v", i) } else { diff --git a/x/reward/types/tx.pb.go b/x/reward/types/tx.pb.go index 96246f6c..d08676d2 100644 --- a/x/reward/types/tx.pb.go +++ b/x/reward/types/tx.pb.go @@ -33,25 +33,25 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// MsgFundFeeCollector allows an account to directly -// fund the fee collector. -type MsgFundFeeCollector struct { +// MsgFundRewardPool allows an account to directly +// fund the reward pool. +type MsgFundRewardPool struct { Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` } -func (m *MsgFundFeeCollector) Reset() { *m = MsgFundFeeCollector{} } -func (m *MsgFundFeeCollector) String() string { return proto.CompactTextString(m) } -func (*MsgFundFeeCollector) ProtoMessage() {} -func (*MsgFundFeeCollector) Descriptor() ([]byte, []int) { +func (m *MsgFundRewardPool) Reset() { *m = MsgFundRewardPool{} } +func (m *MsgFundRewardPool) String() string { return proto.CompactTextString(m) } +func (*MsgFundRewardPool) ProtoMessage() {} +func (*MsgFundRewardPool) Descriptor() ([]byte, []int) { return fileDescriptor_9ab6178765eaaaf2, []int{0} } -func (m *MsgFundFeeCollector) XXX_Unmarshal(b []byte) error { +func (m *MsgFundRewardPool) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgFundFeeCollector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgFundRewardPool) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgFundFeeCollector.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgFundRewardPool.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -61,34 +61,34 @@ func (m *MsgFundFeeCollector) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgFundFeeCollector) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgFundFeeCollector.Merge(m, src) +func (m *MsgFundRewardPool) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgFundRewardPool.Merge(m, src) } -func (m *MsgFundFeeCollector) XXX_Size() int { +func (m *MsgFundRewardPool) XXX_Size() int { return m.Size() } -func (m *MsgFundFeeCollector) XXX_DiscardUnknown() { - xxx_messageInfo_MsgFundFeeCollector.DiscardUnknown(m) +func (m *MsgFundRewardPool) XXX_DiscardUnknown() { + xxx_messageInfo_MsgFundRewardPool.DiscardUnknown(m) } -var xxx_messageInfo_MsgFundFeeCollector proto.InternalMessageInfo +var xxx_messageInfo_MsgFundRewardPool proto.InternalMessageInfo -// MsgFundFeeCollectorResponse defines the Msg/FundFeeCollector response type. -type MsgFundFeeCollectorResponse struct { +// MsgFundRewardPoolResponse defines the Msg/FundRewardPool response type. +type MsgFundRewardPoolResponse struct { } -func (m *MsgFundFeeCollectorResponse) Reset() { *m = MsgFundFeeCollectorResponse{} } -func (m *MsgFundFeeCollectorResponse) String() string { return proto.CompactTextString(m) } -func (*MsgFundFeeCollectorResponse) ProtoMessage() {} -func (*MsgFundFeeCollectorResponse) Descriptor() ([]byte, []int) { +func (m *MsgFundRewardPoolResponse) Reset() { *m = MsgFundRewardPoolResponse{} } +func (m *MsgFundRewardPoolResponse) String() string { return proto.CompactTextString(m) } +func (*MsgFundRewardPoolResponse) ProtoMessage() {} +func (*MsgFundRewardPoolResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9ab6178765eaaaf2, []int{1} } -func (m *MsgFundFeeCollectorResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgFundRewardPoolResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgFundFeeCollectorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgFundRewardPoolResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgFundFeeCollectorResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgFundRewardPoolResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -98,17 +98,17 @@ func (m *MsgFundFeeCollectorResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *MsgFundFeeCollectorResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgFundFeeCollectorResponse.Merge(m, src) +func (m *MsgFundRewardPoolResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgFundRewardPoolResponse.Merge(m, src) } -func (m *MsgFundFeeCollectorResponse) XXX_Size() int { +func (m *MsgFundRewardPoolResponse) XXX_Size() int { return m.Size() } -func (m *MsgFundFeeCollectorResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgFundFeeCollectorResponse.DiscardUnknown(m) +func (m *MsgFundRewardPoolResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgFundRewardPoolResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgFundFeeCollectorResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgFundRewardPoolResponse proto.InternalMessageInfo // MsgUpdateParams is the Msg/UpdateParams request type for reward parameters. // Since: cosmos-sdk 0.47 @@ -207,8 +207,8 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgFundFeeCollector)(nil), "xpla.reward.v1beta1.MsgFundFeeCollector") - proto.RegisterType((*MsgFundFeeCollectorResponse)(nil), "xpla.reward.v1beta1.MsgFundFeeCollectorResponse") + proto.RegisterType((*MsgFundRewardPool)(nil), "xpla.reward.v1beta1.MsgFundRewardPool") + proto.RegisterType((*MsgFundRewardPoolResponse)(nil), "xpla.reward.v1beta1.MsgFundRewardPoolResponse") proto.RegisterType((*MsgUpdateParams)(nil), "xpla.reward.v1beta1.MsgUpdateParams") proto.RegisterType((*MsgUpdateParamsResponse)(nil), "xpla.reward.v1beta1.MsgUpdateParamsResponse") } @@ -216,38 +216,38 @@ func init() { func init() { proto.RegisterFile("xpla/reward/v1beta1/tx.proto", fileDescriptor_9ab6178765eaaaf2) } var fileDescriptor_9ab6178765eaaaf2 = []byte{ - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xf6, 0x51, 0x14, 0x29, 0x57, 0xc4, 0x0f, 0xb7, 0x52, 0xf3, 0xa3, 0x38, 0x51, 0x84, 0x90, - 0x55, 0x51, 0x5f, 0x13, 0x24, 0x24, 0x3a, 0x41, 0x2a, 0x75, 0x8b, 0x84, 0x8c, 0x58, 0x58, 0xd0, - 0xd9, 0x3e, 0xb9, 0x16, 0xb1, 0x9f, 0x75, 0xef, 0x12, 0xd2, 0x95, 0x09, 0x31, 0x31, 0xf0, 0x07, - 0x74, 0x66, 0xea, 0xc0, 0x5f, 0xc0, 0xd4, 0xb1, 0x62, 0x82, 0x05, 0x50, 0x32, 0x94, 0x3f, 0x03, - 0xd9, 0x3e, 0x93, 0x02, 0x46, 0xca, 0x92, 0x8b, 0xdf, 0xf7, 0xdd, 0xf7, 0x7d, 0xef, 0xde, 0xa3, - 0xdb, 0xb3, 0x74, 0xcc, 0x99, 0x14, 0xaf, 0xb8, 0x0c, 0xd8, 0xb4, 0xef, 0x09, 0xc5, 0xfb, 0x4c, - 0xcd, 0x9c, 0x54, 0x82, 0x02, 0x73, 0x23, 0x43, 0x9d, 0x02, 0x75, 0x34, 0xda, 0xda, 0x0c, 0x21, - 0x84, 0x1c, 0x67, 0xd9, 0xbf, 0x82, 0xda, 0xb2, 0x7c, 0xc0, 0x18, 0x90, 0x79, 0x1c, 0xc5, 0x6f, - 0x21, 0x1f, 0xa2, 0x44, 0xe3, 0x5b, 0x1a, 0x8f, 0x31, 0x64, 0xd3, 0x7e, 0x76, 0x68, 0xa0, 0x59, - 0x00, 0x2f, 0x0a, 0xc5, 0xe2, 0x43, 0x43, 0xdd, 0xaa, 0x70, 0x3a, 0x4d, 0xc1, 0xb8, 0xc5, 0xe3, - 0x28, 0x01, 0x96, 0xff, 0x16, 0xa5, 0xde, 0x27, 0x42, 0x37, 0x46, 0x18, 0x1e, 0x4e, 0x92, 0xe0, - 0x50, 0x88, 0x03, 0x18, 0x8f, 0x85, 0xaf, 0x40, 0x9a, 0x3e, 0xad, 0xf1, 0x18, 0x26, 0x89, 0x6a, - 0x90, 0xee, 0x9a, 0xbd, 0x3e, 0x68, 0x3a, 0xda, 0x2b, 0x4b, 0x5c, 0x36, 0xe7, 0x1c, 0x40, 0x94, - 0x0c, 0xf7, 0xce, 0xbe, 0x75, 0x8c, 0x0f, 0xdf, 0x3b, 0x76, 0x18, 0xa9, 0xa3, 0x89, 0xe7, 0xf8, - 0x10, 0xeb, 0x60, 0xfa, 0xd8, 0xc5, 0xe0, 0x25, 0x53, 0xc7, 0xa9, 0xc0, 0xfc, 0x02, 0xba, 0x5a, - 0xda, 0xdc, 0xa6, 0xf5, 0x40, 0xa4, 0x80, 0x91, 0x02, 0xd9, 0xb8, 0xd2, 0x25, 0x76, 0xdd, 0x5d, - 0x16, 0xf6, 0xed, 0x37, 0x27, 0x1d, 0xe3, 0xe7, 0x49, 0xc7, 0x78, 0x7b, 0x71, 0xba, 0xd3, 0xce, - 0x9a, 0x0b, 0xc4, 0x94, 0x55, 0x84, 0xed, 0xdd, 0xa6, 0xed, 0x8a, 0xb2, 0x2b, 0x30, 0x85, 0x04, - 0x45, 0xef, 0x3d, 0xa1, 0x37, 0x46, 0x18, 0x3e, 0x4b, 0x03, 0xae, 0xc4, 0x13, 0x2e, 0x79, 0x8c, - 0xe6, 0x03, 0x5a, 0xe7, 0x13, 0x75, 0x04, 0x32, 0x52, 0xc7, 0x0d, 0x92, 0x59, 0x0f, 0x1b, 0x9f, - 0x3f, 0xee, 0x6e, 0xea, 0x2e, 0x1f, 0x07, 0x81, 0x14, 0x88, 0x4f, 0x95, 0x8c, 0x92, 0xd0, 0x5d, - 0x52, 0xcd, 0x87, 0xb4, 0x96, 0xe6, 0x0a, 0x79, 0xde, 0xf5, 0x41, 0xdb, 0xa9, 0x18, 0xba, 0x53, - 0x98, 0x0c, 0xaf, 0x66, 0x2f, 0xe3, 0xea, 0x0b, 0xfb, 0xd7, 0x5f, 0x5f, 0x9c, 0xee, 0x2c, 0xa5, - 0x7a, 0x4d, 0xba, 0xf5, 0x57, 0xaa, 0x32, 0xf1, 0xe0, 0x2b, 0xa1, 0x6b, 0x23, 0x0c, 0xcd, 0x84, - 0xde, 0xfc, 0x67, 0x32, 0x76, 0xa5, 0x63, 0x45, 0xff, 0xad, 0xbd, 0x55, 0x99, 0xa5, 0xaf, 0xe9, - 0xd1, 0x6b, 0x7f, 0xbc, 0xd2, 0x9d, 0xff, 0x29, 0x5c, 0x66, 0xb5, 0xee, 0xad, 0xc2, 0x2a, 0x3d, - 0x86, 0x8f, 0xce, 0xe6, 0x16, 0x39, 0x9f, 0x5b, 0xe4, 0xc7, 0xdc, 0x22, 0xef, 0x16, 0x96, 0x71, - 0xbe, 0xb0, 0x8c, 0x2f, 0x0b, 0xcb, 0x78, 0x7e, 0xf7, 0xd2, 0x02, 0x95, 0xe3, 0xce, 0x77, 0x7a, - 0x56, 0x6e, 0x75, 0xbe, 0x44, 0x5e, 0x2d, 0x5f, 0xdd, 0xfb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x69, 0x2f, 0x59, 0x50, 0x8e, 0x03, 0x00, 0x00, + // 483 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xf6, 0x51, 0x14, 0x29, 0x57, 0x54, 0x54, 0x53, 0xa9, 0x71, 0x5a, 0x39, 0x51, 0x84, 0xa2, + 0xa8, 0xa2, 0x77, 0x24, 0x48, 0x48, 0x74, 0x82, 0x20, 0xb1, 0x45, 0xaa, 0x8c, 0x58, 0x58, 0xd0, + 0x39, 0x3e, 0x39, 0x16, 0xb5, 0x9f, 0xe5, 0x77, 0x09, 0xe9, 0xca, 0x84, 0x98, 0x18, 0xf8, 0x01, + 0x9d, 0x99, 0x3a, 0x30, 0x33, 0x77, 0xac, 0x60, 0x61, 0x02, 0x94, 0x0c, 0xe5, 0x67, 0x20, 0x9f, + 0xcf, 0xa4, 0x34, 0x41, 0xea, 0xe2, 0xf3, 0xbd, 0xef, 0x7b, 0xef, 0xfb, 0xde, 0xbd, 0x47, 0x77, + 0xa7, 0xe9, 0x91, 0xe0, 0x99, 0x7c, 0x23, 0xb2, 0x80, 0x4f, 0xba, 0xbe, 0x54, 0xa2, 0xcb, 0xd5, + 0x94, 0xa5, 0x19, 0x28, 0xb0, 0xef, 0xe4, 0x28, 0x2b, 0x50, 0x66, 0xd0, 0xfa, 0x56, 0x08, 0x21, + 0x68, 0x9c, 0xe7, 0x7f, 0x05, 0xb5, 0xee, 0x0e, 0x01, 0x63, 0x40, 0xee, 0x0b, 0x94, 0x7f, 0x0b, + 0x0d, 0x21, 0x4a, 0x0c, 0xbe, 0x6d, 0xf0, 0x18, 0x43, 0x3e, 0xe9, 0xe6, 0x87, 0x01, 0x9c, 0x02, + 0x78, 0x55, 0x54, 0x2c, 0x2e, 0x06, 0x6a, 0xae, 0x32, 0x67, 0xdc, 0x14, 0x8c, 0x4d, 0x11, 0x47, + 0x09, 0x70, 0xfd, 0x2d, 0x42, 0xad, 0x2f, 0x84, 0x6e, 0x0e, 0x30, 0x7c, 0x36, 0x4e, 0x02, 0x4f, + 0x53, 0x0f, 0x01, 0x8e, 0xec, 0x21, 0xad, 0x88, 0x18, 0xc6, 0x89, 0xaa, 0x91, 0xe6, 0x5a, 0x67, + 0xbd, 0xe7, 0x30, 0xa3, 0x94, 0xfb, 0x2d, 0x5b, 0x63, 0x4f, 0x21, 0x4a, 0xfa, 0xf7, 0xcf, 0x7e, + 0x34, 0xac, 0x4f, 0x3f, 0x1b, 0x9d, 0x30, 0x52, 0xa3, 0xb1, 0xcf, 0x86, 0x10, 0x1b, 0x5b, 0xe6, + 0xd8, 0xc7, 0xe0, 0x35, 0x57, 0xc7, 0xa9, 0x44, 0x9d, 0x80, 0x9e, 0x29, 0x6d, 0xef, 0xd2, 0x6a, + 0x20, 0x53, 0xc0, 0x48, 0x41, 0x56, 0xbb, 0xd1, 0x24, 0x9d, 0xaa, 0xb7, 0x08, 0x1c, 0xb4, 0xdf, + 0x9d, 0x34, 0xac, 0xdf, 0x27, 0x0d, 0xeb, 0xfd, 0xc5, 0xe9, 0x9e, 0x93, 0xb7, 0x16, 0xc8, 0x09, + 0x5f, 0xb2, 0xda, 0xda, 0xa1, 0xce, 0x52, 0xd0, 0x93, 0x98, 0x42, 0x82, 0xb2, 0xf5, 0x91, 0xd0, + 0xdb, 0x03, 0x0c, 0x5f, 0xa4, 0x81, 0x50, 0xf2, 0x50, 0x64, 0x22, 0x46, 0xfb, 0x21, 0xad, 0x8a, + 0xb1, 0x1a, 0x41, 0x16, 0xa9, 0xe3, 0x1a, 0xc9, 0x65, 0xfb, 0xb5, 0xaf, 0x9f, 0xf7, 0xb7, 0x4c, + 0x87, 0x4f, 0x82, 0x20, 0x93, 0x88, 0xcf, 0x55, 0x16, 0x25, 0xa1, 0xb7, 0xa0, 0xda, 0x8f, 0x68, + 0x25, 0xd5, 0x15, 0xb4, 0xd7, 0xf5, 0xde, 0x0e, 0x5b, 0x31, 0x6e, 0x56, 0x88, 0xf4, 0x6f, 0xe6, + 0xaf, 0xe2, 0x99, 0x84, 0x83, 0x8d, 0xb7, 0x17, 0xa7, 0x7b, 0x8b, 0x52, 0x2d, 0x87, 0x6e, 0x5f, + 0x71, 0x55, 0x3a, 0xee, 0x7d, 0x23, 0x74, 0x6d, 0x80, 0xa1, 0x3d, 0xa2, 0x1b, 0x57, 0x66, 0xd2, + 0x5e, 0xa9, 0xb7, 0xd4, 0x7b, 0x9d, 0x5d, 0x8f, 0x57, 0x2a, 0xda, 0x3e, 0xbd, 0xf5, 0xcf, 0xfb, + 0xdc, 0xfd, 0x5f, 0xfe, 0x65, 0x56, 0xfd, 0xde, 0x75, 0x58, 0xa5, 0x46, 0xff, 0xf1, 0xd9, 0xcc, + 0x25, 0xe7, 0x33, 0x97, 0xfc, 0x9a, 0xb9, 0xe4, 0xc3, 0xdc, 0xb5, 0xce, 0xe7, 0xae, 0xf5, 0x7d, + 0xee, 0x5a, 0x2f, 0xdb, 0x97, 0xd6, 0xa6, 0x1c, 0xb2, 0xde, 0xe3, 0x69, 0xb9, 0xc9, 0x7a, 0x75, + 0xfc, 0x8a, 0x5e, 0xd7, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x52, 0x9b, 0x66, 0x8c, 0x82, + 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -262,9 +262,9 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { - // FundFeeCollector defines a method to allow an account to directly - // fund the fee collector. - FundFeeCollector(ctx context.Context, in *MsgFundFeeCollector, opts ...grpc.CallOption) (*MsgFundFeeCollectorResponse, error) + // MsgFundRewardPool defines a method to allow an account to directly + // fund the reward pool. + FundRewardPool(ctx context.Context, in *MsgFundRewardPool, opts ...grpc.CallOption) (*MsgFundRewardPoolResponse, error) // UpdateParams defined a governance operation for updating the x/reward // module parameters. The authority is hard-coded to the Cosmos SDK x/gov // module account @@ -279,9 +279,9 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { return &msgClient{cc} } -func (c *msgClient) FundFeeCollector(ctx context.Context, in *MsgFundFeeCollector, opts ...grpc.CallOption) (*MsgFundFeeCollectorResponse, error) { - out := new(MsgFundFeeCollectorResponse) - err := c.cc.Invoke(ctx, "/xpla.reward.v1beta1.Msg/FundFeeCollector", in, out, opts...) +func (c *msgClient) FundRewardPool(ctx context.Context, in *MsgFundRewardPool, opts ...grpc.CallOption) (*MsgFundRewardPoolResponse, error) { + out := new(MsgFundRewardPoolResponse) + err := c.cc.Invoke(ctx, "/xpla.reward.v1beta1.Msg/FundRewardPool", in, out, opts...) if err != nil { return nil, err } @@ -299,9 +299,9 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts // MsgServer is the server API for Msg service. type MsgServer interface { - // FundFeeCollector defines a method to allow an account to directly - // fund the fee collector. - FundFeeCollector(context.Context, *MsgFundFeeCollector) (*MsgFundFeeCollectorResponse, error) + // MsgFundRewardPool defines a method to allow an account to directly + // fund the reward pool. + FundRewardPool(context.Context, *MsgFundRewardPool) (*MsgFundRewardPoolResponse, error) // UpdateParams defined a governance operation for updating the x/reward // module parameters. The authority is hard-coded to the Cosmos SDK x/gov // module account @@ -312,8 +312,8 @@ type MsgServer interface { type UnimplementedMsgServer struct { } -func (*UnimplementedMsgServer) FundFeeCollector(ctx context.Context, req *MsgFundFeeCollector) (*MsgFundFeeCollectorResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FundFeeCollector not implemented") +func (*UnimplementedMsgServer) FundRewardPool(ctx context.Context, req *MsgFundRewardPool) (*MsgFundRewardPoolResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FundRewardPool not implemented") } func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") @@ -323,20 +323,20 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) { s.RegisterService(&_Msg_serviceDesc, srv) } -func _Msg_FundFeeCollector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgFundFeeCollector) +func _Msg_FundRewardPool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgFundRewardPool) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).FundFeeCollector(ctx, in) + return srv.(MsgServer).FundRewardPool(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/xpla.reward.v1beta1.Msg/FundFeeCollector", + FullMethod: "/xpla.reward.v1beta1.Msg/FundRewardPool", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).FundFeeCollector(ctx, req.(*MsgFundFeeCollector)) + return srv.(MsgServer).FundRewardPool(ctx, req.(*MsgFundRewardPool)) } return interceptor(ctx, in, info, handler) } @@ -364,8 +364,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "FundFeeCollector", - Handler: _Msg_FundFeeCollector_Handler, + MethodName: "FundRewardPool", + Handler: _Msg_FundRewardPool_Handler, }, { MethodName: "UpdateParams", @@ -376,7 +376,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "xpla/reward/v1beta1/tx.proto", } -func (m *MsgFundFeeCollector) Marshal() (dAtA []byte, err error) { +func (m *MsgFundRewardPool) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -386,12 +386,12 @@ func (m *MsgFundFeeCollector) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgFundFeeCollector) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgFundRewardPool) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgFundFeeCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgFundRewardPool) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -420,7 +420,7 @@ func (m *MsgFundFeeCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgFundFeeCollectorResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgFundRewardPoolResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -430,12 +430,12 @@ func (m *MsgFundFeeCollectorResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgFundFeeCollectorResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgFundRewardPoolResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgFundFeeCollectorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgFundRewardPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -517,7 +517,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgFundFeeCollector) Size() (n int) { +func (m *MsgFundRewardPool) Size() (n int) { if m == nil { return 0 } @@ -536,7 +536,7 @@ func (m *MsgFundFeeCollector) Size() (n int) { return n } -func (m *MsgFundFeeCollectorResponse) Size() (n int) { +func (m *MsgFundRewardPoolResponse) Size() (n int) { if m == nil { return 0 } @@ -575,7 +575,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error { +func (m *MsgFundRewardPool) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -598,10 +598,10 @@ func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgFundFeeCollector: wiretype end group for non-group") + return fmt.Errorf("proto: MsgFundRewardPool: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgFundFeeCollector: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgFundRewardPool: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -691,7 +691,7 @@ func (m *MsgFundFeeCollector) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgFundFeeCollectorResponse) Unmarshal(dAtA []byte) error { +func (m *MsgFundRewardPoolResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -714,10 +714,10 @@ func (m *MsgFundFeeCollectorResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgFundFeeCollectorResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgFundRewardPoolResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgFundFeeCollectorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgFundRewardPoolResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: