fix

x/feemarket/post/expected_keeper.go

@@ -50,7 +50,7 @@ type FeeMarketKeeper interface {
 
 // ConsensusKeeper defines the expected consensus keeper (noalias)
 //
-//go:generate mockery --name ConsensusKeeper --filename mock_conensus_keeper.go
+//go:generate mockery --name ConsensusKeeper --filename mock_consensus_keeper.go
 type ConsensusKeeper interface {
 	Get(ctx sdk.Context) (*tmproto.ConsensusParams, error)
 }

x/feemarket/post/fee.go

@@ -103,17 +103,20 @@ func (dfd FeeMarketDeductDecorator) PostHandle(ctx sdk.Context, tx sdk.Tx, simul
 
 	consensusParams, err := dfd.consensusParamsKeeper.Get(ctx)
 	if err != nil {
-		return ctx, errorsmod.Wrapf(err, "unable to gen consensus params")
+		return ctx, sdkerrors.ErrKeyNotFound.Wrap(err.Error())
 	}
 
 	maxGas := params.MaxBlockUtilization
 	if consensusParams.Block.MaxGas < int64(params.MaxBlockUtilization) && consensusParams.Block.MaxGas >= 0 {
 		maxGas = uint64(consensusParams.Block.MaxGas)
+		ctx.Logger().Info("using consensus params max gas",
+			"max gas", maxGas,
+		)
 	}
 
 	err = state.Update(gas, maxGas)
 	if err != nil {
-		return ctx, errorsmod.Wrapf(err, "unable to update fee market state")
+		return ctx, errorsmod.Wrapf(sdkerrors.ErrTxTooLarge, err.Error())
 	}
 
 	err = dfd.feemarketKeeper.SetState(ctx, state)

x/feemarket/post/fee_test.go

@@ -1,9 +1,12 @@
 package post_test
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
+	testkeeper "github.com/skip-mev/feemarket/testutils/keeper"
+
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/stretchr/testify/mock"
@@ -143,11 +146,73 @@ func TestPostHandle(t *testing.T) {
 			ExpPass:  false,
 			ExpErr:   sdkerrors.ErrInvalidGasLimit,
 		},
+		{
+			Name: "error getting consensus params - should fail",
+			Malleate: func(s *antesuite.TestSuite) antesuite.TestCaseArgs {
+				accs := s.CreateTestAccounts(1)
+				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(nil, errors.New("invalid"))
+
+				return antesuite.TestCaseArgs{
+					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},
+					GasLimit:  gasLimit,
+					FeeAmount: validFee,
+				}
+			},
+			RunAnte:  true,
+			RunPost:  true,
+			Simulate: false,
+			ExpPass:  false,
+			ExpErr:   sdkerrors.ErrKeyNotFound,
+		},
+		{
+			Name: "using consensus params for invalid gas limit (exceeds max gas)",
+			Malleate: func(s *antesuite.TestSuite) antesuite.TestCaseArgs {
+				accs := s.CreateTestAccounts(1)
+				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
+				params := testkeeper.ConsensusParams
+				params.Block.MaxGas = 10 // use tiny gas so that max gas is exceeded
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(params, nil)
+
+				return antesuite.TestCaseArgs{
+					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},
+					GasLimit:  gasLimit,
+					FeeAmount: validFee,
+				}
+			},
+			RunAnte:  true,
+			RunPost:  true,
+			Simulate: false,
+			ExpPass:  false,
+			ExpErr:   sdkerrors.ErrTxTooLarge,
+		},
+		{
+			Name: "using consensus params for max gas override - valid)",
+			Malleate: func(s *antesuite.TestSuite) antesuite.TestCaseArgs {
+				accs := s.CreateTestAccounts(1)
+				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
+				params := testkeeper.ConsensusParams
+				params.Block.MaxGas = int64(gasLimit - 1)
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(params, nil)
+
+				return antesuite.TestCaseArgs{
+					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},
+					GasLimit:  gasLimit,
+					FeeAmount: validFee,
+				}
+			},
+			RunAnte:  true,
+			RunPost:  true,
+			Simulate: false,
+			ExpPass:  true,
+			ExpErr:   nil,
+		},
 		{
 			Name: "signer has enough funds, should pass, no tip",
 			Malleate: func(s *antesuite.TestSuite) antesuite.TestCaseArgs {
 				accs := s.CreateTestAccounts(1)
 				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(testkeeper.ConsensusParams, nil)
 
 				return antesuite.TestCaseArgs{
 					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},
@@ -167,6 +232,7 @@ func TestPostHandle(t *testing.T) {
 				accs := s.CreateTestAccounts(1)
 				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
 				s.MockBankKeeper.On("SendCoins", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(testkeeper.ConsensusParams, nil)
 
 				return antesuite.TestCaseArgs{
 					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},
@@ -186,6 +252,7 @@ func TestPostHandle(t *testing.T) {
 				accs := s.CreateTestAccounts(1)
 				s.MockBankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, accs[0].Account.GetAddress(), types.FeeCollectorName, mock.Anything).Return(nil)
 				s.MockBankKeeper.On("SendCoins", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
+				s.MockConsensusParamsKeeper.On("Get", mock.Anything).Return(testkeeper.ConsensusParams, nil)
 
 				return antesuite.TestCaseArgs{
 					Msgs:      []sdk.Msg{testdata.NewTestMsg(accs[0].Account.GetAddress())},