refactor(x/feegrant): Rewrite feegrant ante handler as tx validator

x/feegrant/expected_keepers.go

@@ -4,12 +4,15 @@ import (
 	"context"
 
 	"cosmossdk.io/core/address"
+	"cosmossdk.io/x/auth/ante"
+	authtypes "cosmossdk.io/x/auth/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // AccountKeeper defines the expected auth Account Keeper (noalias)
 type AccountKeeper interface {
+	ante.AccountKeeper
 	AddressCodec() address.Codec
 
 	GetModuleAddress(moduleName string) sdk.AccAddress
@@ -22,6 +25,7 @@ type AccountKeeper interface {
 
 // BankKeeper defines the expected supply Keeper (noalias)
 type BankKeeper interface {
+	authtypes.BankKeeper
 	SpendableCoins(ctx context.Context, addr sdk.AccAddress) sdk.Coins
 	SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 }

x/feegrant/module/module.go

@@ -13,13 +13,17 @@ import (
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/errors"
+	"cosmossdk.io/runtime/v2"
+	"cosmossdk.io/x/auth/ante"
 	"cosmossdk.io/x/feegrant"
 	"cosmossdk.io/x/feegrant/client/cli"
 	"cosmossdk.io/x/feegrant/keeper"
+	"cosmossdk.io/x/tx/decode"
 
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 )
 
@@ -31,10 +35,11 @@ var (
 	_ module.AppModuleSimulation   = AppModule{}
 	_ module.HasGenesis            = AppModule{}
 
-	_ appmodulev2.AppModule     = AppModule{}
-	_ appmodulev2.HasEndBlocker = AppModule{}
-	_ appmodule.HasServices     = AppModule{}
-	_ appmodulev2.HasMigrations = AppModule{}
+	_ appmodulev2.AppModule                       = AppModule{}
+	_ appmodulev2.HasEndBlocker                   = AppModule{}
+	_ appmodule.HasServices                       = AppModule{}
+	_ appmodulev2.HasMigrations                   = AppModule{}
+	_ appmodulev2.HasTxValidation[transaction.Tx] = AppModule{}
 )
 
 // AppModule implements an application module for the feegrant module.
@@ -97,7 +102,7 @@ func (am AppModule) RegisterServices(registrar grpc.ServiceRegistrar) error {
 }
 
 // RegisterMigrations registers module migrations.
-func (am AppModule) RegisterMigrations(mr appmodule.MigrationRegistrar) error {
+func (am AppModule) RegisterMigrations(mr appmodulev2.MigrationRegistrar) error {
 	m := keeper.NewMigrator(am.keeper)
 
 	if err := mr.Register(feegrant.ModuleName, 1, m.Migrate1to2); err != nil {
@@ -153,7 +158,17 @@ func (am AppModule) EndBlock(ctx context.Context) error {
 
 // TxValidator implements appmodule.HasTxValidation.
 // It replaces auth ante handlers for server/v2
-func (am AppModule) TxValidator(ctx context.Context, tx transaction.Tx) error {
-	// TODO in follow-up
-	return nil
+func (am AppModule) TxValidator(ctx context.Context, tx decode.DecodedTx) error {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+
+	// supports legacy ante handler
+	// eventually do the reverse, write ante handler as TxValidator
+	anteDecorators := []sdk.AnteDecorator{
+		ante.NewDeductFeeDecorator(am.accountKeeper, am.bankKeeper, &am.keeper, nil),
+	}
+
+	anteHandler := sdk.ChainAnteDecorators(anteDecorators...)
+	_, err := anteHandler(sdkCtx, runtime.ServerTxToSDKTx(tx), sdkCtx.ExecMode() == sdk.ExecModeSimulate)
+
+	return err
 }

x/tx/decode/decode.go

@@ -8,6 +8,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	v1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
+	"cosmossdk.io/core/transaction"
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/x/tx/signing"
 )
@@ -21,6 +22,8 @@ type DecodedTx struct {
 	TxBodyHasUnknownNonCriticals bool
 }
 
+var _ transaction.Tx = &DecodedTx{}
+
 // Decoder contains the dependencies required for decoding transactions.
 type Decoder struct {
 	signingCtx *signing.Context
@@ -129,7 +132,7 @@ func (d *Decoder) Decode(txBytes []byte) (*DecodedTx, error) {
 }
 
 // Hash implements the interface for the Tx interface.
-func (dtx *DecodedTx) Hash() [32]byte {
+func (dtx DecodedTx) Hash() [32]byte {
 	bz, err := proto.Marshal(dtx.TxRaw)
 	if err != nil {
 		panic(err)
@@ -138,14 +141,18 @@ func (dtx *DecodedTx) Hash() [32]byte {
 	return sha256.Sum256(bz)
 }
 
-func (dtx *DecodedTx) GetGasLimit() uint64 {
+func (dtx DecodedTx) GetGasLimit() uint64 {
 	return dtx.Tx.AuthInfo.Fee.GasLimit
 }
 
-func (dtx *DecodedTx) GetMessages() []proto.Message {
+func (dtx DecodedTx) GetMessages() []proto.Message {
 	return dtx.Messages
 }
 
-func (dtx *DecodedTx) GetSenders() [][]byte {
+func (dtx DecodedTx) GetSenders() [][]byte {
 	return dtx.Signers
 }
+
+func (dtx DecodedTx) Bytes() []byte {
+	return dtx.TxRaw.BodyBytes
+}

x/tx/go.mod

@@ -25,6 +25,7 @@ require (
 	buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/net v0.21.0 // indirect
@@ -37,4 +38,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace cosmossdk.io/api => ../../api
+replace (
+	cosmossdk.io/api => ../../api
+	cosmossdk.io/core => ../../core
+)

x/tx/go.sum

@@ -2,8 +2,6 @@ buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20230509103710-5e5
 buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20230509103710-5e5b9fdd0180.1/go.mod h1:5GqIYthcy/ASmnKcaT26APpxMhZirnIHXHKki69zjWI=
 buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1 h1:VooqQ3rklp3PwMTAE890M76w/8Z01OPa7RdgU9posFE=
 buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1/go.mod h1:9KmeMJUsSG3IiIwK63Lh1ipZJrwd7KHrWZseJeHukcs=
-cosmossdk.io/core v0.11.0 h1:vtIafqUi+1ZNAE/oxLOQQ7Oek2n4S48SWLG8h/+wdbo=
-cosmossdk.io/core v0.11.0/go.mod h1:LaTtayWBSoacF5xNzoF8tmLhehqlA9z1SWiPuNC6X1w=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
@@ -12,6 +10,7 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48Od
 github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co=
 github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
 github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=