From 831588c72cb050735a01991be5fa69ba5162ee66 Mon Sep 17 00:00:00 2001 From: Vladislav Varadinov Date: Tue, 29 Nov 2022 12:24:16 +0100 Subject: [PATCH] chore(feemarket): Delete deprecated migration logic (#1508) * (refactor): Remove old migration code * (fix): Lint and add CHANGELOG entry --- CHANGELOG.md | 1 + x/feemarket/keeper/keeper.go | 6 +- x/feemarket/keeper/migrations.go | 17 - x/feemarket/keeper/migrations_test.go | 19 - x/feemarket/keeper/params_test.go | 3 +- x/feemarket/migrations/v010/migrate.go | 76 --- x/feemarket/migrations/v010/migrate_test.go | 69 --- .../migrations/v010/types/feemarket.pb.go | 472 ------------------ .../migrations/v010/types/genesis.pb.go | 356 ------------- x/feemarket/migrations/v010/types/params.go | 135 ----- x/feemarket/migrations/v011/migrate.go | 43 -- x/feemarket/migrations/v011/migrate_test.go | 88 ---- .../migrations/v09/types/feemarket.pb.go | 454 ----------------- .../migrations/v09/types/genesis.pb.go | 408 --------------- x/feemarket/module.go | 11 - 15 files changed, 7 insertions(+), 2151 deletions(-) delete mode 100644 x/feemarket/migrations/v010/migrate.go delete mode 100644 x/feemarket/migrations/v010/migrate_test.go delete mode 100644 x/feemarket/migrations/v010/types/feemarket.pb.go delete mode 100644 x/feemarket/migrations/v010/types/genesis.pb.go delete mode 100644 x/feemarket/migrations/v010/types/params.go delete mode 100644 x/feemarket/migrations/v011/migrate.go delete mode 100644 x/feemarket/migrations/v011/migrate_test.go delete mode 100644 x/feemarket/migrations/v09/types/feemarket.pb.go delete mode 100644 x/feemarket/migrations/v09/types/genesis.pb.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 6469a901c4..c1d14b738a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (feemarket) [#1508](https://github.com/evmos/ethermint/pull/1508) Remove old x/params migration logic * (evm) [#1499](https://github.com/evmos/ethermint/pull/1499) Add Shanghai and Cancun block * (ante) [#1455](https://github.com/evmos/ethermint/pull/1455) Refactor `AnteHandler` logic * (evm) [#1444](https://github.com/evmos/ethermint/pull/1444) Improve performance of `eth_estimateGas` diff --git a/x/feemarket/keeper/keeper.go b/x/feemarket/keeper/keeper.go index efcea8cb3a..7460fec7dd 100644 --- a/x/feemarket/keeper/keeper.go +++ b/x/feemarket/keeper/keeper.go @@ -9,10 +9,12 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - v010 "github.com/evmos/ethermint/x/feemarket/migrations/v010" "github.com/evmos/ethermint/x/feemarket/types" ) +// KeyPrefixBaseFeeV1 TODO: Temporary will be removed with params refactor PR +var KeyPrefixBaseFeeV1 = []byte{2} + // Keeper grants access to the Fee Market module state. type Keeper struct { // Protobuf codec @@ -98,7 +100,7 @@ func (k Keeper) AddTransientGasWanted(ctx sdk.Context, gasWanted uint64) (uint64 // return nil if base fee is not enabled func (k Keeper) GetBaseFeeV1(ctx sdk.Context) *big.Int { store := ctx.KVStore(k.storeKey) - bz := store.Get(v010.KeyPrefixBaseFeeV1) + bz := store.Get(KeyPrefixBaseFeeV1) if len(bz) == 0 { return nil } diff --git a/x/feemarket/keeper/migrations.go b/x/feemarket/keeper/migrations.go index 9a16c8d92d..3be1ada66f 100644 --- a/x/feemarket/keeper/migrations.go +++ b/x/feemarket/keeper/migrations.go @@ -1,12 +1,5 @@ package keeper -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - v010 "github.com/evmos/ethermint/x/feemarket/migrations/v010" - v011 "github.com/evmos/ethermint/x/feemarket/migrations/v011" -) - // Migrator is a struct for handling in-place store migrations. type Migrator struct { keeper Keeper @@ -18,13 +11,3 @@ func NewMigrator(keeper Keeper) Migrator { keeper: keeper, } } - -// Migrate1to2 migrates the store from consensus version v1 to v2 -func (m Migrator) Migrate1to2(ctx sdk.Context) error { - return v010.MigrateStore(ctx, &m.keeper.paramSpace, m.keeper.storeKey) -} - -// Migrate2to3 migrates the store from consensus version v2 to v3 -func (m Migrator) Migrate2to3(ctx sdk.Context) error { - return v011.MigrateStore(ctx, &m.keeper.paramSpace) -} diff --git a/x/feemarket/keeper/migrations_test.go b/x/feemarket/keeper/migrations_test.go index 9dbf82480d..9429264902 100644 --- a/x/feemarket/keeper/migrations_test.go +++ b/x/feemarket/keeper/migrations_test.go @@ -1,20 +1 @@ package keeper_test - -import ( - "math/big" - - "github.com/evmos/ethermint/x/feemarket/keeper" - v010 "github.com/evmos/ethermint/x/feemarket/migrations/v010" -) - -func (suite *KeeperTestSuite) TestMigration1To2() { - suite.SetupTest() - storeKey := suite.app.GetKey("feemarket") - store := suite.ctx.KVStore(storeKey) - baseFee := big.NewInt(1000) - store.Set(v010.KeyPrefixBaseFeeV1, baseFee.Bytes()) - m := keeper.NewMigrator(suite.app.FeeMarketKeeper) - err := m.Migrate1to2(suite.ctx) - suite.Require().NoError(err) - suite.Require().Equal(baseFee, suite.app.FeeMarketKeeper.GetBaseFee(suite.ctx)) -} diff --git a/x/feemarket/keeper/params_test.go b/x/feemarket/keeper/params_test.go index 03f2b638cd..59f1a2856f 100644 --- a/x/feemarket/keeper/params_test.go +++ b/x/feemarket/keeper/params_test.go @@ -1,8 +1,9 @@ package keeper_test import ( - "github.com/evmos/ethermint/x/feemarket/types" "reflect" + + "github.com/evmos/ethermint/x/feemarket/types" ) func (suite *KeeperTestSuite) TestSetGetParams() { diff --git a/x/feemarket/migrations/v010/migrate.go b/x/feemarket/migrations/v010/migrate.go deleted file mode 100644 index 8d453d9518..0000000000 --- a/x/feemarket/migrations/v010/migrate.go +++ /dev/null @@ -1,76 +0,0 @@ -package v010 - -import ( - "math/big" - - sdkmath "cosmossdk.io/math" - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" - - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/evmos/ethermint/x/feemarket/migrations/v010/types" - v09types "github.com/evmos/ethermint/x/feemarket/migrations/v09/types" -) - -// KeyPrefixBaseFeeV1 is the base fee key prefix used in version 1 -var KeyPrefixBaseFeeV1 = []byte{2} - -// MigrateStore migrates the BaseFee value from the store to the params for -// In-Place Store migration logic. -func MigrateStore(ctx sdk.Context, paramstore *paramtypes.Subspace, storeKey storetypes.StoreKey) error { - baseFee := types.DefaultParams().BaseFee - - store := ctx.KVStore(storeKey) - - if !paramstore.HasKeyTable() { - ps := paramstore.WithKeyTable(types.ParamKeyTable()) - paramstore = &ps - } - - switch { - case store.Has(KeyPrefixBaseFeeV1): - bz := store.Get(KeyPrefixBaseFeeV1) - baseFee = sdkmath.NewIntFromBigInt(new(big.Int).SetBytes(bz)) - case paramstore.Has(ctx, types.ParamStoreKeyNoBaseFee): - paramstore.GetIfExists(ctx, types.ParamStoreKeyBaseFee, &baseFee) - } - - var ( - noBaseFee bool - baseFeeChangeDenom, elasticityMultiplier uint32 - enableHeight int64 - ) - - paramstore.GetIfExists(ctx, types.ParamStoreKeyNoBaseFee, &noBaseFee) - paramstore.GetIfExists(ctx, types.ParamStoreKeyBaseFeeChangeDenominator, &baseFeeChangeDenom) - paramstore.GetIfExists(ctx, types.ParamStoreKeyElasticityMultiplier, &elasticityMultiplier) - paramstore.GetIfExists(ctx, types.ParamStoreKeyEnableHeight, &enableHeight) - - params := types.Params{ - NoBaseFee: noBaseFee, - BaseFeeChangeDenominator: baseFeeChangeDenom, - ElasticityMultiplier: elasticityMultiplier, - BaseFee: baseFee, - EnableHeight: enableHeight, - } - - paramstore.SetParamSet(ctx, ¶ms) - store.Delete(KeyPrefixBaseFeeV1) - return nil -} - -// MigrateJSON accepts exported v0.9 x/feemarket genesis state and migrates it to -// v0.10 x/feemarket genesis state. The migration includes: -// - Migrate BaseFee to Params -func MigrateJSON(oldState v09types.GenesisState) types.GenesisState { - return types.GenesisState{ - Params: types.Params{ - NoBaseFee: oldState.Params.NoBaseFee, - BaseFeeChangeDenominator: oldState.Params.BaseFeeChangeDenominator, - ElasticityMultiplier: oldState.Params.ElasticityMultiplier, - EnableHeight: oldState.Params.EnableHeight, - BaseFee: oldState.BaseFee, - }, - BlockGas: oldState.BlockGas, - } -} diff --git a/x/feemarket/migrations/v010/migrate_test.go b/x/feemarket/migrations/v010/migrate_test.go deleted file mode 100644 index 414beff959..0000000000 --- a/x/feemarket/migrations/v010/migrate_test.go +++ /dev/null @@ -1,69 +0,0 @@ -package v010_test - -import ( - "fmt" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/cosmos/cosmos-sdk/testutil" - sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - - "github.com/evmos/ethermint/encoding" - - "github.com/evmos/ethermint/app" - feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper" - v010 "github.com/evmos/ethermint/x/feemarket/migrations/v010" - v09types "github.com/evmos/ethermint/x/feemarket/migrations/v09/types" - "github.com/evmos/ethermint/x/feemarket/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" -) - -func TestMigrateStore(t *testing.T) { - encCfg := encoding.MakeConfig(app.ModuleBasics) - feemarketKey := sdk.NewKVStoreKey(feemarkettypes.StoreKey) - tFeeMarketKey := sdk.NewTransientStoreKey(fmt.Sprintf("%s_test", feemarkettypes.StoreKey)) - ctx := testutil.DefaultContext(feemarketKey, tFeeMarketKey) - paramstore := paramtypes.NewSubspace( - encCfg.Codec, encCfg.Amino, feemarketKey, tFeeMarketKey, "feemarket", - ) - fmKeeper := feemarketkeeper.NewKeeper(encCfg.Codec, paramstore, feemarketKey, tFeeMarketKey) - fmKeeper.SetParams(ctx, types.DefaultParams()) - require.True(t, paramstore.HasKeyTable()) - - // check that the fee market is not nil - err := v010.MigrateStore(ctx, ¶mstore, feemarketKey) - require.NoError(t, err) - require.False(t, ctx.KVStore(feemarketKey).Has(v010.KeyPrefixBaseFeeV1)) - - params := fmKeeper.GetParams(ctx) - require.False(t, params.BaseFee.IsNil()) - - baseFee := fmKeeper.GetBaseFee(ctx) - require.NotNil(t, baseFee) - - require.Equal(t, baseFee.Int64(), params.BaseFee.Int64()) -} - -func TestMigrateJSON(t *testing.T) { - rawJson := `{ - "base_fee": "669921875", - "block_gas": "0", - "params": { - "base_fee_change_denominator": 8, - "elasticity_multiplier": 2, - "enable_height": "0", - "initial_base_fee": "1000000000", - "no_base_fee": false - } - }` - encCfg := encoding.MakeConfig(app.ModuleBasics) - var genState v09types.GenesisState - err := encCfg.Codec.UnmarshalJSON([]byte(rawJson), &genState) - require.NoError(t, err) - - migratedGenState := v010.MigrateJSON(genState) - - require.Equal(t, int64(669921875), migratedGenState.Params.BaseFee.Int64()) -} diff --git a/x/feemarket/migrations/v010/types/feemarket.pb.go b/x/feemarket/migrations/v010/types/feemarket.pb.go deleted file mode 100644 index 62133fa3a2..0000000000 --- a/x/feemarket/migrations/v010/types/feemarket.pb.go +++ /dev/null @@ -1,472 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/feemarket/v1/feemarket.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// Params defines the EVM module parameters -type Params struct { - // no base fee forces the EIP-1559 base fee to 0 (needed for 0 price calls) - NoBaseFee bool `protobuf:"varint,1,opt,name=no_base_fee,json=noBaseFee,proto3" json:"no_base_fee,omitempty"` - // base fee change denominator bounds the amount the base fee can change - // between blocks. - BaseFeeChangeDenominator uint32 `protobuf:"varint,2,opt,name=base_fee_change_denominator,json=baseFeeChangeDenominator,proto3" json:"base_fee_change_denominator,omitempty"` - // elasticity multiplier bounds the maximum gas limit an EIP-1559 block may - // have. - ElasticityMultiplier uint32 `protobuf:"varint,3,opt,name=elasticity_multiplier,json=elasticityMultiplier,proto3" json:"elasticity_multiplier,omitempty"` - // height at which the base fee calculation is enabled. - EnableHeight int64 `protobuf:"varint,5,opt,name=enable_height,json=enableHeight,proto3" json:"enable_height,omitempty"` - // base fee for EIP-1559 blocks. - BaseFee github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=base_fee,json=baseFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"base_fee"` -} - -func (m *Params) Reset() { *m = Params{} } -func (m *Params) String() string { return proto.CompactTextString(m) } -func (*Params) ProtoMessage() {} -func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_4feb8b20cf98e6e1, []int{0} -} -func (m *Params) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Params.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Params) XXX_Merge(src proto.Message) { - xxx_messageInfo_Params.Merge(m, src) -} -func (m *Params) XXX_Size() int { - return m.Size() -} -func (m *Params) XXX_DiscardUnknown() { - xxx_messageInfo_Params.DiscardUnknown(m) -} - -var xxx_messageInfo_Params proto.InternalMessageInfo - -func (m *Params) GetNoBaseFee() bool { - if m != nil { - return m.NoBaseFee - } - return false -} - -func (m *Params) GetBaseFeeChangeDenominator() uint32 { - if m != nil { - return m.BaseFeeChangeDenominator - } - return 0 -} - -func (m *Params) GetElasticityMultiplier() uint32 { - if m != nil { - return m.ElasticityMultiplier - } - return 0 -} - -func (m *Params) GetEnableHeight() int64 { - if m != nil { - return m.EnableHeight - } - return 0 -} - -var fileDescriptor_4feb8b20cf98e6e1 = []byte{ - // 343 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcf, 0x6a, 0xea, 0x40, - 0x14, 0x87, 0x33, 0xfe, 0xbb, 0x9a, 0x7b, 0x05, 0x09, 0xde, 0x4b, 0xb8, 0x85, 0x18, 0x5a, 0x90, - 0x6c, 0x9a, 0x20, 0xae, 0xbb, 0xb1, 0xa5, 0x68, 0xa1, 0x50, 0xb2, 0xec, 0x26, 0x4c, 0xe2, 0x31, - 0x19, 0x4c, 0x66, 0x64, 0xe6, 0x28, 0xf5, 0x2d, 0xfa, 0x10, 0x7d, 0x18, 0x97, 0x2e, 0x4b, 0x17, - 0x52, 0xf4, 0x45, 0x4a, 0xa3, 0x4d, 0x5c, 0xcd, 0xcc, 0xf9, 0xbe, 0xe1, 0x1c, 0xce, 0x4f, 0xef, - 0x03, 0x26, 0x20, 0x33, 0xc6, 0xd1, 0x9b, 0x01, 0x64, 0x54, 0xce, 0x01, 0xbd, 0xd5, 0xa0, 0x7c, - 0xb8, 0x0b, 0x29, 0x50, 0x18, 0xff, 0x0a, 0xcf, 0x2d, 0xd1, 0x6a, 0xf0, 0xbf, 0x1b, 0x8b, 0x58, - 0xe4, 0x8a, 0xf7, 0x7d, 0x3b, 0xda, 0x97, 0x6f, 0x15, 0xbd, 0xf1, 0x44, 0x25, 0xcd, 0x94, 0x61, - 0xe9, 0xbf, 0xb9, 0x08, 0x42, 0xaa, 0x20, 0x98, 0x01, 0x98, 0xc4, 0x26, 0x4e, 0xd3, 0x6f, 0x71, - 0x31, 0xa2, 0x0a, 0xee, 0x01, 0x8c, 0x1b, 0xfd, 0xe2, 0x07, 0x06, 0x51, 0x42, 0x79, 0x0c, 0xc1, - 0x14, 0xb8, 0xc8, 0x18, 0xa7, 0x28, 0xa4, 0x59, 0xb1, 0x89, 0xd3, 0xf6, 0xcd, 0xf0, 0x68, 0xdf, - 0xe6, 0xc2, 0x5d, 0xc9, 0x8d, 0xa1, 0xfe, 0x17, 0x52, 0xaa, 0x90, 0x45, 0x0c, 0xd7, 0x41, 0xb6, - 0x4c, 0x91, 0x2d, 0x52, 0x06, 0xd2, 0xac, 0xe6, 0x1f, 0xbb, 0x25, 0x7c, 0x2c, 0x98, 0x71, 0xa5, - 0xb7, 0x81, 0xd3, 0x30, 0x85, 0x20, 0x01, 0x16, 0x27, 0x68, 0xd6, 0x6d, 0xe2, 0x54, 0xfd, 0x3f, - 0xc7, 0xe2, 0x38, 0xaf, 0x19, 0x13, 0xbd, 0x59, 0x4c, 0xdd, 0xb0, 0x89, 0xd3, 0x1a, 0xb9, 0x9b, - 0x5d, 0x4f, 0xfb, 0xd8, 0xf5, 0xfa, 0x31, 0xc3, 0x64, 0x19, 0xba, 0x91, 0xc8, 0xbc, 0x48, 0xa8, - 0x4c, 0xa8, 0xd3, 0x71, 0xad, 0xa6, 0x73, 0x0f, 0xd7, 0x0b, 0x50, 0xee, 0x84, 0xa3, 0xff, 0xeb, - 0x34, 0xf5, 0x43, 0xad, 0x59, 0xeb, 0xd4, 0xfd, 0x0e, 0xe3, 0x0c, 0x19, 0x4d, 0x8b, 0x65, 0x8c, - 0xc6, 0x9b, 0xbd, 0x45, 0xb6, 0x7b, 0x8b, 0x7c, 0xee, 0x2d, 0xf2, 0x7a, 0xb0, 0xb4, 0xed, 0xc1, - 0xd2, 0xde, 0x0f, 0x96, 0xf6, 0xec, 0x9e, 0xb5, 0xc0, 0x84, 0x4a, 0xc5, 0x94, 0x57, 0x26, 0xf5, - 0x72, 0x96, 0x55, 0xde, 0x2e, 0x6c, 0xe4, 0x7b, 0x1f, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0xee, - 0xfc, 0x5c, 0x06, 0xcf, 0x01, 0x00, 0x00, -} - -func (m *Params) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Params) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size := m.BaseFee.Size() - i -= size - if _, err := m.BaseFee.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintFeemarket(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - if m.EnableHeight != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.EnableHeight)) - i-- - dAtA[i] = 0x28 - } - if m.ElasticityMultiplier != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.ElasticityMultiplier)) - i-- - dAtA[i] = 0x18 - } - if m.BaseFeeChangeDenominator != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.BaseFeeChangeDenominator)) - i-- - dAtA[i] = 0x10 - } - if m.NoBaseFee { - i-- - if m.NoBaseFee { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintFeemarket(dAtA []byte, offset int, v uint64) int { - offset -= sovFeemarket(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Params) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.NoBaseFee { - n += 2 - } - if m.BaseFeeChangeDenominator != 0 { - n += 1 + sovFeemarket(uint64(m.BaseFeeChangeDenominator)) - } - if m.ElasticityMultiplier != 0 { - n += 1 + sovFeemarket(uint64(m.ElasticityMultiplier)) - } - if m.EnableHeight != 0 { - n += 1 + sovFeemarket(uint64(m.EnableHeight)) - } - l = m.BaseFee.Size() - n += 1 + l + sovFeemarket(uint64(l)) - return n -} - -func sovFeemarket(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozFeemarket(x uint64) (n int) { - return sovFeemarket(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Params) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Params: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NoBaseFee", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.NoBaseFee = bool(v != 0) - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseFeeChangeDenominator", wireType) - } - m.BaseFeeChangeDenominator = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BaseFeeChangeDenominator |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ElasticityMultiplier", wireType) - } - m.ElasticityMultiplier = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ElasticityMultiplier |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EnableHeight", wireType) - } - m.EnableHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EnableHeight |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseFee", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthFeemarket - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthFeemarket - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.BaseFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipFeemarket(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFeemarket - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipFeemarket(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthFeemarket - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupFeemarket - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthFeemarket - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthFeemarket = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowFeemarket = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupFeemarket = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/feemarket/migrations/v010/types/genesis.pb.go b/x/feemarket/migrations/v010/types/genesis.pb.go deleted file mode 100644 index 586b8057d7..0000000000 --- a/x/feemarket/migrations/v010/types/genesis.pb.go +++ /dev/null @@ -1,356 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/feemarket/v1/genesis.proto - -package types - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// GenesisState defines the feemarket module's genesis state. -type GenesisState struct { - // params defines all the paramaters of the module. - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - // block gas is the amount of gas used on the last block before the upgrade. - // Zero by default. - BlockGas uint64 `protobuf:"varint,3,opt,name=block_gas,json=blockGas,proto3" json:"block_gas,omitempty"` -} - -func (m *GenesisState) Reset() { *m = GenesisState{} } -func (m *GenesisState) String() string { return proto.CompactTextString(m) } -func (*GenesisState) ProtoMessage() {} -func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_6241c21661288629, []int{0} -} -func (m *GenesisState) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *GenesisState) XXX_Merge(src proto.Message) { - xxx_messageInfo_GenesisState.Merge(m, src) -} -func (m *GenesisState) XXX_Size() int { - return m.Size() -} -func (m *GenesisState) XXX_DiscardUnknown() { - xxx_messageInfo_GenesisState.DiscardUnknown(m) -} - -var xxx_messageInfo_GenesisState proto.InternalMessageInfo - -func (m *GenesisState) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - -func (m *GenesisState) GetBlockGas() uint64 { - if m != nil { - return m.BlockGas - } - return 0 -} - -var fileDescriptor_6241c21661288629 = []byte{ - // 246 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0x2d, 0xc9, 0x48, - 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x4b, 0x4d, 0xcd, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, - 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0x83, 0xab, 0xd2, 0x83, 0xab, 0xd2, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, - 0x07, 0x2b, 0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0xd4, 0x70, 0x98, 0x89, 0xd0, 0x0a, 0x56, 0xa7, - 0x54, 0xc9, 0xc5, 0xe3, 0x0e, 0xb1, 0x26, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x86, 0x8b, 0xad, - 0x20, 0xb1, 0x28, 0x31, 0xb7, 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x4e, 0x0f, 0xbb, - 0xb5, 0x7a, 0x01, 0x60, 0x55, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0xf5, 0x08, 0x49, - 0x73, 0x71, 0x26, 0xe5, 0xe4, 0x27, 0x67, 0xc7, 0xa7, 0x27, 0x16, 0x4b, 0x30, 0x2b, 0x30, 0x6a, - 0xb0, 0x04, 0x71, 0x80, 0x05, 0xdc, 0x13, 0x8b, 0xbd, 0x58, 0x38, 0x98, 0x04, 0x98, 0x83, 0x38, - 0x92, 0x12, 0x8b, 0x53, 0xe3, 0xd3, 0x52, 0x53, 0x9d, 0x3c, 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, 0x2f, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, - 0xbf, 0x24, 0x23, 0xb1, 0xa8, 0x38, 0xb3, 0x58, 0x1f, 0xe1, 0x9f, 0x0a, 0x24, 0x1f, 0x95, 0x54, - 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x4e, - 0x2a, 0x68, 0x49, 0x01, 0x00, 0x00, -} - -func (m *GenesisState) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.BlockGas != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.BlockGas)) - i-- - dAtA[i] = 0x18 - } - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { - offset -= sovGenesis(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *GenesisState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Params.Size() - n += 1 + l + sovGenesis(uint64(l)) - if m.BlockGas != 0 { - n += 1 + sovGenesis(uint64(m.BlockGas)) - } - return n -} - -func sovGenesis(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozGenesis(x uint64) (n int) { - return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *GenesisState) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: GenesisState: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockGas", wireType) - } - m.BlockGas = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockGas |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipGenesis(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenesis - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipGenesis(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthGenesis - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupGenesis - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthGenesis - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthGenesis = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGenesis = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/feemarket/migrations/v010/types/params.go b/x/feemarket/migrations/v010/types/params.go deleted file mode 100644 index 2316e40fb0..0000000000 --- a/x/feemarket/migrations/v010/types/params.go +++ /dev/null @@ -1,135 +0,0 @@ -package types - -import ( - "fmt" - - sdkmath "cosmossdk.io/math" - - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/ethereum/go-ethereum/params" -) - -var _ paramtypes.ParamSet = &Params{} - -// Parameter keys -var ( - ParamStoreKeyNoBaseFee = []byte("NoBaseFee") - ParamStoreKeyBaseFeeChangeDenominator = []byte("BaseFeeChangeDenominator") - ParamStoreKeyElasticityMultiplier = []byte("ElasticityMultiplier") - ParamStoreKeyBaseFee = []byte("BaseFee") - ParamStoreKeyEnableHeight = []byte("EnableHeight") -) - -// ParamKeyTable returns the parameter key table. -func ParamKeyTable() paramtypes.KeyTable { - return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) -} - -// NewParams creates a new Params instance -func NewParams(noBaseFee bool, baseFeeChangeDenom, elasticityMultiplier uint32, baseFee uint64, enableHeight int64) Params { - return Params{ - NoBaseFee: noBaseFee, - BaseFeeChangeDenominator: baseFeeChangeDenom, - ElasticityMultiplier: elasticityMultiplier, - BaseFee: sdkmath.NewIntFromUint64(baseFee), - EnableHeight: enableHeight, - } -} - -// DefaultParams returns default evm parameters -func DefaultParams() Params { - return Params{ - NoBaseFee: false, - BaseFeeChangeDenominator: params.BaseFeeChangeDenominator, - ElasticityMultiplier: params.ElasticityMultiplier, - BaseFee: sdkmath.NewIntFromUint64(params.InitialBaseFee), - EnableHeight: 0, - } -} - -// ParamSetPairs returns the parameter set pairs. -func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { - return paramtypes.ParamSetPairs{ - paramtypes.NewParamSetPair(ParamStoreKeyNoBaseFee, &p.NoBaseFee, validateBool), - paramtypes.NewParamSetPair(ParamStoreKeyBaseFeeChangeDenominator, &p.BaseFeeChangeDenominator, validateBaseFeeChangeDenominator), - paramtypes.NewParamSetPair(ParamStoreKeyElasticityMultiplier, &p.ElasticityMultiplier, validateElasticityMultiplier), - paramtypes.NewParamSetPair(ParamStoreKeyBaseFee, &p.BaseFee, validateBaseFee), - paramtypes.NewParamSetPair(ParamStoreKeyEnableHeight, &p.EnableHeight, validateEnableHeight), - } -} - -// Validate performs basic validation on fee market parameters. -func (p Params) Validate() error { - if p.BaseFeeChangeDenominator == 0 { - return fmt.Errorf("base fee change denominator cannot be 0") - } - - if p.BaseFee.IsNegative() { - return fmt.Errorf("initial base fee cannot be negative: %s", p.BaseFee) - } - - if p.EnableHeight < 0 { - return fmt.Errorf("enable height cannot be negative: %d", p.EnableHeight) - } - - return nil -} - -func (p *Params) IsBaseFeeEnabled(height int64) bool { - return !p.NoBaseFee && height >= p.EnableHeight -} - -func validateBool(i interface{}) error { - _, ok := i.(bool) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - return nil -} - -func validateBaseFeeChangeDenominator(i interface{}) error { - value, ok := i.(uint32) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - - if value == 0 { - return fmt.Errorf("base fee change denominator cannot be 0") - } - - return nil -} - -func validateElasticityMultiplier(i interface{}) error { - _, ok := i.(uint32) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - return nil -} - -func validateBaseFee(i interface{}) error { - value, ok := i.(sdkmath.Int) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - - if value.IsNegative() { - return fmt.Errorf("base fee cannot be negative") - } - - return nil -} - -func validateEnableHeight(i interface{}) error { - value, ok := i.(int64) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - - if value < 0 { - return fmt.Errorf("enable height cannot be negative: %d", value) - } - - return nil -} diff --git a/x/feemarket/migrations/v011/migrate.go b/x/feemarket/migrations/v011/migrate.go deleted file mode 100644 index 33b5a4b0c7..0000000000 --- a/x/feemarket/migrations/v011/migrate.go +++ /dev/null @@ -1,43 +0,0 @@ -package v011 - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v010types "github.com/evmos/ethermint/x/feemarket/migrations/v010/types" - "github.com/evmos/ethermint/x/feemarket/types" -) - -// MigrateStore adds the MinGasPrice param with a value of 0 -// and MinGasMultiplier to 0,5 -func MigrateStore(ctx sdk.Context, paramstore *paramtypes.Subspace) error { - if !paramstore.HasKeyTable() { - ps := paramstore.WithKeyTable(types.ParamKeyTable()) - paramstore = &ps - } - - // add MinGasPrice - paramstore.Set(ctx, types.ParamStoreKeyMinGasPrice, types.DefaultMinGasPrice) - // add MinGasMultiplier - paramstore.Set(ctx, types.ParamStoreKeyMinGasMultiplier, types.DefaultMinGasMultiplier) - return nil -} - -// MigrateJSON accepts exported v0.10 x/feemarket genesis state and migrates it to -// v0.11 x/feemarket genesis state. The migration includes: -// - add MinGasPrice param -// - add MinGasMultiplier param -func MigrateJSON(oldState v010types.GenesisState) types.GenesisState { - return types.GenesisState{ - Params: types.Params{ - NoBaseFee: oldState.Params.NoBaseFee, - BaseFeeChangeDenominator: oldState.Params.BaseFeeChangeDenominator, - ElasticityMultiplier: oldState.Params.ElasticityMultiplier, - EnableHeight: oldState.Params.EnableHeight, - BaseFee: oldState.Params.BaseFee, - MinGasPrice: types.DefaultMinGasPrice, - MinGasMultiplier: types.DefaultMinGasMultiplier, - }, - BlockGas: oldState.BlockGas, - } -} diff --git a/x/feemarket/migrations/v011/migrate_test.go b/x/feemarket/migrations/v011/migrate_test.go deleted file mode 100644 index 4652e31ab2..0000000000 --- a/x/feemarket/migrations/v011/migrate_test.go +++ /dev/null @@ -1,88 +0,0 @@ -package v011_test - -import ( - "fmt" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/cosmos/cosmos-sdk/testutil" - sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - - "github.com/evmos/ethermint/encoding" - - "github.com/evmos/ethermint/app" - v010types "github.com/evmos/ethermint/x/feemarket/migrations/v010/types" - v011 "github.com/evmos/ethermint/x/feemarket/migrations/v011" - "github.com/evmos/ethermint/x/feemarket/types" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" -) - -func init() { - // modify defaults through global - types.DefaultMinGasPrice = sdk.NewDecWithPrec(25, 3) -} - -func TestMigrateStore(t *testing.T) { - encCfg := encoding.MakeConfig(app.ModuleBasics) - feemarketKey := sdk.NewKVStoreKey(feemarkettypes.StoreKey) - tFeeMarketKey := sdk.NewTransientStoreKey(fmt.Sprintf("%s_test", feemarkettypes.StoreKey)) - ctx := testutil.DefaultContext(feemarketKey, tFeeMarketKey) - paramstore := paramtypes.NewSubspace( - encCfg.Codec, encCfg.Amino, feemarketKey, tFeeMarketKey, "feemarket", - ) - - paramstore = paramstore.WithKeyTable(feemarkettypes.ParamKeyTable()) - require.True(t, paramstore.HasKeyTable()) - - // check no MinGasPrice param - require.False(t, paramstore.Has(ctx, feemarkettypes.ParamStoreKeyMinGasPrice)) - require.False(t, paramstore.Has(ctx, feemarkettypes.ParamStoreKeyMinGasMultiplier)) - - // Run migrations - err := v011.MigrateStore(ctx, ¶mstore) - require.NoError(t, err) - - // Make sure the params are set - require.True(t, paramstore.Has(ctx, feemarkettypes.ParamStoreKeyMinGasPrice)) - require.True(t, paramstore.Has(ctx, feemarkettypes.ParamStoreKeyMinGasMultiplier)) - - var ( - minGasPrice sdk.Dec - minGasMultiplier sdk.Dec - ) - - // Make sure the new params are set - require.NotPanics(t, func() { - paramstore.Get(ctx, feemarkettypes.ParamStoreKeyMinGasPrice, &minGasPrice) - paramstore.Get(ctx, feemarkettypes.ParamStoreKeyMinGasMultiplier, &minGasMultiplier) - }) - - // check the params are updated - require.Equal(t, types.DefaultMinGasPrice.String(), minGasPrice.String()) - require.False(t, minGasPrice.IsZero()) - require.Equal(t, types.DefaultMinGasMultiplier.String(), minGasMultiplier.String()) -} - -func TestMigrateJSON(t *testing.T) { - rawJson := `{ - "block_gas": "0", - "params": { - "base_fee_change_denominator": 8, - "elasticity_multiplier": 2, - "enable_height": "0", - "base_fee": "1000000000", - "no_base_fee": false - } - }` - encCfg := encoding.MakeConfig(app.ModuleBasics) - var genState v010types.GenesisState - err := encCfg.Codec.UnmarshalJSON([]byte(rawJson), &genState) - require.NoError(t, err) - - migratedGenState := v011.MigrateJSON(genState) - - require.Equal(t, types.DefaultMinGasPrice, migratedGenState.Params.MinGasPrice) - require.Equal(t, types.DefaultMinGasMultiplier, migratedGenState.Params.MinGasMultiplier) -} diff --git a/x/feemarket/migrations/v09/types/feemarket.pb.go b/x/feemarket/migrations/v09/types/feemarket.pb.go deleted file mode 100644 index b5eb23bf73..0000000000 --- a/x/feemarket/migrations/v09/types/feemarket.pb.go +++ /dev/null @@ -1,454 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/feemarket/v1/feemarket.proto - -package types - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// Params defines the EVM module parameters -type Params struct { - // no base fee forces the EIP-1559 base fee to 0 (needed for 0 price calls) - NoBaseFee bool `protobuf:"varint,1,opt,name=no_base_fee,json=noBaseFee,proto3" json:"no_base_fee,omitempty"` - // base fee change denominator bounds the amount the base fee can change - // between blocks. - BaseFeeChangeDenominator uint32 `protobuf:"varint,2,opt,name=base_fee_change_denominator,json=baseFeeChangeDenominator,proto3" json:"base_fee_change_denominator,omitempty"` - // elasticity multiplier bounds the maximum gas limit an EIP-1559 block may - // have. - ElasticityMultiplier uint32 `protobuf:"varint,3,opt,name=elasticity_multiplier,json=elasticityMultiplier,proto3" json:"elasticity_multiplier,omitempty"` - // initial base fee for EIP-1559 blocks. - InitialBaseFee int64 `protobuf:"varint,4,opt,name=initial_base_fee,json=initialBaseFee,proto3" json:"initial_base_fee,omitempty"` - // height at which the base fee calculation is enabled. - EnableHeight int64 `protobuf:"varint,5,opt,name=enable_height,json=enableHeight,proto3" json:"enable_height,omitempty"` -} - -func (m *Params) Reset() { *m = Params{} } -func (m *Params) String() string { return proto.CompactTextString(m) } -func (*Params) ProtoMessage() {} -func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_4feb8b20cf98e6e1, []int{0} -} -func (m *Params) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Params.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Params) XXX_Merge(src proto.Message) { - xxx_messageInfo_Params.Merge(m, src) -} -func (m *Params) XXX_Size() int { - return m.Size() -} -func (m *Params) XXX_DiscardUnknown() { - xxx_messageInfo_Params.DiscardUnknown(m) -} - -var xxx_messageInfo_Params proto.InternalMessageInfo - -func (m *Params) GetNoBaseFee() bool { - if m != nil { - return m.NoBaseFee - } - return false -} - -func (m *Params) GetBaseFeeChangeDenominator() uint32 { - if m != nil { - return m.BaseFeeChangeDenominator - } - return 0 -} - -func (m *Params) GetElasticityMultiplier() uint32 { - if m != nil { - return m.ElasticityMultiplier - } - return 0 -} - -func (m *Params) GetInitialBaseFee() int64 { - if m != nil { - return m.InitialBaseFee - } - return 0 -} - -func (m *Params) GetEnableHeight() int64 { - if m != nil { - return m.EnableHeight - } - return 0 -} - -var fileDescriptor_4feb8b20cf98e6e1 = []byte{ - // 286 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xc1, 0x4a, 0x03, 0x31, - 0x10, 0x86, 0x1b, 0xab, 0x45, 0xa3, 0x15, 0x59, 0x54, 0x16, 0x84, 0x50, 0x14, 0x64, 0x4f, 0xbb, - 0x94, 0x9e, 0xbd, 0x54, 0x91, 0x5e, 0x04, 0xe9, 0xd1, 0x4b, 0xc8, 0xd6, 0x69, 0x33, 0xb8, 0x49, - 0x4a, 0x32, 0x2d, 0xf6, 0x2d, 0x7c, 0x2c, 0x8f, 0x3d, 0x7a, 0x94, 0xf6, 0xe8, 0x4b, 0x08, 0x5b, - 0xdb, 0x78, 0x9c, 0xff, 0xfb, 0x06, 0x7e, 0x7e, 0x7e, 0x0b, 0xa4, 0xc1, 0x1b, 0xb4, 0x54, 0x8c, - 0x01, 0x8c, 0xf2, 0x6f, 0x40, 0xc5, 0xbc, 0x1b, 0x8f, 0x7c, 0xea, 0x1d, 0xb9, 0xe4, 0x72, 0xe7, - 0xe5, 0x11, 0xcd, 0xbb, 0xd7, 0x3f, 0x8c, 0xb7, 0x9e, 0x95, 0x57, 0x26, 0x24, 0x82, 0x1f, 0x5b, - 0x27, 0x4b, 0x15, 0x40, 0x8e, 0x01, 0x52, 0xd6, 0x61, 0xd9, 0xe1, 0xf0, 0xc8, 0xba, 0xbe, 0x0a, - 0xf0, 0x08, 0x90, 0xdc, 0xf1, 0xab, 0x2d, 0x94, 0x23, 0xad, 0xec, 0x04, 0xe4, 0x2b, 0x58, 0x67, - 0xd0, 0x2a, 0x72, 0x3e, 0xdd, 0xeb, 0xb0, 0xac, 0x3d, 0x4c, 0xcb, 0x8d, 0x7d, 0x5f, 0x0b, 0x0f, - 0x91, 0x27, 0x3d, 0x7e, 0x01, 0x95, 0x0a, 0x84, 0x23, 0xa4, 0x85, 0x34, 0xb3, 0x8a, 0x70, 0x5a, - 0x21, 0xf8, 0xb4, 0x59, 0x3f, 0x9e, 0x47, 0xf8, 0xb4, 0x63, 0x49, 0xc6, 0xcf, 0xd0, 0x22, 0xa1, - 0xaa, 0x62, 0xb1, 0xfd, 0x0e, 0xcb, 0x9a, 0xc3, 0xd3, 0xbf, 0x7c, 0xdb, 0xee, 0x86, 0xb7, 0xc1, - 0xaa, 0xb2, 0x02, 0xa9, 0x01, 0x27, 0x9a, 0xd2, 0x83, 0x5a, 0x3b, 0xd9, 0x84, 0x83, 0x3a, 0xeb, - 0x0f, 0x3e, 0x57, 0x82, 0x2d, 0x57, 0x82, 0x7d, 0xaf, 0x04, 0xfb, 0x58, 0x8b, 0xc6, 0x72, 0x2d, - 0x1a, 0x5f, 0x6b, 0xd1, 0x78, 0xc9, 0x27, 0x48, 0x7a, 0x56, 0xe6, 0x23, 0x67, 0x0a, 0xd2, 0xca, - 0x07, 0x0c, 0x45, 0x9c, 0xf6, 0xfd, 0xdf, 0xb8, 0xb4, 0x98, 0x42, 0x28, 0x5b, 0xf5, 0xac, 0xbd, - 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, 0x3a, 0xd4, 0xaa, 0x80, 0x01, 0x00, 0x00, -} - -func (m *Params) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Params) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.EnableHeight != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.EnableHeight)) - i-- - dAtA[i] = 0x28 - } - if m.InitialBaseFee != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.InitialBaseFee)) - i-- - dAtA[i] = 0x20 - } - if m.ElasticityMultiplier != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.ElasticityMultiplier)) - i-- - dAtA[i] = 0x18 - } - if m.BaseFeeChangeDenominator != 0 { - i = encodeVarintFeemarket(dAtA, i, uint64(m.BaseFeeChangeDenominator)) - i-- - dAtA[i] = 0x10 - } - if m.NoBaseFee { - i-- - if m.NoBaseFee { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintFeemarket(dAtA []byte, offset int, v uint64) int { - offset -= sovFeemarket(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Params) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.NoBaseFee { - n += 2 - } - if m.BaseFeeChangeDenominator != 0 { - n += 1 + sovFeemarket(uint64(m.BaseFeeChangeDenominator)) - } - if m.ElasticityMultiplier != 0 { - n += 1 + sovFeemarket(uint64(m.ElasticityMultiplier)) - } - if m.InitialBaseFee != 0 { - n += 1 + sovFeemarket(uint64(m.InitialBaseFee)) - } - if m.EnableHeight != 0 { - n += 1 + sovFeemarket(uint64(m.EnableHeight)) - } - return n -} - -func sovFeemarket(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozFeemarket(x uint64) (n int) { - return sovFeemarket(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Params) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Params: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NoBaseFee", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.NoBaseFee = bool(v != 0) - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseFeeChangeDenominator", wireType) - } - m.BaseFeeChangeDenominator = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BaseFeeChangeDenominator |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ElasticityMultiplier", wireType) - } - m.ElasticityMultiplier = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ElasticityMultiplier |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field InitialBaseFee", wireType) - } - m.InitialBaseFee = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.InitialBaseFee |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EnableHeight", wireType) - } - m.EnableHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFeemarket - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EnableHeight |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipFeemarket(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthFeemarket - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipFeemarket(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFeemarket - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthFeemarket - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupFeemarket - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthFeemarket - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthFeemarket = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowFeemarket = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupFeemarket = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/feemarket/migrations/v09/types/genesis.pb.go b/x/feemarket/migrations/v09/types/genesis.pb.go deleted file mode 100644 index 0b49475e18..0000000000 --- a/x/feemarket/migrations/v09/types/genesis.pb.go +++ /dev/null @@ -1,408 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/feemarket/v1/genesis.proto - -package types - -import ( - fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// GenesisState defines the feemarket module's genesis state. -type GenesisState struct { - // params defines all the paramaters of the module. - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - // base fee is the exported value from previous software version. - // Zero by default. - BaseFee github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=base_fee,json=baseFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"base_fee"` - // block gas is the amount of gas used on the last block before the upgrade. - // Zero by default. - BlockGas uint64 `protobuf:"varint,3,opt,name=block_gas,json=blockGas,proto3" json:"block_gas,omitempty"` -} - -func (m *GenesisState) Reset() { *m = GenesisState{} } -func (m *GenesisState) String() string { return proto.CompactTextString(m) } -func (*GenesisState) ProtoMessage() {} -func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_6241c21661288629, []int{0} -} -func (m *GenesisState) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *GenesisState) XXX_Merge(src proto.Message) { - xxx_messageInfo_GenesisState.Merge(m, src) -} -func (m *GenesisState) XXX_Size() int { - return m.Size() -} -func (m *GenesisState) XXX_DiscardUnknown() { - xxx_messageInfo_GenesisState.DiscardUnknown(m) -} - -var xxx_messageInfo_GenesisState proto.InternalMessageInfo - -func (m *GenesisState) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - -func (m *GenesisState) GetBlockGas() uint64 { - if m != nil { - return m.BlockGas - } - return 0 -} - -var fileDescriptor_6241c21661288629 = []byte{ - // 286 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4b, 0xc3, 0x40, - 0x14, 0xc7, 0x73, 0x5a, 0x6a, 0x1b, 0x9d, 0x82, 0x48, 0xa9, 0x70, 0x0d, 0x22, 0x25, 0x8b, 0x77, - 0x54, 0x57, 0xa7, 0x0c, 0xd6, 0x6e, 0x12, 0x37, 0x97, 0x72, 0x89, 0xaf, 0x49, 0x88, 0xc9, 0x85, - 0x7b, 0x67, 0xd1, 0x6f, 0xe1, 0x87, 0xf1, 0x43, 0x74, 0xec, 0x28, 0x0e, 0x45, 0x92, 0x2f, 0x22, - 0xb9, 0x96, 0xb6, 0x83, 0x4e, 0x77, 0xbc, 0xf7, 0xfb, 0xbf, 0x1f, 0xfc, 0xed, 0x4b, 0xd0, 0x09, - 0xa8, 0x3c, 0x2d, 0x34, 0x9f, 0x01, 0xe4, 0x42, 0x65, 0xa0, 0xf9, 0x7c, 0xc4, 0x63, 0x28, 0x00, - 0x53, 0x64, 0xa5, 0x92, 0x5a, 0x3a, 0x67, 0x5b, 0x8a, 0x6d, 0x29, 0x36, 0x1f, 0xf5, 0x4f, 0x63, - 0x19, 0x4b, 0x83, 0xf0, 0xe6, 0xb7, 0xa6, 0xfb, 0xc3, 0x7f, 0x6e, 0xee, 0xa2, 0x86, 0xbb, 0xf8, - 0x24, 0xf6, 0xc9, 0x78, 0xed, 0x79, 0xd4, 0x42, 0x83, 0x73, 0x6b, 0xb7, 0x4b, 0xa1, 0x44, 0x8e, - 0x3d, 0xe2, 0x12, 0xef, 0xf8, 0x9a, 0xb2, 0xbf, 0xbd, 0xec, 0xc1, 0x50, 0x7e, 0x6b, 0xb1, 0x1a, - 0x58, 0xc1, 0x26, 0xe3, 0x4c, 0xec, 0x4e, 0x28, 0x10, 0xa6, 0x33, 0x80, 0xde, 0x81, 0x4b, 0xbc, - 0xae, 0xcf, 0x9a, 0xfd, 0xf7, 0x6a, 0x30, 0x8c, 0x53, 0x9d, 0xbc, 0x86, 0x2c, 0x92, 0x39, 0x8f, - 0x24, 0xe6, 0x12, 0x37, 0xcf, 0x15, 0x3e, 0x67, 0x5c, 0xbf, 0x97, 0x80, 0x6c, 0x52, 0xe8, 0xe0, - 0xa8, 0xc9, 0xdf, 0x01, 0x38, 0xe7, 0x76, 0x37, 0x7c, 0x91, 0x51, 0x36, 0x8d, 0x05, 0xf6, 0x0e, - 0x5d, 0xe2, 0xb5, 0x82, 0x8e, 0x19, 0x8c, 0x05, 0xfa, 0xf7, 0x8b, 0x8a, 0x92, 0x65, 0x45, 0xc9, - 0x4f, 0x45, 0xc9, 0x47, 0x4d, 0xad, 0x65, 0x4d, 0xad, 0xaf, 0x9a, 0x5a, 0x4f, 0x6c, 0xcf, 0xa3, - 0x13, 0xa1, 0x30, 0x45, 0xbe, 0xeb, 0xe2, 0x6d, 0xaf, 0x0d, 0xe3, 0x0c, 0xdb, 0xa6, 0x87, 0x9b, - 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x41, 0xbf, 0x7e, 0x16, 0x85, 0x01, 0x00, 0x00, -} - -func (m *GenesisState) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.BlockGas != 0 { - i = encodeVarintGenesis(dAtA, i, uint64(m.BlockGas)) - i-- - dAtA[i] = 0x18 - } - { - size := m.BaseFee.Size() - i -= size - if _, err := m.BaseFee.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { - offset -= sovGenesis(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *GenesisState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Params.Size() - n += 1 + l + sovGenesis(uint64(l)) - l = m.BaseFee.Size() - n += 1 + l + sovGenesis(uint64(l)) - if m.BlockGas != 0 { - n += 1 + sovGenesis(uint64(m.BlockGas)) - } - return n -} - -func sovGenesis(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozGenesis(x uint64) (n int) { - return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *GenesisState) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: GenesisState: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseFee", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.BaseFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockGas", wireType) - } - m.BlockGas = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockGas |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipGenesis(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenesis - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipGenesis(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenesis - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthGenesis - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupGenesis - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthGenesis - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthGenesis = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGenesis = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/feemarket/module.go b/x/feemarket/module.go index f16cd6ba50..a93e8fba42 100644 --- a/x/feemarket/module.go +++ b/x/feemarket/module.go @@ -116,17 +116,6 @@ func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {} // module-specific GRPC queries and handle the upgrade store migration for the module. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) - - m := keeper.NewMigrator(am.keeper) - err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2) - if err != nil { - panic(err) - } - - err = cfg.RegisterMigration(types.ModuleName, 2, m.Migrate2to3) - if err != nil { - panic(err) - } } // Route returns the message routing key for the fee market module.