Add tax2gas module and move all handle fees logic to tax2gas module

app/app.go

@@ -55,6 +55,7 @@ import (
 	v7 "github.com/classic-terra/core/v3/app/upgrades/v7"
 	v7_1 "github.com/classic-terra/core/v3/app/upgrades/v7_1"
 	v8 "github.com/classic-terra/core/v3/app/upgrades/v8"
+	v8_1 "github.com/classic-terra/core/v3/app/upgrades/v8_1"
 
 	customante "github.com/classic-terra/core/v3/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v3/custom/auth/post"
@@ -75,7 +76,18 @@ 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, v7.Upgrade, v7_1.Upgrade, v8.Upgrade}
+	Upgrades = []upgrades.Upgrade{
+		v2.Upgrade,
+		v3.Upgrade,
+		v4.Upgrade,
+		v5.Upgrade,
+		v6.Upgrade,
+		v6_1.Upgrade,
+		v7.Upgrade,
+		v7_1.Upgrade,
+		v8.Upgrade,
+		v8_1.Upgrade,
+	}
 
 	// Forks defines forks to be applied to the network
 	Forks = []upgrades.Fork{}
@@ -228,6 +240,7 @@ func NewTerraApp(
 			TXCounterStoreKey:  app.GetKey(wasmtypes.StoreKey),
 			DyncommKeeper:      app.DyncommKeeper,
 			StakingKeeper:      app.StakingKeeper,
+			Tax2Gaskeeper:      app.Tax2gasKeeper,
 			Cdc:                app.appCodec,
 		},
 	)
@@ -237,7 +250,12 @@ func NewTerraApp(
 
 	postHandler, err := custompost.NewPostHandler(
 		custompost.HandlerOptions{
-			DyncommKeeper: app.DyncommKeeper,
+			AccountKeeper:  app.AccountKeeper,
+			BankKeeper:     app.BankKeeper,
+			FeegrantKeeper: app.FeeGrantKeeper,
+			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],
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	// Create IBC Keeper
 	appKeepers.IBCKeeper = ibckeeper.NewKeeper(
 		appCodec,
@@ -390,6 +399,7 @@ func NewAppKeepers(
 		appKeepers.BankKeeper,
 		appKeepers.TreasuryKeeper,
 		appKeepers.AccountKeeper,
+		appKeepers.Tax2gasKeeper,
 		appCodec,
 		appKeepers.TransferKeeper,
 	)

app/legacy/pubkey_replacement.go

@@ -46,7 +46,6 @@ func loadKeydataFromFile(clientCtx client.Context, replacementrJSON string, genD
 	var replacementKeys replacementConfigs
 
 	err = json.Unmarshal(jsonReplacementBlob, &replacementKeys)
-
 	if err != nil {
 		log.Fatal(errors.Wrap(err, "Could not unmarshal replacement keys "))
 	}
@@ -112,7 +111,6 @@ func loadKeydataFromFile(clientCtx client.Context, replacementrJSON string, genD
 	state[slashing.ModuleName] = clientCtx.Codec.MustMarshalJSON(&slashingGenesis)
 
 	genDoc.AppState, err = json.Marshal(state)
-
 	if err != nil {
 		log.Fatal("Could not marshal App State")
 	}

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,
 	}

app/upgrades/v8_1/constants.go

@@ -0,0 +1,13 @@
+//nolint:revive
+package v8_1
+
+import (
+	"github.com/classic-terra/core/v3/app/upgrades"
+)
+
+const UpgradeName = "v8_1"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateV81UpgradeHandler,
+}

app/upgrades/v8_1/upgrades.go

@@ -0,0 +1,24 @@
+//nolint:revive
+package v8_1
+
+import (
+	"github.com/classic-terra/core/v3/app/keepers"
+	"github.com/classic-terra/core/v3/app/upgrades"
+	treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateV81UpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+	_ upgrades.BaseAppParamManager,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		// set default oracle split
+		keepers.TreasuryKeeper.SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit)
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}

contrib/updates/Dockerfile.old

@@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 # Cosmwasm - Download correct libwasmvm version and verify checksum
 RUN set -eux &&\
-    WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \
-    WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \
+    WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \
+    WASMVM_DOWNLOADS="https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}"; \
     wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \
     if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \
         WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \

contrib/updates/docker-compose.yml

@@ -139,4 +139,4 @@ networks:
       driver: default
       config:
       -
-        subnet: 192.168.10.0/16
+        subnet: 192.168.10.0/24

contrib/updates/prepare_cosmovisor.sh

@@ -5,7 +5,7 @@
 
 # These fields should be fetched automatically in the future
 # Need to do more upgrade to see upgrade patterns
-OLD_VERSION=v2.4.2
+OLD_VERSION=v3.0.3
 # this command will retrieve the folder with the largest number in format v<number>
 SOFTWARE_UPGRADE_NAME=$(ls -d -- ./app/upgrades/v* | sort -Vr | head -n 1 | xargs basename)
 BUILDDIR=$1

custom/auth/ante/ante.go

@@ -12,6 +12,9 @@ import (
 
 	dyncommante "github.com/classic-terra/core/v3/x/dyncomm/ante"
 	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"
+	tax2gastypes "github.com/classic-terra/core/v3/x/tax2gas/types"
 	"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"
@@ -26,7 +29,7 @@ type HandlerOptions struct {
 	AccountKeeper          ante.AccountKeeper
 	BankKeeper             BankKeeper
 	ExtensionOptionChecker ante.ExtensionOptionChecker
-	FeegrantKeeper         ante.FeegrantKeeper
+	FeegrantKeeper         tax2gastypes.FeegrantKeeper
 	OracleKeeper           OracleKeeper
 	TreasuryKeeper         TreasuryKeeper
 	SignModeHandler        signing.SignModeHandler
@@ -40,6 +43,7 @@ type HandlerOptions struct {
 	TXCounterStoreKey      storetypes.StoreKey
 	DyncommKeeper          dyncommkeeper.Keeper
 	StakingKeeper          *stakingkeeper.Keeper
+	Tax2Gaskeeper          tax2gaskeeper.Keeper
 	Cdc                    codec.BinaryCodec
 }
 
@@ -88,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),
-		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

@@ -16,6 +16,7 @@ type TreasuryKeeper interface {
 	HasBurnTaxExemptionAddress(ctx sdk.Context, addresses ...string) bool
 	HasBurnTaxExemptionContract(ctx sdk.Context, address string) bool
 	GetMinInitialDepositRatio(ctx sdk.Context) sdk.Dec
+	GetOracleSplitRate(ctx sdk.Context) sdk.Dec
 }
 
 // OracleKeeper for feeder validation
@@ -25,15 +26,19 @@ type OracleKeeper interface {
 
 // BankKeeper defines the contract needed for supply related APIs (noalias)
 type BankKeeper interface {
+	GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
 	IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error
 	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 {
 	FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error
 	GetFeePool(ctx sdk.Context) distributiontypes.FeePool
+	GetCommunityTax(ctx sdk.Context) math.LegacyDec
+	SetFeePool(ctx sdk.Context, feePool distributiontypes.FeePool)
 }
 
 type GovKeeper interface {