feat(x/gov): validators can only vote with own stake (#20)

Change #7 so that validators are allowed to vote, but cannot use
delegations in governance to increase their voting power, they can only
vote with their own stake. This seems more sensible wrt the previous
solution of removing their ability to vote entirely.

This also addresses #19 as I added comments in the README, and also che
changelog should be good. Therefore with this PR we should be able to
also merge the feat branch back into main and close #6

CHANGELOG.md

@@ -14,8 +14,8 @@
 
 * Forked `x/gov` module from Cosmos SDK v0.46.16 for custom modifications
   ([#4](https://github.com/atomone-hub/govgen/pull/4)).
-* Removed ability for validators to vote on proposals
-  ([#10](https://github.com/atomone-hub/govgen/pull/10)).
+* Removed ability for validators to vote on proposals with delegations, they can only use their own stake
+  ([#20](https://github.com/atomone-hub/govgen/pull/20)).
 * Remove community spend proposal
   ([#13](https://github.com/atomone-hub/govgen/pull/13)).
 * Adapt voting period to proposal type.

README.md

@@ -11,3 +11,6 @@ The following modifications have been made to the Cosmos Hub software to create
     4. Revert to standard Cosmos SDK v0.46.16 without the Liquid Staking Module (LSM)
     5. Changed Bech32 prefixes to `govgen` (see `cmd/govgend/cmd/config.go`)
     6. Reduced hard-coded ante min-deposit percentage to 1% (see `ante/gov_ante.go:minInitialDepositFraction`)
+    7. Removed ability for validators to vote on proposals with delegations, they can only use their own stake
+    8. Remove community spend proposal
+    9. Allow selecting different voting periods for different proposal types

app/modules.go

@@ -95,7 +95,7 @@ func appModules(
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
-		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
+		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
@@ -122,7 +122,7 @@ func simulationModules(
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
+		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
 		staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),

x/gov/keeper/common_test.go

@@ -14,7 +14,7 @@ import (
 	govgenhelpers "github.com/atomone-hub/govgen/app/helpers"
 )
 
-func createValidators(t *testing.T, ctx sdk.Context, app *govgenapp.GovGenApp, powers []int64) ([]sdk.AccAddress, []sdk.ValAddress) { //nolint: thelper,unparam
+func createValidators(t *testing.T, ctx sdk.Context, app *govgenapp.GovGenApp, powers []int64) ([]sdk.AccAddress, []sdk.ValAddress) { //nolint: thelper
 	addrs := govgenhelpers.AddTestAddrsIncremental(app, ctx, 5, sdk.NewInt(30000000))
 	valAddrs := govgenhelpers.ConvertAddrsToValAddrs(addrs)
 	pks := govgenhelpers.CreateTestPubKeys(5)

x/gov/keeper/grpc_query_test.go

@@ -7,7 +7,6 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	govgenhelpers "github.com/atomone-hub/govgen/app/helpers"
 	"github.com/atomone-hub/govgen/x/gov/types"
@@ -715,17 +714,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposits() {
 func (suite *KeeperTestSuite) TestGRPCQueryTally() {
 	app, ctx, queryClient := suite.app, suite.ctx, suite.queryClient
 
-	_, valAddrs := createValidators(suite.T(), ctx, app, []int64{5, 5, 5})
-	addrs := govgenhelpers.AddTestAddrs(app, ctx, 3, sdk.NewInt(50000000))
-
-	delTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 5)
-	val1, found := app.StakingKeeper.GetValidator(ctx, valAddrs[0])
-	suite.Require().True(found)
-
-	for _, addr := range addrs {
-		_, err := app.StakingKeeper.Delegate(ctx, addr, delTokens, stakingtypes.Unbonded, val1, true)
-		suite.Require().NoError(err)
-	}
+	addrs, _ := createValidators(suite.T(), ctx, app, []int64{5, 5, 5})
 
 	var (
 		req      *types.QueryTallyResultRequest

x/gov/keeper/tally.go

@@ -71,6 +71,8 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 		return false
 	})
 
+	/* DISABLED on GovGen - Voting can only be done with your own stake
+
 	// iterate over the validators again to tally their voting power
 	for _, val := range currValidators {
 		if len(val.Vote) == 0 {
@@ -87,6 +89,8 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 		totalVotingPower = totalVotingPower.Add(votingPower)
 	}
 
+	*/
+
 	tallyParams := keeper.GetTallyParams(ctx)
 	tallyResults = types.NewTallyResultFromMap(results)