Merge pull request #444 from persistenceOne/puneet/protocolpool

add protocol pool, have custom export genesis

Author: puneet2019

app/app.go

@@ -187,10 +187,9 @@ func NewApplication(
 	app.moduleManager.SetOrderBeginBlockers(orderBeginBlockers()...)
 	app.moduleManager.SetOrderEndBlockers(orderEndBlockers()...)
 	app.moduleManager.SetOrderInitGenesis(orderInitGenesis()...)
-	app.moduleManager.SetOrderExportGenesis(orderInitGenesis()...)
+	app.moduleManager.SetOrderExportGenesis(orderExportGenesis()...)
 	//app.moduleManager.SetOrderMigrations()
 
-	app.moduleManager.RegisterInvariants(app.CrisisKeeper)
 	app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())
 	err = app.moduleManager.RegisterServices(app.configurator)
 	if err != nil {

app/keepers/keepers.go

@@ -44,6 +44,8 @@ import (
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	paramsproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
+	protocolpoolkeeper "github.com/cosmos/cosmos-sdk/x/protocolpool/keeper"
+	protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
@@ -93,6 +95,7 @@ type AppKeepers struct {
 	MintKeeper            *mintkeeper.Keeper
 	DistributionKeeper    *distributionkeeper.Keeper
 	GovKeeper             *govkeeper.Keeper
+	ProtocolPoolKeeper    *protocolpoolkeeper.Keeper
 	UpgradeKeeper         *upgradekeeper.Keeper
 	CrisisKeeper          *crisiskeeper.Keeper
 	ParamsKeeper          *paramskeeper.Keeper
@@ -218,6 +221,15 @@ func NewAppKeeper(
 	)
 	appKeepers.MintKeeper = &mintKeeper
 
+	protocolPoolKeeper := protocolpoolkeeper.NewKeeper(
+		appCodec,
+		runtime.NewKVStoreService(appKeepers.keys[protocolpooltypes.StoreKey]),
+		appKeepers.AccountKeeper,
+		appKeepers.BankKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+	appKeepers.ProtocolPoolKeeper = &protocolPoolKeeper
+
 	distributionKeeper := distributionkeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(appKeepers.keys[distributiontypes.StoreKey]),
@@ -226,6 +238,7 @@ func NewAppKeeper(
 		appKeepers.StakingKeeper,
 		authtypes.FeeCollectorName,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		distributionkeeper.WithExternalCommunityPool(appKeepers.ProtocolPoolKeeper),
 	)
 	appKeepers.DistributionKeeper = &distributionKeeper
 

app/keepers/keys.go

@@ -5,7 +5,7 @@ import (
 	evidencetypes "cosmossdk.io/x/evidence/types"
 	"cosmossdk.io/x/feegrant"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	"github.com/CosmWasm/wasmd/x/wasm"
+	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -16,6 +16,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	liquidtypes "github.com/cosmos/gaia/v25/x/liquid/types"
@@ -57,7 +58,8 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		slashingtypes.StoreKey,
 		stakingtypes.StoreKey,
 		upgradetypes.StoreKey,
-		wasm.StoreKey,
+		wasmtypes.StoreKey,
+		protocolpooltypes.StoreKey,
 	)
 
 	// Define transient store keys

app/modules.go

@@ -36,6 +36,8 @@ import (
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/cosmos/cosmos-sdk/x/protocolpool"
+	protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
@@ -58,16 +60,18 @@ import (
 )
 
 var ModuleAccountPermissions = map[string][]string{
-	authtypes.FeeCollectorName:     nil,
-	distributiontypes.ModuleName:   nil,
-	icatypes.ModuleName:            nil,
-	minttypes.ModuleName:           {authtypes.Minter},
-	stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
-	stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
-	govtypes.ModuleName:            {authtypes.Burner},
-	ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
-	wasm.ModuleName:                {authtypes.Burner},
-	liquidstaketypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
+	authtypes.FeeCollectorName:                  nil,
+	distributiontypes.ModuleName:                nil,
+	icatypes.ModuleName:                         nil,
+	minttypes.ModuleName:                        {authtypes.Minter},
+	stakingtypes.BondedPoolName:                 {authtypes.Burner, authtypes.Staking},
+	stakingtypes.NotBondedPoolName:              {authtypes.Burner, authtypes.Staking},
+	govtypes.ModuleName:                         {authtypes.Burner},
+	ibctransfertypes.ModuleName:                 {authtypes.Minter, authtypes.Burner},
+	wasmtypes.ModuleName:                        {authtypes.Burner},
+	liquidstaketypes.ModuleName:                 {authtypes.Minter, authtypes.Burner},
+	protocolpooltypes.ModuleName:                nil,
+	protocolpooltypes.ProtocolPoolEscrowAccount: nil,
 }
 
 var receiveAllowedMAcc = map[string]bool{
@@ -109,6 +113,7 @@ func appModules(
 		liquidstake.NewAppModule(*app.LiquidStakeKeeper),
 		crisis.NewAppModule(app.CrisisKeeper, false, app.GetSubspace(crisistypes.ModuleName)), // skipGenesisInvariants: false, always be last to make sure that it checks for all invariants and not only part of them
 		ibctm.NewAppModule(app.TMLightClientModule),
+		protocolpool.NewAppModule(*app.ProtocolPoolKeeper, app.AccountKeeper, app.BankKeeper),
 	}
 }
 
@@ -141,6 +146,7 @@ func orderBeginBlockers() []string {
 		authtypes.ModuleName,
 		banktypes.ModuleName,
 		distributiontypes.ModuleName,
+		protocolpooltypes.ModuleName,
 		slashingtypes.ModuleName,
 		minttypes.ModuleName,
 		genutiltypes.ModuleName,
@@ -187,6 +193,7 @@ func orderEndBlockers() []string {
 		epochstypes.ModuleName,
 		liquidtypes.ModuleName,
 		liquidstaketypes.ModuleName,
+		protocolpooltypes.ModuleName,
 	}
 }
 
@@ -223,5 +230,37 @@ func orderInitGenesis() []string {
 		epochstypes.ModuleName,
 		liquidtypes.ModuleName,
 		liquidstaketypes.ModuleName,
+		protocolpooltypes.ModuleName,
+	}
+}
+
+func orderExportGenesis() []string {
+	return []string{
+		consensusparamtypes.ModuleName,
+		authtypes.ModuleName,
+		protocolpooltypes.ModuleName, // Must be exported before bank
+		banktypes.ModuleName,
+		distributiontypes.ModuleName,
+		stakingtypes.ModuleName,
+		slashingtypes.ModuleName,
+		govtypes.ModuleName,
+		minttypes.ModuleName,
+		crisistypes.ModuleName,
+		genutiltypes.ModuleName,
+		evidencetypes.ModuleName,
+		authz.ModuleName,
+		feegrant.ModuleName,
+		ibctransfertypes.ModuleName,
+		ibcexported.ModuleName,
+		icatypes.ModuleName,
+		upgradetypes.ModuleName,
+		vestingtypes.ModuleName,
+		halving.ModuleName,
+		ibchookstypes.ModuleName,
+		packetforwardtypes.ModuleName,
+		epochstypes.ModuleName,
+		liquidtypes.ModuleName,
+		liquidstaketypes.ModuleName,
+		wasmtypes.ModuleName,
 	}
 }

app/upgrades/testnet/v16.0.0-rc0/constants.go

@@ -2,6 +2,8 @@ package v16_0_0_rc0
 
 import (
 	store "cosmossdk.io/store/types"
+	protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
+
 	"github.com/persistenceOne/persistenceCore/v16/app/upgrades"
 )
 
@@ -14,7 +16,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{}, //TODO protocol pool,
-		Deleted: []string{},
+		Added:   []string{protocolpooltypes.StoreKey},
+		Deleted: []string{}, // TODO crisis??
 	},
 }

app/upgrades/v16.0.0/constants.go

@@ -2,6 +2,8 @@ package v16_0_0
 
 import (
 	store "cosmossdk.io/store/types"
+	protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
+
 	"github.com/persistenceOne/persistenceCore/v16/app/upgrades"
 )
 
@@ -14,7 +16,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{}, //TODO add protocolpool
-		Deleted: []string{},
+		Added:   []string{protocolpooltypes.StoreKey},
+		Deleted: []string{}, //TODO crisis?
 	},
 }