Merge pull request #10129 from vegaprotocol/10126-nil-ptr

fix: nil pointer panic
vegaprotocol · Nov 17, 2023 · f53468c · f53468c
2 parents 0eb157d + 9242099
commit f53468c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - [10103](https://github.com/vegaprotocol/vega/issues/10103) - List ledgers `API` returns bad error when filtering by transfer type only.
 - [10120](https://github.com/vegaprotocol/vega/issues/10120) - Assure theoretical and actual funding payment calculations are consistent.
 - [10121](https://github.com/vegaprotocol/vega/issues/10121) - Assure `EstimatePosition` API works correctly with sparse perps data
+- [10126](https://github.com/vegaprotocol/vega/issues/10126) - Account for invalid stop orders in batch, charge default gas.
 
 ## 0.73.0
 

diff --git a/core/processor/gastimator.go b/core/processor/gastimator.go
@@ -209,9 +209,11 @@ func (g *Gastimator) batchGastimate(batch *commandspb.BatchMarketInstructions) u
 			factor = 1.0
 		}
 		var marketId string
-		if os.FallsBelow != nil {
+		// if both are nil, marketId will be empty string, yielding default gas
+		// the order is invalid, but validation is applied later.
+		if os.FallsBelow != nil && os.FallsBelow.OrderSubmission != nil {
 			marketId = os.FallsBelow.OrderSubmission.MarketId
-		} else {
+		} else if os.RisesAbove != nil && os.RisesAbove.OrderSubmission != nil {
 			marketId = os.RisesAbove.OrderSubmission.MarketId
 		}
 		orderGas := g.orderGastimate(marketId)