diff --git a/app/upgrades.go b/app/upgrades.go index 81ddbb512d..37c536c5ad 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -59,7 +59,7 @@ func (app UmeeApp) RegisterUpgradeHandlers() { } func (app *UmeeApp) registerUpgrade6_6RC1(upgradeInfo upgradetypes.Plan) { - planName := "v6.6-rc1" + planName := "v6.6" app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { @@ -67,16 +67,14 @@ func (app *UmeeApp) registerUpgrade6_6RC1(upgradeInfo upgradetypes.Plan) { // update leverage and metoken params to include burn auction fee share. lparams := app.LeverageKeeper.GetParams(ctx) - // TODO: need to check the reward auction fee params value for v6.6 - lparams.RewardsAuctionFee = sdk.MustNewDecFromStr("0.01") + lparams.RewardsAuctionFee = sdk.MustNewDecFromStr("0.02") if err := app.LeverageKeeper.SetParams(ctx, lparams); err != nil { return nil, err } mekeeper := app.MetokenKeeperB.Keeper(&ctx) meparams := mekeeper.GetParams() - // TODO: need to check the Rewards Auction Fee Factor params value for v6.6 - meparams.RewardsAuctionFeeFactor = 10000 // 100% of fees goes to rewards auction + meparams.RewardsAuctionFeeFactor = 1000 // 10% of fees goes to rewards auction if err := mekeeper.SetParams(meparams); err != nil { return nil, err } diff --git a/x/auction/genesis.go b/x/auction/genesis.go index 8157cb9bf3..867993839e 100644 --- a/x/auction/genesis.go +++ b/x/auction/genesis.go @@ -10,9 +10,7 @@ import ( // DefaultGenesis creates a default genesis state func DefaultGenesis() *GenesisState { return &GenesisState{ - // check bid duration value for v6.6 upgrade - // RewardsParams: RewardsParams{BidDuration: 14 * 24 * 3600}, // 14 days - RewardsParams: RewardsParams{BidDuration: 4 * 3600}, // 4 hours for bid duration this is only for canon-4 network + RewardsParams: RewardsParams{BidDuration: 14 * 24 * 3600}, // 14 days RewardAuctionId: 0, RewardsAuctions: []RewardsKV{}, RewardsBids: []BidKV{}, diff --git a/x/auction/msgs.go b/x/auction/msgs.go index 6a06d3d928..ed08668da6 100644 --- a/x/auction/msgs.go +++ b/x/auction/msgs.go @@ -19,7 +19,6 @@ const minBidDuration = 3600 // 1h in seconds // MinRewardsBid is the minimum increase of the previous bid or the minimum bid if it's the // first one. 50 UX = 50e6uumee -// TODO: need to check the value for v6.6 upgrade var MinRewardsBid = sdk.NewInt(50_000_000) //