move feegrant ante to auth ante

simapp/app.go

@@ -56,7 +56,6 @@ import (
 	evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	feegrant "github.com/cosmos/cosmos-sdk/x/feegrant"
-	feegrantante "github.com/cosmos/cosmos-sdk/x/feegrant/ante"
 	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
 	feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -381,9 +380,13 @@ func NewSimApp(
 	app.SetInitChainer(app.InitChainer)
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetAnteHandler(
-		feegrantante.NewAnteHandler(
-			app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, ante.DefaultSigVerificationGasConsumer,
-			encodingConfig.TxConfig.SignModeHandler(),
+		ante.NewAnteHandler(
+			app.AccountKeeper, app.BankKeeper,
+			ante.HandlerOptions{
+				FeegrantKeeper:  &app.FeeGrantKeeper,
+				SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
+				SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
+			},
 		),
 	)
 	app.SetEndBlocker(app.EndBlocker)

x/auth/ante/ante.go

@@ -2,32 +2,52 @@ package ante
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
+	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
+	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
 )
 
+type DefaultSigVerificationGasConsumerHandler func(meter sdk.GasMeter, sig signing.SignatureV2, params types.Params) error
+
+// HandlerOptions are the options for ante handler build
+type HandlerOptions struct {
+	FeegrantKeeper  *feegrantkeeper.Keeper
+	SigGasConsumer  DefaultSigVerificationGasConsumerHandler
+	SignModeHandler authsigning.SignModeHandler
+}
+
 // NewAnteHandler returns an AnteHandler that checks and increments sequence
 // numbers, checks signatures & account numbers, and deducts fees from the first
 // signer.
 func NewAnteHandler(
-	ak AccountKeeper, bankKeeper types.BankKeeper,
-	sigGasConsumer SignatureVerificationGasConsumer,
-	signModeHandler signing.SignModeHandler,
+	ak AccountKeeper, bk types.BankKeeper,
+	anteHandlerOptions HandlerOptions,
 ) sdk.AnteHandler {
-	return sdk.ChainAnteDecorators(
+
+	var feeGrantAnteHandler sdk.AnteDecorator
+	feeGrantAnteHandler = NewRejectFeeGranterDecorator()
+
+	if anteHandlerOptions.FeegrantKeeper != nil {
+		feeGrantAnteHandler = NewDeductGrantedFeeDecorator(ak, bk, anteHandlerOptions.FeegrantKeeper)
+	}
+
+	anteDecorators := []sdk.AnteDecorator{
 		NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		NewRejectExtensionOptionsDecorator(),
 		NewMempoolFeeDecorator(),
 		NewValidateBasicDecorator(),
 		TxTimeoutHeightDecorator{},
 		NewValidateMemoDecorator(ak),
 		NewConsumeGasForTxSizeDecorator(ak),
-		NewRejectFeeGranterDecorator(),
+		feeGrantAnteHandler,
+		NewDeductFeeDecorator(ak, bk),
 		NewSetPubKeyDecorator(ak), // SetPubKeyDecorator must be called before all signature verification decorators
 		NewValidateSigCountDecorator(ak),
-		NewDeductFeeDecorator(ak, bankKeeper),
-		NewSigGasConsumeDecorator(ak, sigGasConsumer),
-		NewSigVerificationDecorator(ak, signModeHandler),
+		NewSigGasConsumeDecorator(ak, anteHandlerOptions.SigGasConsumer),
+		NewSigVerificationDecorator(ak, anteHandlerOptions.SignModeHandler),
 		NewIncrementSequenceDecorator(ak),
-	)
+	}
+
+	return sdk.ChainAnteDecorators(anteDecorators...)
 }

x/auth/ante/ante_test.go

@@ -1011,15 +1011,21 @@ func (suite *AnteTestSuite) TestCustomSignatureVerificationGasConsumer() {
 	suite.SetupTest(false) // setup
 
 	// setup an ante handler that only accepts PubKeyEd25519
-	suite.anteHandler = ante.NewAnteHandler(suite.app.AccountKeeper, suite.app.BankKeeper, func(meter sdk.GasMeter, sig signing.SignatureV2, params types.Params) error {
-		switch pubkey := sig.PubKey.(type) {
-		case *ed25519.PubKey:
-			meter.ConsumeGas(params.SigVerifyCostED25519, "ante verify: ed25519")
-			return nil
-		default:
-			return sdkerrors.Wrapf(sdkerrors.ErrInvalidPubKey, "unrecognized public key type: %T", pubkey)
-		}
-	}, suite.clientCtx.TxConfig.SignModeHandler())
+	suite.anteHandler = ante.NewAnteHandler(suite.app.AccountKeeper, suite.app.BankKeeper,
+		ante.HandlerOptions{
+			FeegrantKeeper: &suite.app.FeeGrantKeeper,
+			SigGasConsumer: func(meter sdk.GasMeter, sig signing.SignatureV2, params types.Params) error {
+				switch pubkey := sig.PubKey.(type) {
+				case *ed25519.PubKey:
+					meter.ConsumeGas(params.SigVerifyCostED25519, "ante verify: ed25519")
+					return nil
+				default:
+					return sdkerrors.Wrapf(sdkerrors.ErrInvalidPubKey, "unrecognized public key type: %T", pubkey)
+				}
+			},
+			SignModeHandler: suite.clientCtx.TxConfig.SignModeHandler(),
+		},
+	)
 
 	// Same data for every test cases
 	accounts := suite.CreateTestAccounts(1)

x/auth/ante/expected_keepers.go

@@ -12,4 +12,6 @@ type AccountKeeper interface {
 	GetAccount(ctx sdk.Context, addr sdk.AccAddress) types.AccountI
 	SetAccount(ctx sdk.Context, acc types.AccountI)
 	GetModuleAddress(moduleName string) sdk.AccAddress
+	GetModuleAccount(ctx sdk.Context, moduleName string) types.ModuleAccountI
+	NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) types.AccountI
 }

x/auth/ante/fee.go

@@ -81,6 +81,14 @@ func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
 	}
 
 	feePayer := feeTx.FeePayer()
+	feeGranter := feeTx.FeeGranter()
+
+	// if feegranter set deduct fee from feegranter account.
+	// this works with only when feegrant enabled.
+	if feeGranter != nil {
+		feePayer = feeGranter
+	}
+
 	feePayerAcc := dfd.ak.GetAccount(ctx, feePayer)
 
 	if feePayerAcc == nil {

x/feegrant/ante/fee.go → x/auth/ante/feegrant_ante.go

@@ -1,13 +1,9 @@
 package ante
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
+	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
 	"github.com/cosmos/cosmos-sdk/x/feegrant/types"
 )
 
@@ -17,11 +13,11 @@ import (
 // CONTRACT: Tx must implement GrantedFeeTx interface to use DeductGrantedFeeDecorator
 type DeductGrantedFeeDecorator struct {
 	ak types.AccountKeeper
-	k  keeper.Keeper
+	k  *feegrantkeeper.Keeper
 	bk types.BankKeeper
 }
 
-func NewDeductGrantedFeeDecorator(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) DeductGrantedFeeDecorator {
+func NewDeductGrantedFeeDecorator(ak types.AccountKeeper, bk types.BankKeeper, k *feegrantkeeper.Keeper) DeductGrantedFeeDecorator {
 	return DeductGrantedFeeDecorator{
 		ak: ak,
 		k:  k,
@@ -40,42 +36,17 @@ func (d DeductGrantedFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
 		return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a GrantedFeeTx")
 	}
 
-	// sanity check from DeductFeeDecorator
-	if addr := d.ak.GetModuleAddress(authtypes.FeeCollectorName); addr == nil {
-		panic(fmt.Sprintf("%s module account has not been set", authtypes.FeeCollectorName))
-	}
-
 	fee := feeTx.GetFee()
 	feePayer := feeTx.FeePayer()
 	feeGranter := feeTx.FeeGranter()
 
-	deductFeesFrom := feePayer
-
 	// ensure the grant is allowed, if we request a different fee payer
 	if feeGranter != nil && !feeGranter.Equals(feePayer) {
 		err := d.k.UseGrantedFees(ctx, feeGranter, feePayer, fee)
 		if err != nil {
 			return ctx, sdkerrors.Wrapf(err, "%s not allowed to pay fees from %s", feeGranter, feePayer)
 		}
 
-		deductFeesFrom = feeGranter
-	}
-
-	// now, either way, we know that we are authorized to deduct the fees from the deductFeesFrom account
-	deductFeesFromAcc := d.ak.GetAccount(ctx, deductFeesFrom)
-	if deductFeesFromAcc == nil {
-		return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnknownAddress, "fee payer address: %s does not exist", deductFeesFrom)
-	}
-
-	// move on if there is no fee to deduct
-	if fee.IsZero() {
-		return next(ctx, tx, simulate)
-	}
-
-	// deduct fee if non-zero
-	err = authante.DeductFees(d.bk, ctx, deductFeesFromAcc, fee)
-	if err != nil {
-		return ctx, err
 	}
 
 	return next(ctx, tx, simulate)