Merge branch 'main' into aptos_spec

med0vyj · Oct 2, 2022 · 2781aed · 2781aed
2 parents ff7ab3e + ecd3c17
commit 2781aed
Show file tree

Hide file tree

Showing 8 changed files with 628 additions and 37 deletions.
diff --git a/app/app.go b/app/app.go
@@ -84,6 +84,7 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
 	"github.com/ignite-hq/cli/ignite/pkg/cosmoscmd"
 	"github.com/ignite-hq/cli/ignite/pkg/openapiconsole"
+	"github.com/lavanet/lava/app/keepers"
 	"github.com/lavanet/lava/app/upgrades"
 	"github.com/lavanet/lava/docs"
 	conflictmodule "github.com/lavanet/lava/x/conflict"
@@ -208,6 +209,8 @@ func init() {
 // capabilities aren't needed for testing.
 type LavaApp struct {
 	*baseapp.BaseApp
+	// keepers
+	keepers.LavaKeepers
 
 	cdc               *codec.LegacyAmino
 	appCodec          codec.Codec
@@ -220,34 +223,6 @@ type LavaApp struct {
 	tkeys   map[string]*sdk.TransientStoreKey
 	memKeys map[string]*sdk.MemoryStoreKey
 
-	// keepers
-	AccountKeeper    authkeeper.AccountKeeper
-	BankKeeper       bankkeeper.Keeper
-	CapabilityKeeper *capabilitykeeper.Keeper
-	StakingKeeper    stakingkeeper.Keeper
-	SlashingKeeper   slashingkeeper.Keeper
-	MintKeeper       mintkeeper.Keeper
-	DistrKeeper      distrkeeper.Keeper
-	GovKeeper        govkeeper.Keeper
-	CrisisKeeper     crisiskeeper.Keeper
-	UpgradeKeeper    upgradekeeper.Keeper
-	ParamsKeeper     paramskeeper.Keeper
-	IBCKeeper        *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
-	EvidenceKeeper   evidencekeeper.Keeper
-	TransferKeeper   ibctransferkeeper.Keeper
-	FeeGrantKeeper   feegrantkeeper.Keeper
-
-	// make scoped keepers public for test purposes
-	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
-	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
-
-	SpecKeeper specmodulekeeper.Keeper
-
-	EpochstorageKeeper epochstoragemodulekeeper.Keeper
-
-	PairingKeeper pairingmodulekeeper.Keeper
-
-	ConflictKeeper conflictmodulekeeper.Keeper
 	// this line is used by starport scaffolding # stargate/app/keeperDeclaration
 
 	// mm is the module manager
@@ -298,6 +273,7 @@ func New(
 
 	app := &LavaApp{
 		BaseApp:           bApp,
+		LavaKeepers:       keepers.LavaKeepers{},
 		cdc:               cdc,
 		appCodec:          appCodec,
 		interfaceRegistry: interfaceRegistry,
@@ -665,6 +641,7 @@ func (app *LavaApp) setupUpgradeHandlers() {
 				app.mm,
 				app.configurator,
 				app.BaseApp,
+				&app.LavaKeepers,
 			),
 		)
 	}

diff --git a/app/keepers/lavaKeepers.go b/app/keepers/lavaKeepers.go
@@ -0,0 +1,54 @@
+package keepers
+
+import (
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
+	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
+	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
+	evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper"
+	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
+	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
+	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
+	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
+	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
+	ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper"
+	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
+	conflictmodulekeeper "github.com/lavanet/lava/x/conflict/keeper"
+	epochstoragemodulekeeper "github.com/lavanet/lava/x/epochstorage/keeper"
+	pairingmodulekeeper "github.com/lavanet/lava/x/pairing/keeper"
+	specmodulekeeper "github.com/lavanet/lava/x/spec/keeper"
+	// this line is used by starport scaffolding # stargate/app/moduleImport
+)
+
+type LavaKeepers struct {
+
+	// Standard Keepers
+	AccountKeeper    authkeeper.AccountKeeper
+	BankKeeper       bankkeeper.Keeper
+	CapabilityKeeper *capabilitykeeper.Keeper
+	StakingKeeper    stakingkeeper.Keeper
+	SlashingKeeper   slashingkeeper.Keeper
+	MintKeeper       mintkeeper.Keeper
+	DistrKeeper      distrkeeper.Keeper
+	GovKeeper        govkeeper.Keeper
+	CrisisKeeper     crisiskeeper.Keeper
+	UpgradeKeeper    upgradekeeper.Keeper
+	ParamsKeeper     paramskeeper.Keeper
+	IBCKeeper        *ibckeeper.Keeper // IBC Keeper must be a pointer in the lk, so we can SetRouter on it correctly
+	EvidenceKeeper   evidencekeeper.Keeper
+	TransferKeeper   ibctransferkeeper.Keeper
+	FeeGrantKeeper   feegrantkeeper.Keeper
+
+	// make scoped keepers public for test purposes
+	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
+	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
+
+	// Special Keepers
+	SpecKeeper         specmodulekeeper.Keeper
+	EpochstorageKeeper epochstoragemodulekeeper.Keeper
+	PairingKeeper      pairingmodulekeeper.Keeper
+	ConflictKeeper     conflictmodulekeeper.Keeper
+}
diff --git a/app/upgrades/types.go b/app/upgrades/types.go
@@ -5,6 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	"github.com/lavanet/lava/app/keepers"
 	abci "github.com/tendermint/tendermint/abci/types"
 )
 
@@ -16,6 +17,6 @@ type BaseAppParamManager interface {
 type Upgrade struct {
 	// Upgrade version name.
 	UpgradeName          string
-	CreateUpgradeHandler func(*module.Manager, module.Configurator, BaseAppParamManager) upgradetypes.UpgradeHandler
+	CreateUpgradeHandler func(*module.Manager, module.Configurator, BaseAppParamManager, *keepers.LavaKeepers) upgradetypes.UpgradeHandler
 	StoreUpgrades        store.StoreUpgrades
 }