Merge branch 'develop' into tick_size

vegaprotocol · Feb 27, 2024 · 61b79a5 · 61b79a5
2 parents c86c27b + 899fb9f
commit 61b79a5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### 🚨 Breaking changes
 
 - [10136](https://github.com/vegaprotocol/vega/issues/10136) - Assure opening auction uncrossing price gets registered in the perps engine.
+- [10635](https://github.com/vegaprotocol/vega/issues/10635) - Add support for tick size
 
 ### 🗑️ Deprecation
 
@@ -20,13 +21,15 @@
 - [10722](https://github.com/vegaprotocol/vega/issues/10722) - Team API aggregation does not aggregate from the latest epoch.
 - [10743](https://github.com/vegaprotocol/vega/issues/10722) - When SLA hysteresis epochs are updated resize the ring using new value.
 - [10725](https://github.com/vegaprotocol/vega/issues/10725) - Batch proposal votes to contain `ELS` per market.
-- [10744](https://github.com/vegaprotocol/vega/issues/10744) - Prevent governance suspension of a market already governance suspended. 
+- [10744](https://github.com/vegaprotocol/vega/issues/10744) - Prevent governance suspension of a market already governance suspended.
 - [10374](https://github.com/vegaprotocol/vega/issues/10374) - Ledger entries did not return data when filtering by transfer id.
-- [10635](https://github.com/vegaprotocol/vega/issues/10635) - Add support for tick size
-- [10750](https://github.com/vegaprotocol/vega/issues/10750) - Handle cancellation of order on entering auction for party in isolated margin mode. 
-- [10748](https://github.com/vegaprotocol/vega/issues/10748) - Ensure apply fees cannot fail. 
-- [10752](https://github.com/vegaprotocol/vega/issues/10752) - Handle amend in place correctly for failure in isolated margin check. 
-- [10753](https://github.com/vegaprotocol/vega/issues/10753) - Handle the case that a submitted order is `FoK` in isolated margin to not double discount it from position. 
+- [10750](https://github.com/vegaprotocol/vega/issues/10750) - Handle cancellation of order on entering auction for party in isolated margin mode.
+- [10748](https://github.com/vegaprotocol/vega/issues/10748) - Ensure apply fees cannot fail.
+- [10752](https://github.com/vegaprotocol/vega/issues/10752) - Handle amend in place correctly for failure in isolated margin check.
+- [10753](https://github.com/vegaprotocol/vega/issues/10753) - Handle the case that a submitted order is `FoK` in isolated margin to not double discount it from position.
+- [10136](https://github.com/vegaprotocol/vega/issues/10136) - Assure opening auction uncrossing price gets registered in the perps engine.
+- [10727](https://github.com/vegaprotocol/vega/issues/10727) - Allow for a 0 funding rate scaling factor.
+
 
 ## 0.74.3
 

diff --git a/commands/proposal_submission.go b/commands/proposal_submission.go
@@ -1276,8 +1276,8 @@ func checkNewPerps(perps *protoTypes.PerpetualProduct, parentProperty string) Er
 		if err != nil {
 			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrIsNotValidNumber)
 		}
-		if !sf.IsPositive() {
-			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrMustBePositive)
+		if sf.IsNegative() {
+			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrMustBePositiveOrZero)
 		}
 	}
 
@@ -1425,8 +1425,8 @@ func checkUpdatePerps(perps *protoTypes.UpdatePerpetualProduct, parentProperty s
 		if err != nil {
 			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrIsNotValidNumber)
 		}
-		if !sf.IsPositive() {
-			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrMustBePositive)
+		if sf.IsNegative() {
+			errs.AddForProperty(fmt.Sprintf("%s.perps.funding_rate_scaling_factor", parentProperty), ErrMustBePositiveOrZero)
 		}
 	}
 

diff --git a/commands/proposal_submission_new_market_test.go b/commands/proposal_submission_new_market_test.go
@@ -5214,14 +5214,7 @@ func testNewPerpsMarketWithFundingRateModifiers(t *testing.T) {
 				FundingRateScalingFactor: ptr.From("-10"),
 			},
 			path: "proposal_submission.terms.change.new_market.changes.instrument.product.perps.funding_rate_scaling_factor",
-			err:  commands.ErrMustBePositive,
-		},
-		{
-			product: vegapb.PerpetualProduct{
-				FundingRateScalingFactor: ptr.From("0"),
-			},
-			path: "proposal_submission.terms.change.new_market.changes.instrument.product.perps.funding_rate_scaling_factor",
-			err:  commands.ErrMustBePositive,
+			err:  commands.ErrMustBePositiveOrZero,
 		},
 		{
 			product: vegapb.PerpetualProduct{

diff --git a/commands/proposal_submission_update_market_test.go b/commands/proposal_submission_update_market_test.go
@@ -3512,14 +3512,7 @@ func testUpdatePerpetualMarketWithFundingRateModifiers(t *testing.T) {
 				FundingRateScalingFactor: ptr.From("-10"),
 			},
 			path: "proposal_submission.terms.change.update_market.changes.instrument.product.perps.funding_rate_scaling_factor",
-			err:  commands.ErrMustBePositive,
-		},
-		{
-			product: vegapb.UpdatePerpetualProduct{
-				FundingRateScalingFactor: ptr.From("0"),
-			},
-			path: "proposal_submission.terms.change.update_market.changes.instrument.product.perps.funding_rate_scaling_factor",
-			err:  commands.ErrMustBePositive,
+			err:  commands.ErrMustBePositiveOrZero,
 		},
 		{
 			product: vegapb.UpdatePerpetualProduct{