620f6a6770
* add gasWanted transient store keys * add gasWanted transient store keeper functions * add gasWanted transient store tracker * add comment * remove unncesary comment * remove unnecesary function * fix tests * fix bad comment * remove unnecesary comment * update comment * update changelog * Update CHANGELOG.md Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * add GasWantedDecorator * remove unnecesary comments * gasWanted decorator test * fix tests * fix tests and build * fix lint * updated end block event * Update app/ante/fee_market.go Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * fix undeclared variable * Update app/ante/fee_market_test.go * remove unnecesary line * migrate MinGasMultiplier to FeeMarket module * set limited gas wanted * remove old newKeeper param * update proto comment * fix test * update comments * Update x/feemarket/keeper/abci.go Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * address comments from review * tidy * tests Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
44 lines
1.5 KiB
Go
44 lines
1.5 KiB
Go
package v011
|
|
|
|
import (
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
|
|
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
|
|
v010types "github.com/tharsis/ethermint/x/feemarket/migrations/v010/types"
|
|
"github.com/tharsis/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,
|
|
}
|
|
}
|