add tax2gas module and implementation

app/app.go

@@ -228,6 +228,7 @@ func NewTerraApp(
 			TXCounterStoreKey:  app.GetKey(wasmtypes.StoreKey),
 			DyncommKeeper:      app.DyncommKeeper,
 			StakingKeeper:      app.StakingKeeper,
+			Tax2Gaskeeper:      app.Tax2gasKeeper,
 			Cdc:                app.appCodec,
 		},
 	)
@@ -237,7 +238,11 @@ func NewTerraApp(
 
 	postHandler, err := custompost.NewPostHandler(
 		custompost.HandlerOptions{
-			DyncommKeeper: app.DyncommKeeper,
+			AccountKeeper:  app.AccountKeeper,
+			BankKeeper:     app.BankKeeper,
+			DyncommKeeper:  app.DyncommKeeper,
+			TreasuryKeeper: app.TreasuryKeeper,
+			Tax2Gaskeeper:  app.Tax2gasKeeper,
 		},
 	)
 	if err != nil {

app/keepers/keepers.go

@@ -66,6 +66,8 @@ import (
 	markettypes "github.com/classic-terra/core/v3/x/market/types"
 	oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper"
 	oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
+	tax2gasKeeper "github.com/classic-terra/core/v3/x/tax2gas/keeper"
+	tax2gasTypes "github.com/classic-terra/core/v3/x/tax2gas/types"
 	treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper"
 	treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
 )
@@ -103,10 +105,10 @@ type AppKeepers struct {
 	DyncommKeeper         dyncommkeeper.Keeper
 	IBCHooksKeeper        *ibchookskeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
-
-	Ics20WasmHooks  *ibchooks.WasmHooks
-	IBCHooksWrapper *ibchooks.ICS4Middleware
-	TransferStack   ibctransfer.IBCModule
+	Tax2gasKeeper         tax2gasKeeper.Keeper
+	Ics20WasmHooks        *ibchooks.WasmHooks
+	IBCHooksWrapper       *ibchooks.ICS4Middleware
+	TransferStack         ibctransfer.IBCModule
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper           capabilitykeeper.ScopedKeeper
@@ -156,6 +158,7 @@ func NewAppKeepers(
 		treasurytypes.StoreKey,
 		wasmtypes.StoreKey,
 		dyncommtypes.StoreKey,
+		tax2gasTypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -276,6 +279,12 @@ func NewAppKeepers(
 		stakingtypes.NewMultiStakingHooks(appKeepers.DistrKeeper.Hooks(), appKeepers.SlashingKeeper.Hooks()),
 	)
 
+	appKeepers.Tax2gasKeeper = tax2gasKeeper.NewKeeper(
+		appCodec,
+		appKeepers.keys[tax2gasTypes.StoreKey],
+		appKeepers.GetSubspace(tax2gasTypes.ModuleName),
+	)
+
 	// Create IBC Keeper
 	appKeepers.IBCKeeper = ibckeeper.NewKeeper(
 		appCodec,
@@ -504,6 +513,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(treasurytypes.ModuleName)
 	paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable())
 	paramsKeeper.Subspace(dyncommtypes.ModuleName)
+	paramsKeeper.Subspace(tax2gasTypes.ModuleName)
 
 	return paramsKeeper
 }

app/modules.go

@@ -25,6 +25,8 @@ import (
 	markettypes "github.com/classic-terra/core/v3/x/market/types"
 	"github.com/classic-terra/core/v3/x/oracle"
 	oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
+	tax2gas "github.com/classic-terra/core/v3/x/tax2gas"
+	tax2gasTypes "github.com/classic-terra/core/v3/x/tax2gas/types"
 	"github.com/classic-terra/core/v3/x/treasury"
 	treasuryclient "github.com/classic-terra/core/v3/x/treasury/client"
 	treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
@@ -123,6 +125,7 @@ var (
 		customwasm.AppModuleBasic{},
 		ibcfee.AppModuleBasic{},
 		dyncomm.AppModuleBasic{},
+		tax2gas.AppModuleBasic{},
 		ibchooks.AppModuleBasic{},
 		consensus.AppModuleBasic{},
 	)
@@ -184,6 +187,7 @@ func appModules(
 		treasury.NewAppModule(appCodec, app.TreasuryKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
 		dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper),
+		tax2gas.NewAppModule(appCodec, app.Tax2gasKeeper),
 		ibchooks.NewAppModule(app.AccountKeeper),
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
 		crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them
@@ -250,6 +254,7 @@ func orderBeginBlockers() []string {
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
+		tax2gasTypes.ModuleName,
 		// consensus module
 		consensusparamtypes.ModuleName,
 	}
@@ -284,6 +289,7 @@ func orderEndBlockers() []string {
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
+		tax2gasTypes.ModuleName,
 		// consensus module
 		consensusparamtypes.ModuleName,
 	}
@@ -318,6 +324,7 @@ func orderInitGenesis() []string {
 		treasurytypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
+		tax2gasTypes.ModuleName,
 		// consensus module
 		consensusparamtypes.ModuleName,
 	}

custom/auth/ante/ante.go

@@ -14,6 +14,7 @@ import (
 	dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper"
 	tax2gasante "github.com/classic-terra/core/v3/x/tax2gas/ante"
 
+	tax2gasKeeper "github.com/classic-terra/core/v3/x/tax2gas/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
@@ -42,6 +43,7 @@ type HandlerOptions struct {
 	TXCounterStoreKey      storetypes.StoreKey
 	DyncommKeeper          dyncommkeeper.Keeper
 	StakingKeeper          *stakingkeeper.Keeper
+	Tax2Gaskeeper          tax2gasKeeper.Keeper
 	Cdc                    codec.BinaryCodec
 }
 
@@ -90,7 +92,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		// MinInitialDepositDecorator prevents submitting governance proposal low initial deposit
 		NewMinInitialDepositDecorator(options.GovKeeper, options.TreasuryKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		tax2gasante.NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper),
+		tax2gasante.NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper, options.Tax2Gaskeeper),
 		dyncommante.NewDyncommDecorator(options.Cdc, options.DyncommKeeper, options.StakingKeeper),
 
 		// Do not add any other decorators below this point unless explicitly explain.

custom/auth/ante/expected_keeper.go

@@ -29,6 +29,7 @@ type BankKeeper interface {
 	SendCoins(ctx sdk.Context, from, to sdk.AccAddress, amt sdk.Coins) error
 	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 	SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, amt sdk.Coins) error
+	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
 }
 
 type DistrKeeper interface {