From 7a73828e8ac2a98cb716ac1ff6d2a7cdcd4528d2 Mon Sep 17 00:00:00 2001
From: StrathCole <strathcole@gmail.com>
Date: Fri, 11 Oct 2024 23:41:40 +0200
Subject: [PATCH] add upgrade handler and linting

---
 app/app.go                            |  2 ++
 app/upgrades/v9/constants.go          | 20 ++++++++++++++++++++
 app/upgrades/v9/upgrades.go           | 26 ++++++++++++++++++++++++++
 contrib/updates/prepare_cosmovisor.sh |  2 +-
 custom/auth/ante/fee_test.go          |  6 +++---
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 app/upgrades/v9/constants.go
 create mode 100644 app/upgrades/v9/upgrades.go

diff --git a/app/app.go b/app/app.go
index aa07e159..7dba12da 100644
--- a/app/app.go
+++ b/app/app.go
@@ -58,6 +58,7 @@ import (
 	v8_1 "github.com/classic-terra/core/v3/app/upgrades/v8_1"
 	v8_2 "github.com/classic-terra/core/v3/app/upgrades/v8_2"
 	v8_3 "github.com/classic-terra/core/v3/app/upgrades/v8_3"
+	v9 "github.com/classic-terra/core/v3/app/upgrades/v9"
 
 	customante "github.com/classic-terra/core/v3/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v3/custom/auth/post"
@@ -91,6 +92,7 @@ var (
 		v8_1.Upgrade,
 		v8_2.Upgrade,
 		v8_3.Upgrade,
+		v9.Upgrade,
 	}
 
 	// Forks defines forks to be applied to the network
diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go
new file mode 100644
index 00000000..fddf7f1c
--- /dev/null
+++ b/app/upgrades/v9/constants.go
@@ -0,0 +1,20 @@
+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/tax/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
new file mode 100644
index 00000000..f2651d21
--- /dev/null
+++ b/app/upgrades/v9/upgrades.go
@@ -0,0 +1,26 @@
+package v9
+
+import (
+	"github.com/classic-terra/core/v3/app/keepers"
+	"github.com/classic-terra/core/v3/app/upgrades"
+	taxtypes "github.com/classic-terra/core/v3/x/tax/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 := taxtypes.DefaultParams()
+		keepers.TaxKeeper.SetParams(ctx, tax2gasParams)
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}
diff --git a/contrib/updates/prepare_cosmovisor.sh b/contrib/updates/prepare_cosmovisor.sh
index 17d98344..abd31aaa 100644
--- a/contrib/updates/prepare_cosmovisor.sh
+++ b/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=v3.1.3
+OLD_VERSION=v3.1.6
 # 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
diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go
index e9cc1be0..13dada80 100644
--- a/custom/auth/ante/fee_test.go
+++ b/custom/auth/ante/fee_test.go
@@ -330,7 +330,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesMultiSend() {
 	newCtx, err := antehandler(s.ctx, tx, false)
 	s.Require().NoError(err, "Decorator should not have errored on missing tax (reverse charge)")
 	s.Require().Equal(true, newCtx.Value(taxtypes.ContextKeyTaxReverseCharge).(bool))
-	//s.Require().Error(err, "Decorator should errored on low fee for local gasPrice + tax")
+	// s.Require().Error(err, "Decorator should errored on low fee for local gasPrice + tax")
 
 	// must pass with tax
 	s.txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, expectedTax.Add(expectedTax))))
@@ -802,7 +802,7 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRa
 	// Set burn split tax
 	tk.SetBurnSplitRate(s.ctx, burnSplitRate)
 	tk.SetOracleSplitRate(s.ctx, oracleSplitRate)
-	//taxRate := tk.GetTaxRate(s.ctx)
+	// taxRate := tk.GetTaxRate(s.ctx)
 
 	// Set community tax
 	dkParams := dk.GetParams(s.ctx)
@@ -842,7 +842,7 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRa
 
 	// feeCollector := ak.GetModuleAccount(s.ctx, authtypes.FeeCollectorName)
 
-	//amountFeeBefore := bk.GetAllBalances(s.ctx, feeCollector.GetAddress())
+	// amountFeeBefore := bk.GetAllBalances(s.ctx, feeCollector.GetAddress())
 
 	totalSupplyBefore, _, err := bk.GetPaginatedTotalSupply(s.ctx, &query.PageRequest{})
 	require.NoError(err)