remove airdrop module, migrate module account and IncentiveSpend mess…

…age type to x/supply

app/app.go

@@ -39,8 +39,8 @@ import (
 
 	"github.com/quicksilver-zone/quicksilver/app/keepers"
 	"github.com/quicksilver-zone/quicksilver/docs"
-	airdroptypes "github.com/quicksilver-zone/quicksilver/x/airdrop/types"
 	interchainstakingtypes "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types"
+	supplytypes "github.com/quicksilver-zone/quicksilver/x/supply/types"
 )
 
 func Init() {
@@ -64,7 +64,7 @@ var (
 	allowedReceivingModAcc = map[string]bool{
 		distrtypes.ModuleName:             true,
 		interchainstakingtypes.ModuleName: true,
-		airdroptypes.ModuleName:           true,
+		supplytypes.AirdropAccount:        true,
 	}
 )
 

app/keepers/keepers.go

@@ -61,8 +61,6 @@ import (
 
 	appconfig "github.com/quicksilver-zone/quicksilver/cmd/config"
 	"github.com/quicksilver-zone/quicksilver/utils"
-	airdropkeeper "github.com/quicksilver-zone/quicksilver/x/airdrop/keeper"
-	airdroptypes "github.com/quicksilver-zone/quicksilver/x/airdrop/types"
 	claimsmanagerkeeper "github.com/quicksilver-zone/quicksilver/x/claimsmanager/keeper"
 	claimsmanagertypes "github.com/quicksilver-zone/quicksilver/x/claimsmanager/types"
 	epochskeeper "github.com/quicksilver-zone/quicksilver/x/epochs/keeper"
@@ -111,7 +109,6 @@ type AppKeepers struct {
 	InterchainstakingKeeper    *interchainstakingkeeper.Keeper
 	InterchainQueryKeeper      interchainquerykeeper.Keeper
 	ParticipationRewardsKeeper *participationrewardskeeper.Keeper
-	AirdropKeeper              *airdropkeeper.Keeper
 	SupplyKeeper               supplykeeper.Keeper
 
 	// 		IBC keepers
@@ -334,6 +331,7 @@ func (appKeepers *AppKeepers) InitKeepers(
 		appKeepers.AccountKeeper,
 		appKeepers.BankKeeper,
 		appKeepers.StakingKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		utils.Keys[[]string](maccPerms),
 		supplyEndpointEnabled,
 	)
@@ -489,22 +487,6 @@ func (appKeepers *AppKeepers) InitKeepers(
 		govConfig,
 	)
 
-	appKeepers.AirdropKeeper = airdropkeeper.NewKeeper(
-		appCodec,
-		appKeepers.keys[airdroptypes.StoreKey],
-		appKeepers.GetSubspace(airdroptypes.ModuleName),
-		appKeepers.AccountKeeper,
-		appKeepers.BankKeeper,
-		appKeepers.StakingKeeper,
-		appKeepers.GovKeeper,
-		appKeepers.IBCKeeper,
-		appKeepers.InterchainstakingKeeper,
-		appKeepers.ParticipationRewardsKeeper,
-		proofOpsFn,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-	// airdropModule := airdrop.NewAppModule(appCodec, appKeepers.AirdropKeeper)
-
 	appKeepers.ScopedIBCKeeper = scopedIBCKeeper
 	appKeepers.ScopedTransferKeeper = scopedTransferKeeper
 	appKeepers.ScopedICAControllerKeeper = scopedICAControllerKeeper
@@ -536,7 +518,6 @@ func (*AppKeepers) initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *cod
 	paramsKeeper.Subspace(interchainstakingtypes.ModuleName)
 	paramsKeeper.Subspace(interchainquerytypes.ModuleName)
 	paramsKeeper.Subspace(participationrewardstypes.ModuleName)
-	paramsKeeper.Subspace(airdroptypes.ModuleName)
 
 	return paramsKeeper
 }

app/keepers/keys.go

@@ -23,7 +23,6 @@ import (
 	ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
 	ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
 
-	airdroptypes "github.com/quicksilver-zone/quicksilver/x/airdrop/types"
 	claimsmanagertypes "github.com/quicksilver-zone/quicksilver/x/claimsmanager/types"
 	epochstypes "github.com/quicksilver-zone/quicksilver/x/epochs/types"
 	interchainquerytypes "github.com/quicksilver-zone/quicksilver/x/interchainquery/types"
@@ -62,7 +61,6 @@ func KVStoreKeys() []string {
 		interchainstakingtypes.StoreKey,
 		interchainquerytypes.StoreKey,
 		participationrewardstypes.StoreKey,
-		airdroptypes.StoreKey,
 		supplytypes.StoreKey,
 	}
 }

app/modules.go

@@ -49,8 +49,6 @@ import (
 	ibcclientclient "github.com/cosmos/ibc-go/v6/modules/core/02-client/client"
 	ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
 
-	"github.com/quicksilver-zone/quicksilver/x/airdrop"
-	airdroptypes "github.com/quicksilver-zone/quicksilver/x/airdrop/types"
 	"github.com/quicksilver-zone/quicksilver/x/claimsmanager"
 	claimsmanagertypes "github.com/quicksilver-zone/quicksilver/x/claimsmanager/types"
 	"github.com/quicksilver-zone/quicksilver/x/epochs"
@@ -105,7 +103,6 @@ var (
 		interchainstaking.AppModuleBasic{},
 		interchainquery.AppModuleBasic{},
 		participationrewards.AppModuleBasic{},
-		airdrop.AppModuleBasic{},
 		supply.AppModuleBasic{},
 	)
 
@@ -124,7 +121,7 @@ var (
 		interchainstakingtypes.EscrowModuleAccount: {authtypes.Burner},
 		interchainquerytypes.ModuleName:            nil,
 		participationrewardstypes.ModuleName:       nil,
-		airdroptypes.ModuleName:                    nil,
+		supplytypes.AirdropAccount:                 nil,
 		packetforwardtypes.ModuleName:              nil,
 	}
 )
@@ -170,7 +167,6 @@ func appModules(
 		interchainstaking.NewAppModule(appCodec, app.InterchainstakingKeeper),
 		interchainquery.NewAppModule(appCodec, app.InterchainQueryKeeper),
 		participationrewards.NewAppModule(appCodec, app.ParticipationRewardsKeeper),
-		airdrop.NewAppModule(appCodec, app.AirdropKeeper),
 		supply.NewAppModule(appCodec, app.SupplyKeeper),
 	}
 }
@@ -208,7 +204,6 @@ func simulationModules(
 		interchainstaking.NewAppModule(appCodec, app.InterchainstakingKeeper),
 		interchainquery.NewAppModule(appCodec, app.InterchainQueryKeeper),
 		participationrewards.NewAppModule(appCodec, app.ParticipationRewardsKeeper),
-		airdrop.NewAppModule(appCodec, app.AirdropKeeper),
 		// supply.NewAppModule(appCodec, app.SupplyKeeper),
 	}
 }
@@ -244,7 +239,6 @@ func orderBeginBlockers() []string {
 		packetforwardtypes.ModuleName,
 		claimsmanagertypes.ModuleName,
 		participationrewardstypes.ModuleName,
-		airdroptypes.ModuleName,
 		authtypes.ModuleName,
 		banktypes.ModuleName,
 		govtypes.ModuleName,
@@ -295,7 +289,6 @@ func orderEndBlockers() []string {
 		claimsmanagertypes.ModuleName,
 		interchainstakingtypes.ModuleName,
 		participationrewardstypes.ModuleName,
-		airdroptypes.ModuleName,
 		supplytypes.ModuleName,
 		// currently no-op.
 	}
@@ -337,7 +330,6 @@ func orderInitBlockers() []string {
 		interchainstakingtypes.ModuleName,
 		interchainquerytypes.ModuleName,
 		participationrewardstypes.ModuleName,
-		airdroptypes.ModuleName,
 		supplytypes.ModuleName,
 		// NOTE: crisis module must go at the end to check for invariants on each module
 		crisistypes.ModuleName,

app/upgrades.go

@@ -17,8 +17,9 @@ import (
 )
 
 const (
-	wasmModuleName = "wasm"
-	tfModuleName   = "tokenfactory"
+	wasmModuleName    = "wasm"
+	tfModuleName      = "tokenfactory"
+	airdropModuleName = "airdrop"
 )
 
 func (app *Quicksilver) setUpgradeHandlers() {
@@ -76,6 +77,10 @@ func (app *Quicksilver) setUpgradeStoreLoaders() {
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Deleted: []string{wasmModuleName, tfModuleName},
 		}
+	case upgrades.V010706UpgradeName:
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Deleted: []string{airdropModuleName},
+		}
 	default:
 		// no-op
 	}

app/upgrades/types.go

@@ -53,6 +53,7 @@ const (
 	V010702UpgradeName = "v1.7.2"
 	V010704UpgradeName = "v1.7.4"
 	V010705UpgradeName = "v1.7.5"
+	V010706UpgradeName = "v1.7.6"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

app/upgrades/upgrades.go

@@ -28,6 +28,7 @@ func Upgrades() []Upgrade {
 		{UpgradeName: V010702UpgradeName, CreateUpgradeHandler: V010702UpgradeHandler},
 		{UpgradeName: V010704UpgradeName, CreateUpgradeHandler: V010704UpgradeHandler},
 		{UpgradeName: V010705UpgradeName, CreateUpgradeHandler: V010705UpgradeHandler},
+		{UpgradeName: V010706UpgradeName, CreateUpgradeHandler: V010706UpgradeHandler},
 	}
 }
 

app/upgrades/v1_7.go

@@ -159,3 +159,13 @@ func V010705UpgradeHandler(
 		return mm.RunMigrations(ctx, configurator, fromVM)
 	}
 }
+
+func V010706UpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	appKeepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}