Consensus min gas fee of .0025 uosmo

x/txfees/keeper/feedecorator.go

@@ -71,22 +71,32 @@ func (mfd MempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
 		}
 	}
 
-	// If we are in CheckTx, this function is ran locally to determine if these fees are sufficient
-	// to enter our mempool.
-	// So we ensure that the provided fees meet a minimum threshold for the validator,
-	// converting every non-osmo specified asset into an osmo-equivalent amount, to determine sufficiency.
+	// Determine if these fees are sufficient for the tx to pass.
+	// if we are in block execution, we use the governance set parameter in
+	// https://www.mintscan.io/osmosis/proposals/354 . (.0025 Uosmo / gas)
+	// Once ABCI++ Process Proposal lands, we can have block validity conditions enforce this.
+	minBaseGasPrice := sdk.NewDecWithPrec(25, 4)
+
+	// If we are in CheckTx, a separate function is ran locally to ensure sufficient fees for entering our mempool.
+	// So we ensure that the provided fees meet a minimum threshold for the validator
 	if (ctx.IsCheckTx() || ctx.IsReCheckTx()) && !simulate {
-		minBaseGasPrice := mfd.GetMinBaseGasPriceForTx(ctx, baseDenom, feeTx)
-		if !(minBaseGasPrice.IsZero()) {
-			// You should only be able to pay with one fee token in a single tx
-			if len(feeCoins) != 1 {
-				return ctx, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "no fee attached")
-			}
-			err = mfd.TxFeesKeeper.IsSufficientFee(ctx, minBaseGasPrice, feeTx.GetGas(), feeCoins[0])
-			if err != nil {
-				return ctx, err
-			}
-		}
+		minBaseGasPrice = sdk.MaxDec(minBaseGasPrice, mfd.GetMinBaseGasPriceForTx(ctx, baseDenom, feeTx))
+	}
+
+	// If minBaseGasPrice is zero, then we don't need to check the fee. Continue
+	if minBaseGasPrice.IsZero() {
+		return next(ctx, tx, simulate)
+	}
+	// You should only be able to pay with one fee token in a single tx
+	if len(feeCoins) != 1 {
+		return ctx, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee,
+			"Expected 1 fee denom attached, got %d", len(feeCoins))
+	}
+	// The minimum base gas price is in uosmo, convert the fee denom's worth to uosmo terms.
+	// Then compare if its sufficient for paying the tx fee.
+	err = mfd.TxFeesKeeper.IsSufficientFee(ctx, minBaseGasPrice, feeTx.GetGas(), feeCoins[0])
+	if err != nil {
+		return ctx, err
 	}
 
 	return next(ctx, tx, simulate)

x/txfees/keeper/feedecorator_test.go

