Skip to content

Commit 3b83f60

Browse files
authored
v3 Upgrade Params (#837)
1 parent 5aacc03 commit 3b83f60

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

app/upgrades/v3/upgrades.go

+15-6
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ func CreateUpgradeHandler(
5757

5858
// Set rate-limit params
5959
keepers.RatelimitKeeper.SetParams(ctx, ratelimittypes.DefaultParams())
60+
6061
// Set pfm params
6162
err = keepers.PFMRouterKeeper.SetParams(ctx, pfmtypes.DefaultParams())
6263
if err != nil {
6364
return nil, err
6465
}
66+
6567
// fee market params
66-
// TODO: change values from default after discussion
67-
ctx.Logger().Info("Setting dynamicfees/feemarket params...")
6868
err = setFeeMarketParams(ctx, keepers.FeeMarketKeeper)
6969
if err != nil {
7070
return nil, err
@@ -77,11 +77,20 @@ func CreateUpgradeHandler(
7777

7878
func setFeeMarketParams(ctx sdk.Context, feemarketKeeper *feemarketkeeper.Keeper) error {
7979
feemarketParams := feemarkettypes.DefaultParams()
80-
feemarketParams.MinBaseGasPrice = math.LegacyMustNewDecFromStr("0.10000000000000000")
81-
feemarketParams.MaxBlockUtilization = uint64(120_000_000)
82-
feemarketParams.FeeDenom = appparams.DefaultBondDenom
83-
feemarketParams.Enabled = true
80+
81+
// update params
82+
feemarketParams.Alpha = math.LegacyMustNewDecFromStr("0.003000000000000000")
83+
feemarketParams.Beta = math.LegacyMustNewDecFromStr("0.980000000000000000")
84+
feemarketParams.Delta = math.LegacyMustNewDecFromStr("0.001500000000000000")
8485
feemarketParams.DistributeFees = true
86+
feemarketParams.Enabled = true
87+
feemarketParams.FeeDenom = appparams.DefaultBondDenom
88+
feemarketParams.Gamma = math.LegacyMustNewDecFromStr("0.008000000000000000")
89+
feemarketParams.MaxBlockUtilization = uint64(120000000)
90+
feemarketParams.MaxLearningRate = math.LegacyMustNewDecFromStr("0.125000000000000000")
91+
feemarketParams.MinBaseGasPrice = math.LegacyMustNewDecFromStr("0.100000000000000000")
92+
feemarketParams.MinLearningRate = math.LegacyMustNewDecFromStr("0.075000000000000000")
93+
feemarketParams.Window = uint64(7)
8594

8695
feemarketState := feemarkettypes.NewState(feemarketParams.Window, feemarketParams.MinBaseGasPrice, feemarketParams.MinLearningRate)
8796
err := feemarketKeeper.SetParams(ctx, feemarketParams)

app/upgrades/v3/upgrades_test.go

+11-3
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,18 @@ func (s *UpgradeTestSuite) TestUpgrade() {
9292
feemarketParams, err := keepers.FeeMarketKeeper.GetParams(ctx)
9393
s.Require().NoError(err, "Error getting feemarket params after upgrade")
9494
expectedFeeMarketParams := feemarkettypes.DefaultParams()
95-
expectedFeeMarketParams.MinBaseGasPrice = math.LegacyMustNewDecFromStr("0.10000000000000000")
96-
expectedFeeMarketParams.MaxBlockUtilization = uint64(120000000)
97-
expectedFeeMarketParams.FeeDenom = "uqsr"
95+
expectedFeeMarketParams.Alpha = math.LegacyMustNewDecFromStr("0.003000000000000000")
96+
expectedFeeMarketParams.Beta = math.LegacyMustNewDecFromStr("0.980000000000000000")
97+
expectedFeeMarketParams.Delta = math.LegacyMustNewDecFromStr("0.001500000000000000")
9898
expectedFeeMarketParams.DistributeFees = true
99+
expectedFeeMarketParams.Enabled = true
100+
expectedFeeMarketParams.FeeDenom = "uqsr"
101+
expectedFeeMarketParams.Gamma = math.LegacyMustNewDecFromStr("0.008000000000000000")
102+
expectedFeeMarketParams.MaxBlockUtilization = uint64(120000000)
103+
expectedFeeMarketParams.MaxLearningRate = math.LegacyMustNewDecFromStr("0.125000000000000000")
104+
expectedFeeMarketParams.MinBaseGasPrice = math.LegacyMustNewDecFromStr("0.100000000000000000")
105+
expectedFeeMarketParams.MinLearningRate = math.LegacyMustNewDecFromStr("0.075000000000000000")
106+
expectedFeeMarketParams.Window = uint64(7)
99107
s.Require().Equal(expectedFeeMarketParams, feemarketParams, "Fee market params do not match expected values after upgrade")
100108
}
101109

0 commit comments

Comments
 (0)