diff --git a/cmd/vega/commands/verify/genesis.go b/cmd/vega/commands/verify/genesis.go index 3eef4231167..0b7be83f563 100644 --- a/cmd/vega/commands/verify/genesis.go +++ b/cmd/vega/commands/verify/genesis.go @@ -182,11 +182,6 @@ func verifyNetworkParameters(r *reporter, nps map[string]string, overwriteParame continue } - if _, ok := netparams.Deprecated[k]; ok { - r.Err("appstate.network_parameters deprecated parameter `%v`", k) - continue - } - err := netp.Validate(k, v) if err != nil { r.Err("appstate.network_parameters invalid parameter `%v`, %v", k, err) diff --git a/core/netparams/defaults.go b/core/netparams/defaults.go index c800bc48a1c..ad2ab96b544 100644 --- a/core/netparams/defaults.go +++ b/core/netparams/defaults.go @@ -87,24 +87,21 @@ func defaultNetParams() map[string]value { MarketAMMMaxCalculationLevels: NewUint(gteU1).Mutable(true).MustUpdate("100"), // markets - MarketAggressiveOrderBlockDelay: NewUint(gteU0).Mutable(true).MustUpdate("1"), - MarketMarginScalingFactors: NewJSON(&proto.ScalingFactors{}, checks.MarginScalingFactor(), checks.MarginScalingFactorRange(num.DecimalOne(), num.DecimalFromInt64(100))).Mutable(true).MustUpdate(`{"search_level": 1.1, "initial_margin": 1.2, "collateral_release": 1.4}`), - MarketFeeFactorsMakerFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0.00025"), - MarketFeeFactorsInfrastructureFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0.0005"), - MarketFeeFactorsBuyBackFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0"), - MarketFeeFactorsTreasuryFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0"), - MarketAuctionMinimumDuration: NewDuration(gte1s, lte1d).Mutable(true).MustUpdate("30m0s"), - MarketAuctionMaximumDuration: NewDuration(gte1s, lte1mo).Mutable(true).MustUpdate(week), - MarketLiquidityTargetStakeTriggeringRatio: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0"), - MarketProbabilityOfTradingTauScaling: NewDecimal(DecimalGTE(num.MustDecimalFromString("0.0001")), lteD1000).Mutable(true).MustUpdate("1"), - MarketMinProbabilityOfTradingForLPOrders: NewDecimal(DecimalGTE(num.MustDecimalFromString("1e-12")), DecimalLTE(num.MustDecimalFromString("0.1"))).Mutable(true).MustUpdate("1e-8"), - MarketTargetStakeTimeWindow: NewDuration(gte1s, lte1mo).Mutable(true).MustUpdate("1h0m0s"), - MarketTargetStakeScalingFactor: NewDecimal(gtD0, lteD100).Mutable(true).MustUpdate("10"), - MarketValueWindowLength: NewDuration(gte1m, lte1mo).Mutable(true).MustUpdate(week), - MarketPriceMonitoringDefaultParameters: NewJSON(&proto.PriceMonitoringParameters{}, checks.PriceMonitoringParametersAuctionExtension(5*time.Second, 30*24*time.Hour), checks.PriceMonitoringParametersHorizon(5*time.Second, 30*24*time.Hour), checks.PriceMonitoringParametersProbability(num.DecimalFromFloat(0.9), num.DecimalOne())).Mutable(true).MustUpdate(`{"triggers": []}`), - MarketLiquidityProvisionShapesMaxSize: NewInt(gteI1, lteI1000).Mutable(true).MustUpdate("5"), - MarketMinLpStakeQuantumMultiple: NewDecimal(gtD0, DecimalLT(num.MustDecimalFromString("1e10"))).Mutable(true).MustUpdate("1"), - RewardMarketCreationQuantumMultiple: NewDecimal(gteD1, DecimalLT(num.MustDecimalFromString("1e20"))).Mutable(true).MustUpdate("10000000"), + MarketAggressiveOrderBlockDelay: NewUint(gteU0).Mutable(true).MustUpdate("1"), + MarketMarginScalingFactors: NewJSON(&proto.ScalingFactors{}, checks.MarginScalingFactor(), checks.MarginScalingFactorRange(num.DecimalOne(), num.DecimalFromInt64(100))).Mutable(true).MustUpdate(`{"search_level": 1.1, "initial_margin": 1.2, "collateral_release": 1.4}`), + MarketFeeFactorsMakerFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0.00025"), + MarketFeeFactorsInfrastructureFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0.0005"), + MarketFeeFactorsBuyBackFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0"), + MarketFeeFactorsTreasuryFee: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0"), + MarketAuctionMinimumDuration: NewDuration(gte1s, lte1d).Mutable(true).MustUpdate("30m0s"), + MarketAuctionMaximumDuration: NewDuration(gte1s, lte1mo).Mutable(true).MustUpdate(week), + MarketProbabilityOfTradingTauScaling: NewDecimal(DecimalGTE(num.MustDecimalFromString("0.0001")), lteD1000).Mutable(true).MustUpdate("1"), + MarketMinProbabilityOfTradingForLPOrders: NewDecimal(DecimalGTE(num.MustDecimalFromString("1e-12")), DecimalLTE(num.MustDecimalFromString("0.1"))).Mutable(true).MustUpdate("1e-8"), + MarketValueWindowLength: NewDuration(gte1m, lte1mo).Mutable(true).MustUpdate(week), + MarketPriceMonitoringDefaultParameters: NewJSON(&proto.PriceMonitoringParameters{}, checks.PriceMonitoringParametersAuctionExtension(5*time.Second, 30*24*time.Hour), checks.PriceMonitoringParametersHorizon(5*time.Second, 30*24*time.Hour), checks.PriceMonitoringParametersProbability(num.DecimalFromFloat(0.9), num.DecimalOne())).Mutable(true).MustUpdate(`{"triggers": []}`), + MarketLiquidityProvisionShapesMaxSize: NewInt(gteI1, lteI1000).Mutable(true).MustUpdate("5"), + MarketMinLpStakeQuantumMultiple: NewDecimal(gtD0, DecimalLT(num.MustDecimalFromString("1e10"))).Mutable(true).MustUpdate("1"), + RewardMarketCreationQuantumMultiple: NewDecimal(gteD1, DecimalLT(num.MustDecimalFromString("1e20"))).Mutable(true).MustUpdate("10000000"), MarketLiquidityBondPenaltyParameter: NewDecimal(gteD0, lteD1000).Mutable(true).MustUpdate("0.1"), MarketLiquidityEarlyExitPenalty: NewDecimal(gteD0, lteD1000).Mutable(true).MustUpdate("0.05"), @@ -220,13 +217,10 @@ func defaultNetParams() map[string]value { DelegationMinAmount: NewDecimal(gtD0).Mutable(true).MustUpdate("1"), // staking and delegation - StakingAndDelegationRewardPayoutFraction: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("1.0"), - StakingAndDelegationRewardPayoutDelay: NewDuration(DurationGTE(0 * time.Second)).Mutable(true).MustUpdate("24h0m0s"), StakingAndDelegationRewardMaxPayoutPerParticipant: NewDecimal(gteD0).Mutable(true).MustUpdate("0"), StakingAndDelegationRewardDelegatorShare: NewDecimal(gteD0, lteD1).Mutable(true).MustUpdate("0.883"), StakingAndDelegationRewardMinimumValidatorStake: NewDecimal(gteD0).Mutable(true).MustUpdate("0"), StakingAndDelegationRewardCompetitionLevel: NewDecimal(gteD1).Mutable(true).MustUpdate("1.1"), - StakingAndDelegationRewardMaxPayoutPerEpoch: NewDecimal(gteD0).Mutable(true).MustUpdate("7000000000000000000000"), StakingAndDelegationRewardsMinValidators: NewInt(gteI1, lteI500).Mutable(true).MustUpdate("5"), StakingAndDelegationRewardOptimalStakeMultiplier: NewDecimal(gteD1).Mutable(true).MustUpdate("3.0"), diff --git a/core/netparams/genesis_state.go b/core/netparams/genesis_state.go index 31b5e979e59..fbec60f62a6 100644 --- a/core/netparams/genesis_state.go +++ b/core/netparams/genesis_state.go @@ -29,9 +29,6 @@ func DefaultGenesisState() GenesisState { netp := defaultNetParams() for k, v := range netp { - if _, ok := Deprecated[k]; ok { - continue - } state[k] = v.String() } diff --git a/core/netparams/keys.go b/core/netparams/keys.go index dc16375fb99..0bbbbc5c644 100644 --- a/core/netparams/keys.go +++ b/core/netparams/keys.go @@ -35,11 +35,8 @@ const ( MinimumMarginQuantumMultiple = "spam.order.minimumMarginQuantumMultiple" MinimumHoldingQuantumMultiple = "spam.order.minimumHoldingQuantumMultiple" - MarketTargetStakeTimeWindow = "market.stake.target.timeWindow" - MarketTargetStakeScalingFactor = "market.stake.target.scalingFactor" - MarketLiquidityTargetStakeTriggeringRatio = "market.liquidity.targetstake.triggering.ratio" - MarketValueWindowLength = "market.value.windowLength" - MarketPriceMonitoringDefaultParameters = "market.monitor.price.defaultParameters" + MarketValueWindowLength = "market.value.windowLength" + MarketPriceMonitoringDefaultParameters = "market.monitor.price.defaultParameters" MarketMinLpStakeQuantumMultiple = "market.liquidityProvision.minLpStakeQuantumMultiple" MarketProbabilityOfTradingTauScaling = "market.liquidity.probabilityOfTrading.tau.scaling" @@ -165,13 +162,10 @@ const ( GovernanceProposalVolumeRebateProgramMinVoterBalance = "governance.proposal.VolumeRebateProgram.minVoterBalance" // staking and delegation reward network params. - StakingAndDelegationRewardPayoutFraction = "reward.staking.delegation.payoutFraction" StakingAndDelegationRewardMaxPayoutPerParticipant = "reward.staking.delegation.maxPayoutPerParticipant" - StakingAndDelegationRewardPayoutDelay = "reward.staking.delegation.payoutDelay" StakingAndDelegationRewardDelegatorShare = "reward.staking.delegation.delegatorShare" StakingAndDelegationRewardMinimumValidatorStake = "reward.staking.delegation.minimumValidatorStake" StakingAndDelegationRewardCompetitionLevel = "reward.staking.delegation.competitionLevel" - StakingAndDelegationRewardMaxPayoutPerEpoch = "reward.staking.delegation.maxPayoutPerEpoch" StakingAndDelegationRewardsMinValidators = "reward.staking.delegation.minValidators" StakingAndDelegationRewardOptimalStakeMultiplier = "reward.staking.delegation.optimalStakeMultiplier" @@ -289,15 +283,6 @@ const ( MarketAMMMaxCalculationLevels = "market.liquidity.maxAmmCalculationLevels" ) -var Deprecated = map[string]struct{}{ - StakingAndDelegationRewardPayoutFraction: {}, - StakingAndDelegationRewardPayoutDelay: {}, - StakingAndDelegationRewardMaxPayoutPerEpoch: {}, - MarketLiquidityTargetStakeTriggeringRatio: {}, - MarketTargetStakeTimeWindow: {}, - MarketTargetStakeScalingFactor: {}, -} - var AllKeys = map[string]struct{}{ NetworkWideAuctionDuration: {}, RewardsUpdateFrequency: {}, @@ -341,15 +326,12 @@ var AllKeys = map[string]struct{}{ MarketAuctionMaximumDuration: {}, MarketLiquidityBondPenaltyParameter: {}, MarketLiquidityMaximumLiquidityFeeFactorLevel: {}, - MarketLiquidityTargetStakeTriggeringRatio: {}, MarketLiquidityEarlyExitPenalty: {}, MarketLiquiditySLANonPerformanceBondPenaltySlope: {}, MarketLiquiditySLANonPerformanceBondPenaltyMax: {}, MarketLiquidityStakeToCCYVolume: {}, MarketLiquidityProvidersFeeCalculationTimeStep: {}, MarketLiquidityEquityLikeShareFeeFraction: {}, - MarketTargetStakeTimeWindow: {}, - MarketTargetStakeScalingFactor: {}, MarketPriceMonitoringDefaultParameters: {}, MarketMinLpStakeQuantumMultiple: {}, RewardAsset: {}, @@ -427,15 +409,12 @@ var AllKeys = map[string]struct{}{ MarketMinProbabilityOfTradingForLPOrders: {}, ValidatorsEpochLength: {}, DelegationMinAmount: {}, - StakingAndDelegationRewardPayoutFraction: {}, StakingAndDelegationRewardMaxPayoutPerParticipant: {}, - StakingAndDelegationRewardPayoutDelay: {}, StakingAndDelegationRewardDelegatorShare: {}, StakingAndDelegationRewardMinimumValidatorStake: {}, ValidatorsVoteRequired: {}, NetworkCheckpointTimeElapsedBetweenCheckpoints: {}, MarketValueWindowLength: {}, - StakingAndDelegationRewardMaxPayoutPerEpoch: {}, SpamProtectionMinTokensForProposal: {}, SpamProtectionMaxVotes: {}, SpamProtectionMaxProposals: {}, diff --git a/core/netparams/netparams.go b/core/netparams/netparams.go index 2ab73df1af1..43ec43e358f 100644 --- a/core/netparams/netparams.go +++ b/core/netparams/netparams.go @@ -477,10 +477,6 @@ func (s *Store) IsUpdateAllowed(key string) error { return ErrUnknownKey } - if _, ok := Deprecated[key]; ok { - return ErrNetworkParameterDeprecated(key) - } - for _, v := range updateDisallowed { if v == key { return ErrNetworkParameterUpdateDisabledFor(key) diff --git a/core/netparams/netparams_test.go b/core/netparams/netparams_test.go index 03b7d1db570..cd4f060f1c7 100644 --- a/core/netparams/netparams_test.go +++ b/core/netparams/netparams_test.go @@ -456,12 +456,3 @@ func TestCrossNetParamUpdatesInGenesis(t *testing.T) { require.NoError(t, err) require.NoError(t, netp.UponGenesis(context.Background(), buf)) } - -func TestDefaultStateHidesDeprecated(t *testing.T) { - st := netparams.DefaultGenesisState() - - for v := range st { - _, ok := netparams.Deprecated[v] - assert.False(t, ok) - } -}