Merge branch 'blv/gov' into blv-labs/optimize-calculation-deposit-gov…

…-v8.4

Makefile

@@ -189,7 +189,7 @@ gen-swagger-docs:
 	bash scripts/protoc-swagger-gen.sh
 
 update-swagger-docs: statik
-	$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m
+	$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m -ns terrad
 	@if [ -n "$(git status --porcelain)" ]; then \
         echo "Swagger docs are out of sync!";\
         exit 1;\

app/app.go

@@ -95,8 +95,8 @@ var (
 		v8_1.Upgrade,
 		v8_2.Upgrade,
 		v8_3.Upgrade,
-		v10_2.Upgrade,
 		v10.Upgrade,
+    v10_2.Upgrade,
 	}
 
 	// Forks defines forks to be applied to the network
@@ -432,11 +432,10 @@ func (app *TerraApp) RegisterNodeService(clientCtx client.Context) {
 
 // RegisterSwaggerAPI registers swagger route with API Server
 func RegisterSwaggerAPI(rtr *mux.Router) {
-	statikFS, err := fs.New()
+	statikFS, err := fs.NewWithNamespace("terrad")
 	if err != nil {
 		panic(err)
 	}
-
 	staticServer := http.FileServer(statikFS)
 	rtr.PathPrefix("/swagger/").Handler(http.StripPrefix("/swagger/", staticServer))
 }

app/upgrades/v10/constants.go → app/upgrades/v10_1/constants.go

@@ -1,4 +1,5 @@
-package v10
+//nolint:revive
+package v10_1
 
 import (
 	"github.com/classic-terra/core/v3/app/upgrades"
@@ -7,11 +8,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,

app/upgrades/v10/upgrades.go → app/upgrades/v10_1/upgrades.go

@@ -1,4 +1,5 @@
-package v10
+//nolint:revive
+package v10_1
 
 import (
 	"github.com/classic-terra/core/v3/app/keepers"
@@ -9,15 +10,18 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-func CreateV10UpgradeHandler(
+func CreateV101UpgradeHandler(
 	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())
+		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)