Add separate min gas price option for txes with high gas wanted (#777)

CHANGELOG.md

@@ -39,14 +39,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v6.3.0]
 
 - [#765](https://github.com/osmosis-labs/osmosis/pull/765) Fix a bug in `Makefile` regarding the location of localtestnet docker image.
 
 ## Features
 
 - Update to Tendermint v0.34.15
 - Increase p2p timeouts to alleviate p2p network breaking at epoch
+- [#724](https://github.com/osmosis-labs/osmosis/pull/724) Make an ante-handler filter for recognizing High gas txs, and having a min gas price for them.
 - [#741](https://github.com/osmosis-labs/osmosis/pull/741) Allow node operators to set a second min gas price for arbitrage txs.
 - [#623](https://github.com/osmosis-labs/osmosis/pull/623) Use gosec for staticly linting for common non-determinism issues in SDK applications.
 
@@ -59,7 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Minor improvements & Bug Fixes
 
 - [#722](https://github.com/osmosis-labs/osmosis/issues/722) reuse code for parsing integer slices from string
-- [#704](https://github.com/osmosis-labs/osmosis/pull/704) fix rocksdb 
+- [#704](https://github.com/osmosis-labs/osmosis/pull/704) fix rocksdb
 - [#666](https://github.com/osmosis-labs/osmosis/pull/666) Fix the `--log-level` and `--log-format` commands on `osmosisd start`
 - [#655](https://github.com/osmosis-labs/osmosis/pull/655) Make the default genesis for pool-incentives work by default
 - [97ac2a8](https://github.com/osmosis-labs/osmosis/commit/97ac2a86303fc8966a4c169107e0945775107e67) Fix InitGenesis bug for gauges
@@ -84,68 +85,68 @@ The Osmosis Boron release is made!
 
 Notable features include:
 
-* Upgrading from SDK v0.42 to [SDK v0.44](https://github.com/cosmos/cosmos-sdk/blob/v0.43.0/RELEASE_NOTES.md), bringing efficiency improvements, integrations and Rosetta support.
-* Bringing in the new modules [Bech32IBC](https://github.com/osmosis-labs/bech32-ibc/), [Authz](https://github.com/cosmos/cosmos-sdk/tree/master/x/authz/spec), [TxFees](https://github.com/osmosis-labs/osmosis/tree/main/x/txfees)
-* Upgrading to IBC v2, allowing for improved Ethereum Bridge and CosmWasm support
-* Implementing Osmosis chain governance's [Proposal 32](https://www.mintscan.io/osmosis/proposals/32)
-* Large suite of gas bugs fixed. (Including several that we have not seen on chain)
-* More queries exposed to aid node operators.
-* Blocking the OFAC banned Ethereum addresses.
-* Several (linear factor) epoch time improvements. (Most were present in v4.2.0)
+- Upgrading from SDK v0.42 to [SDK v0.44](https://github.com/cosmos/cosmos-sdk/blob/v0.43.0/RELEASE_NOTES.md), bringing efficiency improvements, integrations and Rosetta support.
+- Bringing in the new modules [Bech32IBC](https://github.com/osmosis-labs/bech32-ibc/), [Authz](https://github.com/cosmos/cosmos-sdk/tree/master/x/authz/spec), [TxFees](https://github.com/osmosis-labs/osmosis/tree/main/x/txfees)
+- Upgrading to IBC v2, allowing for improved Ethereum Bridge and CosmWasm support
+- Implementing Osmosis chain governance's [Proposal 32](https://www.mintscan.io/osmosis/proposals/32)
+- Large suite of gas bugs fixed. (Including several that we have not seen on chain)
+- More queries exposed to aid node operators.
+- Blocking the OFAC banned Ethereum addresses.
+- Several (linear factor) epoch time improvements. (Most were present in v4.2.0)
 
 Upgrade instructions for node operators can be found [here](https://github.com/osmosis-labs/osmosis/blob/v5.x/networks/osmosis-1/upgrades/v5/guide.md)
 
 ## Features
 
-* [\#637](https://github.com/osmosis-labs/osmosis/pull/637) Add [Bech32IBC](https://github.com/osmosis-labs/bech32-ibc/)
-* [\#610](https://github.com/osmosis-labs/osmosis/pull/610) Upgrade to Cosmos SDK v0.44.x
-  * Numerous large updates, such as making module accounts be 32 bytes, Rosetta support, etc.
-  * Adds & integrates the [Authz module](https://github.com/cosmos/cosmos-sdk/tree/master/x/authz/spec)
+- [\#637](https://github.com/osmosis-labs/osmosis/pull/637) Add [Bech32IBC](https://github.com/osmosis-labs/bech32-ibc/)
+- [\#610](https://github.com/osmosis-labs/osmosis/pull/610) Upgrade to Cosmos SDK v0.44.x
+  - Numerous large updates, such as making module accounts be 32 bytes, Rosetta support, etc.
+  - Adds & integrates the [Authz module](https://github.com/cosmos/cosmos-sdk/tree/master/x/authz/spec)
    See: [SDK v0.43.0 Release Notes](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0) For more details
-* [\#610](https://github.com/osmosis-labs/osmosis/pull/610) Upgrade to IBC-v2
-* [\#560](https://github.com/osmosis-labs/osmosis/pull/560) Implements Osmosis [prop32](https://www.mintscan.io/osmosis/proposals/32) -- clawing back the final 20% of unclaimed osmo and ion airdrop.
-* [\#394](https://github.com/osmosis-labs/osmosis/pull/394) Allow whitelisted tx fee tokens based on conversion rate to OSMO
-* [Commit db450f0](https://github.com/osmosis-labs/osmosis/commit/db450f0dce8c595211d920f9bca7ed0f3a136e43) Add blocking of OFAC banned Ethereum addresses
+- [\#610](https://github.com/osmosis-labs/osmosis/pull/610) Upgrade to IBC-v2
+- [\#560](https://github.com/osmosis-labs/osmosis/pull/560) Implements Osmosis [prop32](https://www.mintscan.io/osmosis/proposals/32) -- clawing back the final 20% of unclaimed osmo and ion airdrop.
+- [\#394](https://github.com/osmosis-labs/osmosis/pull/394) Allow whitelisted tx fee tokens based on conversion rate to OSMO
+- [Commit db450f0](https://github.com/osmosis-labs/osmosis/commit/db450f0dce8c595211d920f9bca7ed0f3a136e43) Add blocking of OFAC banned Ethereum addresses
 
 ## Minor improvements & Bug Fixes
 
-* {In the Osmosis-labs SDK fork}
-  * Increase default IAVL cache size to be in the hundred megabyte range
-  * Significantly improve CacheKVStore speed problems, reduced IBC upgrade time from 2hrs to 5min
-  * Add debug info to make it clear whats happening during upgrade
-* (From a series of commits) Fixes to the claims module to only do the reclaim logic once, not every block.
-* (From a series of commits) More logging to the claims module.
-* [\#563](https://github.com/osmosis-labs/osmosis/pull/563) Allow zero-weight pool-incentive distribution records
-* [\#562](https://github.com/osmosis-labs/osmosis/pull/562) Store block height in epochs module for easier debugging
-* [\#544](https://github.com/osmosis-labs/osmosis/pull/544) Update total liquidity tracking to be denom basis, lowering create pool and join pool gas.
-* [\#540](https://github.com/osmosis-labs/osmosis/pull/540) Fix git lfs links
-* [\#517](https://github.com/osmosis-labs/osmosis/pull/517) Linear time improvement for epoch time
-* [\#515](https://github.com/osmosis-labs/osmosis/pull/515) Add debug command for converting secp pubkeys
-* [\#510](https://github.com/osmosis-labs/osmosis/pull/510) Performance improvement for gauge distribution
-* [\#505](https://github.com/osmosis-labs/osmosis/pull/505) Fix bug in incentives epoch distribution events, used to use raw address, now uses bech32 addr
-* [\#464](https://github.com/osmosis-labs/osmosis/pull/464) Increase maximum outbound peers for validator nodes
-* [\#444](https://github.com/osmosis-labs/osmosis/pull/444) Add script for state sync
-* [\#409](https://github.com/osmosis-labs/osmosis/pull/409) Reduce epoch time growth rate for re-locking assets
+- {In the Osmosis-labs SDK fork}
+  - Increase default IAVL cache size to be in the hundred megabyte range
+  - Significantly improve CacheKVStore speed problems, reduced IBC upgrade time from 2hrs to 5min
+  - Add debug info to make it clear whats happening during upgrade
+- (From a series of commits) Fixes to the claims module to only do the reclaim logic once, not every block.
+- (From a series of commits) More logging to the claims module.
+- [\#563](https://github.com/osmosis-labs/osmosis/pull/563) Allow zero-weight pool-incentive distribution records
+- [\#562](https://github.com/osmosis-labs/osmosis/pull/562) Store block height in epochs module for easier debugging
+- [\#544](https://github.com/osmosis-labs/osmosis/pull/544) Update total liquidity tracking to be denom basis, lowering create pool and join pool gas.
+- [\#540](https://github.com/osmosis-labs/osmosis/pull/540) Fix git lfs links
+- [\#517](https://github.com/osmosis-labs/osmosis/pull/517) Linear time improvement for epoch time
+- [\#515](https://github.com/osmosis-labs/osmosis/pull/515) Add debug command for converting secp pubkeys
+- [\#510](https://github.com/osmosis-labs/osmosis/pull/510) Performance improvement for gauge distribution
+- [\#505](https://github.com/osmosis-labs/osmosis/pull/505) Fix bug in incentives epoch distribution events, used to use raw address, now uses bech32 addr
+- [\#464](https://github.com/osmosis-labs/osmosis/pull/464) Increase maximum outbound peers for validator nodes
+- [\#444](https://github.com/osmosis-labs/osmosis/pull/444) Add script for state sync
+- [\#409](https://github.com/osmosis-labs/osmosis/pull/409) Reduce epoch time growth rate for re-locking assets
 
 ## [v4.0.0]
 
-* Significantly speedup epoch times
-* Fix bug in the lockup module code that caused it to take a linear amount of gas.
-* Make unbonding tokens from the lockup module get automatically claimed when unbonding is done.
-* Add events for all tx types in the gamm module.
-* Add events for adding LP rewards.
-* Make queries to bank total chain balance account for developer vesting correctly.
-* Add ability for nodes to query the total amount locked for each denomination.
-* Embedded seeds in init.go
-* Added changelog and info about changelog format.
-* Fix accumulation store only counting bonded tokens, not unbonding tokens, that prevented the front-end from using more correct APY estimates. (Previously, the front-end could only underestimate rewards)
+- Significantly speedup epoch times
+- Fix bug in the lockup module code that caused it to take a linear amount of gas.
+- Make unbonding tokens from the lockup module get automatically claimed when unbonding is done.
+- Add events for all tx types in the gamm module.
+- Add events for adding LP rewards.
+- Make queries to bank total chain balance account for developer vesting correctly.
+- Add ability for nodes to query the total amount locked for each denomination.
+- Embedded seeds in init.go
+- Added changelog and info about changelog format.
+- Fix accumulation store only counting bonded tokens, not unbonding tokens, that prevented the front-end from using more correct APY estimates. (Previously, the front-end could only underestimate rewards)
 
 ## [v3.2.0](https://github.com/osmosis/osmosis-labs/releases/tag/v2.0.0) - 2021-06-28
 
-* Update the cosmos-sdk version we modify to v0.42.9
-* Fix a bug in the min commission rate code that allows validators to be created with commission rates less than the minimum.
-* Automatically upgrade any validator with less than the minimum comission rate to the minimum at upgrade time.
-* Unbrick on-chain governance, by fixing the deposit parameter to use `uosmo` instead of `osmo`.
+- Update the cosmos-sdk version we modify to v0.42.9
+- Fix a bug in the min commission rate code that allows validators to be created with commission rates less than the minimum.
+- Automatically upgrade any validator with less than the minimum comission rate to the minimum at upgrade time.
+- Unbrick on-chain governance, by fixing the deposit parameter to use `uosmo` instead of `osmo`.
 
 ## [v1.0.2](https://github.com/osmosis/osmosis-labs/releases/tag/v1.0.2) - 2021-06-18
 

app/ante.go

@@ -1,11 +1,8 @@
 package app
 
 import (
-	"fmt"
-
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -28,14 +25,11 @@ func NewAnteHandler(
 	signModeHandler signing.SignModeHandler,
 	channelKeeper channelkeeper.Keeper,
 ) sdk.AnteHandler {
-	mempoolFeeDecorator := txfeeskeeper.NewMempoolFeeDecorator(*txFeesKeeper)
-	// Optional if anyone else is using this repo. Primarily of impact for Osmosis.
-	// TODO: Abstract this better
-	mempoolFeeDecorator.SetArbMinGasFee(parseArbGasFromConfig(appOpts))
+	mempoolFeeOptions := txfeestypes.NewMempoolFeeOptions(appOpts)
+	mempoolFeeDecorator := txfeeskeeper.NewMempoolFeeDecorator(*txFeesKeeper, mempoolFeeOptions)
 	return sdk.ChainAnteDecorators(
 		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		ante.NewRejectExtensionOptionsDecorator(),
-		NewMempoolMaxGasPerTxDecorator(),
 		// Use Mempool Fee Decorator from our txfees module instead of default one from auth
 		// https://github.com/cosmos/cosmos-sdk/blob/master/x/auth/middleware/fee.go#L34
 		mempoolFeeDecorator,
@@ -52,57 +46,3 @@ func NewAnteHandler(
 		ibcante.NewAnteDecorator(channelKeeper),
 	)
 }
-
-// TODO: Abstract this function better. We likely need a parse `osmosis-mempool` config section.
-func parseArbGasFromConfig(appOpts servertypes.AppOptions) sdk.Dec {
-	arbMinFeeInterface := appOpts.Get("osmosis-mempool.arbitrage-min-gas-fee")
-	arbMinFee := txfeeskeeper.DefaultArbMinGasFee
-	if arbMinFeeInterface != nil {
-		arbMinFeeStr, ok := arbMinFeeInterface.(string)
-		if !ok {
-			panic("invalidly configured osmosis-mempool.arbitrage-min-gas-fee")
-		}
-		var err error
-		// pre-pend 0 to allow the config to start with a decimal, e.g. ".01"
-		arbMinFee, err = sdk.NewDecFromStr("0" + arbMinFeeStr)
-		if err != nil {
-			panic(fmt.Errorf("invalidly configured osmosis-mempool.arbitrage-min-gas-fee, err= %v", err))
-		}
-	}
-	return arbMinFee
-}
-
-// NewMempoolMaxGasPerTxDecorator will check if the transaction's gas
-// is greater than the local validator's max_gas_wanted_per_tx.
-// TODO: max_gas_per_tx is hardcoded here, should move to being defined in app.toml.
-// If gas_wanted is too high, decorator returns error and tx is rejected from mempool.
-// Note this only applies when ctx.CheckTx = true
-// If gas is sufficiently low or not CheckTx, then call next AnteHandler
-// CONTRACT: Tx must implement FeeTx to use MempoolMaxGasPerTxDecorator
-type MempoolMaxGasPerTxDecorator struct{}
-
-func NewMempoolMaxGasPerTxDecorator() MempoolMaxGasPerTxDecorator {
-	return MempoolMaxGasPerTxDecorator{}
-}
-
-func (mgd MempoolMaxGasPerTxDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	feeTx, ok := tx.(sdk.FeeTx)
-	if !ok {
-		return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
-	}
-
-	gas := feeTx.GetGas()
-	// maximum gas wanted per tx set to 25M
-	max_gas_wanted_per_tx := uint64(25000000)
-
-	// Ensure that the provided gas is less than the maximum gas per tx.
-	// if this is a CheckTx. This is only for local mempool purposes, and thus
-	// is only ran on check tx.
-	if ctx.IsCheckTx() && !simulate {
-		if gas > max_gas_wanted_per_tx {
-			return ctx, sdkerrors.Wrapf(sdkerrors.ErrOutOfGas, "Too much gas wanted: %d, maximum is 25,000,000", gas)
-		}
-	}
-
-	return next(ctx, tx, simulate)
-}

cmd/osmosisd/cmd/root.go

@@ -110,9 +110,17 @@ func initAppConfig() (string, interface{}) {
 ###############################################################################
 
 [osmosis-mempool]
+# This is the max allowed gas any tx. 
+# This is only for local mempool purposes, and thus	is only ran on check tx.
+max-gas-wanted-per-tx = "25000000"
+
 # This is the minimum gas fee any arbitrage tx should have, denominated in uosmo per gas
 # Default value of ".005" then means that a tx with 1 million gas costs (.005 uosmo/gas) * 1_000_000 gas = .005 osmo
 arbitrage-min-gas-fee = ".005"
+
+# This is the minimum gas fee any tx with high gas demand should have, denominated in uosmo per gas
+# Default value of ".0025" then means that a tx with 1 million gas costs (.0025 uosmo/gas) * 1_000_000 gas = .0025 osmo
+min-gas-price-for-high-gas-tx = ".0025"
 `
 
 	return OsmosisAppTemplate, OsmosisAppCfg

x/txfees/README.md

@@ -28,6 +28,8 @@ Currently the only supported metadata & spot price calculator is using a GAMM po
   * Contains both JoinPool and ExitPool messages in one tx.
     * Has some false positives.
   * These false positives seem like they primarily will get hit during batching of many distinct operations, not really in one atomic action.
+* A max wanted gas per any tx can be set to filter out attack txes.
+* If tx wanted gas > than predefined threshold of 1M, then separate 'min-gas-price-for-high-gas-tx' option used to calculate min gas price.
 
 ## New SDK messages