From 0e3f5469544d958861aebbbb0165ab5cb36230fc Mon Sep 17 00:00:00 2001 From: zale144 Date: Tue, 3 Sep 2024 12:14:13 +0200 Subject: [PATCH] Field image and app_creation_cost renaming --- .../dymensionxyz/dymension/rollapp/app.proto | 4 +- .../dymension/rollapp/params.proto | 6 +- x/rollapp/keeper/msg_server_app.go | 12 ++-- x/rollapp/keeper/msg_server_app_test.go | 8 +-- x/rollapp/keeper/params.go | 8 +-- x/rollapp/types/app.go | 4 +- x/rollapp/types/app.pb.go | 43 ++++++------ x/rollapp/types/errors.go | 2 +- x/rollapp/types/params.go | 22 +++--- x/rollapp/types/params.pb.go | 70 +++++++++---------- 10 files changed, 90 insertions(+), 89 deletions(-) diff --git a/proto/dymensionxyz/dymension/rollapp/app.proto b/proto/dymensionxyz/dymension/rollapp/app.proto index cbc13820c..f4e479a70 100644 --- a/proto/dymensionxyz/dymension/rollapp/app.proto +++ b/proto/dymensionxyz/dymension/rollapp/app.proto @@ -10,8 +10,8 @@ message App { string rollapp_id = 2; // description is the description of the App string description = 3; - // image is the relative path to the App image - string image = 4; + // image_url is the URL to the App's image + string image_url = 4; // url is the URL to the App's website string url = 5; // order is the order of the App in the Rollapp diff --git a/proto/dymensionxyz/dymension/rollapp/params.proto b/proto/dymensionxyz/dymension/rollapp/params.proto index 9f639e4ed..0e13262b7 100644 --- a/proto/dymensionxyz/dymension/rollapp/params.proto +++ b/proto/dymensionxyz/dymension/rollapp/params.proto @@ -24,9 +24,9 @@ message Params { uint64 liveness_slash_interval = 5 [(gogoproto.moretags) = "yaml:\"liveness_slash_interval\""]; // The time (num hub blocks) a sequencer can be down after which he will be jailed rather than slashed uint64 liveness_jail_blocks = 6 [(gogoproto.moretags) = "yaml:\"liveness_jail_blocks\""]; - // app_creation_cost is the cost for registering the App - cosmos.base.v1beta1.Coin app_creation_cost = 7 [ + // app_registration_fee is the fee for registering an App + cosmos.base.v1beta1.Coin app_registration_fee = 7 [ (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"app_creation_cost\"" + (gogoproto.moretags) = "yaml:\"app_registration_fee\"" ]; } diff --git a/x/rollapp/keeper/msg_server_app.go b/x/rollapp/keeper/msg_server_app.go index 6fa4b066f..475a0d036 100644 --- a/x/rollapp/keeper/msg_server_app.go +++ b/x/rollapp/keeper/msg_server_app.go @@ -22,16 +22,16 @@ func (k msgServer) AddApp(goCtx context.Context, msg *types.MsgAddApp) (*types.M msg.Order = -1 } - // charge the app creation fee + // charge the app registration fee creator := sdk.MustAccAddressFromBech32(msg.Creator) - appCost := sdk.NewCoins(k.AppCreationCost(ctx)) + appFee := sdk.NewCoins(k.AppRegistrationFee(ctx)) - if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, creator, types.ModuleName, appCost); err != nil { - return nil, types.ErrAppCreationCostPayment + if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, creator, types.ModuleName, appFee); err != nil { + return nil, types.ErrAppRegistrationFeePayment } - if err := k.bankKeeper.BurnCoins(ctx, types.ModuleName, appCost); err != nil { - return nil, types.ErrAppCreationCostPayment + if err := k.bankKeeper.BurnCoins(ctx, types.ModuleName, appFee); err != nil { + return nil, types.ErrAppRegistrationFeePayment } app := msg.GetApp() diff --git a/x/rollapp/keeper/msg_server_app_test.go b/x/rollapp/keeper/msg_server_app_test.go index dc47373ac..30784bf62 100644 --- a/x/rollapp/keeper/msg_server_app_test.go +++ b/x/rollapp/keeper/msg_server_app_test.go @@ -45,7 +45,7 @@ func (suite *RollappTestSuite) createRollappWithApp() types.RollappSummary { Name: req.GetName(), RollappId: req.GetRollappId(), Description: req.GetDescription(), - Image: req.GetImage(), + ImageUrl: req.GetImage(), Url: req.GetUrl(), Order: req.GetOrder(), } @@ -206,10 +206,10 @@ func (suite *RollappTestSuite) Test_msgServer_AddApp() { }, malleate: func() { params := suite.App.RollappKeeper.GetParams(suite.Ctx) - params.AppCreationCost = sdk.NewInt64Coin("arax", 1) + params.AppRegistrationFee = sdk.NewInt64Coin("arax", 1) suite.App.RollappKeeper.SetParams(suite.Ctx, params) }, - wantErr: types.ErrAppCreationCostPayment, + wantErr: types.ErrAppRegistrationFeePayment, }, } for _, tt := range tests { @@ -400,7 +400,7 @@ func (suite *RollappTestSuite) Test_msgServer_UpdateApp() { for i, app := range rollapp.Apps { suite.Require().Equal(tt.msgs[i].Order, app.Order) suite.Require().Equal(tt.msgs[i].Description, app.Description) - suite.Require().Equal(tt.msgs[i].Image, app.Image) + suite.Require().Equal(tt.msgs[i].Image, app.ImageUrl) suite.Require().Equal(tt.msgs[i].Url, app.Url) } }) diff --git a/x/rollapp/keeper/params.go b/x/rollapp/keeper/params.go index 7a434b2ff..eaca0da56 100644 --- a/x/rollapp/keeper/params.go +++ b/x/rollapp/keeper/params.go @@ -13,7 +13,7 @@ func (k Keeper) GetParams(ctx sdk.Context) types.Params { k.LivenessSlashBlocks(ctx), k.LivenessSlashInterval(ctx), k.LivenessJailBlocks(ctx), - k.AppCreationCost(ctx), + k.AppRegistrationFee(ctx), ) } @@ -43,8 +43,8 @@ func (k Keeper) LivenessJailBlocks(ctx sdk.Context) (res uint64) { return } -// AppCreationCost returns the cost of adding an app -func (k Keeper) AppCreationCost(ctx sdk.Context) (res sdk.Coin) { - k.paramstore.Get(ctx, types.KeyAppCreationCost, &res) +// AppRegistrationFee returns the cost of adding an app +func (k Keeper) AppRegistrationFee(ctx sdk.Context) (res sdk.Coin) { + k.paramstore.Get(ctx, types.KeyAppRegistrationFee, &res) return } diff --git a/x/rollapp/types/app.go b/x/rollapp/types/app.go index 697d12047..7c4df30eb 100644 --- a/x/rollapp/types/app.go +++ b/x/rollapp/types/app.go @@ -9,7 +9,7 @@ func NewApp(name, rollappId, description, image, url string, order int32) App { Name: name, RollappId: rollappId, Description: description, - Image: image, + ImageUrl: image, Url: url, Order: order, } @@ -50,7 +50,7 @@ func (r App) ValidateBasic() error { return ErrInvalidDescription } - if err := validateURL(r.Image); err != nil { + if err := validateURL(r.ImageUrl); err != nil { return errorsmod.Wrap(ErrInvalidAppImage, err.Error()) } diff --git a/x/rollapp/types/app.pb.go b/x/rollapp/types/app.pb.go index 5c3bcb7da..19751ff71 100644 --- a/x/rollapp/types/app.pb.go +++ b/x/rollapp/types/app.pb.go @@ -29,8 +29,8 @@ type App struct { RollappId string `protobuf:"bytes,2,opt,name=rollapp_id,json=rollappId,proto3" json:"rollapp_id,omitempty"` // description is the description of the App Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` - // image is the relative path to the App image - Image string `protobuf:"bytes,4,opt,name=image,proto3" json:"image,omitempty"` + // image_url is the URL to the App's image + ImageUrl string `protobuf:"bytes,4,opt,name=image_url,json=imageUrl,proto3" json:"image_url,omitempty"` // url is the URL to the App's website Url string `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"` // order is the order of the App in the Rollapp @@ -91,9 +91,9 @@ func (m *App) GetDescription() string { return "" } -func (m *App) GetImage() string { +func (m *App) GetImageUrl() string { if m != nil { - return m.Image + return m.ImageUrl } return "" } @@ -121,22 +121,23 @@ func init() { } var fileDescriptor_8f01e4af248858b2 = []byte{ - // 235 bytes of a gzipped FileDescriptorProto + // 243 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x48, 0xa9, 0xcc, 0x4d, 0xcd, 0x2b, 0xce, 0xcc, 0xcf, 0xab, 0xa8, 0xac, 0xd2, 0x87, 0x73, 0xf4, 0x8b, 0xf2, 0x73, 0x72, 0x12, 0x0b, 0x0a, 0xf4, 0x13, 0x0b, 0x0a, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0x90, - 0x55, 0xea, 0xc1, 0x39, 0x7a, 0x50, 0x95, 0x4a, 0x33, 0x18, 0xb9, 0x98, 0x1d, 0x0b, 0x0a, 0x84, + 0x55, 0xea, 0xc1, 0x39, 0x7a, 0x50, 0x95, 0x4a, 0xf3, 0x19, 0xb9, 0x98, 0x1d, 0x0b, 0x0a, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x59, 0x2e, 0x2e, 0xa8, 0xb2, 0xf8, 0xcc, 0x14, 0x09, 0x26, 0xb0, 0x0c, 0x27, 0x54, 0xc4, 0x33, 0x45, 0x48, 0x81, 0x8b, 0x3b, 0x25, 0xb5, 0x38, 0xb9, 0x28, 0xb3, 0xa0, 0x24, 0x33, 0x3f, - 0x4f, 0x82, 0x19, 0x2c, 0x8f, 0x2c, 0x24, 0x24, 0xc2, 0xc5, 0x9a, 0x99, 0x9b, 0x98, 0x9e, 0x2a, - 0xc1, 0x02, 0x96, 0x83, 0x70, 0x84, 0x04, 0xb8, 0x98, 0x4b, 0x8b, 0x72, 0x24, 0x58, 0xc1, 0x62, - 0x20, 0x26, 0x48, 0x5d, 0x7e, 0x51, 0x4a, 0x6a, 0x91, 0x04, 0x9b, 0x02, 0xa3, 0x06, 0x6b, 0x10, - 0x84, 0xe3, 0xe4, 0x77, 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, 0x26, 0xe9, - 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x38, 0x42, 0xa2, 0xcc, 0x58, 0xbf, - 0x02, 0x1e, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x10, 0x31, 0x06, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x9c, 0x9b, 0x3b, 0x17, 0x3d, 0x01, 0x00, 0x00, + 0x4f, 0x82, 0x19, 0x2c, 0x8f, 0x2c, 0x24, 0x24, 0xcd, 0xc5, 0x99, 0x99, 0x9b, 0x98, 0x9e, 0x1a, + 0x5f, 0x5a, 0x94, 0x23, 0xc1, 0x02, 0x96, 0xe7, 0x00, 0x0b, 0x84, 0x16, 0xe5, 0x08, 0x09, 0x70, + 0x31, 0x83, 0x84, 0x59, 0xc1, 0xc2, 0x20, 0xa6, 0x90, 0x08, 0x17, 0x6b, 0x7e, 0x51, 0x4a, 0x6a, + 0x91, 0x04, 0x9b, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x84, 0xe3, 0xe4, 0x77, 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, 0x26, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, + 0xb9, 0xfa, 0x38, 0x02, 0xa4, 0xcc, 0x58, 0xbf, 0x02, 0x1e, 0x2a, 0x25, 0x95, 0x05, 0xa9, 0xc5, + 0x49, 0x6c, 0xe0, 0x80, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xfe, 0xed, 0x45, 0x44, + 0x01, 0x00, 0x00, } func (m *App) Marshal() (dAtA []byte, err error) { @@ -171,10 +172,10 @@ func (m *App) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x2a } - if len(m.Image) > 0 { - i -= len(m.Image) - copy(dAtA[i:], m.Image) - i = encodeVarintApp(dAtA, i, uint64(len(m.Image))) + if len(m.ImageUrl) > 0 { + i -= len(m.ImageUrl) + copy(dAtA[i:], m.ImageUrl) + i = encodeVarintApp(dAtA, i, uint64(len(m.ImageUrl))) i-- dAtA[i] = 0x22 } @@ -231,7 +232,7 @@ func (m *App) Size() (n int) { if l > 0 { n += 1 + l + sovApp(uint64(l)) } - l = len(m.Image) + l = len(m.ImageUrl) if l > 0 { n += 1 + l + sovApp(uint64(l)) } @@ -378,7 +379,7 @@ func (m *App) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Image", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ImageUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -406,7 +407,7 @@ func (m *App) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Image = string(dAtA[iNdEx:postIndex]) + m.ImageUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { diff --git a/x/rollapp/types/errors.go b/x/rollapp/types/errors.go index c5868bcfe..64f16ced3 100644 --- a/x/rollapp/types/errors.go +++ b/x/rollapp/types/errors.go @@ -18,7 +18,7 @@ var ( ErrWrongBlockHeight = errorsmod.Register(ModuleName, 1009, "start-height does not match rollapps state") ErrInvalidGenesisChecksum = errorsmod.Register(ModuleName, 1010, "invalid genesis checksum") ErrInvalidStateRoot = errorsmod.Register(ModuleName, 1011, "invalid blocks state root") - ErrAppCreationCostPayment = errorsmod.Register(ModuleName, 1013, "app creation cost payment error") + ErrAppRegistrationFeePayment = errorsmod.Register(ModuleName, 1013, "app registration fee payment error") ErrStateNotExists = errorsmod.Register(ModuleName, 1017, "state of this height doesn't exist") ErrInvalidHeight = errorsmod.Register(ModuleName, 1018, "invalid rollapp height") ErrInvalidRollappID = errorsmod.Register(ModuleName, 1020, "invalid rollapp-id") diff --git a/x/rollapp/types/params.go b/x/rollapp/types/params.go index 865225f77..adc59ba32 100644 --- a/x/rollapp/types/params.go +++ b/x/rollapp/types/params.go @@ -24,12 +24,12 @@ var ( KeyLivenessSlashInterval = []byte("LivenessSlashInterval") KeyLivenessJailBlocks = []byte("LivenessJailBlocks") - // KeyAppCreationCost defines the key to store the cost of the app - KeyAppCreationCost = []byte("KeyAppCreationCost") + // KeyAppRegistrationFee defines the key to store the cost of the app + KeyAppRegistrationFee = []byte("KeyAppRegistrationFee") // DYM is 1dym - DYM = sdk.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)) - DefaultAppCreationCost = sdk.NewCoin(params.BaseDenom, DYM) + DYM = sdk.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)) + DefaultAppRegistrationFee = sdk.NewCoin(params.BaseDenom, DYM) ) const ( @@ -53,14 +53,14 @@ func NewParams( livenessSlashBlocks uint64, livenessSlashInterval uint64, livenessJailBlocks uint64, - appCreationCost sdk.Coin, + appRegistrationFee sdk.Coin, ) Params { return Params{ DisputePeriodInBlocks: disputePeriodInBlocks, LivenessSlashBlocks: livenessSlashBlocks, LivenessSlashInterval: livenessSlashInterval, LivenessJailBlocks: livenessJailBlocks, - AppCreationCost: appCreationCost, + AppRegistrationFee: appRegistrationFee, } } @@ -70,7 +70,7 @@ func DefaultParams() Params { DefaultLivenessSlashBlocks, DefaultLivenessSlashInterval, DefaultLivenessJailBlocks, - DefaultAppCreationCost, + DefaultAppRegistrationFee, ) } @@ -81,7 +81,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { paramtypes.NewParamSetPair(KeyLivenessSlashBlocks, &p.LivenessSlashBlocks, validateLivenessSlashBlocks), paramtypes.NewParamSetPair(KeyLivenessSlashInterval, &p.LivenessSlashInterval, validateLivenessSlashInterval), paramtypes.NewParamSetPair(KeyLivenessJailBlocks, &p.LivenessJailBlocks, validateLivenessJailBlocks), - paramtypes.NewParamSetPair(KeyAppCreationCost, &p.AppCreationCost, validateAppCreationCost), + paramtypes.NewParamSetPair(KeyAppRegistrationFee, &p.AppRegistrationFee, validateAppRegistrationFee), } } @@ -121,8 +121,8 @@ func (p Params) Validate() error { return errorsmod.Wrap(err, "liveness jail blocks") } - if err := validateAppCreationCost(p.AppCreationCost); err != nil { - return errorsmod.Wrap(err, "app creation cost") + if err := validateAppRegistrationFee(p.AppRegistrationFee); err != nil { + return errorsmod.Wrap(err, "app registration fee") } return nil } @@ -159,7 +159,7 @@ func validateDisputePeriodInBlocks(v interface{}) error { return nil } -func validateAppCreationCost(i interface{}) error { +func validateAppRegistrationFee(i interface{}) error { v, ok := i.(sdk.Coin) if !ok { return fmt.Errorf("invalid parameter type: %T", i) diff --git a/x/rollapp/types/params.pb.go b/x/rollapp/types/params.pb.go index 821bc4680..d3b3fad70 100644 --- a/x/rollapp/types/params.pb.go +++ b/x/rollapp/types/params.pb.go @@ -36,8 +36,8 @@ type Params struct { LivenessSlashInterval uint64 `protobuf:"varint,5,opt,name=liveness_slash_interval,json=livenessSlashInterval,proto3" json:"liveness_slash_interval,omitempty" yaml:"liveness_slash_interval"` // The time (num hub blocks) a sequencer can be down after which he will be jailed rather than slashed LivenessJailBlocks uint64 `protobuf:"varint,6,opt,name=liveness_jail_blocks,json=livenessJailBlocks,proto3" json:"liveness_jail_blocks,omitempty" yaml:"liveness_jail_blocks"` - // app_creation_cost is the cost for registering the App - AppCreationCost types.Coin `protobuf:"bytes,7,opt,name=app_creation_cost,json=appCreationCost,proto3" json:"app_creation_cost" yaml:"app_creation_cost"` + // app_registration_fee is the fee for registering the App + AppRegistrationFee types.Coin `protobuf:"bytes,7,opt,name=app_registration_fee,json=appRegistrationFee,proto3" json:"app_registration_fee" yaml:"app_registration_fee"` } func (m *Params) Reset() { *m = Params{} } @@ -100,9 +100,9 @@ func (m *Params) GetLivenessJailBlocks() uint64 { return 0 } -func (m *Params) GetAppCreationCost() types.Coin { +func (m *Params) GetAppRegistrationFee() types.Coin { if m != nil { - return m.AppCreationCost + return m.AppRegistrationFee } return types.Coin{} } @@ -116,34 +116,34 @@ func init() { } var fileDescriptor_75a44aa904ae1ba5 = []byte{ - // 428 bytes of a gzipped FileDescriptorProto + // 427 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0x87, 0x13, 0x1a, 0xca, 0x14, 0x0e, 0x8c, 0xb0, 0x8a, 0x30, 0x90, 0x5d, 0x85, 0xcb, 0x24, - 0xa4, 0x58, 0x63, 0x9c, 0x76, 0x6c, 0x4f, 0xeb, 0x01, 0x8d, 0xc0, 0x69, 0x42, 0x8a, 0x9c, 0xd4, - 0xea, 0x0c, 0x8e, 0x5f, 0x2b, 0xf6, 0xaa, 0x95, 0x4f, 0xc1, 0x91, 0x23, 0x1f, 0x67, 0xc7, 0x1d, - 0x39, 0x45, 0xa8, 0x95, 0xf8, 0x00, 0xf9, 0x04, 0xa8, 0xce, 0x1f, 0x8d, 0xb1, 0xdd, 0xec, 0xdf, - 0xfb, 0xf8, 0xf1, 0x2b, 0xbd, 0xaf, 0xff, 0x66, 0xbe, 0x2a, 0x98, 0xd4, 0x1c, 0xe4, 0xe5, 0xea, - 0x1b, 0xe9, 0x2f, 0xa4, 0x04, 0x21, 0xa8, 0x52, 0x44, 0xd1, 0x92, 0x16, 0x3a, 0x56, 0x25, 0x18, - 0x08, 0xd0, 0x4d, 0x38, 0xee, 0x2f, 0x71, 0x0b, 0xef, 0xef, 0x2d, 0x60, 0x01, 0x16, 0x25, 0xdb, - 0x53, 0xf3, 0x6a, 0x1f, 0xe5, 0xa0, 0x0b, 0xd0, 0x24, 0xa3, 0x9a, 0x91, 0xe5, 0x61, 0xc6, 0x0c, - 0x3d, 0x24, 0x39, 0x70, 0xd9, 0xd4, 0xa3, 0x3f, 0x03, 0x7f, 0x78, 0x6a, 0xbf, 0x09, 0x3e, 0xfb, - 0xe1, 0x9c, 0x6b, 0x75, 0x61, 0x58, 0xaa, 0x58, 0xc9, 0x61, 0x9e, 0x72, 0x99, 0x66, 0x02, 0xf2, - 0xaf, 0x3a, 0x74, 0xc7, 0xee, 0x81, 0x37, 0x79, 0x5d, 0x57, 0x18, 0xaf, 0x68, 0x21, 0x8e, 0xa3, - 0xfb, 0xc8, 0x28, 0x19, 0xb5, 0xa5, 0x53, 0x5b, 0x39, 0x91, 0x13, 0x9b, 0x07, 0x9f, 0xfc, 0x91, - 0xe0, 0x4b, 0x26, 0x99, 0xd6, 0xa9, 0x16, 0x54, 0x9f, 0x77, 0x6a, 0xcf, 0xaa, 0xc7, 0x75, 0x85, - 0x5f, 0x35, 0xea, 0x3b, 0xb1, 0x28, 0x79, 0xd6, 0xe5, 0x1f, 0xb7, 0x71, 0x6b, 0x3d, 0xf3, 0x9f, - 0xdf, 0xc2, 0xb9, 0x34, 0xac, 0x5c, 0x52, 0x11, 0x3e, 0xb4, 0xde, 0xa8, 0xae, 0x30, 0xba, 0xd3, - 0xdb, 0x81, 0x51, 0x32, 0xfa, 0xc7, 0x7c, 0xd2, 0xe6, 0xc1, 0x07, 0x7f, 0xaf, 0x7f, 0xf2, 0x85, - 0x72, 0xd1, 0x35, 0x3c, 0xb4, 0x62, 0x5c, 0x57, 0xf8, 0xe5, 0x2d, 0xf1, 0x0d, 0x2a, 0x4a, 0x82, - 0x2e, 0x9e, 0x51, 0x2e, 0xda, 0x76, 0x17, 0xfe, 0x53, 0xaa, 0x54, 0x9a, 0x97, 0x8c, 0x1a, 0x0e, - 0x32, 0xcd, 0x41, 0x9b, 0xf0, 0xd1, 0xd8, 0x3d, 0x78, 0xfc, 0xf6, 0x45, 0xdc, 0x4c, 0x2a, 0xde, - 0x4e, 0x2a, 0x6e, 0x27, 0x15, 0x4f, 0x81, 0xcb, 0xc9, 0xf8, 0xaa, 0xc2, 0x4e, 0x5d, 0xe1, 0xb0, - 0xf9, 0xee, 0x3f, 0x43, 0x94, 0x3c, 0xa1, 0x4a, 0x4d, 0xdb, 0x68, 0x0a, 0xda, 0x1c, 0x7b, 0x3f, - 0x7e, 0x62, 0x67, 0xe6, 0xed, 0x3c, 0xd8, 0x1d, 0xcc, 0xbc, 0x9d, 0xc1, 0xae, 0x37, 0x79, 0x7f, - 0xb5, 0x46, 0xee, 0xf5, 0x1a, 0xb9, 0xbf, 0xd7, 0xc8, 0xfd, 0xbe, 0x41, 0xce, 0xf5, 0x06, 0x39, - 0xbf, 0x36, 0xc8, 0x39, 0x7b, 0xb7, 0xe0, 0xe6, 0xfc, 0x22, 0x8b, 0x73, 0x28, 0xc8, 0x3d, 0x0b, - 0xb9, 0x3c, 0x22, 0x97, 0xfd, 0x56, 0x9a, 0x95, 0x62, 0x3a, 0x1b, 0xda, 0xfd, 0x39, 0xfa, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0xac, 0xb4, 0xb0, 0x01, 0xc4, 0x02, 0x00, 0x00, + 0x18, 0x87, 0x13, 0x1a, 0xca, 0x14, 0x2e, 0x53, 0x68, 0x45, 0x19, 0xc8, 0xae, 0xbc, 0xcb, 0x24, + 0x24, 0x5b, 0x63, 0x9c, 0x76, 0x2c, 0x12, 0xd2, 0x7a, 0x40, 0x23, 0x70, 0x9a, 0x90, 0x22, 0xa7, + 0x35, 0x9d, 0xc1, 0xb1, 0xad, 0xd8, 0xab, 0x16, 0x3e, 0x05, 0x47, 0x8e, 0x7c, 0x9c, 0x1d, 0x77, + 0xe4, 0x14, 0xa1, 0xf6, 0x03, 0x20, 0xe5, 0x13, 0xa0, 0x3a, 0x7f, 0x28, 0x53, 0x77, 0xb3, 0x7f, + 0xef, 0xe3, 0xc7, 0xaf, 0xf4, 0xbe, 0xe1, 0xcb, 0x79, 0x91, 0x31, 0x69, 0xb8, 0x92, 0xd7, 0xc5, + 0x37, 0xd2, 0x5d, 0x48, 0xae, 0x84, 0xa0, 0x5a, 0x13, 0x4d, 0x73, 0x9a, 0x19, 0xac, 0x73, 0x65, + 0x55, 0x04, 0xb6, 0x61, 0xdc, 0x5d, 0x70, 0x03, 0x1f, 0x0c, 0x16, 0x6a, 0xa1, 0x1c, 0x4a, 0x36, + 0xa7, 0xfa, 0xd5, 0x01, 0x98, 0x29, 0x93, 0x29, 0x43, 0x52, 0x6a, 0x18, 0x59, 0x1e, 0xa7, 0xcc, + 0xd2, 0x63, 0x32, 0x53, 0x5c, 0xd6, 0x75, 0xf4, 0xa7, 0x17, 0xf6, 0xcf, 0xdd, 0x37, 0xd1, 0xa7, + 0x70, 0x34, 0xe7, 0x46, 0x5f, 0x59, 0x96, 0x68, 0x96, 0x73, 0x35, 0x4f, 0xb8, 0x4c, 0x52, 0xa1, + 0x66, 0x5f, 0xcd, 0xc8, 0x1f, 0xfb, 0x47, 0xc1, 0xe4, 0xb0, 0x2a, 0x21, 0x2c, 0x68, 0x26, 0x4e, + 0xd1, 0x7d, 0x24, 0x8a, 0x87, 0x4d, 0xe9, 0xdc, 0x55, 0xce, 0xe4, 0xc4, 0xe5, 0xd1, 0xc7, 0x70, + 0x28, 0xf8, 0x92, 0x49, 0x66, 0x4c, 0x62, 0x04, 0x35, 0x97, 0xad, 0x3a, 0x70, 0xea, 0x71, 0x55, + 0xc2, 0x17, 0xb5, 0x7a, 0x27, 0x86, 0xe2, 0x27, 0x6d, 0xfe, 0x61, 0x13, 0x37, 0xd6, 0x8b, 0xf0, + 0xe9, 0x1d, 0x9c, 0x4b, 0xcb, 0xf2, 0x25, 0x15, 0xa3, 0x87, 0xce, 0x8b, 0xaa, 0x12, 0x82, 0x9d, + 0xde, 0x16, 0x44, 0xf1, 0xf0, 0x3f, 0xf3, 0x59, 0x93, 0x47, 0xef, 0xc3, 0x41, 0xf7, 0xe4, 0x0b, + 0xe5, 0xa2, 0x6d, 0xb8, 0xef, 0xc4, 0xb0, 0x2a, 0xe1, 0xf3, 0x3b, 0xe2, 0x2d, 0x0a, 0xc5, 0x51, + 0x1b, 0x4f, 0x29, 0x17, 0x4d, 0xbb, 0x3a, 0x1c, 0x50, 0xad, 0x93, 0x9c, 0x2d, 0xb8, 0xb1, 0x39, + 0xb5, 0x5c, 0xc9, 0xe4, 0x33, 0x63, 0xa3, 0x47, 0x63, 0xff, 0xe8, 0xf1, 0xab, 0x67, 0xb8, 0x1e, + 0x16, 0xde, 0x0c, 0x0b, 0x37, 0xc3, 0xc2, 0x6f, 0x14, 0x97, 0x93, 0xc3, 0x9b, 0x12, 0x7a, 0xff, + 0x7e, 0xdc, 0x25, 0x41, 0x71, 0x44, 0xb5, 0x8e, 0xb7, 0xd2, 0xb7, 0x8c, 0x9d, 0x06, 0x3f, 0x7e, + 0x42, 0x6f, 0x1a, 0xec, 0x3d, 0xd8, 0xef, 0x4d, 0x83, 0xbd, 0xde, 0x7e, 0x30, 0x79, 0x77, 0xb3, + 0x02, 0xfe, 0xed, 0x0a, 0xf8, 0xbf, 0x57, 0xc0, 0xff, 0xbe, 0x06, 0xde, 0xed, 0x1a, 0x78, 0xbf, + 0xd6, 0xc0, 0xbb, 0x78, 0xbd, 0xe0, 0xf6, 0xf2, 0x2a, 0xc5, 0x33, 0x95, 0x91, 0x7b, 0x36, 0x73, + 0x79, 0x42, 0xae, 0xbb, 0xf5, 0xb4, 0x85, 0x66, 0x26, 0xed, 0xbb, 0x45, 0x3a, 0xf9, 0x1b, 0x00, + 0x00, 0xff, 0xff, 0xd4, 0xcf, 0x4a, 0xc3, 0xcd, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -167,7 +167,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size, err := m.AppCreationCost.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.AppRegistrationFee.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -228,7 +228,7 @@ func (m *Params) Size() (n int) { if m.LivenessJailBlocks != 0 { n += 1 + sovParams(uint64(m.LivenessJailBlocks)) } - l = m.AppCreationCost.Size() + l = m.AppRegistrationFee.Size() n += 1 + l + sovParams(uint64(l)) return n } @@ -346,7 +346,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { } case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AppCreationCost", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AppRegistrationFee", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -373,7 +373,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.AppCreationCost.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.AppRegistrationFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex