Improve the Gov Module Mechanism by BLV Labs

app/app.go

@@ -61,6 +61,7 @@ import (
 
 	// v9 had been used by tax2gas and has to be skipped
 	v10 "github.com/classic-terra/core/v3/app/upgrades/v10"
+	v10_1 "github.com/classic-terra/core/v3/app/upgrades/v10_1"
 
 	customante "github.com/classic-terra/core/v3/custom/auth/ante"
 	custompost "github.com/classic-terra/core/v3/custom/auth/post"
@@ -94,6 +95,7 @@ var (
 		v8_1.Upgrade,
 		v8_2.Upgrade,
 		v8_3.Upgrade,
+		v10_1.Upgrade,
 		v10.Upgrade,
 	}
 

app/keepers/keepers.go

@@ -42,7 +42,6 @@ import (
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
-	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
@@ -62,6 +61,8 @@ import (
 	customwasmkeeper "github.com/classic-terra/core/v3/custom/wasm/keeper"
 	terrawasm "github.com/classic-terra/core/v3/wasmbinding"
 
+	customgovkeeper "github.com/classic-terra/core/v3/custom/gov/keeper"
+
 	dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper"
 	dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types"
 	marketkeeper "github.com/classic-terra/core/v3/x/market/keeper"
@@ -87,7 +88,7 @@ type AppKeepers struct {
 	SlashingKeeper        slashingkeeper.Keeper
 	MintKeeper            mintkeeper.Keeper
 	DistrKeeper           distrkeeper.Keeper
-	GovKeeper             govkeeper.Keeper
+	GovKeeper             customgovkeeper.Keeper
 	CrisisKeeper          *crisiskeeper.Keeper
 	UpgradeKeeper         *upgradekeeper.Keeper
 	ParamsKeeper          paramskeeper.Keeper
@@ -444,18 +445,20 @@ func NewAppKeepers(
 	// register the proposal types
 	govRouter := appKeepers.newGovRouter()
 	govConfig := govtypes.DefaultConfig()
-	govKeeper := govkeeper.NewKeeper(
+	govKeeper := customgovkeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[govtypes.StoreKey],
 		appKeepers.AccountKeeper,
 		appKeepers.BankKeeper,
 		appKeepers.StakingKeeper,
+		appKeepers.OracleKeeper,
 		bApp.MsgServiceRouter(),
 		govConfig,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	// Set legacy router for backwards compatibility with gov v1beta1
 	govKeeper.SetLegacyRouter(govRouter)
+
 	appKeepers.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(
 		// register the governance hooks

app/modules.go

@@ -12,6 +12,7 @@ import (
 	customdistr "github.com/classic-terra/core/v3/custom/distribution"
 	customevidence "github.com/classic-terra/core/v3/custom/evidence"
 	customfeegrant "github.com/classic-terra/core/v3/custom/feegrant"
+	// "github.com/classic-terra/core/v3/custom/gov"
 	customgov "github.com/classic-terra/core/v3/custom/gov"
 	custommint "github.com/classic-terra/core/v3/custom/mint"
 	customparams "github.com/classic-terra/core/v3/custom/params"
@@ -50,7 +51,7 @@ import (
 	feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
-	"github.com/cosmos/cosmos-sdk/x/gov"
+
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/mint"
@@ -171,7 +172,7 @@ func appModules(
 		taxbank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.TreasuryKeeper, app.GetSubspace(banktypes.ModuleName), app.TaxKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-		gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
+		customgov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper, app.GetSubspace(govtypes.ModuleName)),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)),
@@ -207,7 +208,7 @@ func simulationModules(
 		custombank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
-		gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
+		customgov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper, app.GetSubspace(govtypes.ModuleName)),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)),

app/upgrades/v10_1/constants.go

@@ -0,0 +1,13 @@
+//nolint:revive
+package v10_1
+
+import (
+	"github.com/classic-terra/core/v3/app/upgrades"
+)
+
+const UpgradeName = "v10_1"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateV101UpgradeHandler,
+}

app/upgrades/v10_1/upgrades.go

@@ -0,0 +1,21 @@
+//nolint:revive
+package v10_1
+
+import (
+	"github.com/classic-terra/core/v3/app/keepers"
+	"github.com/classic-terra/core/v3/app/upgrades"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateV101UpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+	_ upgrades.BaseAppParamManager,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, cfg, fromVM)
+	}
+}

cmd/terrad/testnet.go

@@ -11,12 +11,12 @@ import (
 	"path/filepath"
 	"time"
 
+	govv2custom "github.com/classic-terra/core/v3/custom/gov/types/v2custom"
 	tmconfig "github.com/cometbft/cometbft/config"
 	tmos "github.com/cometbft/cometbft/libs/os"
 	tmrand "github.com/cometbft/cometbft/libs/rand"
 	"github.com/cometbft/cometbft/types"
 	tmtime "github.com/cometbft/cometbft/types/time"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -309,7 +309,7 @@ func initGenFiles(
 	appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState)
 
 	// set gov in the genesis state
-	var govGenState govv1.GenesisState
+	var govGenState govv2custom.GenesisState
 	clientCtx.Codec.MustUnmarshalJSON(appGenState[govtypes.ModuleName], &govGenState)
 	votingPeriod := time.Minute * 3
 	govGenState.Params.VotingPeriod = &votingPeriod

custom/auth/ante/ante.go

@@ -8,8 +8,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
-	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 
+	customgovkeeper "github.com/classic-terra/core/v3/custom/gov/keeper"
 	dyncommante "github.com/classic-terra/core/v3/x/dyncomm/ante"
 	dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -37,7 +37,7 @@ type HandlerOptions struct {
 	IBCKeeper              ibckeeper.Keeper
 	WasmKeeper             *wasmkeeper.Keeper
 	DistributionKeeper     distributionkeeper.Keeper
-	GovKeeper              govkeeper.Keeper
+	GovKeeper              customgovkeeper.Keeper
 	WasmConfig             *wasmtypes.WasmConfig
 	TXCounterStoreKey      storetypes.StoreKey
 	DyncommKeeper          dyncommkeeper.Keeper

custom/auth/ante/min_initial_deposit.go

@@ -4,23 +4,23 @@ import (
 	"fmt"
 
 	errorsmod "cosmossdk.io/errors"
+	core "github.com/classic-terra/core/v3/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	core "github.com/classic-terra/core/v3/types"
+	customgovkeeper "github.com/classic-terra/core/v3/custom/gov/keeper"
 )
 
 // MinInitialDeposit Decorator will check Initial Deposits for MsgSubmitProposal
 type MinInitialDepositDecorator struct {
-	govKeeper      govkeeper.Keeper
+	govKeeper      customgovkeeper.Keeper
 	treasuryKeeper TreasuryKeeper
 }
 
 // NewMinInitialDeposit returns new min initial deposit decorator instance
-func NewMinInitialDepositDecorator(govKeeper govkeeper.Keeper, treasuryKeeper TreasuryKeeper) MinInitialDepositDecorator {
+func NewMinInitialDepositDecorator(govKeeper customgovkeeper.Keeper, treasuryKeeper TreasuryKeeper) MinInitialDepositDecorator {
 	return MinInitialDepositDecorator{
 		govKeeper:      govKeeper,
 		treasuryKeeper: treasuryKeeper,
@@ -38,9 +38,8 @@ func IsMsgSubmitProposal(msg sdk.Msg) bool {
 }
 
 // HandleCheckMinInitialDeposit
-func HandleCheckMinInitialDeposit(ctx sdk.Context, msg sdk.Msg, govKeeper govkeeper.Keeper, treasuryKeeper TreasuryKeeper) (err error) {
+func HandleCheckMinInitialDeposit(ctx sdk.Context, msg sdk.Msg, govKeeper customgovkeeper.Keeper, treasuryKeeper TreasuryKeeper) (err error) {
 	var initialDepositCoins sdk.Coins
-
 	switch submitPropMsg := msg.(type) {
 	case *govv1beta1.MsgSubmitProposal:
 		initialDepositCoins = submitPropMsg.GetInitialDeposit()
@@ -49,18 +48,19 @@ func HandleCheckMinInitialDeposit(ctx sdk.Context, msg sdk.Msg, govKeeper govkee
 	default:
 		return fmt.Errorf("could not dereference msg as MsgSubmitProposal")
 	}
-	minDeposit := govKeeper.GetParams(ctx).MinDeposit
-	requiredAmount := sdk.NewDecFromInt(minDeposit[0].Amount).Mul(treasuryKeeper.GetMinInitialDepositRatio(ctx)).TruncateInt()
-
-	requiredDepositCoins := sdk.NewCoins(
-		sdk.NewCoin(core.MicroLunaDenom, requiredAmount),
-	)
-
-	if !initialDepositCoins.IsAllGTE(requiredDepositCoins) {
-		return fmt.Errorf("not enough initial deposit provided. Expected %q; got %q", requiredDepositCoins, initialDepositCoins)
+	// set offset price change 3%
+	offsetPrice := sdk.NewDecWithPrec(97, 2)
+	minUlunaAmount, err := govKeeper.GetMinimumDepositBaseUstc(ctx)
+	minInitialDepositRatio := treasuryKeeper.GetMinInitialDepositRatio(ctx)
+	if err == nil && minUlunaAmount.GT(sdk.ZeroInt()) {
+		requiredDeposit := sdk.NewDecFromInt(minUlunaAmount).Mul(minInitialDepositRatio).Mul(offsetPrice).TruncateInt()
+		requiredDepositCoins := sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, requiredDeposit))
+		if initialDepositCoins.IsAllLT(requiredDepositCoins) {
+			return fmt.Errorf("not enough initial deposit provided. Expected %q; got %q", requiredDepositCoins, initialDepositCoins)
+		}
+		return nil
 	}
-
-	return nil
+	return fmt.Errorf("could not get minimum deposit base uusd")
 }
 
 // AnteHandle handles checking MsgSubmitProposal

custom/auth/ante/min_initial_deposit_test.go

@@ -1,24 +1,14 @@
 package ante_test
 
 import (
-	// "fmt"
+	"fmt"
 
+	"github.com/classic-terra/core/v3/custom/auth/ante"
+	govv2custom "github.com/classic-terra/core/v3/custom/gov/types/v2custom"
+	core "github.com/classic-terra/core/v3/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	// banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-
-	"github.com/classic-terra/core/v3/custom/auth/ante"
-	core "github.com/classic-terra/core/v3/types"
-
-	// core "github.com/terra-money/core/types"
-	// treasury "github.com/terra-money/core/x/treasury/types"
-
-	// "github.com/cosmos/cosmos-sdk/types/query"
-	// cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	// "github.com/cosmos/cosmos-sdk/x/auth/types"
-	// minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 )
@@ -30,14 +20,19 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioDefault() {
 	midd := ante.NewMinInitialDepositDecorator(suite.app.GovKeeper, suite.app.TreasuryKeeper)
 	antehandler := sdk.ChainAnteDecorators(midd)
 
+	lunaPriceInUSD := sdk.MustNewDecFromStr("0.10008905")
+	fmt.Printf("\n lunaPriceInUSD %s", lunaPriceInUSD.String())
+	suite.app.OracleKeeper.SetLunaExchangeRate(suite.ctx, core.MicroUSDDenom, lunaPriceInUSD)
+
 	// set required deposit to uluna
-	suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams())
+	suite.app.GovKeeper.SetParams(suite.ctx, govv2custom.DefaultParams())
 	govparams := suite.app.GovKeeper.GetParams(suite.ctx)
-	govparams.MinDeposit = sdk.NewCoins(
-		sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)),
-	)
+	govparams.MinUusdDeposit = sdk.NewCoin(core.MicroUSDDenom, sdk.NewInt(500_000_000))
 	suite.app.GovKeeper.SetParams(suite.ctx, govparams)
 
+	price, _ := suite.app.GovKeeper.GetMinimumDepositBaseUstc(suite.ctx)
+	fmt.Printf("\n GetMinimumDepositBaseUstc %s", price.String())
+
 	// set initial deposit ratio to 0.0
 	ratio := sdk.ZeroDec()
 	suite.app.TreasuryKeeper.SetMinInitialDepositRatio(suite.ctx, ratio)
@@ -85,23 +80,32 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithSufficientDeposit() {
 	midd := ante.NewMinInitialDepositDecorator(suite.app.GovKeeper, suite.app.TreasuryKeeper)
 	antehandler := sdk.ChainAnteDecorators(midd)
 
+	lunaPriceInUSD := sdk.MustNewDecFromStr("0.0001")
+	fmt.Printf("\n lunaPriceInUSD %s", lunaPriceInUSD.String())
+	suite.app.OracleKeeper.SetLunaExchangeRate(suite.ctx, core.MicroUSDDenom, lunaPriceInUSD)
+
 	// set required deposit to uluna
-	suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams())
+	suite.app.GovKeeper.SetParams(suite.ctx, govv2custom.DefaultParams())
 	govparams := suite.app.GovKeeper.GetParams(suite.ctx)
-	govparams.MinDeposit = sdk.NewCoins(
-		sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)),
-	)
+	govparams.MinUusdDeposit = sdk.NewCoin(core.MicroUSDDenom, sdk.NewInt(500_000_000))
 	suite.app.GovKeeper.SetParams(suite.ctx, govparams)
 
+	price, _ := suite.app.GovKeeper.GetMinimumDepositBaseUstc(suite.ctx)
+	fmt.Printf("\n GetMinimumDepositBaseUstc %s", price.String())
+
 	// set initial deposit ratio to 0.2
 	ratio := sdk.NewDecWithPrec(2, 1)
 	suite.app.TreasuryKeeper.SetMinInitialDepositRatio(suite.ctx, ratio)
 
 	// keys and addresses
+
+	initDeposit, _ := sdk.NewIntFromString("1000000000000")
+	fmt.Printf("\n initDeposit %s", initDeposit.String())
+
 	priv1, _, addr1 := testdata.KeyTestPubAddr()
 	prop1 := govv1beta1.NewTextProposal("prop1", "prop1")
 	depositCoins1 := sdk.NewCoins(
-		sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(200_000)),
+		sdk.NewCoin(core.MicroLunaDenom, initDeposit),
 	)
 
 	// create prop tx
@@ -142,14 +146,19 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit()
 	midd := ante.NewMinInitialDepositDecorator(suite.app.GovKeeper, suite.app.TreasuryKeeper)
 	antehandler := sdk.ChainAnteDecorators(midd)
 
+	lunaPriceInUSD := sdk.MustNewDecFromStr("0.00008905")
+	fmt.Printf("\n lunaPriceInUSD %s", lunaPriceInUSD.String())
+	suite.app.OracleKeeper.SetLunaExchangeRate(suite.ctx, core.MicroUSDDenom, lunaPriceInUSD)
+
 	// set required deposit to uluna
-	suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams())
+	suite.app.GovKeeper.SetParams(suite.ctx, govv2custom.DefaultParams())
 	govparams := suite.app.GovKeeper.GetParams(suite.ctx)
-	govparams.MinDeposit = sdk.NewCoins(
-		sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)),
-	)
+	govparams.MinUusdDeposit = sdk.NewCoin(core.MicroUSDDenom, sdk.NewInt(500_000_000))
 	suite.app.GovKeeper.SetParams(suite.ctx, govparams)
 
+	price, _ := suite.app.GovKeeper.GetMinimumDepositBaseUstc(suite.ctx)
+	fmt.Printf("\n GetMinimumDepositBaseUstc %s", price.String())
+
 	// set initial deposit ratio to 0.2
 	ratio := sdk.NewDecWithPrec(2, 1)
 	suite.app.TreasuryKeeper.SetMinInitialDepositRatio(suite.ctx, ratio)
@@ -187,7 +196,7 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit()
 	txv1, err := suite.CreateTestTx(privs, accNums, accSeqs, suite.ctx.ChainID())
 	suite.Require().NoError(err)
 
-	// ante handler should error for v1 proposal with insufficient deposit
+	// // ante handler should error for v1 proposal with insufficient deposit
 	_, err = antehandler(suite.ctx, txv1, false)
 	suite.Require().Error(err, "error: v1 proposal with insufficient initial deposit should have failed")
 }

custom/distribution/types/codec.go

@@ -6,7 +6,7 @@ import (
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 
-	govtypes "github.com/classic-terra/core/v3/custom/gov/types"
+	govtypes "github.com/classic-terra/core/v3/custom/gov/types/v2custom"
 )
 
 // RegisterLegacyAminoCodec registers the necessary x/distribution interfaces and concrete types