feat(x/rewards): Add fee burn

CHANGELOG.md

@@ -32,6 +32,7 @@ Contains all the PRs that improved the code without changing the behaviours.
 
 ### Added
 
+- [#422](https://github.com/archway-network/archway/pull/422/) - Add fee burning of tx fees not distributed to contracts.
 - [#419](https://github.com/archway-network/archway/pull/419) - Easily run localnet via make
 - [#421](https://github.com/archway-network/archway/pull/421) - Add archwayd darwin binaries
 

app/ante.go

@@ -22,8 +22,9 @@ import (
 type HandlerOptions struct {
 	ante.HandlerOptions
 
-	IBCKeeper  *ibckeeper.Keeper
-	WasmConfig *wasmTypes.WasmConfig
+	IBCKeeper             *ibckeeper.Keeper
+	WasmConfig            *wasmTypes.WasmConfig
+	RewardsAnteBankKeeper rewardsAnte.BankKeeper
 
 	TXCounterStoreKey sdk.StoreKey
 
@@ -76,7 +77,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		// Custom Archway interceptor to track new transactions
 		trackingAnte.NewTxGasTrackingDecorator(options.TrackingKeeper),
 		// Custom Archway fee deduction, which splits fees between x/rewards and x/auth fee collector
-		rewardsAnte.NewDeductFeeDecorator(options.Codec, options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.RewardsKeeper),
+		rewardsAnte.NewDeductFeeDecorator(options.Codec, options.AccountKeeper, options.RewardsAnteBankKeeper, options.FeegrantKeeper, options.RewardsKeeper),
 		// SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewSetPubKeyDecorator(options.AccountKeeper),
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),

app/app.go

@@ -225,7 +225,7 @@ var (
 	// module account permissions
 	maccPerms = map[string][]string{
 		rewardsTypes.ContractRewardCollector: nil,
-		authtypes.FeeCollectorName:           nil,
+		authtypes.FeeCollectorName:           {authtypes.Burner},
 		distrtypes.ModuleName:                nil,
 		minttypes.ModuleName:                 {authtypes.Minter},
 		stakingtypes.BondedPoolName:          {authtypes.Burner, authtypes.Staking},
@@ -799,11 +799,12 @@ func NewArchwayApp(
 				SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
 				SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
 			},
-			IBCKeeper:         app.IBCKeeper,
-			WasmConfig:        &wasmConfig,
-			TXCounterStoreKey: keys[wasm.StoreKey],
-			TrackingKeeper:    app.TrackingKeeper,
-			RewardsKeeper:     app.RewardsKeeper,
+			IBCKeeper:             app.IBCKeeper,
+			WasmConfig:            &wasmConfig,
+			RewardsAnteBankKeeper: app.BankKeeper,
+			TXCounterStoreKey:     keys[wasm.StoreKey],
+			TrackingKeeper:        app.TrackingKeeper,
+			RewardsKeeper:         app.RewardsKeeper,
 		},
 	)
 	if err != nil {

e2e/txfees_test.go

@@ -20,7 +20,7 @@ import (
 // Test configures a chain based on the Archway mainnet parameters.
 func (s *E2ETestSuite) TestTxFees() {
 	const (
-		txGasLimit        = 201_000
+		txGasLimit        = 212_000
 		txFeeAmtIncrement = 1000
 	)
 

x/rewards/ante/fee_deduction.go

@@ -15,20 +15,25 @@ import (
 
 var _ sdk.AnteDecorator = DeductFeeDecorator{}
 
+type BankKeeper interface {
+	authTypes.BankKeeper
+	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+}
+
 // DeductFeeDecorator deducts fees from the first signer of the tx.
 // If the first signer does not have the funds to pay for the fees, return with InsufficientFunds error.
 // Call next AnteHandler if fees successfully deducted.
 // CONTRACT: Tx must implement FeeTx interface to use DeductFeeDecorator.
 type DeductFeeDecorator struct {
 	codec          codec.BinaryCodec
 	ak             ante.AccountKeeper
-	bankKeeper     authTypes.BankKeeper
+	bankKeeper     BankKeeper
 	feegrantKeeper ante.FeegrantKeeper
 	rewardsKeeper  RewardsKeeperExpected
 }
 
 // NewDeductFeeDecorator returns a new DeductFeeDecorator instance.
-func NewDeductFeeDecorator(codec codec.BinaryCodec, ak ante.AccountKeeper, bk authTypes.BankKeeper, fk ante.FeegrantKeeper, rk RewardsKeeperExpected) DeductFeeDecorator {
+func NewDeductFeeDecorator(codec codec.BinaryCodec, ak ante.AccountKeeper, bk BankKeeper, fk ante.FeegrantKeeper, rk RewardsKeeperExpected) DeductFeeDecorator {
 	return DeductFeeDecorator{
 		codec:          codec,
 		ak:             ak,
@@ -138,6 +143,10 @@ func (dfd DeductFeeDecorator) deductFees(ctx sdk.Context, tx sdk.Tx, acc authTyp
 		if err := dfd.bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), authTypes.FeeCollectorName, authFees); err != nil {
 			return sdkErrors.Wrapf(sdkErrors.ErrInsufficientFunds, err.Error())
 		}
+		// burn the auth fees.
+		if err := dfd.bankKeeper.BurnCoins(ctx, authTypes.FeeCollectorName, authFees); err != nil {
+			return sdkErrors.Wrapf(sdkErrors.ErrInsufficientFunds, err.Error())
+		}
 	}
 
 	if !rewardsFees.Empty() {

x/rewards/ante/fee_deduction_test.go

@@ -54,7 +54,7 @@ func TestRewardsFeeDeductionAnteHandler(t *testing.T) {
 				mockWasmExecuteMsg,
 			},
 			rewardRecordExpected:            true,
-			feeCollectorBalanceDiffExpected: "500stake",
+			feeCollectorBalanceDiffExpected: "0stake", // fees are burnt
 			rewardsBalanceDiffExpected:      "500stake",
 		},
 		{
@@ -66,7 +66,7 @@ func TestRewardsFeeDeductionAnteHandler(t *testing.T) {
 				mockWasmExecuteMsg,
 			},
 			rewardRecordExpected:            true,
-			feeCollectorBalanceDiffExpected: "900stake,450uarch",
+			feeCollectorBalanceDiffExpected: "0stake,0uarch", // fees are burnt
 			rewardsBalanceDiffExpected:      "100stake,50uarch",
 		},
 		{