@@ -1,6 +1,8 @@
 package keeper_test
 
 import (
+	"fmt"
+
 	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/simapp"
@@ -19,137 +21,92 @@ func (suite *KeeperTestSuite) TestFeeDecorator() {
 	mempoolFeeOpts := types.NewDefaultMempoolFeeOptions()
 	mempoolFeeOpts.MinGasPriceForHighGasTx = sdk.MustNewDecFromStr("0.0025")
 	baseDenom, _ := suite.App.TxFeesKeeper.GetBaseDenom(suite.Ctx)
+	baseGas := uint64(10000)
+	consensusMinFeeAmt := int64(25)
 
+	// uion is setup with a relative price of 1:1
 	uion := "uion"
 
-	uionPoolId := suite.PrepareBalancerPoolWithCoins(
-		sdk.NewInt64Coin(sdk.DefaultBondDenom, 500),
-		sdk.NewInt64Coin(uion, 500),
-	)
-	suite.ExecuteUpgradeFeeTokenProposal(uion, uionPoolId)
-
-	tests := []struct {
+	type testcase struct {
 		name         string
 		txFee        sdk.Coins
-		minGasPrices sdk.DecCoins
-		gasRequested uint64
+		minGasPrices sdk.DecCoins // if blank, set to 0
+		gasRequested uint64       // if blank, set to base gas
 		isCheckTx    bool
 		expectPass   bool
-		baseDenomGas bool
-	}{
-		{
-			name:         "no min gas price - checktx",
-			txFee:        sdk.NewCoins(),
-			minGasPrices: sdk.NewDecCoins(),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   true,
-			baseDenomGas: true,
-		},
-		{
-			name:         "no min gas price - delivertx",
-			txFee:        sdk.NewCoins(),
-			minGasPrices: sdk.NewDecCoins(),
-			gasRequested: 10000,
-			isCheckTx:    false,
-			expectPass:   true,
-			baseDenomGas: true,
-		},
+	}
+
+	tests := []testcase{}
+	txType := []string{"delivertx", "checktx"}
+	succesType := []string{"does", "doesn't"}
+	for isCheckTx := 0; isCheckTx <= 1; isCheckTx++ {
+		tests = append(tests, []testcase{
+			{
+				name:       fmt.Sprintf("no min gas price - %s. Fails w/ consensus minimum", txType[isCheckTx]),
+				txFee:      sdk.NewCoins(),
+				isCheckTx:  isCheckTx == 1,
+				expectPass: false,
+			},
+			{
+				name:       fmt.Sprintf("Consensus min gas price - %s", txType[isCheckTx]),
+				txFee:      sdk.NewCoins(sdk.NewInt64Coin(baseDenom, consensusMinFeeAmt)),
+				isCheckTx:  isCheckTx == 1,
+				expectPass: true,
+			},
+			{
+				name:       fmt.Sprintf("multiple fee coins - %s", txType[isCheckTx]),
+				txFee:      sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1), sdk.NewInt64Coin(uion, 1)),
+				isCheckTx:  isCheckTx == 1,
+				expectPass: false,
+			},
+			{
+				name:  fmt.Sprintf("%s work with insufficient mempool fee in %s", succesType[isCheckTx], txType[isCheckTx]),
+				txFee: sdk.NewCoins(sdk.NewInt64Coin(baseDenom, consensusMinFeeAmt)), // consensus minimum
+				minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
+					sdk.MustNewDecFromStr("0.1"))),
+				isCheckTx:  isCheckTx == 1,
+				expectPass: isCheckTx != 1,
+			},
+			{
+				name:  fmt.Sprintf("%s work with insufficient converted mempool fee in %s", succesType[isCheckTx], txType[isCheckTx]),
+				txFee: sdk.NewCoins(sdk.NewInt64Coin(uion, 25)), // consensus minimum
+				minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
+					sdk.MustNewDecFromStr("0.1"))),
+				isCheckTx:  isCheckTx == 1,
+				expectPass: isCheckTx != 1,
+			},
+		}...)
+	}
+
+	custTests := []testcase{
 		{
 			name:  "works with valid basedenom fee",
 			txFee: sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1000)),
 			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
 				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   true,
