Merge pull request #28 from 0glabs/handle_ws_new_txn

save suggestion gas price in memory

Author: Solovyov1796

app/app.go

@@ -248,7 +248,7 @@ type EthermintApp struct {
 
 	// Ethermint keepers
 	EvmKeeper       *evmkeeper.Keeper
-	FeeMarketKeeper feemarketkeeper.Keeper
+	FeeMarketKeeper *feemarketkeeper.Keeper
 
 	// the module manager
 	mm *module.Manager

x/feemarket/genesis.go

@@ -27,7 +27,7 @@ import (
 // InitGenesis initializes genesis state based on exported genesis
 func InitGenesis(
 	ctx sdk.Context,
-	k keeper.Keeper,
+	k *keeper.Keeper,
 	data types.GenesisState,
 ) []abci.ValidatorUpdate {
 	err := k.SetParams(ctx, data.Params)
@@ -41,7 +41,7 @@ func InitGenesis(
 }
 
 // ExportGenesis exports genesis state of the fee market module
-func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
+func ExportGenesis(ctx sdk.Context, k *keeper.Keeper) *types.GenesisState {
 	return &types.GenesisState{
 		Params:   k.GetParams(ctx),
 		BlockGas: k.GetBlockGasWanted(ctx),

x/feemarket/keeper/abci.go

@@ -102,7 +102,7 @@ func (k *Keeper) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) { //nolint:
 	k.foundSuggestionGasPrice(ctx)
 }
 
-func (k Keeper) foundSuggestionGasPrice(ctx sdk.Context) {
+func (k *Keeper) foundSuggestionGasPrice(ctx sdk.Context) {
 	logger := k.Logger(ctx)
 	var maxBlockGas uint64
 	if b := ctx.ConsensusParams().Block; b != nil {
@@ -153,30 +153,37 @@ func (k Keeper) foundSuggestionGasPrice(ctx sdk.Context) {
 						}
 					}
 				}
-			} else {
-				// ignore multisig case now
-				if fee, ok := memTx.(sdk.FeeTx); ok {
-					if len(sigs) == 1 {
-						signer := sdk.AccAddress(sigs[0].PubKey.Address()).String()
-
-						if _, exists := txnInfoMap[signer]; !exists {
-							txnInfoMap[signer] = make([]*txnInfo, 0, 16)
-						}
-
-						evmGasPrice, err := utilCosmosDemonGasPriceToEvmDemonGasPrice(fee.GetFee())
-
-						if err == nil {
-							txnInfoMap[signer] = append(txnInfoMap[signer], &txnInfo{
-								gasPrice: evmGasPrice,
-								gasLimit: utilCosmosDemonGasLimitToEvmDemonGasLimit(fee.GetGas()),
-								nonce:    sigs[0].Sequence,
-								sender:   signer,
-							})
-						}
-					}
-				} else {
-					logger.Error("unknown type of memTx: ", "type", reflect.TypeOf(memTx))
-				}
+				// ignore cosmos txn case now
+				// } else {
+				// 	// ignore multisig case now
+				// 	if fee, ok := memTx.(sdk.FeeTx); ok {
+				// 		feeCoins := fee.GetFee()
+				// 		if len(feeCoins) != 0 {
+				// 			if len(sigs) == 1 {
+				// 				signer := sdk.AccAddress(sigs[0].PubKey.Address()).String()
+
+				// 				if _, exists := txnInfoMap[signer]; !exists {
+				// 					txnInfoMap[signer] = make([]*txnInfo, 0, 16)
+				// 				}
+
+				// 				gasPrice := sdk.NewDecCoinsFromCoins(fee.GetFee()...).QuoDec(math.LegacyNewDec(int64(fee.GetGas())))
+
+				// 				evmGasPrice, err := utilCosmosDemonGasPriceToEvmDemonGasPrice(gasPrice)
+				// 				evmGasLimit := utilCosmosDemonGasLimitToEvmDemonGasLimit(fee.GetGas())
+
+				// 				if err == nil {
+				// 					txnInfoMap[signer] = append(txnInfoMap[signer], &txnInfo{
+				// 						gasPrice: evmGasPrice,
+				// 						gasLimit: evmGasLimit,
+				// 						nonce:    sigs[0].Sequence,
+				// 						sender:   signer,
+				// 					})
+				// 				}
+				// 			}
+				// 		}
+				// 	} else {
+				// 		logger.Error("unknown type of memTx: ", "type", reflect.TypeOf(memTx))
+				// 	}
 			}
 
 			iterator = iterator.Next()
@@ -246,13 +253,12 @@ func (k Keeper) foundSuggestionGasPrice(ctx sdk.Context) {
 	}
 }
 
-func utilCosmosDemonGasPriceToEvmDemonGasPrice(gasGroup sdk.Coins) (*big.Int, error) {
+func utilCosmosDemonGasPriceToEvmDemonGasPrice(gasGroup sdk.DecCoins) (*big.Int, error) {
 	gasPrice := big.NewInt(0)
 	for _, coin := range gasGroup {
 		if coin.Denom == GasDenom {
-			thisGasPrice := big.NewInt(0).SetUint64(coin.Amount.Uint64())
-			thisGasPrice = thisGasPrice.Mul(thisGasPrice, big.NewInt(0).SetInt64(GasDenomConversionMultiplier))
-			gasPrice = gasPrice.Add(gasPrice, thisGasPrice)
+			thisGasPrice := coin.Amount.MulRoundUp(sdk.NewDec(GasDenomConversionMultiplier))
+			gasPrice = gasPrice.Add(gasPrice, thisGasPrice.TruncateInt().BigInt())
 		} else {
 			return big.NewInt(0), fmt.Errorf("invalid denom: %s", coin.Denom)
 		}

x/feemarket/keeper/grpc_query.go

@@ -24,10 +24,10 @@ import (
 	"github.com/evmos/ethermint/x/feemarket/types"
 )
 
-var _ types.QueryServer = Keeper{}
+var _ types.QueryServer = &Keeper{}
 
 // Params implements the Query/Params gRPC method
-func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
+func (k *Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	params := k.GetParams(ctx)
 
@@ -37,7 +37,7 @@ func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.Q
 }
 
 // BaseFee implements the Query/BaseFee gRPC method
-func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types.QueryBaseFeeResponse, error) {
+func (k *Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types.QueryBaseFeeResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	res := &types.QueryBaseFeeResponse{}
@@ -52,7 +52,7 @@ func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types
 }
 
 // BlockGas implements the Query/BlockGas gRPC method
-func (k Keeper) BlockGas(c context.Context, _ *types.QueryBlockGasRequest) (*types.QueryBlockGasResponse, error) {
+func (k *Keeper) BlockGas(c context.Context, _ *types.QueryBlockGasRequest) (*types.QueryBlockGasResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	gas := k.GetBlockGasWanted(ctx)
 
@@ -61,7 +61,7 @@ func (k Keeper) BlockGas(c context.Context, _ *types.QueryBlockGasRequest) (*typ
 	}, nil
 }
 
-func (k Keeper) SuggestionGasPrice(c context.Context, _ *types.QuerySuggestionGasPriceRequest) (*types.QuerySuggestionGasPriceResponse, error) {
+func (k *Keeper) SuggestionGasPrice(c context.Context, _ *types.QuerySuggestionGasPriceRequest) (*types.QuerySuggestionGasPriceResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	gas := k.GetSuggestionGasPrice(ctx)
 

x/feemarket/keeper/keeper.go

@@ -55,7 +55,7 @@ func NewKeeper(
 	storeKey, transientKey storetypes.StoreKey,
 	ss paramstypes.Subspace,
 	mempool mempool.Mempool,
-) Keeper {
+) *Keeper {
 	// ensure authority account is correctly formatted
 	if err := sdk.VerifyAddressFormat(authority); err != nil {
 		panic(err)
@@ -65,7 +65,7 @@ func NewKeeper(
 		ss = ss.WithKeyTable(types.ParamKeyTable())
 	}
 
-	return Keeper{
+	return &Keeper{
 		cdc:                cdc,
 		storeKey:           storeKey,
 		authority:          authority,
@@ -141,18 +141,14 @@ func (k Keeper) GetBaseFeeV1(ctx sdk.Context) *big.Int {
 	return new(big.Int).SetBytes(bz)
 }
 
-func (k Keeper) SetSuggestionGasPrice(ctx sdk.Context, gas *big.Int) {
-	store := ctx.KVStore(k.storeKey)
-	gasBz := gas.Bytes()
-	store.Set(types.KeyPrefixSuggestionGasPrice, gasBz)
+func (k *Keeper) SetSuggestionGasPrice(ctx sdk.Context, gas *big.Int) {
+	logger := k.Logger(ctx)
+	k.suggestionGasPrice = big.NewInt(0).Set(gas)
+	logger.Debug("set suggestion gas price: ", "value", k.suggestionGasPrice.String())
 }
 
-func (k Keeper) GetSuggestionGasPrice(ctx sdk.Context) *big.Int {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get(types.KeyPrefixSuggestionGasPrice)
-	if len(bz) == 0 {
-		return big.NewInt(0)
-	}
-
-	return new(big.Int).SetBytes(bz)
+func (k *Keeper) GetSuggestionGasPrice(ctx sdk.Context) *big.Int {
+	logger := k.Logger(ctx)
+	logger.Debug("get suggestion gas price: ", "value", k.suggestionGasPrice.String())
+	return k.suggestionGasPrice
 }

x/feemarket/keeper/migrations.go

@@ -23,12 +23,12 @@ import (
 
 // Migrator is a struct for handling in-place store migrations.
 type Migrator struct {
-	keeper         Keeper
+	keeper         *Keeper
 	legacySubspace types.Subspace
 }
 
 // NewMigrator returns a new Migrator.
-func NewMigrator(keeper Keeper, legacySubspace types.Subspace) Migrator {
+func NewMigrator(keeper *Keeper, legacySubspace types.Subspace) Migrator {
 	return Migrator{
 		keeper:         keeper,
 		legacySubspace: legacySubspace,

x/feemarket/module.go

@@ -111,13 +111,13 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 // AppModule implements an application module for the fee market module.
 type AppModule struct {
 	AppModuleBasic
-	keeper keeper.Keeper
+	keeper *keeper.Keeper
 	// legacySubspace is used solely for migration of x/params managed parameters
 	legacySubspace types.Subspace
 }
 
 // NewAppModule creates a new AppModule object
-func NewAppModule(k keeper.Keeper, ss types.Subspace) AppModule {
+func NewAppModule(k *keeper.Keeper, ss types.Subspace) AppModule {
 	return AppModule{
 		AppModuleBasic: AppModuleBasic{},
 		keeper:         k,
@@ -138,7 +138,7 @@ func (am AppModule) RegisterInvariants(_ 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)
-	types.RegisterMsgServer(cfg.MsgServer(), &am.keeper)
+	types.RegisterMsgServer(cfg.MsgServer(), am.keeper)
 
 	m := keeper.NewMigrator(am.keeper, am.legacySubspace)
 	if err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate2to3); err != nil {

x/feemarket/types/keys.go

@@ -35,7 +35,6 @@ const (
 const (
 	prefixBlockGasWanted    = iota + 1
 	deprecatedPrefixBaseFee // unused
-	prefixSuggestionGasPrice
 )
 
 const (
@@ -44,8 +43,7 @@ const (
 
 // KVStore key prefixes
 var (
-	KeyPrefixBlockGasWanted     = []byte{prefixBlockGasWanted}
-	KeyPrefixSuggestionGasPrice = []byte{prefixSuggestionGasPrice}
+	KeyPrefixBlockGasWanted = []byte{prefixBlockGasWanted}
 )
 
 // Transient Store key prefixes