feat: cellarfees v2 changes

app/app.go

@@ -96,10 +96,6 @@ import (
 	gravitykeeper "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper"
 	gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"
 	appParams "github.com/peggyjv/sommelier/v7/app/params"
-	v4 "github.com/peggyjv/sommelier/v7/app/upgrades/v4"
-	v5 "github.com/peggyjv/sommelier/v7/app/upgrades/v5"
-	v6 "github.com/peggyjv/sommelier/v7/app/upgrades/v6"
-	v7 "github.com/peggyjv/sommelier/v7/app/upgrades/v7"
 	"github.com/peggyjv/sommelier/v7/x/auction"
 	auctionclient "github.com/peggyjv/sommelier/v7/x/auction/client"
 	auctionkeeper "github.com/peggyjv/sommelier/v7/x/auction/keeper"
@@ -223,6 +219,7 @@ var (
 	// incidentally this permission is also required to be able to send tokens from module accounts
 	allowedReceivingModAcc = map[string]bool{
 		axelarcorktypes.ModuleName: true,
+		cellarfeestypes.ModuleName: true,
 	}
 
 	_ simapp.App              = (*SommelierApp)(nil)
@@ -492,7 +489,7 @@ func NewSommelierApp(
 
 	app.CellarFeesKeeper = cellarfeeskeeper.NewKeeper(
 		appCodec, keys[cellarfeestypes.StoreKey], app.GetSubspace(cellarfeestypes.ModuleName),
-		app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper,
+		app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.AuctionKeeper,
 	)
 
 	app.IncentivesKeeper = incentiveskeeper.NewKeeper(
@@ -506,7 +503,6 @@ func NewSommelierApp(
 	app.GravityKeeper = *app.GravityKeeper.SetHooks(
 		gravitytypes.NewMultiGravityHooks(
 			app.CorkKeeper.Hooks(),
-			app.CellarFeesKeeper.Hooks(),
 		))
 
 	// register the proposal types
@@ -578,7 +574,7 @@ func NewSommelierApp(
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		cork.NewAppModule(app.CorkKeeper, appCodec),
 		incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec),
-		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper),
+		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.AuctionKeeper),
 		auction.NewAppModule(app.AuctionKeeper, app.BankKeeper, app.AccountKeeper, appCodec),
 		pubsub.NewAppModule(appCodec, app.PubsubKeeper, app.StakingKeeper, app.GravityKeeper),
 	)
@@ -713,7 +709,7 @@ func NewSommelierApp(
 		cork.NewAppModule(app.CorkKeeper, appCodec),
 		axelarcork.NewAppModule(app.AxelarCorkKeeper, appCodec),
 		incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec),
-		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper),
+		cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.AuctionKeeper),
 		auction.NewAppModule(app.AuctionKeeper, app.BankKeeper, app.AccountKeeper, appCodec),
 		pubsub.NewAppModule(appCodec, app.PubsubKeeper, app.StakingKeeper, app.GravityKeeper),
 	)
@@ -969,75 +965,13 @@ func (app *SommelierApp) setupUpgradeStoreLoaders() {
 
 	var storeUpgrades *storetypes.StoreUpgrades = nil
 
-	if upgradeInfo.Name == v4.UpgradeName {
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added:   []string{corktypes.ModuleName, cellarfeestypes.ModuleName},
-			Deleted: []string{"allocation"},
-		}
-	}
-
-	if upgradeInfo.Name == v5.UpgradeName {
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added: []string{incentivestypes.ModuleName},
-		}
-	}
-
-	if upgradeInfo.Name == v6.UpgradeName {
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added: []string{icahosttypes.SubModuleName},
-		}
-	}
-
-	if upgradeInfo.Name == v7.UpgradeName {
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added: []string{auctiontypes.ModuleName, axelarcorktypes.ModuleName, cellarfeestypes.ModuleName, pubsubtypes.ModuleName},
-		}
-	}
+	// TODO: Add v8 store loader when writing upgrade handler
 
 	if storeUpgrades != nil {
 		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, storeUpgrades))
 	}
 }
 
 func (app *SommelierApp) setupUpgradeHandlers() {
-	app.UpgradeKeeper.SetUpgradeHandler(
-		v4.UpgradeName,
-		v4.CreateUpgradeHandler(
-			app.mm,
-			app.configurator,
-			app.AccountKeeper,
-			app.BankKeeper,
-		),
-	)
-
-	app.UpgradeKeeper.SetUpgradeHandler(
-		v5.UpgradeName,
-		v5.CreateUpgradeHandler(
-			app.mm,
-			app.configurator,
-			app.IncentivesKeeper,
-		),
-	)
-
-	app.UpgradeKeeper.SetUpgradeHandler(
-		v6.UpgradeName,
-		v6.CreateUpgradeHandler(
-			app.mm,
-			app.configurator,
-		),
-	)
-
-	app.UpgradeKeeper.SetUpgradeHandler(
-		v7.UpgradeName,
-		v7.CreateUpgradeHandler(
-			app.mm,
-			app.configurator,
-			app.AuctionKeeper,
-			app.AxelarCorkKeeper,
-			app.CellarFeesKeeper,
-			app.CorkKeeper,
-			app.ICAHostKeeper,
-			app.PubsubKeeper,
-		),
-	)
+	// TODO: Add v8 upgrade handler
 }

app/upgrades/v4/upgrades.go

@@ -1,3 +1,5 @@
+//go:build exclude
+
 package v4
 
 import (

app/upgrades/v5/upgrades.go

@@ -1,3 +1,5 @@
+//go:build exclude
+
 package v5
 
 import (

app/upgrades/v6/upgrades.go

@@ -1,3 +1,5 @@
+//go:build exclude
+
 package v6
 
 import (

app/upgrades/v7/constants.go

@@ -1,3 +1,5 @@
+//go:build exclude
+
 package v7
 
 // UpgradeName defines the on-chain upgrade name for the Sommelier v7 upgrade

app/upgrades/v7/upgrades.go

@@ -1,3 +1,6 @@
+//go:build exclude
+// +build exclude
+
 package v7
 
 import (