Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update gov default params #906

Merged
merged 1 commit into from
Jan 16, 2025
Merged

feat: update gov default params #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ func newDefAppGenesisByDenom(cdc codec.JSONCodec, moduleBasics module.BasicManag
genesis[m.Name()] = cdc.MustMarshalJSON(state)
case govtypes.ModuleName:
state := govv1.DefaultGenesisState()
coinOne := sdkmath.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil))
for i := 0; i < len(state.Params.MinDeposit); i++ {
state.Params.MinDeposit[i].Denom = denom
state.Params.MinDeposit[i].Amount = coinOne.Mul(sdkmath.NewInt(10000))
}
minDepositAmount := sdkmath.NewInt(1e18).MulRaw(30)
state.Params.MinDeposit = sdk.NewCoins(sdk.NewCoin(denom, minDepositAmount))
state.Params.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin(denom, minDepositAmount.MulRaw(govv1.DefaultMinExpeditedDepositTokensRatio)))
state.Params.MinInitialDepositRatio = sdkmath.LegacyMustNewDecFromStr("0.33").String()
state.Params.MinDepositRatio = sdkmath.LegacyMustNewDecFromStr("0").String()

duration := time.Hour * 24 * 14
state.Params.MaxDepositPeriod = &duration
state.Params.VotingPeriod = &duration
Expand Down
10 changes: 5 additions & 5 deletions app/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,29 +338,29 @@
"min_deposit": [
{
"denom": "apundiai",
"amount": "10000000000000000000000"
"amount": "30000000000000000000"
}
],
"max_deposit_period": "1209600s",
"voting_period": "1209600s",
"quorum": "0.400000000000000000",
"threshold": "0.500000000000000000",
"veto_threshold": "0.334000000000000000",
"min_initial_deposit_ratio": "0.000000000000000000",
"min_initial_deposit_ratio": "0.330000000000000000",
"proposal_cancel_ratio": "0.500000000000000000",
"proposal_cancel_dest": "",
"expedited_voting_period": "86400s",
"expedited_threshold": "0.667000000000000000",
"expedited_min_deposit": [
{
"denom": "stake",
"amount": "50000000"
"denom": "apundiai",
"amount": "150000000000000000000"
}
],
"burn_vote_quorum": false,
"burn_proposal_deposit_prevote": false,
"burn_vote_veto": true,
"min_deposit_ratio": "0.010000000000000000"
"min_deposit_ratio": "0.000000000000000000"
},
"constitution": ""
},
Expand Down
31 changes: 28 additions & 3 deletions app/upgrades/v8/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
Expand All @@ -37,7 +38,7 @@ import (
erc20types "github.com/pundiai/fx-core/v8/x/erc20/types"
ethtypes "github.com/pundiai/fx-core/v8/x/eth/types"
fxevmkeeper "github.com/pundiai/fx-core/v8/x/evm/keeper"
"github.com/pundiai/fx-core/v8/x/gov/keeper"
fxgovkeeper "github.com/pundiai/fx-core/v8/x/gov/keeper"
fxgovv8 "github.com/pundiai/fx-core/v8/x/gov/migrations/v8"
layer2types "github.com/pundiai/fx-core/v8/x/layer2/types"
fxstakingv8 "github.com/pundiai/fx-core/v8/x/staking/migrations/v8"
Expand Down Expand Up @@ -78,6 +79,9 @@ func upgradeTestnet(ctx sdk.Context, app *keepers.AppKeepers) error {
if err := fixTestnetTokenAmount(ctx, app.BankKeeper, app.EvmKeeper, app.Erc20Keeper); err != nil {
return err
}
if err := migrateGovDefaultParams(ctx, app.GovKeeper); err != nil {
return err
}
if err := migrateFeemarketGasPrice(ctx, app.FeeMarketKeeper); err != nil {
return err
}
Expand Down Expand Up @@ -171,12 +175,17 @@ func migrateEvmParams(ctx sdk.Context, evmKeeper *fxevmkeeper.Keeper) error {
return evmKeeper.SetParams(ctx, params)
}

func migrationGovCustomParam(ctx sdk.Context, keeper *keeper.Keeper, storeKey *storetypes.KVStoreKey) error {
func migrationGovCustomParam(ctx sdk.Context, keeper *fxgovkeeper.Keeper, storeKey *storetypes.KVStoreKey) error {
// 1. delete fxParams key
store.RemoveStoreKeys(ctx, storeKey, fxgovv8.GetRemovedStoreKeys())

// 2. init custom params
return keeper.InitCustomParams(ctx)
if err := keeper.InitCustomParams(ctx); err != nil {
return err
}

// 3. set default params
return migrateGovDefaultParams(ctx, keeper)
}

func migrateCrosschainModuleAccount(ctx sdk.Context, ak authkeeper.AccountKeeper) error {
Expand Down Expand Up @@ -521,6 +530,22 @@ func redeployTestnetContract(
)
}

func migrateGovDefaultParams(ctx sdk.Context, keeper *fxgovkeeper.Keeper) error {
params, err := keeper.Params.Get(ctx)
if err != nil {
return err
}

minDepositAmount := sdkmath.NewInt(1e18).MulRaw(30)

params.MinDeposit = sdk.NewCoins(sdk.NewCoin(fxtypes.DefaultDenom, minDepositAmount))
params.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin(fxtypes.DefaultDenom, minDepositAmount.MulRaw(govv1.DefaultMinExpeditedDepositTokensRatio)))
params.MinInitialDepositRatio = sdkmath.LegacyMustNewDecFromStr("0.33").String()
params.MinDepositRatio = sdkmath.LegacyMustNewDecFromStr("0").String()

return keeper.Params.Set(ctx, params)
}

func migrateFeemarketGasPrice(ctx sdk.Context, feemarketKeeper feemarketkeeper.Keeper) error {
params := feemarketKeeper.GetParams(ctx)
params.BaseFee = sdkmath.NewInt(fxtypes.DefaultGasPrice)
Expand Down
6 changes: 3 additions & 3 deletions x/gov/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (suite *KeeperTestSuite) TestDeposits() {
suite.True(initCoins.IsAllLT(params.MinDeposit))

// first deposit
firstCoins := helpers.NewStakingCoins(1000, 18)
firstCoins := helpers.NewStakingCoins(10, 18)
votingStarted, err := suite.App.GovKeeper.AddDeposit(suite.Ctx, proposal.Id, addr, firstCoins)
suite.Require().NoError(err)
suite.False(votingStarted)
Expand All @@ -97,7 +97,7 @@ func (suite *KeeperTestSuite) TestDeposits() {
suite.True(initCoins.Add(firstCoins...).IsAllLT(params.MinDeposit))

// second deposit
secondCoins := helpers.NewStakingCoins(9_000, 18)
secondCoins := helpers.NewStakingCoins(90, 18)
votingStarted, err = suite.App.GovKeeper.AddDeposit(suite.Ctx, proposal.Id, addr, secondCoins)
suite.Require().NoError(err)
suite.True(votingStarted)
Expand All @@ -112,7 +112,7 @@ func (suite *KeeperTestSuite) TestDeposits() {
}

func (suite *KeeperTestSuite) getTextProposal() (sdk.Coins, *govv1.MsgSubmitProposal, error) {
initCoins := helpers.NewStakingCoins(1000, 18)
initCoins := helpers.NewStakingCoins(10, 18)
content := govv1beta1.NewTextProposal("Test", "description")
msgExecLegacyContent, err := govv1.NewLegacyContent(content, suite.govAcct)
suite.Require().NoError(err)
Expand Down
Loading