Whitelisting (tax exemption) feature according to prop #11824

app/app.go

@@ -49,6 +49,7 @@ import (
 	v5 "github.com/classic-terra/core/v2/app/upgrades/v5"
 	v6 "github.com/classic-terra/core/v2/app/upgrades/v6"
 	v6_1 "github.com/classic-terra/core/v2/app/upgrades/v6_1"
+	v7 "github.com/classic-terra/core/v2/app/upgrades/v7"
 
 	customante "github.com/classic-terra/core/v2/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v2/custom/auth/post"
@@ -67,7 +68,7 @@ var (
 	DefaultNodeHome string
 
 	// Upgrades defines upgrades to be applied to the network
-	Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade, v5.Upgrade, v6.Upgrade, v6_1.Upgrade}
+	Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade, v5.Upgrade, v6.Upgrade, v6_1.Upgrade, v7.Upgrade}
 
 	// Forks defines forks to be applied to the network
 	Forks = []upgrades.Fork{}
@@ -206,6 +207,7 @@ func NewTerraApp(
 			FeegrantKeeper:     app.FeeGrantKeeper,
 			OracleKeeper:       app.OracleKeeper,
 			TreasuryKeeper:     app.TreasuryKeeper,
+			TaxExemptionKeeper: app.TaxExemptionKeeper,
 			SigGasConsumer:     ante.DefaultSigVerificationGasConsumer,
 			SignModeHandler:    encodingConfig.TxConfig.SignModeHandler(),
 			IBCKeeper:          *app.IBCKeeper,

app/keepers/keepers.go

@@ -60,6 +60,8 @@ import (
 	markettypes "github.com/classic-terra/core/v2/x/market/types"
 	oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper"
 	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
+	taxexemptionkeeper "github.com/classic-terra/core/v2/x/taxexemption/keeper"
+	taxexemptiontypes "github.com/classic-terra/core/v2/x/taxexemption/types"
 	treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper"
 	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
 )
@@ -93,6 +95,7 @@ type AppKeepers struct {
 	OracleKeeper        oraclekeeper.Keeper
 	MarketKeeper        marketkeeper.Keeper
 	TreasuryKeeper      treasurykeeper.Keeper
+	TaxExemptionKeeper  taxexemptionkeeper.Keeper
 	WasmKeeper          wasmkeeper.Keeper
 	DyncommKeeper       dyncommkeeper.Keeper
 
@@ -139,6 +142,7 @@ func NewAppKeepers(
 		oracletypes.StoreKey,
 		markettypes.StoreKey,
 		treasurytypes.StoreKey,
+		taxexemptiontypes.StoreKey,
 		wasmtypes.StoreKey,
 		dyncommtypes.StoreKey,
 	)
@@ -340,6 +344,10 @@ func NewAppKeepers(
 		appKeepers.StakingKeeper, appKeepers.DistrKeeper,
 		&appKeepers.WasmKeeper, distrtypes.ModuleName,
 	)
+	appKeepers.TaxExemptionKeeper = taxexemptionkeeper.NewKeeper(
+		appCodec, appKeepers.keys[taxexemptiontypes.StoreKey],
+		appKeepers.GetSubspace(taxexemptiontypes.ModuleName),
+	)
 
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
 	if err != nil {
@@ -352,6 +360,7 @@ func NewAppKeepers(
 		appKeepers.IBCKeeper.ChannelKeeper,
 		scopedWasmKeeper,
 		appKeepers.BankKeeper,
+		appKeepers.TaxExemptionKeeper,
 		appKeepers.TreasuryKeeper,
 		appKeepers.AccountKeeper,
 		appCodec,
@@ -451,6 +460,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
 	paramsKeeper.Subspace(markettypes.ModuleName)
 	paramsKeeper.Subspace(oracletypes.ModuleName)
+	paramsKeeper.Subspace(taxexemptiontypes.ModuleName)
 	paramsKeeper.Subspace(treasurytypes.ModuleName)
 	paramsKeeper.Subspace(wasmtypes.ModuleName)
 	paramsKeeper.Subspace(dyncommtypes.ModuleName)

app/keepers/routers.go

@@ -12,6 +12,8 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
 	porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
 
+	"github.com/classic-terra/core/v2/x/taxexemption"
+	taxexemptiontypes "github.com/classic-terra/core/v2/x/taxexemption/types"
 	"github.com/classic-terra/core/v2/x/treasury"
 	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
@@ -35,7 +37,8 @@ func (appKeepers *AppKeepers) newGovRouter() govv1beta1.Router {
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)).
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(appKeepers.IBCKeeper.ClientKeeper)).
 		AddRoute(treasurytypes.RouterKey, treasury.NewProposalHandler(appKeepers.TreasuryKeeper)).
-		AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(appKeepers.WasmKeeper, wasm.EnableAllProposals))
+		AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(appKeepers.WasmKeeper, wasm.EnableAllProposals)).
+		AddRoute(taxexemptiontypes.RouterKey, taxexemption.NewProposalHandler(appKeepers.TaxExemptionKeeper))
 
 	return govRouter
 }

