Rework of tax to be included in gas

.gitignore

@@ -28,6 +28,7 @@ client/lcd/keys/*
 client/docs/statik/statik.go
 remote/ansible/testnets
 mytestnet
+proto/google
 
 # Testing
 coverage.txt

app/app.go

@@ -212,6 +212,7 @@ func NewTerraApp(
 			GovKeeper:          app.GovKeeper,
 			WasmConfig:         &wasmConfig,
 			TXCounterStoreKey:  app.GetKey(wasm.StoreKey),
+			ClassicTaxKeeper:   app.ClassicTaxKeeper,
 			DyncommKeeper:      app.DyncommKeeper,
 			StakingKeeper:      app.StakingKeeper,
 		},
@@ -222,7 +223,11 @@ func NewTerraApp(
 
 	postHandler, err := custompost.NewPostHandler(
 		custompost.HandlerOptions{
-			DyncommKeeper: app.DyncommKeeper,
+			TreasuryKeeper:   app.TreasuryKeeper,
+			BankKeeper:       app.BankKeeper,
+			OracleKeeper:     app.OracleKeeper,
+			ClassicTaxKeeper: app.ClassicTaxKeeper,
+			DyncommKeeper:    app.DyncommKeeper,
 		},
 	)
 	if err != nil {

app/keepers/keepers.go

@@ -54,6 +54,8 @@ import (
 	customwasmkeeper "github.com/classic-terra/core/v2/custom/wasm/keeper"
 	terrawasm "github.com/classic-terra/core/v2/wasmbinding"
 
+	classictaxkeeper "github.com/classic-terra/core/v2/x/classictax/keeper"
+	classictaxtypes "github.com/classic-terra/core/v2/x/classictax/types"
 	dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper"
 	dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types"
 	marketkeeper "github.com/classic-terra/core/v2/x/market/keeper"
@@ -94,6 +96,7 @@ type AppKeepers struct {
 	MarketKeeper        marketkeeper.Keeper
 	TreasuryKeeper      treasurykeeper.Keeper
 	WasmKeeper          wasmkeeper.Keeper
+	ClassicTaxKeeper    classictaxkeeper.Keeper
 	DyncommKeeper       dyncommkeeper.Keeper
 
 	// make scoped keepers public for test purposes
@@ -140,6 +143,7 @@ func NewAppKeepers(
 		markettypes.StoreKey,
 		treasurytypes.StoreKey,
 		wasmtypes.StoreKey,
+		classictaxtypes.StoreKey,
 		dyncommtypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -341,6 +345,18 @@ func NewAppKeepers(
 		&appKeepers.WasmKeeper, distrtypes.ModuleName,
 	)
 
+	// register the classictax keeper, needs to be before wasmkeeper
+	appKeepers.ClassicTaxKeeper = classictaxkeeper.NewKeeper(
+		appCodec,
+		appKeepers.keys[classictaxtypes.StoreKey],
+		appKeepers.GetSubspace(classictaxtypes.ModuleName),
+		appKeepers.OracleKeeper,
+		appKeepers.AccountKeeper,
+		appKeepers.BankKeeper,
+		appKeepers.TreasuryKeeper,
+		appKeepers.FeeGrantKeeper,
+	)
+
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
 	if err != nil {
 		panic("error while reading wasm config: " + err.Error())
@@ -356,6 +372,7 @@ func NewAppKeepers(
 		appKeepers.AccountKeeper,
 		appCodec,
 		appKeepers.TransferKeeper,
+		appKeepers.ClassicTaxKeeper,
 	)
 	// the first slice will replace all default msh handler with custom one
 	wasmOpts = append([]wasmkeeper.Option{wasmkeeper.WithMessageHandler(wasmMsgHandler)}, wasmOpts...)
@@ -453,6 +470,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(oracletypes.ModuleName)
 	paramsKeeper.Subspace(treasurytypes.ModuleName)
 	paramsKeeper.Subspace(wasmtypes.ModuleName)
+	paramsKeeper.Subspace(classictaxtypes.ModuleName)
 	paramsKeeper.Subspace(dyncommtypes.ModuleName)
 
 	return paramsKeeper

app/modules.go

@@ -67,6 +67,8 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	"github.com/classic-terra/core/v2/x/classictax"
+	classictaxtypes "github.com/classic-terra/core/v2/x/classictax/types"
 	"github.com/classic-terra/core/v2/x/dyncomm"
 	dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types"
 	"github.com/classic-terra/core/v2/x/market"
@@ -123,6 +125,7 @@ var (
 		treasury.AppModuleBasic{},
 		customwasm.AppModuleBasic{},
 		ibcfee.AppModuleBasic{},
+		classictax.AppModuleBasic{},
 		dyncomm.AppModuleBasic{},
 	)
 
@@ -185,6 +188,7 @@ func appModules(
 		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
 		treasury.NewAppModule(appCodec, app.TreasuryKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
+		classictax.NewAppModule(appCodec, app.ClassicTaxKeeper),
 		dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper),
 	}
 }
@@ -217,6 +221,7 @@ func simulationModules(
 		market.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper),
 		treasury.NewAppModule(appCodec, app.TreasuryKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
+		classictax.NewAppModule(appCodec, app.ClassicTaxKeeper),
 		dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper),
 	}
 }
@@ -248,6 +253,7 @@ func orderBeginBlockers() []string {
 		treasurytypes.ModuleName,
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
+		classictaxtypes.ModuleName,
 		dyncommtypes.ModuleName,
 	}
 }
@@ -279,6 +285,7 @@ func orderEndBlockers() []string {
 		treasurytypes.ModuleName,
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
+		classictaxtypes.ModuleName,
 		dyncommtypes.ModuleName,
 	}
 }
@@ -294,6 +301,8 @@ func orderInitGenesis() []string {
 		govtypes.ModuleName,
 		minttypes.ModuleName,
 		crisistypes.ModuleName,
+		// needs to be before any genesis init that makes txs
+		classictaxtypes.ModuleName,
 		genutiltypes.ModuleName,
 		evidencetypes.ModuleName,
 		authz.ModuleName,

app/upgrades/v6/upgrades.go

@@ -15,6 +15,9 @@ func CreateV6UpgradeHandler(
 	_ *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// as the stability tax rate is no longer used for the burn tax,
+		// we set it to 0 to allow dApps/clients to run without changes and
+		// without being double-taxed
 		return mm.RunMigrations(ctx, cfg, fromVM)
 	}
 }

app/upgrades/v7/constants.go

@@ -0,0 +1,19 @@
+package v6
+
+import (
+	"github.com/classic-terra/core/v2/app/upgrades"
+	classictaxtypes "github.com/classic-terra/core/v2/x/classictax/types"
+	store "github.com/cosmos/cosmos-sdk/store/types"
+)
+
+const UpgradeName = "v6"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateV6UpgradeHandler,
+	StoreUpgrades: store.StoreUpgrades{
+		Added: []string{
+			classictaxtypes.StoreKey,
+		},
+	},
+}

app/upgrades/v7/upgrades.go

@@ -0,0 +1,24 @@
+package v6
+
+import (
+	"github.com/classic-terra/core/v2/app/keepers"
+	"github.com/classic-terra/core/v2/app/upgrades"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateV6UpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+	_ upgrades.BaseAppParamManager,
+	k *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// as the stability tax rate is no longer used for the burn tax,
+		// we set it to 0 to allow dApps/clients to run without changes and
+		// without being double-taxed
+		k.TreasuryKeeper.SetTaxRate(ctx, sdk.NewDec(0))
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}

client/docs/config.json

@@ -145,6 +145,14 @@
         }
       }
     },
+    {
+      "url": "./tmp-swagger-gen/terra/classictax/v1beta1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "ClassicTaxParams"
+        }
+      }
+    },
     {
       "url": "./tmp-swagger-gen/cosmwasm/wasm/v1/query.swagger.json",
       "operationIds": {

client/docs/swagger-ui/swagger.yaml

@@ -26665,6 +26665,57 @@ paths:
           type: string
       tags:
         - Query
+  /terra/classictax/v1beta1/params:
+    get:
+      summary: Params queries all parameters.
+      operationId: ClassicTaxParams
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              params:
+                description: params defines the parameters of the module.
+                type: object
+                properties:
+                  burn_tax:
+                    type: string
+                  gas_prices:
+                    type: array
+                    items:
+                      type: string
+                  taxable_msg_types:
+                    type: array
+                    items:
+                      type: string
+            description: >-
+              QueryParamsResponse is the response type for the Query/Params RPC
+              method.
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              error:
+                type: string
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    type_url:
+                      type: string
+                    value:
+                      type: string
+                      format: byte
+      tags:
+        - Query
   /cosmwasm/wasm/v1/code:
     get:
       summary: Codes gets the metadata for all stored wasm codes
@@ -61069,6 +61120,38 @@ definitions:
       target:
         type: string
     description: QueryRateResponse is the response type for the Query/Rate RPC method.
+  terra.classictax.v1beta1.Params:
+    type: object
+    properties:
+      burn_tax:
+        type: string
+      gas_prices:
+        type: array
+        items:
+          type: string
+      taxable_msg_types:
+        type: array
+        items:
+          type: string
+    description: Params defines the parameters for the classictax module.
+  terra.classictax.v1beta1.QueryParamsResponse:
+    type: object
+    properties:
+      params:
+        description: params defines the parameters of the module.
+        type: object
+        properties:
+          burn_tax:
+            type: string
+          gas_prices:
+            type: array
+            items:
+              type: string
+          taxable_msg_types:
+            type: array
+            items:
+              type: string
+    description: QueryParamsResponse is the response type for the Query/Params RPC method.
   cosmwasm.wasm.v1.AbsoluteTxPosition:
     type: object
     properties:

custom/auth/ante/ante.go

@@ -9,6 +9,10 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	expectedkeeper "github.com/classic-terra/core/v2/custom/auth/keeper"
+	classictax "github.com/classic-terra/core/v2/x/classictax/ante"
+	classictaxkeeper "github.com/classic-terra/core/v2/x/classictax/keeper"
+	oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -21,11 +25,11 @@ import (
 // HandlerOptions are the options required for constructing a default SDK AnteHandler.
 type HandlerOptions struct {
 	AccountKeeper          ante.AccountKeeper
-	BankKeeper             BankKeeper
+	BankKeeper             expectedkeeper.BankKeeper
 	ExtensionOptionChecker ante.ExtensionOptionChecker
 	FeegrantKeeper         ante.FeegrantKeeper
-	OracleKeeper           OracleKeeper
-	TreasuryKeeper         TreasuryKeeper
+	OracleKeeper           expectedkeeper.OracleKeeper
+	TreasuryKeeper         expectedkeeper.TreasuryKeeper
 	SignModeHandler        signing.SignModeHandler
 	SigGasConsumer         ante.SignatureVerificationGasConsumer
 	TxFeeChecker           ante.TxFeeChecker
@@ -34,6 +38,8 @@ type HandlerOptions struct {
 	GovKeeper              govkeeper.Keeper
 	WasmConfig             *wasmtypes.WasmConfig
 	TXCounterStoreKey      storetypes.StoreKey
+	DefaultOracleKeeper    oraclekeeper.Keeper
+	ClassicTaxKeeper       classictaxkeeper.Keeper
 	DyncommKeeper          dyncommkeeper.Keeper
 	StakingKeeper          stakingkeeper.Keeper
 }
@@ -83,7 +89,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),
-		NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper),
+		classictax.NewClassicTaxFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper, options.DefaultOracleKeeper, options.ClassicTaxKeeper),
 		ante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),