Add Council

app/app.go

@@ -1,7 +1,9 @@
 package app
 
 import (
+	"fmt"
 	"io"
+	"math"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -100,7 +102,7 @@ import (
 const (
 	AccountAddressPrefix = "cc"
 	Name                 = "Cardchain"
-	BondDenom						 = "bpf"
+	BondDenom            = "bpf"
 	// epochBlockTime defines how many blocks are one buffnerf epoch
 	epochBlockTime = 86000 // this is 1 week with 7s block time
 	// epochBlockTime = 5		// this is great for debugging
@@ -256,7 +258,7 @@ func New(
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
-		cardchainmoduletypes.UsersStoreKey, cardchainmoduletypes.CardsStoreKey, cardchainmoduletypes.MatchesStoreKey, cardchainmoduletypes.CollectionsStoreKey, cardchainmoduletypes.SellOffersStoreKey, cardchainmoduletypes.InternalStoreKey,
+		cardchainmoduletypes.GeneralStoreKey, cardchainmoduletypes.UsersStoreKey, cardchainmoduletypes.CardsStoreKey, cardchainmoduletypes.MatchesStoreKey, cardchainmoduletypes.CollectionsStoreKey, cardchainmoduletypes.SellOffersStoreKey, cardchainmoduletypes.PoolsStoreKey, cardchainmoduletypes.CouncilsStoreKey, cardchainmoduletypes.InternalStoreKey,
 		// this line is used by starport scaffolding # stargate/app/storeKey
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -344,11 +346,14 @@ func New(
 
 	app.CardchainKeeper = *cardchainmodulekeeper.NewKeeper(
 		appCodec,
+		keys[cardchainmoduletypes.GeneralStoreKey],
 		keys[cardchainmoduletypes.UsersStoreKey],
 		keys[cardchainmoduletypes.CardsStoreKey],
 		keys[cardchainmoduletypes.MatchesStoreKey],
 		keys[cardchainmoduletypes.CollectionsStoreKey],
 		keys[cardchainmoduletypes.SellOffersStoreKey],
+		keys[cardchainmoduletypes.PoolsStoreKey],
+		keys[cardchainmoduletypes.CouncilsStoreKey],
 		keys[cardchainmoduletypes.InternalStoreKey],
 		app.GetSubspace(cardchainmoduletypes.ModuleName),
 
@@ -526,30 +531,61 @@ func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.R
 // EndBlocker application updates every end block
 func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 	// update the price of card auction (currently 1% decay per block)
-	price := app.CardchainKeeper.GetCardAuctionPrice(ctx)
-	newprice := price.Sub(sdk.NewCoin("ucredits", price.Amount.Quo(sdk.NewInt(100000000)))) // Somehow this line is evil
-	app.CardchainKeeper.SetCardAuctionPrice(ctx, newprice)
+	price := app.CardchainKeeper.GetCardAuctionPrice(ctx)  // TODO intervall
+	newprice := price.Sub(cardchainmodulekeeper.QuoCoin(price, 100))
+	if !newprice.IsLT(sdk.NewInt64Coin("ucredits", 1000000)) { // stop at 1 credit
+		app.CardchainKeeper.SetCardAuctionPrice(ctx, newprice)
+	}
+	app.CardchainKeeper.Logger(ctx).Info(fmt.Sprintf(":: CardAuctionPrice: %s", app.CardchainKeeper.GetCardAuctionPrice(ctx)))
 
 	// automated nerf/buff happens here
 	if app.LastBlockHeight()%epochBlockTime == 0 {
 		cardchainmodule.UpdateNerfLevels(ctx, app.CardchainKeeper)
 		app.CardchainKeeper.AddVoteRightsToAllUsers(ctx, ctx.BlockHeight()+app.CardchainKeeper.GetParams(ctx).VotingRightsExpirationTime)
 	}
 
+	if app.LastBlockHeight()%500 == 0 { //HourlyFaucet
+		app.CardchainKeeper.AddPoolCredits(ctx, cardchainmodulekeeper.PublicPoolKey, app.CardchainKeeper.GetParams(ctx).HourlyFaucet)
+
+		incentives := cardchainmodulekeeper.QuoCoin(app.CardchainKeeper.GetPool(ctx, cardchainmodulekeeper.PublicPoolKey), 10)
+		app.CardchainKeeper.SubPoolCredits(ctx, cardchainmodulekeeper.PublicPoolKey, incentives)
+		winnersIncentives := cardchainmodulekeeper.MulCoinFloat(incentives, float64(app.CardchainKeeper.GetWinnerIncentives(ctx)))
+		balancersIncentives := cardchainmodulekeeper.MulCoinFloat(incentives, float64(app.CardchainKeeper.GetBalancerIncentives(ctx)))
+		app.CardchainKeeper.AddPoolCredits(ctx, cardchainmodulekeeper.WinnersPoolKey, winnersIncentives)
+		app.CardchainKeeper.AddPoolCredits(ctx, cardchainmodulekeeper.BalancersPoolKey, balancersIncentives)
+		app.CardchainKeeper.Logger(ctx).Info(fmt.Sprintf(":: PublicPool: %s", app.CardchainKeeper.GetPool(ctx, cardchainmodulekeeper.PublicPoolKey)))
+	}
+
+	if app.LastBlockHeight()%(24*500) == 0 { //Dayly game/vote reset
+		app.CardchainKeeper.SetGeneralValue(ctx, cardchainmodulekeeper.Votes24ValueKey, 0)
+		app.CardchainKeeper.SetGeneralValue(ctx, cardchainmodulekeeper.Games24ValueKey, 0)
+	}
+
+	err := app.CardchainKeeper.CheckTrial(ctx)
+	if err != nil {
+		app.CardchainKeeper.Logger(ctx).Error(fmt.Sprintf("%s", err))
+	}
+
 	return app.mm.EndBlock(ctx, req)
 }
 
 // InitChainer application update at chain initialization
 func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
 	var genesisState GenesisState
 	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
-		panic(err)
+		//panic(err)
 	}
 
 	// initialize CardScheme Id, Auction price and public pool
-	app.CardchainKeeper.SetLastCardSchemeId(ctx, uint64(0))
 	app.CardchainKeeper.SetCardAuctionPrice(ctx, sdk.NewInt64Coin("ucredits", 10000000))
-	app.CardchainKeeper.SetPublicPoolCredits(ctx, sdk.NewInt64Coin("ucredits", 1000000000))
+
+	for _, key := range app.CardchainKeeper.PoolKeys {
+		app.CardchainKeeper.SetPool(ctx, key, sdk.NewInt64Coin("ucredits", int64(1000*math.Pow(10, 6))))
+	}
+
+	for _, key := range app.CardchainKeeper.GeneralValueKeys {
+		app.CardchainKeeper.SetGeneralValue(ctx, key, uint64(0))
+	}
 
 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
 	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)

app/modules.go

@@ -1,19 +1,19 @@
 package app
 
 import (
-  "encoding/json"
+	"encoding/json"
 
-  "github.com/cosmos/cosmos-sdk/codec"
-  sdk "github.com/cosmos/cosmos-sdk/types"
-  "github.com/cosmos/cosmos-sdk/x/bank"
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/bank"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-  "github.com/cosmos/cosmos-sdk/x/crisis"
-  crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
-  "github.com/cosmos/cosmos-sdk/x/gov"
+	"github.com/cosmos/cosmos-sdk/x/crisis"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
+	"github.com/cosmos/cosmos-sdk/x/gov"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-  "github.com/cosmos/cosmos-sdk/x/mint"
-  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
-  "github.com/cosmos/cosmos-sdk/x/staking"
+	"github.com/cosmos/cosmos-sdk/x/mint"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
@@ -26,16 +26,16 @@ type BankModule struct {
 // DefaultGenesis returns custom x/bank module genesis state.
 func (BankModule) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
 	Metadata := banktypes.Metadata{
-    Name:        "Burning Pitchfork",
-  	Symbol:      "BPF",
-  	Description: "The native staking token of the CrowdControlNetwork.",
-  	DenomUnits: []*banktypes.DenomUnit{
-  		{"ubpf", uint32(0), []string{"microbpf"}},
-  		{"mbpf", uint32(3), []string{"millibpf"}},
-  		{BondDenom, uint32(6), nil},
-  	},
-  	Base:    "ubpf",
-  	Display: BondDenom,
+		Name:        "Burning Pitchfork",
+		Symbol:      "BPF",
+		Description: "The native staking token of the CrowdControlNetwork.",
+		DenomUnits: []*banktypes.DenomUnit{
+			{"ubpf", uint32(0), []string{"microbpf"}},
+			{"mbpf", uint32(3), []string{"millibpf"}},
+			{BondDenom, uint32(6), nil},
+		},
+		Base:    "ubpf",
+		Display: BondDenom,
 	}
 
 	genState := banktypes.DefaultGenesisState()
@@ -74,7 +74,6 @@ func (MintModule) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
 	return cdc.MustMarshalJSON(genState)
 }
 
-
 // GovModule defines a custom wrapper around the x/gov module's
 // AppModuleBasic implementation to provide custom default genesis state.
 type GovModule struct {