From 804838439aa175e326e2a22e22e00b97f3cf7f9d Mon Sep 17 00:00:00 2001 From: StrathCole Date: Tue, 3 Dec 2024 10:46:52 +0100 Subject: [PATCH 1/4] - handler --- app/upgrades/v10/upgrades.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 98539c0e..6fea534d 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10/upgrades.go @@ -16,8 +16,11 @@ func CreateV10UpgradeHandler( 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()) + params := keepers.TreasuryKeeper.GetParams(ctx) + params.TaxPolicy.RateMax = sdk.ZeroDec() + params.TaxPolicy.RateMin = sdk.ZeroDec() + keepers.TreasuryKeeper.SetParams(ctx, params) tax2gasParams := taxtypes.DefaultParams() keepers.TaxKeeper.SetParams(ctx, tax2gasParams) From 246e52b272de6e9e1b28f33de75a7124a7d26aad Mon Sep 17 00:00:00 2001 From: StrathCole Date: Tue, 3 Dec 2024 11:51:59 +0100 Subject: [PATCH 2/4] - change upgrade name --- app/app.go | 4 ++-- app/upgrades/{v10 => v10_1}/constants.go | 6 +++--- app/upgrades/{v10 => v10_1}/upgrades.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename app/upgrades/{v10 => v10_1}/constants.go (78%) rename app/upgrades/{v10 => v10_1}/upgrades.go (95%) diff --git a/app/app.go b/app/app.go index b35e8746..cf5250ca 100644 --- a/app/app.go +++ b/app/app.go @@ -60,7 +60,7 @@ import ( v8_3 "github.com/classic-terra/core/v3/app/upgrades/v8_3" // v9 had been used by tax2gas and has to be skipped - v10 "github.com/classic-terra/core/v3/app/upgrades/v10" + v10_1 "github.com/classic-terra/core/v3/app/upgrades/v10_1" customante "github.com/classic-terra/core/v3/custom/auth/ante" custompost "github.com/classic-terra/core/v3/custom/auth/post" @@ -94,7 +94,7 @@ var ( v8_1.Upgrade, v8_2.Upgrade, v8_3.Upgrade, - v10.Upgrade, + v10_1.Upgrade, } // Forks defines forks to be applied to the network diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10_1/constants.go similarity index 78% rename from app/upgrades/v10/constants.go rename to app/upgrades/v10_1/constants.go index 59ad629a..3f6dd7e3 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10_1/constants.go @@ -1,4 +1,4 @@ -package v10 +package v10_1 import ( "github.com/classic-terra/core/v3/app/upgrades" @@ -7,11 +7,11 @@ import ( tax2gastypes "github.com/classic-terra/core/v3/x/tax/types" ) -const UpgradeName = "v10" +const UpgradeName = "v10_1" var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, - CreateUpgradeHandler: CreateV10UpgradeHandler, + CreateUpgradeHandler: CreateV101UpgradeHandler, StoreUpgrades: store.StoreUpgrades{ Added: []string{ tax2gastypes.ModuleName, diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10_1/upgrades.go similarity index 95% rename from app/upgrades/v10/upgrades.go rename to app/upgrades/v10_1/upgrades.go index 6fea534d..e2352763 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10_1/upgrades.go @@ -1,4 +1,4 @@ -package v10 +package v10_1 import ( "github.com/classic-terra/core/v3/app/keepers" @@ -9,7 +9,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) -func CreateV10UpgradeHandler( +func CreateV101UpgradeHandler( mm *module.Manager, cfg module.Configurator, _ upgrades.BaseAppParamManager, From af6faa0bba77e4fc2c552f2cb3d9c2f78cbd5a79 Mon Sep 17 00:00:00 2001 From: StrathCole Date: Tue, 3 Dec 2024 11:55:13 +0100 Subject: [PATCH 3/4] - nolint --- app/upgrades/v10_1/upgrades.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/upgrades/v10_1/upgrades.go b/app/upgrades/v10_1/upgrades.go index e2352763..23a0147e 100644 --- a/app/upgrades/v10_1/upgrades.go +++ b/app/upgrades/v10_1/upgrades.go @@ -1,3 +1,4 @@ +//nolint:revive package v10_1 import ( From 2c5a1cf6230e4ac2ade4803b291ec731a969d9ff Mon Sep 17 00:00:00 2001 From: StrathCole Date: Tue, 3 Dec 2024 11:55:37 +0100 Subject: [PATCH 4/4] nolint --- app/upgrades/v10_1/constants.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/upgrades/v10_1/constants.go b/app/upgrades/v10_1/constants.go index 3f6dd7e3..62eda885 100644 --- a/app/upgrades/v10_1/constants.go +++ b/app/upgrades/v10_1/constants.go @@ -1,3 +1,4 @@ +//nolint:revive package v10_1 import (