-			baseDenomGas: true,
-		},
-		{
-			name:  "doesn't work with not enough fee in checktx",
-			txFee: sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1)),
-			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
-				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   false,
-			baseDenomGas: true,
-		},
-		{
-			name:  "works with not enough fee in delivertx",
-			txFee: sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1)),
-			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
-				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    false,
-			expectPass:   true,
-			baseDenomGas: true,
+			isCheckTx:  true,
+			expectPass: true,
 		},
 		{
 			name:  "works with valid converted fee",
 			txFee: sdk.NewCoins(sdk.NewInt64Coin(uion, 1000)),
 			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
 				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   true,
-			baseDenomGas: false,
+			isCheckTx:  true,
+			expectPass: true,
 		},
 		{
-			name:  "doesn't work with not enough converted fee in checktx",
-			txFee: sdk.NewCoins(sdk.NewInt64Coin(uion, 1)),
-			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
-				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   false,
-			baseDenomGas: false,
-		},
-		{
-			name:  "works with not enough converted fee in delivertx",
-			txFee: sdk.NewCoins(sdk.NewInt64Coin(uion, 1)),
-			minGasPrices: sdk.NewDecCoins(sdk.NewDecCoinFromDec(baseDenom,
-				sdk.MustNewDecFromStr("0.1"))),
-			gasRequested: 10000,
-			isCheckTx:    false,
-			expectPass:   true,
-			baseDenomGas: false,
-		},
-		{
-			name:         "multiple fee coins - checktx",
-			txFee:        sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1), sdk.NewInt64Coin(uion, 1)),
-			minGasPrices: sdk.NewDecCoins(),
-			gasRequested: 10000,
-			isCheckTx:    true,
-			expectPass:   false,
-			baseDenomGas: false,
-		},
-		{
-			name:         "multiple fee coins - delivertx",
-			txFee:        sdk.NewCoins(sdk.NewInt64Coin(baseDenom, 1), sdk.NewInt64Coin(uion, 1)),
-			minGasPrices: sdk.NewDecCoins(),
-			gasRequested: 10000,
-			isCheckTx:    false,
-			expectPass:   false,
-			baseDenomGas: false,
-		},
-		{
-			name:         "invalid fee denom",
-			txFee:        sdk.NewCoins(sdk.NewInt64Coin("moo", 1)),
-			minGasPrices: sdk.NewDecCoins(),
-			gasRequested: 10000,
-			isCheckTx:    false,
-			expectPass:   false,
-			baseDenomGas: false,
+			name:       "invalid fee denom",
+			txFee:      sdk.NewCoins(sdk.NewInt64Coin("moooooo", 1000)),
+			isCheckTx:  false,
+			expectPass: false,
 		},
 		{
 			name:         "mingasprice not containing basedenom gets treated as min gas price 0",
-			txFee:        sdk.NewCoins(sdk.NewInt64Coin(uion, 100000000)),
-			minGasPrices: sdk.NewDecCoins(sdk.NewInt64DecCoin(uion, 1)),
-			gasRequested: 10000,
+			txFee:        sdk.NewCoins(sdk.NewInt64Coin(uion, 1000)),
+			minGasPrices: sdk.NewDecCoins(sdk.NewInt64DecCoin(uion, 1000000)),
 			isCheckTx:    true,
 			expectPass:   true,
-			baseDenomGas: false,
 		},
 		{
 			name:         "tx with gas wanted more than allowed should not pass",
@@ -158,7 +115,6 @@ func (suite *KeeperTestSuite) TestFeeDecorator() {
 			gasRequested: mempoolFeeOpts.MaxGasWantedPerTx + 1,
 			isCheckTx:    true,
 			expectPass:   false,
-			baseDenomGas: false,
 		},
 		{
 			name:         "tx with high gas and not enough fee should no pass",
@@ -167,7 +123,6 @@ func (suite *KeeperTestSuite) TestFeeDecorator() {
 			gasRequested: mempoolFeeOpts.HighGasTxThreshold,
 			isCheckTx:    true,
 			expectPass:   false,
-			baseDenomGas: false,
 		},
 		{
 			name:         "tx with high gas and enough fee should pass",
@@ -176,23 +131,31 @@ func (suite *KeeperTestSuite) TestFeeDecorator() {
 			gasRequested: mempoolFeeOpts.HighGasTxThreshold,
 			isCheckTx:    true,
 			expectPass:   true,
-			baseDenomGas: false,
 		},
 	}
+	tests = append(tests, custTests...)
 
 	for _, tc := range tests {
 		// reset pool and accounts for each test
 		suite.SetupTest(false)
 		suite.Run(tc.name, func() {
+			// setup uion with 1:1 fee
 			uionPoolId := suite.PrepareBalancerPoolWithCoins(
 				sdk.NewInt64Coin(sdk.DefaultBondDenom, 500),
 				sdk.NewInt64Coin(uion, 500),
 			)
 			suite.ExecuteUpgradeFeeTokenProposal(uion, uionPoolId)
 
+			if tc.minGasPrices == nil {
+				tc.minGasPrices = sdk.NewDecCoins()
+			}
+			if tc.gasRequested == 0 {
+				tc.gasRequested = baseGas
+			}
 			suite.Ctx = suite.Ctx.WithIsCheckTx(tc.isCheckTx).WithMinGasPrices(tc.minGasPrices)
 			suite.Ctx = suite.Ctx.WithMinGasPrices(tc.minGasPrices)
 
+			// TODO: Cleanup this code.
 			// TxBuilder components reset for every test case
 			txBuilder := suite.clientCtx.TxConfig.NewTxBuilder()
 			priv0, _, addr0 := testdata.KeyTestPubAddr()
@@ -226,11 +189,13 @@ func (suite *KeeperTestSuite) TestFeeDecorator() {
 			_, err := antehandlerMFD(suite.Ctx, tx, false)
 
 			if tc.expectPass {
-				if tc.baseDenomGas && !tc.txFee.IsZero() {
-					moduleAddr := suite.App.AccountKeeper.GetModuleAddress(types.FeeCollectorName)
-					suite.Require().Equal(tc.txFee[0], suite.App.BankKeeper.GetBalance(suite.Ctx, moduleAddr, baseDenom), tc.name)
-				} else if !tc.txFee.IsZero() {
-					moduleAddr := suite.App.AccountKeeper.GetModuleAddress(types.NonNativeFeeCollectorName)
+				// ensure fee was collected
+				if !tc.txFee.IsZero() {
+					moduleName := types.FeeCollectorName
+					if tc.txFee[0].Denom != baseDenom {
+						moduleName = types.NonNativeFeeCollectorName
+					}
+					moduleAddr := suite.App.AccountKeeper.GetModuleAddress(moduleName)
 					suite.Require().Equal(tc.txFee[0], suite.App.BankKeeper.GetBalance(suite.Ctx, moduleAddr, tc.txFee[0].Denom), tc.name)
 				}
 				suite.Require().NoError(err, "test: %s", tc.name)