fix: feemarket blackberry security update

app/ante/ante.go

@@ -32,6 +32,7 @@ type HandlerOptions struct {
 	FeeAbskeeper          feeabskeeper.Keeper
 	FeeMarketKeeper       feemarketante.FeeMarketKeeper
 	AccountKeeper         feemarketante.AccountKeeper
+	BankKeeper            feemarketante.BankKeeper
 }
 
 // NewAnteHandler constructor
@@ -63,6 +64,9 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
 		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		feemarketante.NewFeeMarketCheckDecorator( // fee market check replaces fee deduct decorator
+			options.AccountKeeper,
+			options.BankKeeper,
+			options.FeegrantKeeper,
 			options.FeeMarketKeeper,
 			ante.NewDeductFeeDecorator(
 				options.AccountKeeper,

app/ante/ante_test.go

@@ -1,6 +1,7 @@
 package ante
 
 import (
+	"github.com/stretchr/testify/mock"
 	"testing"
 
 	"github.com/osmosis-labs/fee-abstraction/v8/x/feeabs/types"
@@ -11,6 +12,7 @@ import (
 
 	"cosmossdk.io/errors"
 	math "cosmossdk.io/math"
+	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -45,7 +47,10 @@ func TestMempoolDecorator(t *testing.T) {
 		{
 			"valid native fee, should pass",
 			validFee,
-			func(suite *AnteTestSuite) {},
+			func(suite *AnteTestSuite) {
+				suite.bankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything,
+					feemarkettypes.FeeCollectorName, mock.Anything).Return(nil).Once()
+			},
 			nil,
 		},
 		{
@@ -56,6 +61,8 @@ func TestMempoolDecorator(t *testing.T) {
 				require.NoError(t, err)
 				suite.feeabsKeeper.SetTwapRate(suite.ctx, "ibcfee", math.LegacyNewDec(1))
 				suite.stakingKeeper.EXPECT().BondDenom(gomock.Any()).Return("ueve", nil).AnyTimes()
+				suite.bankKeeper.On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything,
+					feemarkettypes.FeeCollectorName, mock.Anything).Return(nil).Once()
 			},
 			nil,
 		},
@@ -93,11 +100,19 @@ func TestMempoolDecorator(t *testing.T) {
 			tc.malleate(suite)
 			suite.txBuilder.SetGasLimit(gasLimit)
 			suite.txBuilder.SetFeeAmount(tc.feeAmount)
+			accs := suite.CreateTestAccounts(1)
+			require.NoError(t, suite.txBuilder.SetMsgs([]sdk.Msg{testdata.NewTestMsg(accs[0].acc.GetAddress())}...))
+
 			suite.ctx = suite.ctx.WithMinGasPrices(minGasPrice)
 
 			// Construct tx and run through mempool decorator
 			tx := suite.txBuilder.GetTx()
-			feemarketDecorator := feemarketante.NewFeeMarketCheckDecorator(suite.feemarketKeeper, nil)
+			feemarketDecorator := feemarketante.NewFeeMarketCheckDecorator(
+				suite.accountKeeper,
+				suite.bankKeeper,
+				suite.feeGrantKeeper,
+				suite.feemarketKeeper,
+				nil)
 			antehandler := sdk.ChainAnteDecorators(feemarketDecorator)
 
 			// Run the ante handler

app/ante/suite.go

@@ -11,6 +11,7 @@ import (
 	feeabstestutil "github.com/osmosis-labs/fee-abstraction/v8/x/feeabs/testutil"
 	feeabstypes "github.com/osmosis-labs/fee-abstraction/v8/x/feeabs/types"
 	feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante"
+	feemarketmocks "github.com/skip-mev/feemarket/x/feemarket/ante/mocks"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 	"github.com/stretchr/testify/require"
@@ -45,7 +46,7 @@ type AnteTestSuite struct {
 	clientCtx       client.Context
 	txBuilder       client.TxBuilder
 	accountKeeper   authkeeper.AccountKeeper
-	bankKeeper      *feeabstestutil.MockBankKeeper
+	bankKeeper      *feemarketmocks.BankKeeper
 	feeGrantKeeper  *feeabstestutil.MockFeegrantKeeper
 	stakingKeeper   *feeabstestutil.MockStakingKeeper
 	feeabsKeeper    feeabskeeper.Keeper
@@ -65,7 +66,7 @@ func SetupTestSuite(t *testing.T, isCheckTx bool) *AnteTestSuite {
 	govAuthority := authtypes.NewModuleAddress("gov").String()
 
 	// Setup mock keepers
-	suite.bankKeeper = feeabstestutil.NewMockBankKeeper(ctrl)
+	suite.bankKeeper = feemarketmocks.NewBankKeeper(t)
 	suite.stakingKeeper = feeabstestutil.NewMockStakingKeeper(ctrl)
 	suite.feeGrantKeeper = feeabstestutil.NewMockFeegrantKeeper(ctrl)
 	suite.channelKeeper = feeabstestutil.NewMockChannelKeeper(ctrl)
@@ -99,7 +100,8 @@ func SetupTestSuite(t *testing.T, isCheckTx bool) *AnteTestSuite {
 	suite.encCfg.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
 	testdata.RegisterInterfaces(suite.encCfg.InterfaceRegistry)
 	suite.accountKeeper = authkeeper.NewAccountKeeper(
-		suite.encCfg.Codec, runtime.NewKVStoreService(key), authtypes.ProtoBaseAccount, maccPerms, authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), sdk.Bech32MainPrefix, govAuthority,
+		suite.encCfg.Codec, runtime.NewKVStoreService(authKey), authtypes.ProtoBaseAccount, maccPerms,
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), sdk.Bech32MainPrefix, govAuthority,
 	)
 	suite.accountKeeper.SetModuleAccount(suite.ctx, authtypes.NewEmptyModuleAccount(feeabstypes.ModuleName))
 	// Setup feeabs keeper

app/app.go

@@ -1114,7 +1114,6 @@ func (app *EveApp) setPostHandler() {
 	postHandler := feemarketapp.PostHandlerOptions{
 		AccountKeeper:   app.AccountKeeper,
 		BankKeeper:      app.BankKeeper,
-		FeeGrantKeeper:  app.FeeGrantKeeper,
 		FeeMarketKeeper: app.FeeMarketKeeper,
 	}
 	// Set the PostHandler for the app
@@ -1380,7 +1379,6 @@ func NewPostHandler(options feemarketapp.PostHandlerOptions) (sdk.PostHandler, e
 		feemarketpost.NewFeeMarketDeductDecorator(
 			options.AccountKeeper,
 			options.BankKeeper,
-			options.FeeGrantKeeper,
 			options.FeeMarketKeeper,
 		),
 	}

go.mod

@@ -1,16 +1,16 @@
 module github.com/eve-network/eve
 
-go 1.22.3
+go 1.22.6
 
-toolchain go1.22.4
+toolchain go1.23.0
 
 require (
 	github.com/CosmWasm/wasmd v0.52.0
 	github.com/CosmWasm/wasmvm/v2 v2.1.2
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
-	github.com/cosmos/cosmos-sdk v0.50.8
+	github.com/cosmos/cosmos-sdk v0.50.9
 	github.com/cosmos/gogogateway v1.2.0 // indirect
-	github.com/cosmos/gogoproto v1.5.0
+	github.com/cosmos/gogoproto v1.6.0
 	github.com/cosmos/iavl v1.2.0 // indirect
 	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
@@ -28,14 +28,14 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
-	google.golang.org/grpc v1.64.1 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 require (
 	cosmossdk.io/api v0.7.5
 	cosmossdk.io/client/v2 v2.0.0-beta.1
-	cosmossdk.io/core v0.11.0
+	cosmossdk.io/core v0.11.1
 	cosmossdk.io/errors v1.0.1
 	cosmossdk.io/log v1.3.1
 	cosmossdk.io/math v1.3.0
@@ -54,7 +54,7 @@ require (
 	github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.2.1-0.20240523101951-4b45d1822fb6
 	github.com/cosmos/ibc-go/v8 v8.4.0
 	github.com/osmosis-labs/tokenfactory v0.0.0-20240310155926-981fbeb0fe42
-	github.com/skip-mev/feemarket v1.0.4
+	github.com/skip-mev/feemarket v1.1.0
 	github.com/terra-money/alliance v0.4.3
 	go.uber.org/mock v0.4.0
 )
@@ -67,7 +67,7 @@ require (
 	cloud.google.com/go/iam v1.1.8 // indirect
 	cloud.google.com/go/storage v1.41.0 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
-	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
+	cosmossdk.io/depinject v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
@@ -185,6 +185,7 @@ require (
 	github.com/shamaton/msgpack/v2 v2.2.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
@@ -199,18 +200,18 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/oauth2 v0.20.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/api v0.180.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect