diff --git a/app/app.go b/app/app.go index 2371d4f8..0dc928fb 100644 --- a/app/app.go +++ b/app/app.go @@ -57,7 +57,6 @@ import ( v8 "github.com/classic-terra/core/v3/app/upgrades/v8" v8_1 "github.com/classic-terra/core/v3/app/upgrades/v8_1" v8_2 "github.com/classic-terra/core/v3/app/upgrades/v8_2" - v9 "github.com/classic-terra/core/v3/app/upgrades/v9" v9_1 "github.com/classic-terra/core/v3/app/upgrades/v9_1" customante "github.com/classic-terra/core/v3/custom/auth/ante" @@ -90,7 +89,6 @@ var ( v7_1.Upgrade, v8.Upgrade, v8_1.Upgrade, - v9.Upgrade, v8_2.Upgrade, v9_1.Upgrade, } diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go deleted file mode 100644 index 8bca8b61..00000000 --- a/app/upgrades/v9/constants.go +++ /dev/null @@ -1,20 +0,0 @@ -package v9 - -import ( - "github.com/classic-terra/core/v3/app/upgrades" - store "github.com/cosmos/cosmos-sdk/store/types" - - tax2gastypes "github.com/classic-terra/core/v3/x/tax2gas/types" -) - -const UpgradeName = "v9" - -var Upgrade = upgrades.Upgrade{ - UpgradeName: UpgradeName, - CreateUpgradeHandler: CreateV9UpgradeHandler, - StoreUpgrades: store.StoreUpgrades{ - Added: []string{ - tax2gastypes.ModuleName, - }, - }, -} diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go deleted file mode 100644 index fb67fa7d..00000000 --- a/app/upgrades/v9/upgrades.go +++ /dev/null @@ -1,31 +0,0 @@ -package v9 - -import ( - "github.com/classic-terra/core/v3/app/keepers" - "github.com/classic-terra/core/v3/app/upgrades" - tax2gastypes "github.com/classic-terra/core/v3/x/tax2gas/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 CreateV9UpgradeHandler( - 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.SetTaxRate(ctx, sdk.ZeroDec()) - - tax2gasParams := tax2gastypes.DefaultParams() - tax2gasParams.GasPrices = sdk.NewDecCoins( - sdk.NewDecCoinFromDec("uluna", sdk.NewDecWithPrec(28325, 3)), - sdk.NewDecCoinFromDec("uusd", sdk.NewDecWithPrec(75, 2)), - ) - tax2gasParams.MaxTotalBypassMinFeeMsgGasUsage = 200000 - keepers.Tax2gasKeeper.SetParams(ctx, tax2gasParams) - return mm.RunMigrations(ctx, cfg, fromVM) - } -} diff --git a/app/upgrades/v9_1/constants.go b/app/upgrades/v9_1/constants.go index 6b887852..3b5ca487 100644 --- a/app/upgrades/v9_1/constants.go +++ b/app/upgrades/v9_1/constants.go @@ -2,6 +2,9 @@ package v91 import ( "github.com/classic-terra/core/v3/app/upgrades" + store "github.com/cosmos/cosmos-sdk/store/types" + + tax2gastypes "github.com/classic-terra/core/v3/x/tax2gas/types" ) const UpgradeName = "v9_1" @@ -9,4 +12,9 @@ const UpgradeName = "v9_1" var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateV91UpgradeHandler, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{ + tax2gastypes.ModuleName, + }, + }, } diff --git a/x/tax2gas/types/keys.go b/x/tax2gas/types/keys.go index ef679c3a..588980e9 100644 --- a/x/tax2gas/types/keys.go +++ b/x/tax2gas/types/keys.go @@ -1,7 +1,7 @@ package types const ( - ModuleName = "tax2gas" + ModuleName = "tax2gas_testnet" StoreKey = ModuleName