Merge branch 'main' into blv/gov

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

@@ -60,7 +60,6 @@ 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"
 
 	customante "github.com/classic-terra/core/v3/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v3/custom/auth/post"
@@ -94,7 +93,6 @@ var (
 		v8_1.Upgrade,
 		v8_2.Upgrade,
 		v8_3.Upgrade,
-		v10.Upgrade,
 	}
 
 	// Forks defines forks to be applied to the network
@@ -430,11 +428,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_1/constants.go

@@ -0,0 +1,21 @@
+//nolint:revive
+package v10_1
+
+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 = "v10_1"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateV101UpgradeHandler,
+	StoreUpgrades: store.StoreUpgrades{
+		Added: []string{
+			tax2gastypes.ModuleName,
+		},
+	},
+}

app/upgrades/v10_1/upgrades.go

@@ -0,0 +1,30 @@
+//nolint:revive
+package v10_1
+
+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 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) {
+		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)
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}