app/modules.go

@@ -73,6 +73,9 @@ import (
 	markettypes "github.com/classic-terra/core/v2/x/market/types"
 	"github.com/classic-terra/core/v2/x/oracle"
 	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
+	"github.com/classic-terra/core/v2/x/taxexemption"
+	taxexemptionclient "github.com/classic-terra/core/v2/x/taxexemption/client"
+	taxexemptiontypes "github.com/classic-terra/core/v2/x/taxexemption/types"
 	"github.com/classic-terra/core/v2/x/treasury"
 	treasuryclient "github.com/classic-terra/core/v2/x/treasury/client"
 	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
@@ -106,6 +109,11 @@ var (
 				ibcclientclient.UpgradeProposalHandler,
 				treasuryclient.ProposalAddBurnTaxExemptionAddressHandler,
 				treasuryclient.ProposalRemoveBurnTaxExemptionAddressHandler,
+				taxexemptionclient.ProposalAddTaxExemptionZoneHandler,
+				taxexemptionclient.ProposalRemoveTaxExemptionZoneHandler,
+				taxexemptionclient.ProposalModifyTaxExemptionZoneHandler,
+				taxexemptionclient.ProposalAddTaxExemptionAddressHandler,
+				taxexemptionclient.ProposalRemoveTaxExemptionAddressHandler,
 			),
 		),
 		customparams.AppModuleBasic{},
@@ -121,6 +129,7 @@ var (
 		oracle.AppModuleBasic{},
 		market.AppModuleBasic{},
 		treasury.AppModuleBasic{},
+		taxexemption.AppModuleBasic{},
 		customwasm.AppModuleBasic{},
 		ibcfee.AppModuleBasic{},
 		dyncomm.AppModuleBasic{},
@@ -184,6 +193,7 @@ func appModules(
 		market.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper),
 		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
 		treasury.NewAppModule(appCodec, app.TreasuryKeeper),
+		taxexemption.NewAppModule(appCodec, app.TaxExemptionKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
 		dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper),
 	}
@@ -216,6 +226,7 @@ func simulationModules(
 		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
 		market.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper),
 		treasury.NewAppModule(appCodec, app.TreasuryKeeper),
+		taxexemption.NewAppModule(appCodec, app.TaxExemptionKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
 		dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper),
 	}
@@ -246,6 +257,7 @@ func orderBeginBlockers() []string {
 		// Terra Classic modules
 		oracletypes.ModuleName,
 		treasurytypes.ModuleName,
+		taxexemptiontypes.ModuleName,
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
@@ -277,6 +289,7 @@ func orderEndBlockers() []string {
 		// Terra Classic modules
 		oracletypes.ModuleName,
 		treasurytypes.ModuleName,
+		taxexemptiontypes.ModuleName,
 		markettypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
@@ -309,6 +322,7 @@ func orderInitGenesis() []string {
 		markettypes.ModuleName,
 		oracletypes.ModuleName,
 		treasurytypes.ModuleName,
+		taxexemptiontypes.ModuleName,
 		wasmtypes.ModuleName,
 		dyncommtypes.ModuleName,
 	}

app/upgrades/v7/constants.go

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

app/upgrades/v7/upgrades.go

@@ -0,0 +1,41 @@
+package v6
+
+import (
+	"github.com/classic-terra/core/v2/app/keepers"
+	"github.com/classic-terra/core/v2/app/upgrades"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
+	"github.com/cosmos/cosmos-sdk/store/prefix"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateV7UpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+	_ upgrades.BaseAppParamManager,
+	k *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(c sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// migrate old treasurykeeper tax exemption to new tax exemption keeper
+		// tax exemption keeper is now a module
+
+		// get old tax exemption keeper
+		sub := prefix.NewStore(c.KVStore(k.TreasuryKeeper.GetStoreKey()), treasurytypes.BurnTaxExemptionListPrefix)
+
+		intoZone := "Binance"
+
+		// iterate through all tax exemptions
+		iterator := sub.Iterator(nil, nil)
+		defer iterator.Close()
+		for ; iterator.Valid(); iterator.Next() {
+			// get tax exemption address
+			address := string(iterator.Key())
+
+			// add tax exemption address to new tax exemption keeper
+			k.TaxExemptionKeeper.AddTaxExemptionAddress(c, intoZone, address)
+		}
+
+		return mm.RunMigrations(c, cfg, fromVM)
+	}
+}

client/docs/config.json

@@ -137,6 +137,14 @@
         }
       }
     },
+    {
+      "url": "./tmp-swagger-gen/terra/taxexemption/v1beta1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "TaxExemptionParams"
+        }
+      }
+    },
     {
       "url": "./tmp-swagger-gen/terra/dyncomm/v1beta1/query.swagger.json",
       "operationIds": {